diff --git a/datapackage.yml b/datapackage.yml
index 9f012953..b68fb4d9 100644
--- a/datapackage.yml
+++ b/datapackage.yml
@@ -1,310 +1,321 @@
-name: country-codes
-title: "Comprehensive country codes: ISO 3166, ITU, ISO 4217 currency codes and many more"
-format: csv
+collection: reference-data
+contributors:
+- path: https://github.com/datasets/country-codes
+  role: maintainer
+  title: Evan Wheeler
 datapackage_version: 1.0.0-beta.13
+format: csv
 last_modified: 2023-09-25
+licenses:
+- name: ODC-PDDL-1.0
+  path: http://opendatacommons.org/licenses/pddl/
+  title: Open Data Commons Public Domain Dedication and License v1.0
+name: country-codes
+related:
+- formats:
+  - CSV
+  - JSON
+  path: /core/country-list
+  publisher: core
+  title: Country list
+- formats:
+  - CSV
+  - JSON
+  path: /core/language-codes
+  publisher: core
+  title: Language codes
+- formats:
+  - CSV
+  - JSON
+  path: /core/airport-codes
+  publisher: core
+  title: Airport codes
+- formats:
+  - CSV
+  - JSON
+  path: /core/continent-codes
+  publisher: core
+  title: Continent codes
 repository:
   type: git
   url: https://github.com/datasets/country-codes
-licenses:
-  - name: ODC-PDDL-1.0
-    path: http://opendatacommons.org/licenses/pddl/
-    title: Open Data Commons Public Domain Dedication and License v1.0
-sources:
-  - name: United Nations Protocol and Liaison Service
-    title: United Nations Protocol and Liaison Service
-    path: https://www.un.org/dgacm/sites/www.un.org.dgacm/files/Documents_Protocol/unterm-efsrca.xlsx
-  - name: Unicode Common Locale Data Repository (CLDR) Project
-    title: Unicode Common Locale Data Repository (CLDR) Project
-    path: https://github.com/unicode-org/cldr-json/blob/d38478855dd8342749f0494332cc8acc2895d20d/cldr-json/cldr-localenames-full/main/ms/territories.json
-  - name: United Nations Department of Economic and Social Affairs Statistics Division
-    title: United Nations Department of Economic and Social Affairs Statistics Division
-    path: https://unstats.un.org/unsd/methodology/m49/overview/
-  - name: SIX Interbank Clearing Ltd (on behalf of ISO)
-    title: SIX Interbank Clearing Ltd (on behalf of ISO)
-    path: https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/list-one.xml
-  - name: Statoids
-    title: Statoids
-    path: http://www.statoids.com/wab.html
-  - name: Geonames
-    title: Geonames
-    path: http://download.geonames.org/export/dump/countryInfo.txt
-  - name: US Securities and Exchange Commission
-    title: US Securities and Exchange Commission
-    path: https://www.sec.gov/submit-filings/filer-support-resources/edgar-state-country-codes
 resources:
-  - name: country-codes
-    format: csv
-    path: data/country-codes.csv
-    schema:
-      fields:
-        - name: FIFA
-          title: FIFA code
-          description: Codes assigned by the Fédération Internationale de Football Association
-          type: string
-        - name: Dial
-          title: telephone dialing code
-          description: Country code from ITU-T recommendation E.164, sometimes followed by area code
-          type: string
-        - name: ISO3166-1-Alpha-3
-          title: ISO3166-1-Alpha-3
-          description: Alpha-3 codes from ISO 3166-1 (synonymous with World Bank Codes)
-          type: string
-          constraints:
-            unique: true
-            minLength: 3
-            maxLength: 3
-        - name: MARC
-          title: MARC code
-          description: MAchine-Readable Cataloging codes from the Library of Congress
-          type: string
-        - name: is_independent
-          title: independent country
-          description: Country status, based on the CIA World Factbook
-          type: string
-        - name: ISO3166-1-numeric
-          title: ISO3166-1-numeric
-          description: Numeric codes from ISO 3166-1
-          type: string
-        - name: GAUL
-          title: GAUL code
-          description: Global Administrative Unit Layers from the Food and Agriculture Organization
-          type: string
-        - name: FIPS
-          title: FIPS code
-          description: Codes from the U.S. standard FIPS PUB 10-4
-          type: string
-        - name: WMO
-          title: WMO code
-          description: Country abbreviations by the World Meteorological Organization
-          type: string
-          constraints:
-            maxLength: 2
-        - name: ISO3166-1-Alpha-2
-          title: ISO3166-1-Alpha-2
-          description: Alpha-2 codes from ISO 3166-1
-          type: string
-          constraints:
-            unique: true
-            minLength: 2
-            maxLength: 2
-        - name: ITU
-          title: ITU code
-          description: Codes assigned by the International Telecommunications Union
-          type: string
-        - name: IOC
-          title: IOC code
-          description: Codes assigned by the International Olympics Committee
-          type: string
-          constraints:
-            maxLength: 3
-        - name: DS
-          title: distinguishing signs of vehicles
-          description: Distinguishing signs of vehicles in international traffic
-          type: string
-        - name: UNTERM Spanish Formal
-          title: UNTERM Spanish Formal
-          description: Country's formal Spanish name from UN Protocol and Liaison Service
-          type: string
-        - name: Global Code
-          title: global code
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: Intermediate Region Code
-          title: intermediate region code
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: official_name_fr
-          title: official name French
-          description: Country or Area official French short name from UN Statistics Division
-          type: string
-        - name: UNTERM French Short
-          title: UNTERM French Short
-          description: Country's short French name from UN Protocol and Liaison Service
-          type: string
-        - name: ISO4217-currency_name
-          title: ISO4217-currency_name
-          description: ISO 4217 currency name
-          type: string
-        - name: UNTERM Russian Formal
-          title: UNTERM Russian Formal
-          description: Country's formal Russian name from UN Protocol and Liaison Service
-          type: string
-        - name: UNTERM English Short
-          title: UNTERM English Short
-          description: Country's short English name from UN Protocol and Liaison Service
-          type: string
-        - name: ISO4217-currency_alphabetic_code
-          title: ISO4217-currency_alphabetic_code
-          description: ISO 4217 currency alphabetic code
-          type: string
-        - name: Small Island Developing States (SIDS)
-          title: small island developing state (SIDS)
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: UNTERM Spanish Short
-          title: UNTERM Spanish Short
-          description: Country's short Spanish name from UN Protocol and Liaison Service
-          type: string
-        - name: ISO4217-currency_numeric_code
-          title: ISO4217-currency_numeric_code
-          description: ISO 4217 currency numeric code
-          type: string
-        - name: UNTERM Chinese Formal
-          title: UNTERM Chinese Formal
-          description: Country's formal Chinese name from UN Protocol and Liaison Service
-          type: string
-        - name: UNTERM French Formal
-          title: UNTERM French Formal
-          description: Country's formal French name from UN Protocol and Liaison Service
-          type: string
-        - name: UNTERM Russian Short
-          title: UNTERM Russian Short
-          description: Country's short Russian name from UN Protocol and Liaison Service
-          type: string
-        - name: M49
-          title: M49
-          description: UN Statistics M49 numeric codes (nearly synonymous with ISO 3166-1 numeric codes, which are based on UN M49. ISO 3166-1 does not include Channel Islands or Sark, for example)
-          type: number
-          constraints:
-            unique: true
-        - name: Sub-region Code
-          title: sub-region code
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: Region Code
-          title: region code
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: official_name_ar
-          title: official name Arabic
-          description: Country or Area official Arabic short name from UN Statistics Division
-          type: string
-        - name: ISO4217-currency_minor_unit
-          title: ISO4217-currency_minor_unit
-          description: ISO 4217 currency number of minor units
-          type: string
-        - name: UNTERM Arabic Formal
-          title: UNTERM Arabic Formal
-          description: Country's formal Arabic name from UN Protocol and Liaison Service
-          type: string
-        - name: UNTERM Chinese Short
-          title: UNTERM Chinese Short
-          description: Country's short Chinese name from UN Protocol and Liaison Service
-          type: string
-        - name: Land Locked Developing Countries (LLDC)
-          title: land locked developing country (LLDC)
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: Intermediate Region Name
-          title: intermediate region name
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: official_name_es
-          title: official name Spanish
-          description: Country or Area official Spanish short name from UN Statistics Division
-          type: string
-        - name: UNTERM English Formal
-          title: UNTERM English Formal
-          description: Country's formal English name from UN Protocol and Liaison Service
-          type: string
-        - name: official_name_cn
-          title: official name Chinese
-          description: Country or Area official Chinese short name from UN Statistics Division
-          type: string
-        - name: official_name_en
-          title: official name English
-          description: Country or Area official English short name from UN Statistics Division
-          type: string
-        - name: ISO4217-currency_country_name
-          title: ISO4217-currency_country_name
-          description: ISO 4217 country name
-          type: string
-        - name: Least Developed Countries (LDC)
-          title: least developed country (LDC)
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: Region Name
-          title: region name
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: UNTERM Arabic Short
-          title: UNTERM Arabic Short
-          description: Country's short Arabic name from UN Protocol and Liaison Service
-          type: string
-        - name: Sub-region Name
-          title: sub-region name
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: official_name_ru
-          title: official name Russian
-          description: Country or Area official Russian short name from UN Statistics Division
-          type: string
-        - name: Global Name
-          title: global name
-          description: Country classification from United Nations Statistics Division
-          type: string
-        - name: Capital
-          title: capital city
-          description: Capital city from Geonames
-          type: string
-        - name: Continent
-          title: continent
-          description: Continent from Geonames
-          type: string
-          constraints:
-            minLength: 2
-            maxLength: 2
-        - name: TLD
-          title: TLD
-          description: Top level domain from Geonames
-          type: string
-        - name: Languages
-          title: languages
-          description: Languages from Geonames
-          type: string
-        - name: Geoname ID
-          title: Geoname ID
-          description: Geoname ID
-          type: number
-          constraints:
-            unique: true
-        - name: CLDR display name
-          title: CLDR display name
-          description: Country's customary English short name (CLDR)
-          type: string
-        - name: EDGAR
-          title: EDGAR code
-          description: EDGAR country code from SEC
-          type: string
-          constraints:
-            maxLength: 2
-contributors:
-  - title: Evan Wheeler
-    path: https://github.com/datasets/country-codes
-    role: maintainer
-related:
-  - title: Country list
-    path: /core/country-list
-    publisher: core
-    formats:
-      - CSV
-      - JSON
-  - title: Language codes
-    path: /core/language-codes
-    publisher: core
-    formats:
-      - CSV
-      - JSON
-  - title: Airport codes
-    path: /core/airport-codes
-    publisher: core
-    formats:
-      - CSV
-      - JSON
-  - title: Continent codes
-    path: /core/continent-codes
-    publisher: core
-    formats:
-      - CSV
-      - JSON
+- format: csv
+  name: country-codes
+  path: data/country-codes.csv
+  schema:
+    fields:
+    - description: "Codes assigned by the F\xE9d\xE9ration Internationale de Football\
+        \ Association"
+      name: FIFA
+      title: FIFA code
+      type: string
+    - description: Country code from ITU-T recommendation E.164, sometimes followed
+        by area code
+      name: Dial
+      title: telephone dialing code
+      type: string
+    - constraints:
+        maxLength: 3
+        minLength: 3
+        unique: true
+      description: Alpha-3 codes from ISO 3166-1 (synonymous with World Bank Codes)
+      name: ISO3166-1-Alpha-3
+      title: ISO3166-1-Alpha-3
+      type: string
+    - description: MAchine-Readable Cataloging codes from the Library of Congress
+      name: MARC
+      title: MARC code
+      type: string
+    - description: Country status, based on the CIA World Factbook
+      name: is_independent
+      title: independent country
+      type: string
+    - description: Numeric codes from ISO 3166-1
+      name: ISO3166-1-numeric
+      title: ISO3166-1-numeric
+      type: string
+    - description: Global Administrative Unit Layers from the Food and Agriculture
+        Organization
+      name: GAUL
+      title: GAUL code
+      type: string
+    - description: Codes from the U.S. standard FIPS PUB 10-4
+      name: FIPS
+      title: FIPS code
+      type: string
+    - constraints:
+        maxLength: 2
+      description: Country abbreviations by the World Meteorological Organization
+      name: WMO
+      title: WMO code
+      type: string
+    - constraints:
+        maxLength: 2
+        minLength: 2
+        unique: true
+      description: Alpha-2 codes from ISO 3166-1
+      name: ISO3166-1-Alpha-2
+      title: ISO3166-1-Alpha-2
+      type: string
+    - description: Codes assigned by the International Telecommunications Union
+      name: ITU
+      title: ITU code
+      type: string
+    - constraints:
+        maxLength: 3
+      description: Codes assigned by the International Olympics Committee
+      name: IOC
+      title: IOC code
+      type: string
+    - description: Distinguishing signs of vehicles in international traffic
+      name: DS
+      title: distinguishing signs of vehicles
+      type: string
+    - description: Country's formal Spanish name from UN Protocol and Liaison Service
+      name: UNTERM Spanish Formal
+      title: UNTERM Spanish Formal
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Global Code
+      title: global code
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Intermediate Region Code
+      title: intermediate region code
+      type: string
+    - description: Country or Area official French short name from UN Statistics Division
+      name: official_name_fr
+      title: official name French
+      type: string
+    - description: Country's short French name from UN Protocol and Liaison Service
+      name: UNTERM French Short
+      title: UNTERM French Short
+      type: string
+    - description: ISO 4217 currency name
+      name: ISO4217-currency_name
+      title: ISO4217-currency_name
+      type: string
+    - description: Country's formal Russian name from UN Protocol and Liaison Service
+      name: UNTERM Russian Formal
+      title: UNTERM Russian Formal
+      type: string
+    - description: Country's short English name from UN Protocol and Liaison Service
+      name: UNTERM English Short
+      title: UNTERM English Short
+      type: string
+    - description: ISO 4217 currency alphabetic code
+      name: ISO4217-currency_alphabetic_code
+      title: ISO4217-currency_alphabetic_code
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Small Island Developing States (SIDS)
+      title: small island developing state (SIDS)
+      type: string
+    - description: Country's short Spanish name from UN Protocol and Liaison Service
+      name: UNTERM Spanish Short
+      title: UNTERM Spanish Short
+      type: string
+    - description: ISO 4217 currency numeric code
+      name: ISO4217-currency_numeric_code
+      title: ISO4217-currency_numeric_code
+      type: string
+    - description: Country's formal Chinese name from UN Protocol and Liaison Service
+      name: UNTERM Chinese Formal
+      title: UNTERM Chinese Formal
+      type: string
+    - description: Country's formal French name from UN Protocol and Liaison Service
+      name: UNTERM French Formal
+      title: UNTERM French Formal
+      type: string
+    - description: Country's short Russian name from UN Protocol and Liaison Service
+      name: UNTERM Russian Short
+      title: UNTERM Russian Short
+      type: string
+    - constraints:
+        unique: true
+      description: UN Statistics M49 numeric codes (nearly synonymous with ISO 3166-1
+        numeric codes, which are based on UN M49. ISO 3166-1 does not include Channel
+        Islands or Sark, for example)
+      name: M49
+      title: M49
+      type: number
+    - description: Country classification from United Nations Statistics Division
+      name: Sub-region Code
+      title: sub-region code
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Region Code
+      title: region code
+      type: string
+    - description: Country or Area official Arabic short name from UN Statistics Division
+      name: official_name_ar
+      title: official name Arabic
+      type: string
+    - description: ISO 4217 currency number of minor units
+      name: ISO4217-currency_minor_unit
+      title: ISO4217-currency_minor_unit
+      type: string
+    - description: Country's formal Arabic name from UN Protocol and Liaison Service
+      name: UNTERM Arabic Formal
+      title: UNTERM Arabic Formal
+      type: string
+    - description: Country's short Chinese name from UN Protocol and Liaison Service
+      name: UNTERM Chinese Short
+      title: UNTERM Chinese Short
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Land Locked Developing Countries (LLDC)
+      title: land locked developing country (LLDC)
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Intermediate Region Name
+      title: intermediate region name
+      type: string
+    - description: Country or Area official Spanish short name from UN Statistics
+        Division
+      name: official_name_es
+      title: official name Spanish
+      type: string
+    - description: Country's formal English name from UN Protocol and Liaison Service
+      name: UNTERM English Formal
+      title: UNTERM English Formal
+      type: string
+    - description: Country or Area official Chinese short name from UN Statistics
+        Division
+      name: official_name_cn
+      title: official name Chinese
+      type: string
+    - description: Country or Area official English short name from UN Statistics
+        Division
+      name: official_name_en
+      title: official name English
+      type: string
+    - description: ISO 4217 country name
+      name: ISO4217-currency_country_name
+      title: ISO4217-currency_country_name
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Least Developed Countries (LDC)
+      title: least developed country (LDC)
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Region Name
+      title: region name
+      type: string
+    - description: Country's short Arabic name from UN Protocol and Liaison Service
+      name: UNTERM Arabic Short
+      title: UNTERM Arabic Short
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Sub-region Name
+      title: sub-region name
+      type: string
+    - description: Country or Area official Russian short name from UN Statistics
+        Division
+      name: official_name_ru
+      title: official name Russian
+      type: string
+    - description: Country classification from United Nations Statistics Division
+      name: Global Name
+      title: global name
+      type: string
+    - description: Capital city from Geonames
+      name: Capital
+      title: capital city
+      type: string
+    - constraints:
+        maxLength: 2
+        minLength: 2
+      description: Continent from Geonames
+      name: Continent
+      title: continent
+      type: string
+    - description: Top level domain from Geonames
+      name: TLD
+      title: TLD
+      type: string
+    - description: Languages from Geonames
+      name: Languages
+      title: languages
+      type: string
+    - constraints:
+        unique: true
+      description: Geoname ID
+      name: Geoname ID
+      title: Geoname ID
+      type: number
+    - description: Country's customary English short name (CLDR)
+      name: CLDR display name
+      title: CLDR display name
+      type: string
+    - constraints:
+        maxLength: 2
+      description: EDGAR country code from SEC
+      name: EDGAR
+      title: EDGAR code
+      type: string
+sources:
+- name: United Nations Protocol and Liaison Service
+  path: https://www.un.org/dgacm/sites/www.un.org.dgacm/files/Documents_Protocol/unterm-efsrca.xlsx
+  title: United Nations Protocol and Liaison Service
+- name: Unicode Common Locale Data Repository (CLDR) Project
+  path: https://github.com/unicode-org/cldr-json/blob/d38478855dd8342749f0494332cc8acc2895d20d/cldr-json/cldr-localenames-full/main/ms/territories.json
+  title: Unicode Common Locale Data Repository (CLDR) Project
+- name: United Nations Department of Economic and Social Affairs Statistics Division
+  path: https://unstats.un.org/unsd/methodology/m49/overview/
+  title: United Nations Department of Economic and Social Affairs Statistics Division
+- name: SIX Interbank Clearing Ltd (on behalf of ISO)
+  path: https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/list-one.xml
+  title: SIX Interbank Clearing Ltd (on behalf of ISO)
+- name: Statoids
+  path: http://www.statoids.com/wab.html
+  title: Statoids
+- name: Geonames
+  path: http://download.geonames.org/export/dump/countryInfo.txt
+  title: Geonames
+- name: US Securities and Exchange Commission
+  path: https://www.sec.gov/submit-filings/filer-support-resources/edgar-state-country-codes
+  title: US Securities and Exchange Commission
+title: 'Comprehensive country codes: ISO 3166, ITU, ISO 4217 currency codes and many
+  more'