Update 20260915-0151

Update 20260913-0150
Update 20260912-0151
2026-09-15 22:50:40 +03:00 · 2026-09-15 03:51:21 +02:00 · 2026-09-13 03:50:34 +02:00 · 2026-09-12 03:51:08 +02:00 · 2026-09-11 03:52:05 +02:00 · 2026-09-10 03:53:02 +02:00
548 changed files with 10909 additions and 249515 deletions
--- a/MIGRATION.md
+++ b/MIGRATION.md
@ -1,117 +0,0 @@
 # Migration guide
 This repository was renamed from **rir-ip** to **country-ip-blocks**.
 ## Migration steps
 1. If only consuming raw text files: just update the download URL, no code changes needed
 2. Update repository URLs in your code from `ipverse/rir-ip` to `ipverse/country-ip-blocks`
 3. If parsing JSON: handle field renames (see below)
 ## What's changing
 ### Repository name
 - Old: `ipverse/rir-ip`
 - New: `ipverse/country-ip-blocks`
 ### File structure
 The file structure remains the same:
 ```
 country/ad/aggregated.json
 country/ad/ipv4-aggregated.txt
 country/ad/ipv6-aggregated.txt
 ```
 ### JSON format
 **Old:**
 ```json
 {
  "country": "Andorra",
  "country-code": "AD",
  "delegation-status": [
    "allocated",
    "assigned"
  ],
  "mode": "aggregated",
  "subnets": {
    "ipv4": [
      "46.172.224.0/19",
      "85.94.160.0/19"
    ],
    "ipv6": [
      "2a01:fb00::/29"
    ]
  }
 }
 ```
 **New:**
 ```json
 {
  "country": "Andorra",
  "countryCode": "AD",
  "delegationStatus": [
    "allocated",
    "assigned"
  ],
  "exportMode": "aggregated",
  "prefixes": {
    "ipv4": [
      "46.172.224.0/19",
      "85.94.160.0/19"
    ],
    "ipv6": [
      "2a01:fb00::/29"
    ]
  }
 }
 ```
 **Changes:**
 - `country-code` renamed to `countryCode`
 - `delegation-status` renamed to `delegationStatus`
 - `mode` renamed to `exportMode`
 - `subnets` renamed to `prefixes`
 ### Plaintext format
 The plaintext file format remains the same:
 ipv4-aggregated.txt:
 ```
 # Country: Andorra (AD)
 # Address family: IPv4
 # Delegation status: Allocated || Assigned
 # Export mode: Aggregated
 #
 46.172.224.0/19
 85.94.160.0/19
 ```
 ipv6-aggregated.txt:
 ```
 # Country: Andorra (AD)
 # Address family: IPv6
 # Delegation status: Allocated || Assigned
 # Export mode: Aggregated
 #
 2a01:fb00::/29
 ```
 ### URL changes
 **Old:**
 ```
 https://raw.githubusercontent.com/ipverse/rir-ip/master/country/ad/aggregated.json
 https://raw.githubusercontent.com/ipverse/rir-ip/master/country/ad/ipv4-aggregated.txt
 https://raw.githubusercontent.com/ipverse/rir-ip/master/country/ad/ipv6-aggregated.txt
 ```
 **New:**
 ```
 https://raw.githubusercontent.com/ipverse/country-ip-blocks/master/country/ad/aggregated.json
 https://raw.githubusercontent.com/ipverse/country-ip-blocks/master/country/ad/ipv4-aggregated.txt
 https://raw.githubusercontent.com/ipverse/country-ip-blocks/master/country/ad/ipv6-aggregated.txt
 ```
--- a/README.md
+++ b/README.md
@ -1,15 +1,23 @@
-# country-ip-blocks (formerly rir-ip)
+# country-ip-blocks
-> **📢 Heads up:** This repo has a new name and the data format has changed. Check out [MIGRATION.md](MIGRATION.md) for what you need to update.
+## 🔍 Try it online
-Ready-to-use IPv4 and IPv6 prefixes delegated to countries (ISO 3166-1 alpha-2), sourced from all five regional internet registries (RIR).
+Look up any IP address or prefix at **[Lens by ipverse](https://lens.ipverse.net)** to see its country and AS information.
-This dataset saves you from parsing RIR delegation files yourself - the prefixes are aggregated and ready to drop into firewalls, access control lists, or geo-routing configurations.
+## Overview
 Updated daily when the underlying RIR data changes, so you always have current allocations.
-> **Note:** This data shows which country an IP range is *delegated to* by the RIRs. While it can be used for country-level blocking and compliance, it has limitations - delegated IPs can be used in other countries or routed globally. For pinpoint geolocation (city-level, actual user location), you'll need a dedicated geolocation service.
+Ready-to-use IPv4 and IPv6 prefixes by country (ISO 3166-1 alpha-2), sourced from all five regional internet registries (RIR). Aggregated and updated daily.
-Available formats: JSON and plaintext
+## 📍 Need more accurate geolocation?
 This dataset shows where IP ranges are officially *delegated* - useful for administrative and regulatory purposes. For more accurate operational geolocation based on actual network assignments, check out **[geo-ip-blocks](https://github.com/ipverse/geo-ip-blocks)**.
 | Dataset | Best for |
 |---------|----------|
 | [country-ip-blocks](https://github.com/ipverse/country-ip-blocks) | Administrative/regulatory use cases |
 | [geo-ip-blocks](https://github.com/ipverse/geo-ip-blocks) | Operational geolocation |
 ## Formats
 **JSON format**:
 ```json
@ -44,15 +52,9 @@ Available formats: JSON and plaintext
 2a01:fb00::/29
 ```
 ## Recent changes
 - **2026-01-03**: Repo renamed from `rir-ip` to `country-ip-blocks` and JSON format updated to use camelCase. Check [MIGRATION.md](MIGRATION.md) if you're already using this data.
 - 2025-05-04: Removed country code EU (non-standard code that RIPE only kept for historical reasons)
 ## How to use
-Download the delegated networks for a specific country (Andorra in these examples):
+Download prefixes for a specific country (Andorra in these examples):
 **Andorra in JSON format:**
 ```bash
@ -69,18 +71,29 @@ curl https://raw.githubusercontent.com/ipverse/country-ip-blocks/master/country/
 curl https://raw.githubusercontent.com/ipverse/country-ip-blocks/master/country/ad/ipv6-aggregated.txt
 ```
 ### Bulk download
 Download all countries in a single archive from the [latest release](https://github.com/ipverse/country-ip-blocks/releases/latest):
 ```bash
 curl -LO https://github.com/ipverse/country-ip-blocks/releases/latest/download/country-ip-blocks.tar.gz
 tar -xzf country-ip-blocks.tar.gz
 ```
 ### Want more granular control?
-Instead of blocking an entire geographic region, it might be more effective to block specific internet providers based 
+Instead of blocking an entire geographic region, it might be more effective to block specific internet providers based on their autonomous system number (ASN). Check out [as-ip-blocks](https://github.com/ipverse/as-ip-blocks) for more information.
 on their autonomous system number (ASN). Check out [as-ip-blocks](https://github.com/ipverse/as-ip-blocks) for more information.
 ## Use cases
- Block entire countries at the firewall (for compliance or security reasons)
+- Block countries at the firewall (for compliance or security reasons)
 - Geo-based access control and traffic routing
 - Network research and statistical analysis
 - Threat hunting and security research
- Figure out which IPs are delegated to specific countries
+
- Pretty much anything where you need to map country codes to their delegated networks
+## Recent changes
 - **2026-01-17**: Added bulk download archive in [releases](https://github.com/ipverse/country-ip-blocks/releases/latest)
 - **2026-01-03**: Repo renamed from `rir-ip` to `country-ip-blocks` and JSON format updated to use camelCase.
 - 2025-05-04: Removed country code EU (non-standard code that RIPE only kept for historical reasons)
 ## Questions or issues?
--- a/STATS.md
+++ b/STATS.md
@ -0,0 +1,256 @@
 # country-ip-blocks Statistics
 | RIR | Region | Countries | IPv4 | IPv6 | Total |
 |:----|:-------|----------:|-----:|-----:|------:|
 | AFRINIC | Africa | 56 | 5 597 | 1 657 | 7 254 |
 | APNIC | Asia Pacific | 80 | 58 141 | 17 147 | 75 288 |
 | ARIN | North America | 61 | 76 771 | 11 431 | 88 202 |
 | LACNIC | Latin America & Caribbean | 30 | 20 401 | 13 539 | 33 940 |
 | RIPE | Europe, Middle East & Central Asia | 124 | 101 853 | 26 804 | 128 657 |
 | | | | | | |
 | **Total** | | **238** | **262 763** | **70 578** | **333 341** |
 ## Prefixes by Country
 | Country | IPv4 | IPv6 | Total |
 |:--------|-----:|-----:|------:|
 | Afghanistan (AF) | 127 | 33 | 160 |
 | Åland Islands (AX) | 3 | 2 | 5 |
 | Albania (AL) | 232 | 101 | 333 |
 | Algeria (DZ) | 36 | 8 | 44 |
 | American Samoa (AS) | 2 | 2 | 4 |
 | Andorra (AD) | 27 | 2 | 29 |
 | Angola (AO) | 147 | 40 | 187 |
 | Anguilla (AI) | 9 | 3 | 12 |
 | Antarctica (AQ) | 3 | 1 | 4 |
 | Antigua & Barbuda (AG) | 47 | 9 | 56 |
 | Argentina (AR) | 1 601 | 1 150 | 2 751 |
 | Armenia (AM) | 198 | 54 | 252 |
 | Aruba (AW) | 12 | 3 | 15 |
 | Australia (AU) | 5 670 | 1 663 | 7 333 |
 | Austria (AT) | 1 905 | 597 | 2 502 |
 | Azerbaijan (AZ) | 186 | 77 | 263 |
 | Bahamas (BS) | 26 | 6 | 32 |
 | Bahrain (BH) | 56 | 15 | 71 |
 | Bangladesh (BD) | 2 148 | 1 661 | 3 809 |
 | Barbados (BB) | 30 | 4 | 34 |
 | Belarus (BY) | 105 | 32 | 137 |
 | Belgium (BE) | 920 | 324 | 1 244 |
 | Belize (BZ) | 82 | 27 | 109 |
 | Benin (BJ) | 38 | 15 | 53 |
 | Bermuda (BM) | 47 | 11 | 58 |
 | Bhutan (BT) | 49 | 27 | 76 |
 | Bolivia (BO) | 102 | 57 | 159 |
 | Bosnia & Herzegovina (BA) | 159 | 38 | 197 |
 | Botswana (BW) | 57 | 21 | 78 |
 | Brazil (BR) | 4 921 | 8 942 | 13 863 |
 | British Indian Ocean Territory (IO) | 2 | 1 | 3 |
 | British Virgin Islands (VG) | 213 | 48 | 261 |
 | Brunei (BN) | 35 | 9 | 44 |
 | Bulgaria (BG) | 1 348 | 263 | 1 611 |
 | Burkina Faso (BF) | 51 | 28 | 79 |
 | Burundi (BI) | 12 | 6 | 18 |
 | Cambodia (KH) | 271 | 91 | 362 |
 | Cameroon (CM) | 59 | 23 | 82 |
 | Canada (CA) | 6 362 | 1 138 | 7 500 |
 | Cape Verde (CV) | 23 | 6 | 29 |
 | Caribbean Netherlands (BQ) | 12 | 6 | 18 |
 | Cayman Islands (KY) | 37 | 5 | 42 |
 | Central African Republic (CF) | 5 | 0 | 5 |
 | Chad (TD) | 20 | 5 | 25 |
 | Chile (CL) | 639 | 335 | 974 |
 | China (CN) | 5 513 | 2 033 | 7 546 |
 | Colombia (CO) | 520 | 739 | 1 259 |
 | Comoros (KM) | 6 | 2 | 8 |
 | Congo - Brazzaville (CG) | 22 | 10 | 32 |
 | Congo - Kinshasa (CD) | 83 | 23 | 106 |
 | Cook Islands (CK) | 2 | 2 | 4 |
 | Costa Rica (CR) | 172 | 107 | 279 |
 | Côte d’Ivoire (CI) | 234 | 18 | 252 |
 | Croatia (HR) | 271 | 75 | 346 |
 | Cuba (CU) | 17 | 6 | 23 |
 | Curaçao (CW) | 45 | 21 | 66 |
 | Cyprus (CY) | 538 | 386 | 924 |
 | Czechia (CZ) | 1 567 | 675 | 2 242 |
 | Denmark (DK) | 1 290 | 412 | 1 702 |
 | Djibouti (DJ) | 8 | 3 | 11 |
 | Dominica (DM) | 13 | 6 | 19 |
 | Dominican Republic (DO) | 148 | 216 | 364 |
 | Ecuador (EC) | 315 | 277 | 592 |
 | Egypt (EG) | 180 | 20 | 200 |
 | El Salvador (SV) | 75 | 46 | 121 |
 | Equatorial Guinea (GQ) | 11 | 3 | 14 |
 | Eritrea (ER) | 1 | 0 | 1 |
 | Estonia (EE) | 457 | 163 | 620 |
 | Eswatini (SZ) | 26 | 8 | 34 |
 | Ethiopia (ET) | 17 | 5 | 22 |
 | Falkland Islands (FK) | 7 | 0 | 7 |
 | Faroe Islands (FO) | 14 | 4 | 18 |
 | Fiji (FJ) | 38 | 18 | 56 |
 | Finland (FI) | 987 | 311 | 1 298 |
 | France (FR) | 4 156 | 1 393 | 5 549 |
 | French Guiana (GF) | 6 | 6 | 12 |
 | French Polynesia (PF) | 19 | 7 | 26 |
 | Gabon (GA) | 25 | 8 | 33 |
 | Gambia (GM) | 25 | 10 | 35 |
 | Georgia (GE) | 315 | 80 | 395 |
 | Germany (DE) | 8 728 | 3 081 | 11 809 |
 | Ghana (GH) | 152 | 55 | 207 |
 | Gibraltar (GI) | 74 | 13 | 87 |
 | Greece (GR) | 444 | 109 | 553 |
 | Greenland (GL) | 25 | 3 | 28 |
 | Grenada (GD) | 15 | 10 | 25 |
 | Guadeloupe (GP) | 16 | 5 | 21 |
 | Guam (GU) | 27 | 11 | 38 |
 | Guatemala (GT) | 139 | 82 | 221 |
 | Guernsey (GG) | 59 | 9 | 68 |
 | Guinea (GN) | 23 | 11 | 34 |
 | Guinea-Bissau (GW) | 4 | 2 | 6 |
 | Guyana (GY) | 14 | 9 | 23 |
 | Haiti (HT) | 21 | 10 | 31 |
 | Honduras (HN) | 187 | 116 | 303 |
 | Hong Kong SAR China (HK) | 3 072 | 915 | 3 987 |
 | Hungary (HU) | 656 | 170 | 826 |
 | Iceland (IS) | 162 | 73 | 235 |
 | India (IN) | 7 188 | 2 844 | 10 032 |
 | Indonesia (ID) | 4 749 | 2 744 | 7 493 |
 | Iran (IR) | 1 742 | 570 | 2 312 |
 | Iraq (IQ) | 283 | 118 | 401 |
 | Ireland (IE) | 715 | 214 | 929 |
 | Isle of Man (IM) | 74 | 17 | 91 |
 | Israel (IL) | 780 | 161 | 941 |
 | Italy (IT) | 3 370 | 1 068 | 4 438 |
 | Jamaica (JM) | 52 | 10 | 62 |
 | Japan (JP) | 3 197 | 667 | 3 864 |
 | Jersey (JE) | 47 | 11 | 58 |
 | Jordan (JO) | 128 | 40 | 168 |
 | Kazakhstan (KZ) | 601 | 96 | 697 |
 | Kenya (KE) | 370 | 166 | 536 |
 | Kiribati (KI) | 5 | 3 | 8 |
 | Kuwait (KW) | 132 | 35 | 167 |
 | Kyrgyzstan (KG) | 122 | 30 | 152 |
 | Laos (LA) | 62 | 28 | 90 |
 | Latvia (LV) | 432 | 92 | 524 |
 | Lebanon (LB) | 231 | 109 | 340 |
 | Lesotho (LS) | 20 | 8 | 28 |
 | Liberia (LR) | 20 | 7 | 27 |
 | Libya (LY) | 72 | 18 | 90 |
 | Liechtenstein (LI) | 62 | 29 | 91 |
 | Lithuania (LT) | 948 | 376 | 1 324 |
 | Luxembourg (LU) | 540 | 108 | 648 |
 | Macao SAR China (MO) | 31 | 11 | 42 |
 | Madagascar (MG) | 27 | 8 | 35 |
 | Malawi (MW) | 51 | 32 | 83 |
 | Malaysia (MY) | 790 | 336 | 1 126 |
 | Maldives (MV) | 44 | 14 | 58 |
 | Mali (ML) | 27 | 8 | 35 |
 | Malta (MT) | 124 | 27 | 151 |
 | Marshall Islands (MH) | 9 | 5 | 14 |
 | Martinique (MQ) | 21 | 6 | 27 |
 | Mauritania (MR) | 18 | 6 | 24 |
 | Mauritius (MU) | 118 | 35 | 153 |
 | Mayotte (YT) | 1 | 0 | 1 |
 | Mexico (MX) | 805 | 212 | 1 017 |
 | Micronesia (FM) | 5 | 2 | 7 |
 | Moldova (MD) | 412 | 217 | 629 |
 | Monaco (MC) | 28 | 6 | 34 |
 | Mongolia (MN) | 133 | 55 | 188 |
 | Montenegro (ME) | 43 | 20 | 63 |
 | Montserrat (MS) | 2 | 0 | 2 |
 | Morocco (MA) | 78 | 28 | 106 |
 | Mozambique (MZ) | 59 | 18 | 77 |
 | Myanmar (Burma) (MM) | 234 | 131 | 365 |
 | Namibia (NA) | 39 | 9 | 48 |
 | Nauru (NR) | 7 | 2 | 9 |
 | Nepal (NP) | 270 | 166 | 436 |
 | Netherlands (NL) | 5 701 | 1 931 | 7 632 |
 | New Caledonia (NC) | 42 | 13 | 55 |
 | New Zealand (NZ) | 1 274 | 423 | 1 697 |
 | Nicaragua (NI) | 49 | 24 | 73 |
 | Niger (NE) | 12 | 4 | 16 |
 | Nigeria (NG) | 401 | 133 | 534 |
 | Niue (NU) | 2 | 2 | 4 |
 | Norfolk Island (NF) | 2 | 1 | 3 |
 | Northern Mariana Islands (MP) | 7 | 1 | 8 |
 | North Korea (KP) | 1 | 0 | 1 |
 | North Macedonia (MK) | 106 | 42 | 148 |
 | Norway (NO) | 1 239 | 459 | 1 698 |
 | Oman (OM) | 78 | 25 | 103 |
 | Pakistan (PK) | 742 | 348 | 1 090 |
 | Palau (PW) | 4 | 3 | 7 |
 | Palestinian Territories (PS) | 246 | 46 | 292 |
 | Panama (PA) | 158 | 81 | 239 |
 | Papua New Guinea (PG) | 64 | 26 | 90 |
 | Paraguay (PY) | 143 | 109 | 252 |
 | Peru (PE) | 233 | 231 | 464 |
 | Philippines (PH) | 832 | 371 | 1 203 |
 | Poland (PL) | 3 951 | 974 | 4 925 |
 | Portugal (PT) | 405 | 120 | 525 |
 | Puerto Rico (PR) | 210 | 73 | 283 |
 | Qatar (QA) | 47 | 21 | 68 |
 | Réunion (RE) | 24 | 6 | 30 |
 | Romania (RO) | 2 423 | 269 | 2 692 |
 | Russia (RU) | 8 652 | 2 177 | 10 829 |
 | Rwanda (RW) | 33 | 21 | 54 |
 | Samoa (WS) | 16 | 8 | 24 |
 | San Marino (SM) | 24 | 14 | 38 |
 | São Tomé & Príncipe (ST) | 4 | 1 | 5 |
 | Saudi Arabia (SA) | 591 | 124 | 715 |
 | Senegal (SN) | 36 | 13 | 49 |
 | Serbia (RS) | 388 | 90 | 478 |
 | Seychelles (SC) | 803 | 727 | 1 530 |
 | Sierra Leone (SL) | 30 | 9 | 39 |
 | Singapore (SG) | 1 742 | 472 | 2 214 |
 | Sint Maarten (SX) | 10 | 7 | 17 |
 | Slovakia (SK) | 413 | 148 | 561 |
 | Slovenia (SI) | 535 | 148 | 683 |
 | Solomon Islands (SB) | 12 | 8 | 20 |
 | Somalia (SO) | 30 | 14 | 44 |
 | South Africa (ZA) | 1 587 | 542 | 2 129 |
 | South Korea (KR) | 999 | 142 | 1 141 |
 | South Sudan (SS) | 29 | 8 | 37 |
 | Spain (ES) | 3 432 | 887 | 4 319 |
 | Sri Lanka (LK) | 68 | 24 | 92 |
 | St. Barthélemy (BL) | 3 | 3 | 6 |
 | St. Kitts & Nevis (KN) | 19 | 4 | 23 |
 | St. Lucia (LC) | 21 | 4 | 25 |
 | St. Martin (MF) | 7 | 4 | 11 |
 | St. Pierre & Miquelon (PM) | 2 | 1 | 3 |
 | St. Vincent & Grenadines (VC) | 12 | 3 | 15 |
 | Sudan (SD) | 34 | 10 | 44 |
 | Suriname (SR) | 12 | 5 | 17 |
 | Sweden (SE) | 2 050 | 855 | 2 905 |
 | Switzerland (CH) | 2 681 | 871 | 3 552 |
 | Syria (SY) | 191 | 34 | 225 |
 | Taiwan (TW) | 728 | 318 | 1 046 |
 | Tajikistan (TJ) | 59 | 24 | 83 |
 | Tanzania (TZ) | 196 | 77 | 273 |
 | Thailand (TH) | 669 | 217 | 886 |
 | Timor-Leste (TL) | 39 | 15 | 54 |
 | Togo (TG) | 17 | 8 | 25 |
 | Tokelau (TK) | 3 | 5 | 8 |
 | Tonga (TO) | 11 | 5 | 16 |
 | Trinidad & Tobago (TT) | 53 | 16 | 69 |
 | Tunisia (TN) | 44 | 12 | 56 |
 | Türkiye (TR) | 1 617 | 666 | 2 283 |
 | Turkmenistan (TM) | 11 | 3 | 14 |
 | Turks & Caicos Islands (TC) | 7 | 1 | 8 |
 | Tuvalu (TV) | 1 | 2 | 3 |
 | U.S. Virgin Islands (VI) | 24 | 6 | 30 |
 | Uganda (UG) | 109 | 38 | 147 |
 | Ukraine (UA) | 2 659 | 620 | 3 279 |
 | United Arab Emirates (AE) | 1 207 | 594 | 1 801 |
 | United Kingdom (GB) | 8 242 | 2 046 | 10 288 |
 | United States (US) | 29 581 | 10 618 | 40 199 |
 | Uruguay (UY) | 58 | 41 | 99 |
 | Uzbekistan (UZ) | 175 | 49 | 224 |
 | Vanuatu (VU) | 20 | 11 | 31 |
 | Vatican City (VA) | 4 | 3 | 7 |
 | Venezuela (VE) | 218 | 235 | 453 |
 | Vietnam (VN) | 1 268 | 954 | 2 222 |
 | Wallis & Futuna (WF) | 3 | 1 | 4 |
 | Yemen (YE) | 29 | 6 | 35 |
 | Zambia (ZM) | 40 | 13 | 53 |
 | Zimbabwe (ZW) | 41 | 20 | 61 |
 | | | | |
 | **Total** | **178 288** | **69 327** | **247 615** |
--- a/country/ad/aggregated.json
+++ b/country/ad/aggregated.json
@ -1,42 +1,10 @@
 {
-  "country" : "Andorra",
+  "country": "Andorra",
-  "countryCode" : "AD",
+  "countryCode": "AD",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "2.152.216.0/21", "46.172.224.0/19", "46.175.156.0/22", "80.80.84.0/22", "80.80.92.0/22", "85.8.222.0/24", "85.94.160.0/19", "89.150.2.0/23", "89.150.4.0/22", "89.150.8.0/21", "91.187.64.0/19", "94.125.138.0/23", "94.125.140.0/23", "109.111.96.0/19", "109.175.210.0/24", "109.205.193.0/24", "158.94.220.0/23", "185.4.52.0/22", "185.33.0.0/22", "185.87.36.0/22", "185.87.40.0/21", "185.132.200.0/22", "185.194.56.0/22", "185.247.24.0/22", "188.241.26.0/23", "194.158.64.0/19", "213.236.8.0/21" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2a01:fb00::/29", "2a02:8060::/31" ]
  "prefixes" : {
    "ipv4" : [
      "46.172.224.0/19",
      "46.175.156.0/22",
      "80.80.84.0/22",
      "80.80.92.0/22",
      "85.94.160.0/19",
      "89.150.2.0/23",
      "89.150.4.0/22",
      "89.150.8.0/21",
      "91.187.64.0/19",
      "94.125.138.0/23",
      "94.125.140.0/23",
      "109.111.96.0/19",
      "109.175.210.0/24",
      "109.205.193.0/24",
      "158.94.220.0/23",
      "185.4.52.0/22",
      "185.33.0.0/22",
      "185.87.36.0/22",
      "185.87.40.0/21",
      "185.132.200.0/22",
      "185.194.56.0/22",
      "185.247.24.0/22",
      "188.241.26.0/23",
      "194.158.64.0/19",
      "213.236.8.0/21"
    ],
    "ipv6" : [
      "2a01:fb00::/29",
      "2a02:8060::/31"
    ]
  }
 }
--- a/country/ad/ipv4-aggregated.txt
+++ b/country/ad/ipv4-aggregated.txt
@ -3,10 +3,12 @@
 # Delegation status: Allocated || Assigned
 # Export mode: Aggregated
 #
 2.152.216.0/21
 46.172.224.0/19
 46.175.156.0/22
 80.80.84.0/22
 80.80.92.0/22
 85.8.222.0/24
 85.94.160.0/19
 89.150.2.0/23
 89.150.4.0/22
--- a/country/ae/aggregated.json
+++ b/country/ae/aggregated.json
--- a/country/ae/ipv4-aggregated.txt
+++ b/country/ae/ipv4-aggregated.txt
@ -12,6 +12,7 @@
 2.57.148.0/22
 2.57.240.0/22
 2.58.28.0/22
 2.58.60.0/22
 2.58.96.0/23
 2.58.99.0/24
 2.58.172.0/22
@ -29,6 +30,7 @@
 5.45.64.0/19
 5.53.96.0/21
 5.61.32.0/19
 5.63.128.0/21
 5.83.112.0/21
 5.107.0.0/16
 5.133.108.0/22
@ -38,6 +40,7 @@
 5.181.14.0/23
 5.181.124.0/22
 5.181.128.0/21
 5.181.161.0/24
 5.182.24.0/22
 5.182.108.0/22
 5.182.124.0/22
@ -49,11 +52,17 @@
 5.252.80.0/22
 5.252.160.0/22
 5.253.200.0/22
 9.137.0.0/16
 9.153.0.0/16
 9.171.0.0/16
 9.178.0.0/16
 9.199.0.0/16
 31.14.10.0/24
 31.24.253.0/24
 31.29.64.0/19
 31.41.38.0/23
 31.56.0.0/14
 31.207.4.0/22
 31.215.0.0/16
 31.218.0.0/15
 37.1.192.0/19
@ -161,6 +170,7 @@
 45.137.152.0/21
 45.137.189.0/24
 45.137.190.0/23
 45.137.212.0/22
 45.138.0.0/22
 45.138.144.0/22
 45.139.0.0/22
@ -224,9 +234,12 @@
 45.152.224.0/22
 45.153.48.0/21
 45.153.68.0/22
 45.153.173.0/24
 45.153.224.0/21
 45.154.35.0/24
 45.154.160.0/22
-45.155.60.0/22
+45.155.61.0/24
 45.155.62.0/23
 45.155.156.0/22
 45.156.148.0/22
 45.158.44.0/22
@ -257,13 +270,14 @@
 62.106.86.0/24
 62.122.184.0/24
 62.133.52.0/22
 62.182.168.0/21
 62.192.152.0/24
 62.197.45.0/24
 62.197.48.0/23
 64.255.25.0/24
 65.20.128.0/17
 66.116.128.0/17
 66.220.48.0/22
 72.35.240.0/21
 77.74.201.0/24
 77.81.65.0/24
 77.81.88.0/24
@ -282,23 +296,29 @@
 77.104.64.0/18
 77.105.136.0/21
 77.110.64.0/18
 77.221.132.0/23
 77.237.64.0/19
 77.238.224.0/19
 77.242.240.0/20
 77.243.82.0/23
 77.246.96.0/20
 78.17.0.0/16
 78.40.192.0/21
 79.98.120.0/21
 79.108.227.0/24
 79.110.227.0/24
 79.170.196.0/24
 79.171.117.0/24
 79.171.118.0/23
 80.64.16.0/20
 80.71.147.0/24
 80.71.153.0/24
 80.74.24.0/21
 80.76.32.0/22
 80.76.52.0/22
 80.76.60.0/22
 80.85.244.0/22
 80.224.238.0/24
 80.227.0.0/16
 80.242.56.0/21
 81.16.132.0/22
@ -306,6 +326,8 @@
 81.22.44.0/23
 81.25.68.0/22
 81.25.76.0/22
 81.85.92.0/22
 82.117.242.0/23
 82.178.32.0/23
 82.178.158.0/23
 82.205.128.0/22
@ -314,7 +336,6 @@
 82.205.204.0/22
 82.205.208.0/20
 82.205.224.0/19
 83.97.96.0/21
 83.110.0.0/15
 83.150.220.0/22
 84.38.255.0/24
@ -324,8 +345,13 @@
 84.252.102.0/23
 85.8.184.0/24
 85.8.186.0/23
 85.8.223.0/24
 85.90.208.0/23
 85.115.64.0/19
 85.117.232.0/23
 85.137.24.0/22
 85.137.30.0/24
 85.137.88.0/21
 85.137.251.0/24
 85.202.84.0/22
 85.202.164.0/22
@ -343,6 +369,7 @@
 86.107.50.0/23
 86.107.100.0/23
 86.107.168.0/24
 87.199.192.0/18
 87.200.0.0/15
 87.247.140.0/22
 87.247.156.0/22
@ -383,15 +410,15 @@
 89.46.42.0/24
 89.46.131.0/24
 89.47.36.0/24
 89.47.52.0/24
 89.47.55.0/24
 89.47.252.0/24
 89.110.64.0/18
 89.124.64.0/18
 89.125.0.0/16
 89.150.34.0/23
 89.150.41.0/24
 89.150.59.0/24
 89.187.73.0/24
 89.187.77.0/24
 90.156.144.0/22
 90.156.220.0/23
 91.72.0.0/14
@ -406,12 +433,12 @@
 91.193.180.0/22
 91.194.149.0/24
 91.195.132.0/23
 91.198.18.0/24
 91.198.220.0/24
 91.200.12.0/22
 91.200.146.0/24
 91.201.4.0/22
 91.201.112.0/22
 91.202.211.0/24
 91.206.92.0/23
 91.207.208.0/24
 91.207.236.0/24
@ -431,6 +458,7 @@
 91.213.35.0/24
 91.213.50.0/24
 91.213.99.0/24
 91.213.211.0/26
 91.216.13.0/24
 91.216.59.0/24
 91.216.185.0/24
@ -471,6 +499,7 @@
 92.114.32.0/24
 92.114.54.0/24
 92.114.93.0/24
 92.118.8.0/22
 92.118.160.0/22
 92.119.32.0/22
 92.119.128.0/22
@ -539,10 +568,12 @@
 103.71.20.0/22
 103.73.34.0/23
 103.74.92.0/22
 103.82.102.0/23
 103.85.112.0/22
 103.88.240.0/22
 103.90.72.0/22
 103.110.39.0/24
 103.127.76.0/23
 103.137.248.0/22
 103.141.68.0/23
 103.145.20.0/23
@ -551,16 +582,22 @@
 103.245.228.0/22
 103.249.132.0/22
 104.128.128.0/20
 104.143.192.0/19
 109.69.56.0/21
 109.71.159.0/24
 109.94.208.0/23
 109.94.210.0/24
 109.94.216.0/22
 109.105.128.0/19
 109.106.0.0/22
 109.107.164.0/22
 109.107.172.0/22
 109.107.176.0/22
 109.107.184.0/22
 109.120.141.0/24
 109.120.142.0/24
 109.120.154.0/24
 109.120.158.0/24
 109.175.206.0/24
 109.175.249.0/24
 109.175.254.0/24
@ -584,13 +621,23 @@
 130.49.160.0/22
 130.185.120.0/21
 130.255.0.0/21
-131.222.0.0/16
+131.222.0.0/17
 131.222.129.0/24
 131.222.203.0/24
 131.222.204.0/22
 131.222.222.0/23
 132.243.16.0/20
 132.243.112.0/20
 134.0.216.0/21
 135.136.176.0/20
 138.128.224.0/22
 140.150.48.0/20
 140.225.192.0/19
 141.98.88.0/22
 141.105.160.0/21
 141.163.112.0/20
 143.246.36.0/22
 143.246.40.0/22
 144.124.224.0/19
 146.19.251.0/24
 146.103.96.0/19
@ -598,11 +645,34 @@
 148.222.120.0/22
 149.62.40.0/22
 149.255.192.0/18
 151.158.76.0/23
 151.240.0.0/13
 151.248.96.0/20
 151.253.0.0/16
-153.56.0.0/16
+152.234.128.0/19
 152.237.224.0/19
 153.56.0.0/17
 153.56.132.0/22
 153.56.137.0/24
 153.56.145.0/24
 153.56.146.0/23
 153.56.148.0/24
 153.56.152.0/23
 153.56.172.0/24
 153.56.176.0/22
 153.56.182.0/23
 153.56.210.0/24
 153.56.212.0/22
 153.56.216.0/21
 153.56.224.0/19
 153.75.80.0/20
 153.76.192.0/19
 157.228.112.0/20
 157.228.128.0/18
 158.255.77.0/24
 161.104.88.0/22
 162.35.224.0/19
 164.37.44.0/23
 167.17.32.0/19
 167.17.176.0/20
 167.150.18.0/23
@ -616,6 +686,7 @@
 176.74.24.0/21
 176.74.48.0/21
 176.97.64.0/20
 176.98.40.0/24
 176.101.56.0/21
 176.113.64.0/22
 176.113.80.0/22
@ -625,8 +696,11 @@
 176.204.0.0/15
 176.223.66.0/24
 176.223.188.0/24
 177.177.0.0/19
 177.177.64.0/19
 177.177.224.0/19
 177.201.192.0/19
 178.22.8.0/21
 178.22.24.0/24
 178.23.185.0/24
 178.23.186.0/23
 178.130.40.0/22
@ -634,6 +708,9 @@
 178.217.102.0/24
 178.250.248.0/21
 179.61.128.0/17
 179.69.64.0/18
 179.253.32.0/19
 179.254.192.0/19
 181.41.192.0/19
 181.214.0.0/15
 185.1.15.0/24
@ -644,8 +721,10 @@
 185.21.12.0/22
 185.21.140.0/22
 185.22.228.0/24
 185.24.72.0/22
 185.26.24.0/22
 185.27.116.0/22
 185.28.12.0/22
 185.31.188.0/22
 185.34.40.0/22
 185.34.101.0/24
@ -666,13 +745,13 @@
 185.54.16.0/22
 185.56.88.0/22
 185.64.5.0/24
 185.65.116.0/24
 185.66.16.0/22
 185.66.144.0/22
 185.68.20.0/22
 185.70.100.0/22
 185.71.204.0/22
 185.72.8.0/23
 185.73.85.0/24
 185.76.128.0/22
 185.76.204.0/22
 185.78.244.0/22
@ -690,8 +769,11 @@
 185.105.88.0/22
 185.106.120.0/24
 185.106.122.0/23
 185.109.48.0/24
 185.112.249.0/24
 185.113.250.0/24
 185.114.72.0/22
 185.115.32.0/22
 185.117.72.0/23
 185.117.152.0/22
 185.117.228.0/22
@ -761,6 +843,7 @@
 185.184.77.0/24
 185.184.78.0/24
 185.184.152.0/22
 185.186.52.0/24
 185.187.88.0/24
 185.187.196.0/23
 185.187.198.0/24
@ -783,6 +866,7 @@
 185.193.152.0/22
 185.194.104.0/23
 185.194.106.0/24
 185.194.124.0/22
 185.195.168.0/24
 185.195.240.0/23
 185.195.242.0/24
@ -805,6 +889,7 @@
 185.201.192.0/22
 185.202.111.0/24
 185.203.228.0/22
 185.204.80.0/22
 185.204.168.0/22
 185.209.49.0/24
 185.210.136.0/23
@ -813,10 +898,13 @@
 185.212.119.0/24
 185.215.232.0/22
 185.216.84.0/22
 185.217.172.0/22
 185.218.0.0/24
 185.219.52.0/22
 185.225.192.0/22
 185.225.240.0/22
 185.228.12.0/22
 185.231.44.0/22
 185.232.96.0/24
 185.234.10.0/24
 185.235.40.0/22
@ -831,10 +919,16 @@
 185.244.148.0/23
 185.244.151.0/24
 185.245.104.0/22
 185.246.76.0/22
 185.247.143.0/24
 185.251.20.0/24
 185.254.66.0/23
 186.2.160.0/20
 186.241.160.0/19
 187.5.0.0/20
 187.14.128.0/18
 187.15.192.0/18
 187.55.0.0/18
 188.64.142.0/24
 188.64.162.0/24
 188.95.192.0/24
@ -857,7 +951,13 @@
 188.241.196.0/23
 188.241.221.0/24
 188.244.112.0/24
 189.12.128.0/18
 189.30.64.0/18
 189.31.0.0/19
 189.73.32.0/20
 190.115.16.0/20
 191.0.80.0/20
 191.45.32.0/20
 191.96.0.0/16
 191.101.0.0/16
 192.58.29.0/24
@ -897,7 +997,9 @@
 193.56.186.0/24
 193.58.104.0/22
 193.58.119.0/24
 193.93.170.0/24
 193.104.120.0/24
 193.105.82.0/24
 193.107.49.0/24
 193.107.208.0/22
 193.124.36.0/24
@ -922,13 +1024,16 @@
 193.178.174.0/24
 193.203.60.0/22
 193.203.105.0/24
 193.223.100.0/24
 193.228.139.0/24
 193.238.134.0/23
 193.239.160.0/23
 193.239.166.0/23
 193.242.180.0/24
 194.0.194.0/24
 194.5.192.0/23
 194.5.206.0/23
 194.15.56.0/22
 194.28.112.0/22
 194.31.72.0/22
 194.32.96.0/22
 194.32.104.0/24
@ -944,6 +1049,8 @@
 194.35.126.0/23
 194.36.188.0/24
 194.36.190.0/23
 194.48.196.0/24
 194.48.203.0/24
 194.50.0.0/23
 194.50.4.0/23
 194.50.223.0/24
@ -1035,20 +1142,32 @@
 195.200.64.0/24
 195.229.0.0/16
 195.244.14.0/23
 195.244.18.0/23
 195.245.102.0/23
 195.245.110.0/23
 195.246.110.0/23
 196.3.67.0/24
 196.3.68.0/22
 200.138.16.0/20
 200.138.32.0/20
 200.141.48.0/20
 200.141.176.0/20
 200.149.176.0/20
 200.180.160.0/19
 201.4.0.0/18
 201.24.224.0/20
 201.50.0.0/18
 202.71.12.0/22
 204.77.0.0/22
 206.245.128.0/19
 208.92.224.0/22
 208.122.11.0/24
 208.123.184.0/21
 212.8.251.0/24
 212.34.128.0/20
 212.34.144.0/21
 212.34.152.0/22
 212.80.216.0/22
 212.81.36.0/22
 212.107.20.0/22
 212.108.111.0/24
--- a/country/ae/ipv6-aggregated.txt
+++ b/country/ae/ipv6-aggregated.txt
@ -15,8 +15,10 @@
 2001:67c:29d8::/48
 2001:7f8:7a::/48
 2001:7f8:96::/48
 2001:7f8:178::/48
 2001:8f8::/29
 2001:df4:1980::/48
 2001:df6:a040::/48
 2001:33c0::/29
 2402:2320::/32
 2a00:d30::/32
@ -24,6 +26,7 @@
 2a00:1b00::/32
 2a00:68a0::/32
 2a00:8340::/29
 2a00:9aa0::/32
 2a00:bea0::/32
 2a00:d1a0::/32
 2a00:e460::/29
@ -42,6 +45,7 @@
 2a03:a120::/32
 2a03:a960::/29
 2a03:b180::/32
 2a03:e680::/29
 2a03:f7c0::/29
 2a03:fbc0::/29
 2a03:fd00::/32
@ -63,6 +67,7 @@
 2a05:b440::/29
 2a05:bd80::/29
 2a05:c500::/29
 2a05:ff80::/29
 2a06:c40::/29
 2a06:1ec0::/29
 2a06:2b80::/29
@ -75,6 +80,7 @@
 2a06:b180::/29
 2a06:c680::/29
 2a06:ddc0::/29
 2a07:8c0::/29
 2a07:1f00::/29
 2a07:3700::/29
 2a07:5340::/29
@ -209,6 +215,7 @@
 2a0a:77c0::/29
 2a0a:7a00::/29
 2a0a:7e00::/29
 2a0a:8180::/29
 2a0a:8600::/29
 2a0a:8e00::/29
 2a0a:9200::/29
@ -239,6 +246,7 @@
 2a0b:3300::/29
 2a0b:3700::/29
 2a0b:4180::/29
 2a0b:5440::/29
 2a0b:5780::/29
 2a0b:58c0::/29
 2a0b:8040::/29
@ -248,6 +256,7 @@
 2a0b:d900::/29
 2a0b:e9c0::/29
 2a0b:f340::/29
 2a0c:480::/32
 2a0c:5c0::/29
 2a0c:2ac0::/29
 2a0c:3740::/29
@ -364,6 +373,7 @@
 2a0e:9440::/29
 2a0e:9600::/29
 2a0e:9640::/29
 2a0e:99c0::/29
 2a0e:a040::/29
 2a0e:a340::/29
 2a0e:a740::/29
@ -564,6 +574,9 @@
 2a12:e700::/29
 2a12:ed80::/29
 2a13:a80::/29
 2a13:28c0::/29
 2a13:36c0::/32
 2a13:4480::/29
 2a13:4980::/29
 2a13:4b80::/29
 2a13:5200::/29
@ -578,7 +591,6 @@
 2a14:1000::/29
 2a14:1e00::/29
 2a14:48c0::/29
 2a14:5280::/29
 2a14:6b80::/29
 2a14:6e40::/32
 2a14:9d00::/29
--- a/country/af/aggregated.json
+++ b/country/af/aggregated.json
@ -1,175 +1,10 @@
 {
-  "country" : "Afghanistan",
+  "country": "Afghanistan",
-  "countryCode" : "AF",
+  "countryCode": "AF",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "23.88.192.0/19", "36.50.21.0/24", "43.230.209.0/24", "43.250.136.0/22", "45.65.56.0/22", "45.116.128.0/23", "45.126.253.0/24", "58.147.128.0/19", "59.153.124.0/22", "61.5.192.0/20", "64.207.208.0/21", "64.224.144.0/20", "74.118.80.0/22", "91.109.216.0/21", "103.5.172.0/22", "103.13.64.0/22", "103.15.38.0/24", "103.15.238.0/23", "103.17.60.0/22", "103.17.165.0/24", "103.17.166.0/23", "103.18.160.0/22", "103.23.36.0/22", "103.28.132.0/22", "103.30.136.0/22", "103.42.0.0/22", "103.46.208.0/22", "103.53.16.0/22", "103.53.24.0/22", "103.71.59.0/24", "103.84.97.0/24", "103.86.124.0/22", "103.87.88.0/24", "103.88.192.0/22", "103.89.152.0/23", "103.93.254.0/24", "103.94.24.0/23", "103.96.233.0/24", "103.102.220.0/23", "103.104.146.0/23", "103.106.182.0/24", "103.110.53.0/24", "103.110.54.0/23", "103.112.164.0/22", "103.112.177.0/24", "103.112.178.0/23", "103.114.128.0/23", "103.115.14.0/23", "103.116.25.0/24", "103.119.24.0/22", "103.125.186.0/24", "103.126.4.0/23", "103.132.98.0/23", "103.133.75.0/24", "103.133.82.0/23", "103.139.179.0/24", "103.142.212.0/23", "103.143.204.0/23", "103.144.237.0/24", "103.146.104.0/24", "103.146.146.0/24", "103.146.198.0/24", "103.147.232.0/23", "103.148.70.0/23", "103.149.39.0/24", "103.151.88.0/24", "103.153.80.0/24", "103.156.190.0/23", "103.157.85.0/24", "103.159.163.0/24", "103.161.236.0/23", "103.162.126.0/24", "103.165.190.0/23", "103.168.193.0/24", "103.170.98.0/23", "103.177.206.0/23", "103.185.231.0/24", "103.212.160.0/23", "103.213.104.0/22", "103.215.210.0/23", "103.216.160.0/24", "103.224.127.0/24", "103.227.16.0/22", "103.230.252.0/22", "103.233.183.0/24", "103.235.176.0/22", "103.241.156.0/22", "103.242.50.0/23", "103.247.198.0/24", "103.254.166.0/24", "103.255.204.0/23", "111.125.152.0/21", "116.204.160.0/22", "116.204.240.0/22", "116.206.188.0/22", "117.104.224.0/21", "119.59.80.0/21", "121.100.48.0/21", "125.213.192.0/19", "137.59.120.0/22", "149.54.0.0/17", "152.36.192.0/19", "157.10.229.0/24", "160.30.234.0/24", "160.187.18.0/23", "160.187.20.0/23", "160.191.140.0/23", "160.191.190.0/23", "163.47.160.0/22", "163.61.14.0/23", "163.223.18.0/24", "163.223.36.0/24", "163.223.180.0/23", "163.227.255.0/24", "165.99.188.0/23", "165.101.20.0/23", "165.101.26.0/24", "175.106.32.0/19", "180.94.64.0/19", "180.222.136.0/21", "185.178.144.0/22", "185.193.212.0/22", "202.3.76.0/24", "203.171.96.0/19", "203.174.27.0/24", "203.215.32.0/20", "223.26.20.0/22" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:df0:d500::/48", "2001:df2:6380::/48", "2001:df2:7440::/48", "2001:df2:aa80::/48", "2001:df3:5c0::/48", "2001:df3:31c0::/48", "2001:df4:3f40::/48", "2001:df6:7180::/48", "2400:1980::/32", "2400:3080::/32", "2400:5180::/32", "2400:8b20::/32", "2400:9cc0::/32", "2400:bdc0::/32", "2400:d5c0::/32", "2400:e500::/31", "2400:e640::/32", "2401:1520::/32", "2401:8080::/32", "2402:1ca0::/32", "2402:2880::/32", "2402:3440::/32", "2402:4e40::/32", "2402:e080::/32", "2403:3e40::/32", "2404:6240::/32", "2404:9b00::/32", "2405:2240::/32", "2405:cd40::/32", "2406:3940::/32", "2406:5700::/32", "2406:d100::/32", "2407:6b40::/32" ]
  "prefixes" : {
    "ipv4" : [
      "23.88.192.0/19",
      "36.50.21.0/24",
      "43.230.209.0/24",
      "43.250.136.0/22",
      "45.65.56.0/22",
      "45.116.128.0/23",
      "45.126.253.0/24",
      "58.147.128.0/19",
      "59.153.124.0/22",
      "61.5.192.0/20",
      "64.207.208.0/21",
      "64.224.144.0/20",
      "74.118.80.0/22",
      "91.109.216.0/21",
      "103.5.172.0/22",
      "103.13.64.0/22",
      "103.15.38.0/24",
      "103.15.238.0/23",
      "103.17.60.0/22",
      "103.17.165.0/24",
      "103.17.166.0/23",
      "103.18.160.0/22",
      "103.23.36.0/22",
      "103.28.132.0/22",
      "103.30.136.0/22",
      "103.42.0.0/22",
      "103.46.208.0/22",
      "103.53.16.0/22",
      "103.53.24.0/22",
      "103.71.59.0/24",
      "103.84.97.0/24",
      "103.86.124.0/22",
      "103.87.88.0/24",
      "103.88.192.0/22",
      "103.89.152.0/23",
      "103.93.254.0/24",
      "103.94.24.0/23",
      "103.96.233.0/24",
      "103.102.220.0/23",
      "103.104.146.0/23",
      "103.106.182.0/24",
      "103.110.53.0/24",
      "103.110.54.0/23",
      "103.112.164.0/22",
      "103.112.177.0/24",
      "103.112.178.0/23",
      "103.114.128.0/23",
      "103.115.14.0/23",
      "103.116.25.0/24",
      "103.119.24.0/22",
      "103.125.186.0/24",
      "103.126.4.0/23",
      "103.132.98.0/23",
      "103.133.75.0/24",
      "103.133.82.0/23",
      "103.139.179.0/24",
      "103.142.212.0/23",
      "103.143.204.0/23",
      "103.144.237.0/24",
      "103.146.104.0/24",
      "103.146.146.0/24",
      "103.146.198.0/24",
      "103.147.232.0/23",
      "103.148.70.0/23",
      "103.149.39.0/24",
      "103.151.88.0/24",
      "103.153.80.0/24",
      "103.156.190.0/23",
      "103.157.85.0/24",
      "103.159.163.0/24",
      "103.161.236.0/23",
      "103.162.126.0/24",
      "103.165.190.0/23",
      "103.168.193.0/24",
      "103.170.98.0/23",
      "103.177.206.0/23",
      "103.185.231.0/24",
      "103.212.160.0/23",
      "103.213.104.0/22",
      "103.215.210.0/23",
      "103.216.160.0/24",
      "103.224.127.0/24",
      "103.227.16.0/22",
      "103.230.252.0/22",
      "103.233.183.0/24",
      "103.235.176.0/22",
      "103.241.156.0/22",
      "103.242.50.0/23",
      "103.247.198.0/24",
      "103.254.166.0/24",
      "103.255.204.0/23",
      "111.125.152.0/21",
      "116.204.160.0/22",
      "116.204.240.0/22",
      "116.206.188.0/22",
      "117.104.224.0/21",
      "119.59.80.0/21",
      "121.100.48.0/21",
      "125.213.192.0/19",
      "137.59.120.0/22",
      "149.54.0.0/17",
      "152.36.192.0/19",
      "157.10.229.0/24",
      "160.30.234.0/24",
      "160.187.18.0/23",
      "160.187.20.0/23",
      "160.191.140.0/23",
      "160.191.190.0/23",
      "163.47.160.0/22",
      "163.61.14.0/23",
      "163.223.18.0/24",
      "163.223.36.0/24",
      "163.223.180.0/23",
      "163.227.255.0/24",
      "165.99.188.0/23",
      "165.101.20.0/23",
      "165.101.26.0/24",
      "175.106.32.0/19",
      "180.94.64.0/19",
      "180.222.136.0/21",
      "185.178.144.0/22",
      "185.193.212.0/22",
      "202.3.76.0/24",
      "203.171.96.0/19",
      "203.174.27.0/24",
      "203.215.32.0/20",
      "223.26.20.0/22"
    ],
    "ipv6" : [
      "2001:df0:d500::/48",
      "2001:df2:6380::/48",
      "2001:df2:7440::/48",
      "2001:df2:aa80::/48",
      "2001:df3:5c0::/48",
      "2001:df3:31c0::/48",
      "2001:df4:3f40::/48",
      "2001:df6:7180::/48",
      "2400:1980::/32",
      "2400:3080::/32",
      "2400:5180::/32",
      "2400:8b20::/32",
      "2400:9cc0::/32",
      "2400:bdc0::/32",
      "2400:d5c0::/32",
      "2400:e500::/31",
      "2400:e640::/32",
      "2401:1520::/32",
      "2401:8080::/32",
      "2402:1ca0::/32",
      "2402:2880::/32",
      "2402:3440::/32",
      "2402:4e40::/32",
      "2402:e080::/32",
      "2403:3e40::/32",
      "2404:6240::/32",
      "2404:9b00::/32",
      "2405:2240::/32",
      "2405:cd40::/32",
      "2406:3940::/32",
      "2406:5700::/32",
      "2406:d100::/32",
      "2407:6b40::/32"
    ]
  }
 }
--- a/country/ag/aggregated.json
+++ b/country/ag/aggregated.json
@ -1,66 +1,10 @@
 {
-  "country" : "Antigua & Barbuda",
+  "country": "Antigua & Barbuda",
-  "countryCode" : "AG",
+  "countryCode": "AG",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "2.153.0.0/16", "23.132.144.0/24", "23.176.240.0/24", "46.19.184.0/21", "66.85.40.0/24", "69.50.64.0/20", "69.57.224.0/19", "76.76.160.0/19", "77.239.224.0/19", "83.243.64.0/21", "91.108.0.0/18", "91.212.88.0/24", "92.62.48.0/20", "94.124.176.0/21", "94.229.96.0/20", "95.140.80.0/20", "95.161.0.0/17", "95.161.128.0/21", "95.161.136.0/22", "95.161.240.0/20", "109.239.128.0/20", "149.112.100.0/24", "149.154.160.0/20", "162.210.156.0/22", "162.222.84.0/22", "162.252.188.0/22", "170.39.108.0/22", "178.18.224.0/20", "185.26.72.0/22", "185.51.60.0/22", "185.182.12.0/22", "188.65.64.0/21", "192.64.120.0/22", "193.218.140.0/22", "199.16.56.0/22", "199.48.204.0/22", "199.189.112.0/22", "204.16.112.0/22", "205.217.224.0/19", "206.83.13.0/24", "206.214.0.0/19", "208.83.80.0/21", "209.59.64.0/18", "212.232.64.0/20", "213.21.0.0/19", "213.21.48.0/20", "216.48.96.0/22" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:504:13c::/48", "2001:b28::/32", "2602:f6b5::/36", "2605:9e40::/32", "2620:6f:2000::/44", "2620:95:a000::/48", "2a00:11d8::/32", "2a02:1e0::/29", "2a03:5f80::/32" ]
  "prefixes" : {
    "ipv4" : [
      "23.132.144.0/24",
      "23.176.240.0/24",
      "46.19.184.0/21",
      "69.50.64.0/20",
      "69.57.224.0/19",
      "76.76.160.0/19",
      "77.239.224.0/19",
      "91.108.0.0/18",
      "91.212.88.0/24",
      "92.62.48.0/20",
      "94.124.176.0/21",
      "94.229.96.0/20",
      "95.140.80.0/20",
      "95.161.0.0/17",
      "95.161.128.0/21",
      "95.161.136.0/22",
      "95.161.240.0/20",
      "109.239.128.0/20",
      "149.112.100.0/24",
      "149.154.160.0/20",
      "162.210.156.0/22",
      "162.222.84.0/22",
      "162.252.188.0/22",
      "170.39.108.0/22",
      "178.18.224.0/20",
      "185.51.60.0/22",
      "185.182.12.0/22",
      "188.65.64.0/21",
      "192.64.120.0/22",
      "199.16.56.0/22",
      "199.48.204.0/22",
      "199.189.112.0/22",
      "204.16.112.0/22",
      "205.217.224.0/19",
      "206.83.13.0/24",
      "206.214.0.0/19",
      "208.83.80.0/21",
      "209.59.64.0/18",
      "212.232.64.0/20",
      "213.21.0.0/19",
      "213.21.48.0/20",
      "216.48.96.0/22"
    ],
    "ipv6" : [
      "2001:504:13c::/48",
      "2001:b28::/32",
      "2602:f6b5::/36",
      "2605:9e40::/32",
      "2620:6f:2000::/44",
      "2620:95:a000::/48",
      "2a00:11d8::/32",
      "2a02:1e0::/29",
      "2a03:5f80::/32"
    ]
  }
 }
--- a/country/ag/ipv4-aggregated.txt
+++ b/country/ag/ipv4-aggregated.txt
@ -3,13 +3,16 @@
 # Delegation status: Allocated || Assigned
 # Export mode: Aggregated
 #
 2.153.0.0/16
 23.132.144.0/24
 23.176.240.0/24
 46.19.184.0/21
 66.85.40.0/24
 69.50.64.0/20
 69.57.224.0/19
 76.76.160.0/19
 77.239.224.0/19
 83.243.64.0/21
 91.108.0.0/18
 91.212.88.0/24
 92.62.48.0/20
@ -28,10 +31,12 @@
 162.252.188.0/22
 170.39.108.0/22
 178.18.224.0/20
 185.26.72.0/22
 185.51.60.0/22
 185.182.12.0/22
 188.65.64.0/21
 192.64.120.0/22
 193.218.140.0/22
 199.16.56.0/22
 199.48.204.0/22
 199.189.112.0/22
--- a/country/ai/aggregated.json
+++ b/country/ai/aggregated.json
@ -1,27 +1,10 @@
 {
-  "country" : "Anguilla",
+  "country": "Anguilla",
-  "countryCode" : "AI",
+  "countryCode": "AI",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "104.192.92.0/22", "104.193.196.0/22", "104.255.176.0/22", "162.251.108.0/22", "162.254.188.0/22", "192.30.124.0/24", "195.149.107.0/24", "204.14.248.0/21", "208.66.48.0/21" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2602:f871::/40", "2602:fd72::/36", "2605:6280::/32" ]
  "prefixes" : {
    "ipv4" : [
      "104.192.92.0/22",
      "104.193.196.0/22",
      "104.255.176.0/22",
      "162.251.108.0/22",
      "162.254.188.0/22",
      "192.30.124.0/24",
      "195.149.107.0/24",
      "204.14.248.0/21",
      "208.66.48.0/21"
    ],
    "ipv6" : [
      "2602:f871::/40",
      "2602:fd72::/36",
      "2605:6280::/32"
    ]
  }
 }
--- a/country/al/aggregated.json
+++ b/country/al/aggregated.json
@ -1,337 +1,10 @@
 {
-  "country" : "Albania",
+  "country": "Albania",
-  "countryCode" : "AL",
+  "countryCode": "AL",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "5.206.232.0/21", "31.22.48.0/20", "31.41.33.0/24", "31.44.64.0/20", "31.171.152.0/22", "31.222.40.0/21", "37.26.64.0/21", "37.26.80.0/21", "37.35.64.0/21", "37.139.112.0/21", "37.252.221.0/24", "45.66.252.0/22", "45.74.144.0/21", "45.80.48.0/22", "45.84.116.0/22", "45.84.236.0/22", "45.88.89.0/24", "45.90.80.0/22", "45.93.220.0/22", "45.141.216.0/24", "45.142.24.0/22", "46.19.224.0/21", "46.99.0.0/16", "46.183.20.0/24", "46.183.120.0/21", "46.252.32.0/20", "46.255.144.0/21", "62.101.160.0/21", "66.186.194.0/23", "66.186.198.0/23", "70.40.188.0/23", "77.83.120.0/22", "77.242.16.0/20", "77.247.88.0/21", "77.247.195.0/24", "77.247.248.0/21", "79.98.112.0/21", "79.106.0.0/16", "79.171.48.0/21", "79.174.24.0/22", "80.78.64.0/20", "80.79.13.0/24", "80.80.160.0/20", "80.90.80.0/20", "80.91.112.0/20", "81.26.200.0/21", "82.114.64.0/19", "82.198.32.0/22", "84.20.64.0/19", "84.22.32.0/19", "84.54.48.0/24", "85.137.214.0/24", "85.209.248.0/22", "87.120.100.0/22", "87.121.60.0/23", "87.238.208.0/21", "88.214.16.0/22", "91.92.250.0/24", "91.102.124.0/24", "91.132.172.0/22", "91.187.96.0/19", "91.210.136.0/22", "91.212.96.0/24", "91.226.220.0/24", "91.230.254.0/23", "91.239.6.0/23", "91.239.145.0/24", "91.239.240.0/24", "91.240.165.0/24", "92.60.16.0/20", "92.119.236.0/22", "93.93.168.0/22", "93.115.6.0/24", "93.115.108.0/24", "93.123.113.0/24", "93.159.192.0/21", "93.187.110.0/24", "94.100.48.0/20", "94.125.112.0/21", "94.137.144.0/21", "94.154.152.0/22", "95.86.40.0/22", "95.86.56.0/22", "95.107.128.0/17", "95.133.132.0/22", "95.143.103.0/24", "103.69.32.0/22", "103.93.40.0/22", "103.111.0.0/22", "103.124.164.0/22", "103.167.234.0/23", "103.204.120.0/22", "103.254.240.0/22", "109.69.0.0/21", "109.69.160.0/21", "109.74.28.0/22", "109.104.128.0/22", "109.104.132.0/23", "109.104.134.0/24", "109.104.140.0/23", "109.104.144.0/23", "109.234.232.0/21", "109.236.32.0/20", "130.0.24.0/21", "134.0.32.0/19", "136.148.192.0/20", "139.28.24.0/22", "141.8.200.0/21", "141.98.140.0/22", "144.48.52.0/22", "146.0.16.0/21", "147.78.160.0/22", "151.123.186.0/23", "171.22.148.0/22", "178.132.216.0/21", "178.175.0.0/17", "185.1.73.0/24", "185.1.100.0/24", "185.9.44.0/22", "185.9.139.0/24", "185.16.250.0/24", "185.23.110.0/24", "185.30.144.0/22", "185.32.20.0/22", "185.33.32.0/22", "185.38.192.0/22", "185.46.141.0/24", "185.47.188.0/22", "185.49.24.0/22", "185.50.180.0/22", "185.53.100.0/22", "185.55.44.0/22", "185.55.148.0/22", "185.62.172.0/22", "185.63.176.0/22", "185.66.128.0/22", "185.67.176.0/22", "185.71.180.0/22", "185.77.20.0/24", "185.78.224.0/22", "185.80.224.0/22", "185.82.108.0/22", "185.85.152.0/22", "185.89.156.0/22", "185.94.183.0/24", "185.97.212.0/24", "185.114.112.0/22", "185.118.148.0/22", "185.120.36.0/22", "185.120.181.0/24", "185.122.228.0/22", "185.132.92.0/22", "185.139.4.0/24", "185.144.112.0/24", "185.145.0.0/22", "185.153.124.0/22", "185.156.12.0/22", "185.158.0.0/22", "185.161.184.0/23", "185.171.60.0/22", "185.171.144.0/22", "185.173.204.0/22", "185.174.208.0/22", "185.175.252.0/22", "185.177.28.0/22", "185.179.28.0/22", "185.182.158.0/24", "185.184.217.0/24", "185.186.80.0/22", "185.187.0.0/22", "185.188.216.0/22", "185.190.38.0/24", "185.190.90.0/24", "185.190.132.0/22", "185.191.164.0/22", "185.196.180.0/22", "185.200.212.0/22", "185.200.248.0/22", "185.204.32.0/22", "185.204.154.0/24", "185.205.168.0/22", "185.212.188.0/22", "185.216.15.0/24", "185.221.252.0/22", "185.224.100.0/22", "185.226.88.0/22", "185.233.124.0/22", "185.237.16.0/22", "185.239.8.0/22", "185.254.116.0/23", "188.93.112.0/24", "188.164.216.0/21", "188.172.96.0/20", "188.241.55.0/24", "192.109.210.0/24", "192.109.217.0/24", "192.109.219.0/24", "192.109.220.0/24", "193.38.33.0/24", "193.104.143.0/24", "193.107.12.0/24", "193.163.91.0/24", "193.163.116.0/24", "193.163.187.0/24", "193.187.100.0/22", "193.254.1.0/24", "193.254.2.0/24", "194.1.149.0/24", "194.35.248.0/22", "194.56.182.0/24", "194.117.55.64/26", "194.150.78.0/24", "194.156.252.0/22", "194.169.164.0/22", "195.8.107.0/24", "195.144.24.0/24", "195.146.16.0/20", "195.178.99.0/24", "195.200.234.0/24", "199.168.120.0/22", "203.12.28.0/24", "203.30.219.0/24", "209.23.32.0/20", "212.6.49.0/24", "212.32.43.0/24", "213.163.96.0/19", "213.177.161.0/24", "213.207.32.0/19", "217.20.253.0/24", "217.21.144.0/20", "217.24.240.0/20", "217.73.128.0/20" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:67c:fd0::/48", "2001:7f8:a4::/48", "2001:7f8:bb::/48", "2001:7f8:16a::/48", "2001:7f9:4::/48", "2001:3780::/29", "2001:3800::/29", "2001:3a80::/29", "2407:79c0::/32", "2a00:4940::/29", "2a00:6b80::/29", "2a00:8ba0::/32", "2a00:9be0::/32", "2a00:9f40::/29", "2a00:a260::/32", "2a00:c160::/32", "2a01:4160::/32", "2a01:4f00::/32", "2a01:9d20::/29", "2a01:a960::/32", "2a02:dd00::/29", "2a02:e540::/29", "2a03:2bc0::/29", "2a03:2de0::/32", "2a03:33e0::/29", "2a03:3aa0::/32", "2a03:4840::/29", "2a03:4b80::/32", "2a03:8480::/29", "2a03:df80::/32", "2a04:27c0::/29", "2a04:3080::/29", "2a04:49c0::/29", "2a04:5900::/29", "2a04:a700::/29", "2a04:eb40::/29", "2a05:8300::/29", "2a05:8fc0::/29", "2a05:fdc0::/29", "2a06:73c0::/29", "2a06:8f00::/29", "2a07:9bc0::/29", "2a07:e0c0::/29", "2a09:6e40::/29", "2a09:6ec0::/29", "2a09:a240::/29", "2a09:bc40::/29", "2a09:ca80::/29", "2a0a:7480::/29", "2a0a:a0c0::/29", "2a0a:bac0::/29", "2a0b:6300::/29", "2a0b:96c0::/29", "2a0c:2380::/29", "2a0c:b340::/29", "2a0c:b600::/29", "2a0d:1dc0::/29", "2a0d:27c0::/29", "2a0d:42c0::/29", "2a0d:4940::/29", "2a0d:4a40::/29", "2a0d:ab40::/32", "2a0d:cc00::/29", "2a0d:ccc0::/29", "2a0e:ec0::/29", "2a0e:3f00::/29", "2a0e:4f00::/29", "2a0e:55c0::/29", "2a0e:abc0::/29", "2a0e:d4c0::/29", "2a0f:42c0::/29", "2a0f:4780::/29", "2a0f:8880::/29", "2a0f:a880::/29", "2a0f:ce40::/32", "2a10:b480::/29", "2a10:b800::/32", "2a10:d0c0::/29", "2a10:df40::/29", "2a10:f240::/29", "2a10:ff40::/29", "2a11:1580::/32", "2a11:e340::/29", "2a12:4040::/29", "2a12:7cc0::/29", "2a12:9e40::/29", "2a12:e3c0::/29", "2a12:fc40::/29", "2a12:ffc0::/29", "2a13:500::/32", "2a13:1540::/29", "2a13:4180::/29", "2a13:9ec0::/29", "2a13:bc00::/29", "2a13:c8c0::/29", "2a13:d940::/29", "2a14:1800::/29", "2a14:3400::/29", "2a14:5580::/29", "2a14:7100::/29", "2a14:a700::/29" ]
  "prefixes" : {
    "ipv4" : [
      "5.206.232.0/21",
      "31.22.48.0/20",
      "31.41.33.0/24",
      "31.44.64.0/20",
      "31.171.152.0/22",
      "31.222.40.0/21",
      "37.26.64.0/21",
      "37.26.80.0/21",
      "37.35.64.0/21",
      "37.139.112.0/21",
      "37.252.221.0/24",
      "45.66.252.0/22",
      "45.80.48.0/22",
      "45.84.116.0/22",
      "45.84.236.0/22",
      "45.88.89.0/24",
      "45.90.80.0/22",
      "45.93.220.0/22",
      "45.141.216.0/24",
      "45.142.24.0/22",
      "46.19.224.0/21",
      "46.99.0.0/16",
      "46.183.120.0/21",
      "46.252.32.0/20",
      "46.255.144.0/21",
      "62.101.160.0/21",
      "66.186.194.0/23",
      "66.186.198.0/23",
      "77.83.120.0/22",
      "77.242.16.0/20",
      "77.247.88.0/21",
      "77.247.195.0/24",
      "77.247.248.0/21",
      "79.98.112.0/21",
      "79.106.0.0/16",
      "79.171.48.0/21",
      "79.174.24.0/22",
      "80.78.64.0/20",
      "80.79.13.0/24",
      "80.80.160.0/20",
      "80.90.80.0/20",
      "80.91.112.0/20",
      "81.26.200.0/21",
      "82.114.64.0/19",
      "82.198.32.0/22",
      "84.20.64.0/19",
      "84.22.32.0/19",
      "84.54.48.0/24",
      "85.209.248.0/22",
      "87.120.100.0/22",
      "87.238.208.0/21",
      "88.214.16.0/22",
      "91.132.172.0/22",
      "91.187.96.0/19",
      "91.210.136.0/22",
      "91.212.96.0/24",
      "91.217.6.0/23",
      "91.217.72.0/23",
      "91.226.220.0/24",
      "91.230.254.0/23",
      "91.239.6.0/23",
      "91.239.145.0/24",
      "91.239.240.0/24",
      "91.240.165.0/24",
      "92.60.16.0/20",
      "92.119.236.0/22",
      "93.93.168.0/22",
      "93.115.6.0/24",
      "93.115.108.0/24",
      "93.159.192.0/21",
      "93.187.110.0/24",
      "94.100.48.0/20",
      "94.125.112.0/21",
      "94.137.144.0/21",
      "94.154.152.0/22",
      "95.86.40.0/22",
      "95.86.56.0/22",
      "95.107.128.0/17",
      "103.69.32.0/22",
      "103.93.40.0/22",
      "103.111.0.0/22",
      "103.124.164.0/22",
      "103.167.234.0/23",
      "103.204.120.0/22",
      "103.254.240.0/22",
      "109.69.0.0/21",
      "109.69.160.0/21",
      "109.74.28.0/22",
      "109.104.128.0/22",
      "109.104.132.0/23",
      "109.104.134.0/24",
      "109.104.140.0/22",
      "109.104.144.0/23",
      "109.104.156.0/22",
      "109.234.232.0/21",
      "109.236.32.0/20",
      "130.0.24.0/21",
      "134.0.32.0/19",
      "139.28.24.0/22",
      "141.8.200.0/21",
      "141.98.140.0/22",
      "144.48.52.0/22",
      "146.0.16.0/21",
      "147.78.160.0/22",
      "171.22.148.0/22",
      "178.132.216.0/21",
      "178.175.0.0/17",
      "185.1.73.0/24",
      "185.1.100.0/24",
      "185.9.44.0/22",
      "185.9.139.0/24",
      "185.16.250.0/24",
      "185.23.110.0/24",
      "185.30.144.0/22",
      "185.32.20.0/22",
      "185.33.32.0/22",
      "185.38.192.0/22",
      "185.46.141.0/24",
      "185.47.188.0/22",
      "185.49.24.0/22",
      "185.50.180.0/22",
      "185.53.100.0/22",
      "185.55.44.0/22",
      "185.55.148.0/22",
      "185.62.172.0/22",
      "185.63.176.0/22",
      "185.66.128.0/22",
      "185.67.176.0/22",
      "185.71.180.0/22",
      "185.77.20.0/24",
      "185.78.224.0/22",
      "185.80.224.0/22",
      "185.82.108.0/22",
      "185.85.152.0/22",
      "185.89.156.0/22",
      "185.94.183.0/24",
      "185.97.212.0/24",
      "185.114.112.0/22",
      "185.118.148.0/22",
      "185.120.36.0/22",
      "185.120.181.0/24",
      "185.122.228.0/22",
      "185.132.92.0/22",
      "185.139.4.0/24",
      "185.144.112.0/24",
      "185.145.0.0/22",
      "185.153.124.0/22",
      "185.156.12.0/22",
      "185.158.0.0/22",
      "185.161.184.0/23",
      "185.171.60.0/22",
      "185.171.144.0/22",
      "185.173.204.0/22",
      "185.174.208.0/22",
      "185.175.252.0/22",
      "185.177.28.0/22",
      "185.179.28.0/22",
      "185.182.158.0/24",
      "185.184.217.0/24",
      "185.186.80.0/22",
      "185.187.0.0/22",
      "185.188.216.0/22",
      "185.190.38.0/24",
      "185.190.90.0/24",
      "185.190.132.0/22",
      "185.191.164.0/22",
      "185.196.180.0/22",
      "185.200.212.0/22",
      "185.200.248.0/22",
      "185.204.32.0/22",
      "185.204.154.0/24",
      "185.205.168.0/22",
      "185.212.188.0/22",
      "185.216.15.0/24",
      "185.221.252.0/22",
      "185.224.100.0/22",
      "185.226.88.0/22",
      "185.233.124.0/22",
      "185.237.16.0/22",
      "185.239.8.0/22",
      "185.254.116.0/23",
      "188.93.112.0/24",
      "188.164.216.0/21",
      "188.172.96.0/20",
      "188.241.55.0/24",
      "192.109.210.0/24",
      "192.109.217.0/24",
      "192.109.219.0/24",
      "192.109.220.0/24",
      "193.38.33.0/24",
      "193.104.143.0/24",
      "193.107.12.0/24",
      "193.163.91.0/24",
      "193.163.116.0/24",
      "193.163.187.0/24",
      "193.187.100.0/22",
      "193.254.1.0/24",
      "193.254.2.0/24",
      "194.1.149.0/24",
      "194.35.248.0/22",
      "194.56.182.0/24",
      "194.113.80.0/23",
      "194.113.94.0/23",
      "194.117.55.64/26",
      "194.150.78.0/24",
      "194.156.252.0/22",
      "194.169.164.0/22",
      "195.8.107.0/24",
      "195.178.99.0/24",
      "195.200.234.0/24",
      "199.168.120.0/22",
      "203.30.219.0/24",
      "209.23.32.0/20",
      "212.6.49.0/24",
      "212.32.43.0/24",
      "213.163.96.0/19",
      "213.177.161.0/24",
      "213.207.32.0/19",
      "217.20.253.0/24",
      "217.21.144.0/20",
      "217.24.240.0/20",
      "217.73.128.0/20"
    ],
    "ipv6" : [
      "2001:67c:fd0::/48",
      "2001:7f8:a4::/48",
      "2001:7f8:bb::/48",
      "2001:7f8:16a::/48",
      "2001:7f9:4::/48",
      "2001:3780::/29",
      "2001:3800::/29",
      "2001:3a80::/29",
      "2407:79c0::/32",
      "2a00:4940::/29",
      "2a00:6b80::/29",
      "2a00:8ba0::/32",
      "2a00:9be0::/32",
      "2a00:9f40::/29",
      "2a00:a260::/32",
      "2a00:c160::/32",
      "2a01:4160::/32",
      "2a01:4f00::/32",
      "2a01:9d20::/29",
      "2a01:a960::/32",
      "2a02:dd00::/29",
      "2a02:e540::/29",
      "2a03:2bc0::/29",
      "2a03:2de0::/32",
      "2a03:33e0::/29",
      "2a03:3aa0::/32",
      "2a03:4840::/29",
      "2a03:4b80::/32",
      "2a03:8480::/29",
      "2a03:df80::/32",
      "2a04:27c0::/29",
      "2a04:3080::/29",
      "2a04:49c0::/29",
      "2a04:5900::/29",
      "2a04:a700::/29",
      "2a04:eb40::/29",
      "2a05:8300::/29",
      "2a05:8fc0::/29",
      "2a05:fdc0::/29",
      "2a06:73c0::/29",
      "2a06:8f00::/29",
      "2a07:9bc0::/29",
      "2a07:e0c0::/29",
      "2a09:6e40::/29",
      "2a09:6ec0::/29",
      "2a09:a240::/29",
      "2a09:bc40::/29",
      "2a09:ca80::/29",
      "2a0a:7480::/29",
      "2a0a:a0c0::/29",
      "2a0a:bac0::/29",
      "2a0b:6300::/29",
      "2a0b:96c0::/29",
      "2a0c:2380::/29",
      "2a0c:b340::/29",
      "2a0c:b600::/29",
      "2a0d:1dc0::/29",
      "2a0d:27c0::/29",
      "2a0d:42c0::/29",
      "2a0d:4940::/29",
      "2a0d:4a40::/29",
      "2a0d:ab40::/32",
      "2a0d:cc00::/29",
      "2a0d:ccc0::/29",
      "2a0e:ec0::/29",
      "2a0e:3f00::/29",
      "2a0e:4f00::/29",
      "2a0e:55c0::/29",
      "2a0e:abc0::/29",
      "2a0e:d4c0::/29",
      "2a0f:42c0::/29",
      "2a0f:4780::/29",
      "2a0f:8880::/29",
      "2a0f:a880::/29",
      "2a0f:ce40::/32",
      "2a10:b480::/29",
      "2a10:b800::/32",
      "2a10:d0c0::/29",
      "2a10:df40::/29",
      "2a10:f240::/29",
      "2a10:ff40::/29",
      "2a11:e340::/29",
      "2a12:4040::/29",
      "2a12:7cc0::/29",
      "2a12:9e40::/29",
      "2a12:a3c0::/29",
      "2a12:e3c0::/29",
      "2a12:fc40::/29",
      "2a12:ffc0::/29",
      "2a13:500::/32",
      "2a13:1540::/29",
      "2a13:4180::/29",
      "2a13:9ec0::/29",
      "2a13:bc00::/29",
      "2a13:d940::/29",
      "2a14:1800::/29",
      "2a14:3400::/29",
      "2a14:5580::/29",
      "2a14:7100::/29",
      "2a14:a700::/29"
    ]
  }
 }
--- a/country/al/ipv4-aggregated.txt
+++ b/country/al/ipv4-aggregated.txt
@ -15,6 +15,7 @@
 37.139.112.0/21
 37.252.221.0/24
 45.66.252.0/22
 45.74.144.0/21
 45.80.48.0/22
 45.84.116.0/22
 45.84.236.0/22
@ -25,12 +26,14 @@
 45.142.24.0/22
 46.19.224.0/21
 46.99.0.0/16
 46.183.20.0/24
 46.183.120.0/21
 46.252.32.0/20
 46.255.144.0/21
 62.101.160.0/21
 66.186.194.0/23
 66.186.198.0/23
 70.40.188.0/23
 77.83.120.0/22
 77.242.16.0/20
 77.247.88.0/21
@ -51,16 +54,18 @@
 84.20.64.0/19
 84.22.32.0/19
 84.54.48.0/24
 85.137.214.0/24
 85.209.248.0/22
 87.120.100.0/22
 87.121.60.0/23
 87.238.208.0/21
 88.214.16.0/22
 91.92.250.0/24
 91.102.124.0/24
 91.132.172.0/22
 91.187.96.0/19
 91.210.136.0/22
 91.212.96.0/24
 91.217.6.0/23
 91.217.72.0/23
 91.226.220.0/24
 91.230.254.0/23
 91.239.6.0/23
@ -72,6 +77,7 @@
 93.93.168.0/22
 93.115.6.0/24
 93.115.108.0/24
 93.123.113.0/24
 93.159.192.0/21
 93.187.110.0/24
 94.100.48.0/20
@ -81,6 +87,8 @@
 95.86.40.0/22
 95.86.56.0/22
 95.107.128.0/17
 95.133.132.0/22
 95.143.103.0/24
 103.69.32.0/22
 103.93.40.0/22
 103.111.0.0/22
@ -94,19 +102,20 @@
 109.104.128.0/22
 109.104.132.0/23
 109.104.134.0/24
-109.104.140.0/22
+109.104.140.0/23
 109.104.144.0/23
 109.104.156.0/22
 109.234.232.0/21
 109.236.32.0/20
 130.0.24.0/21
 134.0.32.0/19
 136.148.192.0/20
 139.28.24.0/22
 141.8.200.0/21
 141.98.140.0/22
 144.48.52.0/22
 146.0.16.0/21
 147.78.160.0/22
 151.123.186.0/23
 171.22.148.0/22
 178.132.216.0/21
 178.175.0.0/17
@ -204,16 +213,17 @@
 194.1.149.0/24
 194.35.248.0/22
 194.56.182.0/24
 194.113.80.0/23
 194.113.94.0/23
 194.117.55.64/26
 194.150.78.0/24
 194.156.252.0/22
 194.169.164.0/22
 195.8.107.0/24
 195.144.24.0/24
 195.146.16.0/20
 195.178.99.0/24
 195.200.234.0/24
 199.168.120.0/22
 203.12.28.0/24
 203.30.219.0/24
 209.23.32.0/20
 212.6.49.0/24
--- a/country/al/ipv6-aggregated.txt
+++ b/country/al/ipv6-aggregated.txt
@ -84,11 +84,11 @@
 2a10:df40::/29
 2a10:f240::/29
 2a10:ff40::/29
 2a11:1580::/32
 2a11:e340::/29
 2a12:4040::/29
 2a12:7cc0::/29
 2a12:9e40::/29
 2a12:a3c0::/29
 2a12:e3c0::/29
 2a12:fc40::/29
 2a12:ffc0::/29
@ -97,6 +97,7 @@
 2a13:4180::/29
 2a13:9ec0::/29
 2a13:bc00::/29
 2a13:c8c0::/29
 2a13:d940::/29
 2a14:1800::/29
 2a14:3400::/29
--- a/country/am/aggregated.json
+++ b/country/am/aggregated.json
@ -1,249 +1,10 @@
 {
-  "country" : "Armenia",
+  "country": "Armenia",
-  "countryCode" : "AM",
+  "countryCode": "AM",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "2.56.204.0/22", "5.39.204.0/22", "5.63.160.0/21", "5.77.128.0/17", "5.134.80.0/21", "31.7.160.0/21", "31.47.192.0/21", "31.128.60.0/24", "31.132.72.0/21", "31.171.209.0/24", "37.26.168.0/21", "37.157.208.0/20", "37.186.64.0/18", "37.252.64.0/19", "37.252.216.0/22", "45.11.136.0/22", "45.15.148.0/22", "45.131.124.0/22", "45.133.104.0/22", "45.143.204.0/22", "45.153.212.0/22", "45.159.72.0/22", "46.19.96.0/21", "46.36.112.0/20", "46.70.0.0/15", "46.130.0.0/16", "46.162.192.0/18", "46.182.172.0/22", "46.226.160.0/21", "46.241.128.0/17", "62.3.16.0/24", "62.89.0.0/19", "77.95.184.0/21", "77.105.128.0/21", "77.105.144.0/24", "77.105.160.0/22", "77.105.164.0/24", "78.109.64.0/20", "80.72.16.0/21", "80.72.24.0/22", "80.86.224.0/20", "80.173.118.0/23", "80.173.175.0/24", "81.16.0.0/20", "81.89.208.0/20", "82.199.192.0/20", "83.139.0.0/18", "85.194.252.0/23", "85.198.120.0/21", "87.241.128.0/18", "89.169.32.0/22", "89.169.52.0/22", "89.249.192.0/20", "91.103.24.0/21", "91.103.56.0/21", "91.103.248.0/22", "91.193.43.0/24", "91.195.110.0/23", "91.195.254.0/23", "91.196.36.0/22", "91.198.108.0/23", "91.199.38.0/24", "91.199.226.0/24", "91.201.196.0/24", "91.204.188.0/22", "91.205.132.0/22", "91.205.136.0/21", "91.205.196.0/22", "91.208.76.0/24", "91.209.38.0/24", "91.212.71.0/24", "91.217.157.0/24", "91.218.4.0/22", "91.221.60.0/23", "91.221.228.0/23", "91.223.82.0/24", "91.226.12.0/23", "91.226.235.0/24", "91.228.249.0/24", "91.231.200.0/22", "91.237.150.0/24", "91.239.22.0/24", "91.239.85.0/24", "92.42.102.0/24", "92.43.136.0/21", "92.118.72.0/22", "92.246.132.0/22", "92.246.136.0/21", "93.94.216.0/21", "93.185.32.0/20", "93.185.144.0/20", "93.187.160.0/21", "94.141.100.0/22", "94.142.250.0/24", "94.154.127.0/24", "95.140.192.0/20", "95.174.96.0/19", "109.68.120.0/21", "109.75.32.0/20", "130.193.27.0/24", "130.193.120.0/21", "132.243.185.0/24", "132.243.186.0/23", "132.243.188.0/22", "141.136.64.0/19", "146.19.140.0/24", "148.52.128.0/19", "150.251.46.0/23", "157.228.64.0/19", "157.228.97.0/24", "157.228.98.0/23", "157.228.100.0/22", "157.228.104.0/21", "176.32.192.0/21", "176.113.118.0/24", "176.120.24.0/21", "176.124.96.0/21", "178.78.128.0/18", "178.160.192.0/18", "178.212.139.0/24", "178.219.48.0/20", "178.248.0.0/21", "185.3.188.0/22", "185.8.0.0/22", "185.9.184.0/22", "185.13.196.0/22", "185.21.252.0/22", "185.36.36.0/22", "185.44.228.0/22", "185.48.240.0/22", "185.57.68.0/22", "185.59.68.0/22", "185.77.192.0/22", "185.78.144.0/22", "185.79.0.0/22", "185.80.91.0/24", "185.86.192.0/22", "185.92.84.0/22", "185.113.8.0/24", "185.127.64.0/22", "185.136.32.0/22", "185.149.140.0/22", "185.150.164.0/22", "185.155.232.0/22", "185.167.217.0/24", "185.177.104.0/22", "185.202.113.0/24", "185.215.52.0/22", "185.223.124.0/22", "185.225.202.0/23", "185.230.240.0/22", "185.247.0.0/22", "185.255.68.0/22", "188.92.28.0/24", "188.115.192.0/18", "188.164.152.0/21", "193.29.226.0/24", "193.32.54.0/24", "193.57.28.0/22", "193.104.56.0/24", "193.104.198.0/24", "193.142.19.0/24", "193.163.170.0/24", "193.177.240.0/24", "193.228.137.0/24", "194.1.152.0/24", "194.11.239.0/24", "194.30.176.0/23", "194.31.4.0/23", "194.33.82.0/24", "194.39.82.0/23", "194.39.102.0/23", "194.50.153.0/24", "194.61.88.0/22", "194.117.80.0/24", "194.247.50.0/24", "195.8.50.0/23", "195.20.16.0/24", "195.28.188.0/24", "195.43.74.0/23", "195.60.80.128/27", "195.88.66.0/23", "195.88.254.0/23", "195.128.166.0/23", "195.191.100.0/23", "195.191.154.0/23", "195.191.186.0/23", "195.225.234.0/23", "195.248.240.0/22", "195.250.64.0/19", "212.34.224.0/19", "212.42.192.0/19", "212.73.64.0/19", "213.108.20.0/22", "213.109.197.0/24", "217.76.0.0/20", "217.113.0.0/19", "217.144.176.0/20" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:678:ca4::/48", "2001:67c:21c::/48", "2001:67c:924::/48", "2001:67c:2cdc::/48", "2001:7f8:94::/48", "2001:7f9:8::/48", "2001:4d00::/32", "2a00:f38::/29", "2a00:1500::/29", "2a00:1f28::/32", "2a00:8740::/32", "2a00:cc40::/29", "2a00:f9a0::/32", "2a01:4000::/32", "2a01:4a00::/32", "2a01:bbc0::/32", "2a02:29f8::/32", "2a02:2a50::/29", "2a02:5960::/32", "2a03:1080::/32", "2a03:1900::/29", "2a03:2300::/29", "2a03:27c0::/32", "2a03:3d00::/29", "2a03:5620::/32", "2a03:db40::/29", "2a05:f140::/29", "2a06:33c0::/29", "2a07:66c0::/29", "2a07:ce00::/29", "2a09:f840::/29", "2a0a:9c0::/29", "2a0a:3880::/29", "2a0a:c140::/29", "2a0b:1c40::/29", "2a0b:a3c0::/29", "2a0b:ff80::/29", "2a0c:2080::/29", "2a0c:6440::/29", "2a0c:c840::/29", "2a0d:b800::/29", "2a0d:cd00::/29", "2a0e:2d80::/29", "2a0e:6040::/29", "2a0e:7100::/29", "2a11:6fc0::/29", "2a12:3280::/32", "2a12:5940::/29", "2a13:1ec0::/32", "2a13:3a00::/29", "2a13:9740::/29", "2a14:200::/29", "2a14:ac0::/29", "2a14:4800::/29" ]
  "prefixes" : {
    "ipv4" : [
      "2.56.204.0/22",
      "5.39.204.0/22",
      "5.63.160.0/21",
      "5.77.128.0/17",
      "5.134.80.0/21",
      "31.7.160.0/21",
      "31.47.192.0/21",
      "31.128.60.0/24",
      "31.132.72.0/21",
      "37.26.168.0/21",
      "37.157.208.0/20",
      "37.186.64.0/18",
      "37.252.64.0/19",
      "37.252.216.0/22",
      "45.11.136.0/22",
      "45.15.148.0/22",
      "45.131.124.0/22",
      "45.133.104.0/22",
      "45.143.204.0/22",
      "45.153.212.0/22",
      "45.159.72.0/22",
      "46.19.96.0/21",
      "46.36.112.0/20",
      "46.70.0.0/15",
      "46.130.0.0/16",
      "46.162.192.0/18",
      "46.182.172.0/22",
      "46.226.160.0/21",
      "46.241.128.0/17",
      "62.3.16.0/24",
      "62.89.0.0/19",
      "77.95.184.0/21",
      "77.105.128.0/21",
      "77.105.144.0/24",
      "77.105.160.0/22",
      "77.105.164.0/24",
      "78.109.64.0/20",
      "80.72.16.0/21",
      "80.72.24.0/22",
      "80.86.224.0/20",
      "81.16.0.0/20",
      "81.89.208.0/20",
      "82.199.192.0/20",
      "83.139.0.0/18",
      "85.194.252.0/23",
      "85.198.120.0/21",
      "87.241.128.0/18",
      "89.169.32.0/22",
      "89.169.52.0/22",
      "89.249.192.0/20",
      "91.103.24.0/21",
      "91.103.56.0/21",
      "91.103.248.0/22",
      "91.108.187.0/24",
      "91.193.43.0/24",
      "91.195.110.0/23",
      "91.195.254.0/23",
      "91.196.36.0/22",
      "91.198.108.0/23",
      "91.199.38.0/24",
      "91.199.226.0/24",
      "91.201.196.0/24",
      "91.204.188.0/22",
      "91.205.132.0/22",
      "91.205.136.0/21",
      "91.205.196.0/22",
      "91.208.76.0/24",
      "91.209.38.0/24",
      "91.212.71.0/24",
      "91.217.157.0/24",
      "91.218.4.0/22",
      "91.221.60.0/23",
      "91.221.228.0/23",
      "91.223.82.0/24",
      "91.226.12.0/23",
      "91.226.235.0/24",
      "91.228.249.0/24",
      "91.231.200.0/22",
      "91.237.150.0/24",
      "91.239.22.0/24",
      "91.239.85.0/24",
      "92.42.102.0/24",
      "92.43.136.0/21",
      "92.118.72.0/22",
      "92.246.132.0/22",
      "92.246.136.0/21",
      "93.94.216.0/21",
      "93.185.32.0/20",
      "93.185.144.0/20",
      "93.187.160.0/21",
      "94.141.100.0/22",
      "94.142.250.0/24",
      "95.140.192.0/20",
      "95.174.96.0/19",
      "109.68.120.0/21",
      "109.75.32.0/20",
      "130.193.27.0/24",
      "130.193.120.0/21",
      "141.136.64.0/19",
      "176.32.192.0/21",
      "176.113.118.0/24",
      "176.120.24.0/21",
      "176.124.96.0/21",
      "178.78.128.0/18",
      "178.160.192.0/18",
      "178.212.139.0/24",
      "178.219.48.0/20",
      "178.248.0.0/21",
      "185.3.188.0/22",
      "185.8.0.0/22",
      "185.9.184.0/22",
      "185.13.196.0/22",
      "185.21.252.0/22",
      "185.36.36.0/22",
      "185.44.228.0/22",
      "185.48.240.0/22",
      "185.57.68.0/22",
      "185.59.68.0/22",
      "185.77.192.0/22",
      "185.78.144.0/22",
      "185.79.0.0/22",
      "185.80.91.0/24",
      "185.86.192.0/22",
      "185.92.84.0/22",
      "185.127.64.0/22",
      "185.136.32.0/22",
      "185.149.140.0/22",
      "185.150.164.0/22",
      "185.155.232.0/22",
      "185.167.217.0/24",
      "185.177.104.0/22",
      "185.202.113.0/24",
      "185.215.52.0/22",
      "185.223.124.0/22",
      "185.225.202.0/23",
      "185.230.240.0/22",
      "185.247.0.0/22",
      "185.255.68.0/22",
      "188.92.28.0/24",
      "188.115.192.0/18",
      "188.164.152.0/21",
      "193.29.226.0/24",
      "193.57.28.0/22",
      "193.104.56.0/24",
      "193.104.198.0/24",
      "193.142.19.0/24",
      "193.163.170.0/24",
      "193.177.240.0/24",
      "193.228.137.0/24",
      "194.1.152.0/24",
      "194.11.239.0/24",
      "194.30.176.0/23",
      "194.31.4.0/23",
      "194.33.82.0/24",
      "194.39.82.0/23",
      "194.39.102.0/23",
      "194.50.153.0/24",
      "194.61.88.0/22",
      "194.117.80.0/24",
      "194.247.50.0/24",
      "195.8.50.0/23",
      "195.20.16.0/24",
      "195.28.188.0/24",
      "195.43.74.0/23",
      "195.60.80.128/27",
      "195.88.66.0/23",
      "195.88.254.0/23",
      "195.128.166.0/23",
      "195.191.100.0/23",
      "195.191.154.0/23",
      "195.191.186.0/23",
      "195.225.234.0/23",
      "195.248.240.0/22",
      "195.250.64.0/19",
      "212.34.224.0/19",
      "212.42.192.0/19",
      "212.73.64.0/19",
      "213.108.20.0/22",
      "213.109.197.0/24",
      "217.76.0.0/20",
      "217.113.0.0/19",
      "217.144.176.0/20"
    ],
    "ipv6" : [
      "2001:678:ca4::/48",
      "2001:67c:21c::/48",
      "2001:67c:2cdc::/48",
      "2001:7f8:94::/48",
      "2001:7f9:8::/48",
      "2001:4d00::/32",
      "2a00:f38::/29",
      "2a00:1500::/29",
      "2a00:1f28::/32",
      "2a00:8740::/32",
      "2a00:cc40::/29",
      "2a00:f9a0::/32",
      "2a01:4000::/32",
      "2a01:4a00::/32",
      "2a01:bbc0::/32",
      "2a02:29f8::/32",
      "2a02:2a50::/29",
      "2a02:5960::/32",
      "2a03:5e0::/32",
      "2a03:1080::/32",
      "2a03:1900::/29",
      "2a03:2300::/29",
      "2a03:27c0::/32",
      "2a03:3d00::/29",
      "2a03:5620::/32",
      "2a05:f140::/29",
      "2a06:33c0::/29",
      "2a07:66c0::/29",
      "2a07:ce00::/29",
      "2a09:f840::/29",
      "2a0a:9c0::/29",
      "2a0a:3880::/29",
      "2a0a:c140::/29",
      "2a0b:1c40::/29",
      "2a0b:a3c0::/29",
      "2a0b:ff80::/29",
      "2a0c:2080::/29",
      "2a0c:6440::/29",
      "2a0d:b800::/29",
      "2a0d:cd00::/29",
      "2a0e:2d80::/29",
      "2a0e:6040::/29",
      "2a0e:7100::/29",
      "2a11:6fc0::/29",
      "2a12:3280::/32",
      "2a12:5940::/29",
      "2a12:5d40::/29",
      "2a13:1ec0::/32",
      "2a13:3a00::/29",
      "2a14:200::/29",
      "2a14:ac0::/29",
      "2a14:4800::/29"
    ]
  }
 }
--- a/country/am/ipv4-aggregated.txt
+++ b/country/am/ipv4-aggregated.txt
@ -12,6 +12,7 @@
 31.47.192.0/21
 31.128.60.0/24
 31.132.72.0/21
 31.171.209.0/24
 37.26.168.0/21
 37.157.208.0/20
 37.186.64.0/18
@ -43,6 +44,8 @@
 80.72.16.0/21
 80.72.24.0/22
 80.86.224.0/20
 80.173.118.0/23
 80.173.175.0/24
 81.16.0.0/20
 81.89.208.0/20
 82.199.192.0/20
@ -56,7 +59,6 @@
 91.103.24.0/21
 91.103.56.0/21
 91.103.248.0/22
 91.108.187.0/24
 91.193.43.0/24
 91.195.110.0/23
 91.195.254.0/23
@ -95,13 +97,25 @@
 93.187.160.0/21
 94.141.100.0/22
 94.142.250.0/24
 94.154.127.0/24
 95.140.192.0/20
 95.174.96.0/19
 109.68.120.0/21
 109.75.32.0/20
 130.193.27.0/24
 130.193.120.0/21
 132.243.185.0/24
 132.243.186.0/23
 132.243.188.0/22
 141.136.64.0/19
 146.19.140.0/24
 148.52.128.0/19
 150.251.46.0/23
 157.228.64.0/19
 157.228.97.0/24
 157.228.98.0/23
 157.228.100.0/22
 157.228.104.0/21
 176.32.192.0/21
 176.113.118.0/24
 176.120.24.0/21
@ -127,6 +141,7 @@
 185.80.91.0/24
 185.86.192.0/22
 185.92.84.0/22
 185.113.8.0/24
 185.127.64.0/22
 185.136.32.0/22
 185.149.140.0/22
@ -145,6 +160,7 @@
 188.115.192.0/18
 188.164.152.0/21
 193.29.226.0/24
 193.32.54.0/24
 193.57.28.0/22
 193.104.56.0/24
 193.104.198.0/24
--- a/country/am/ipv6-aggregated.txt
+++ b/country/am/ipv6-aggregated.txt
@ -5,6 +5,7 @@
 #
 2001:678:ca4::/48
 2001:67c:21c::/48
 2001:67c:924::/48
 2001:67c:2cdc::/48
 2001:7f8:94::/48
 2001:7f9:8::/48
@ -21,13 +22,13 @@
 2a02:29f8::/32
 2a02:2a50::/29
 2a02:5960::/32
 2a03:5e0::/32
 2a03:1080::/32
 2a03:1900::/29
 2a03:2300::/29
 2a03:27c0::/32
 2a03:3d00::/29
 2a03:5620::/32
 2a03:db40::/29
 2a05:f140::/29
 2a06:33c0::/29
 2a07:66c0::/29
@ -41,6 +42,7 @@
 2a0b:ff80::/29
 2a0c:2080::/29
 2a0c:6440::/29
 2a0c:c840::/29
 2a0d:b800::/29
 2a0d:cd00::/29
 2a0e:2d80::/29
@ -49,9 +51,9 @@
 2a11:6fc0::/29
 2a12:3280::/32
 2a12:5940::/29
 2a12:5d40::/29
 2a13:1ec0::/32
 2a13:3a00::/29
 2a13:9740::/29
 2a14:200::/29
 2a14:ac0::/29
 2a14:4800::/29
--- a/country/ao/aggregated.json
+++ b/country/ao/aggregated.json
@ -1,195 +1,10 @@
 {
-  "country" : "Angola",
+  "country": "Angola",
-  "countryCode" : "AO",
+  "countryCode": "AO",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.63.160.0/19", "41.70.128.0/17", "41.74.240.0/20", "41.78.16.0/22", "41.205.32.0/19", "41.210.192.0/18", "41.216.236.0/22", "41.221.240.0/20", "41.222.200.0/22", "41.222.236.0/22", "41.222.248.0/21", "41.223.40.0/22", "41.223.100.0/22", "41.223.156.0/22", "41.223.164.0/22", "80.88.9.0/24", "102.36.224.0/22", "102.64.60.0/22", "102.130.64.0/21", "102.130.192.0/19", "102.201.200.0/22", "102.201.212.0/22", "102.202.0.0/22", "102.202.4.0/24", "102.202.244.0/22", "102.203.1.0/24", "102.203.128.0/22", "102.203.139.0/24", "102.203.164.0/22", "102.203.240.0/20", "102.204.164.0/22", "102.204.192.0/22", "102.205.75.0/24", "102.205.146.0/23", "102.205.234.0/24", "102.206.52.0/22", "102.206.56.0/21", "102.206.76.0/22", "102.206.196.0/22", "102.207.128.0/22", "102.207.192.0/22", "102.207.212.0/22", "102.208.92.0/22", "102.208.148.0/22", "102.209.4.0/22", "102.209.154.0/24", "102.210.4.0/22", "102.210.120.0/22", "102.210.169.0/24", "102.210.176.0/22", "102.210.228.0/22", "102.211.55.0/24", "102.211.128.0/22", "102.211.152.0/22", "102.211.200.0/22", "102.211.224.0/22", "102.212.216.0/22", "102.213.12.0/22", "102.213.32.0/22", "102.213.54.0/24", "102.213.96.0/20", "102.213.240.0/24", "102.214.0.0/22", "102.214.36.0/22", "102.214.120.0/22", "102.214.127.0/24", "102.214.236.0/22", "102.215.60.0/22", "102.215.168.0/22", "102.215.180.0/22", "102.215.184.0/22", "102.216.44.0/22", "102.216.48.0/21", "102.216.56.0/22", "102.216.140.0/22", "102.216.168.0/22", "102.216.208.0/22", "102.216.252.0/22", "102.217.116.0/22", "102.217.192.0/22", "102.218.84.0/22", "102.218.92.0/22", "102.218.148.0/22", "102.218.180.0/22", "102.219.30.0/24", "102.219.80.0/24", "102.219.124.0/22", "102.219.184.0/22", "102.219.226.0/24", "102.220.192.0/22", "102.221.52.0/22", "102.221.108.0/22", "102.221.172.0/22", "102.222.16.0/22", "102.222.92.0/22", "102.223.3.0/24", "105.168.0.0/13", "129.122.128.0/17", "154.65.128.0/17", "154.66.80.0/22", "154.66.104.0/22", "154.71.128.0/17", "154.116.128.0/17", "154.118.192.0/19", "154.127.128.0/17", "155.89.0.0/16", "160.119.240.0/22", "160.224.0.0/15", "169.239.32.0/22", "169.239.76.0/22", "169.239.108.0/22", "169.239.132.0/22", "169.255.88.0/22", "185.148.112.0/22", "192.12.111.0/24", "196.1.15.0/24", "196.6.255.0/24", "196.11.189.0/24", "196.11.234.0/24", "196.13.109.0/24", "196.13.204.0/24", "196.13.243.0/24", "196.29.192.0/20", "196.32.192.0/21", "196.41.77.0/24", "196.43.197.0/24", "196.43.210.0/24", "196.43.223.0/24", "196.45.160.0/22", "196.46.21.0/24", "196.46.72.0/21", "196.49.6.0/24", "196.61.76.0/22", "196.202.252.0/22", "196.216.161.0/24", "196.216.248.0/23", "196.223.1.0/24", "196.223.13.0/24", "196.223.19.0/24", "196.249.192.0/18", "197.148.0.0/18", "197.148.88.0/21", "197.149.148.0/22", "197.157.196.0/22", "197.216.0.0/15", "197.241.128.0/17", "204.8.204.0/24" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:4250::/32", "2001:43f8:390::/47", "2001:43f8:400::/40", "2001:43f8:760::/48", "2001:43f8:7c0::/48", "2001:43f8:9d0::/48", "2001:43f8:a80::/48", "2001:43f8:dc0::/48", "2001:43f8:1100::/48", "2a07:6040::/29", "2c0f:300::/32", "2c0f:520::/32", "2c0f:11c0::/32", "2c0f:1a00::/32", "2c0f:1c80::/32", "2c0f:2700::/32", "2c0f:2b80::/32", "2c0f:2bc0::/32", "2c0f:43a0::/32", "2c0f:4520::/32", "2c0f:51a0::/32", "2c0f:5600::/32", "2c0f:6540::/32", "2c0f:73c0::/32", "2c0f:78c0::/32", "2c0f:e968::/32", "2c0f:ea28::/32", "2c0f:eab0::/32", "2c0f:f060::/32", "2c0f:f280::/32", "2c0f:f740::/32", "2c0f:f810::/32", "2c0f:f828::/32", "2c0f:f888::/32", "2c0f:fa38::/32", "2c0f:fa60::/32", "2c0f:fa80::/32", "2c0f:faf0::/32", "2c0f:fb58::/32", "2c0f:fb70::/32" ]
  "prefixes" : {
    "ipv4" : [
      "41.63.160.0/19",
      "41.70.128.0/17",
      "41.74.240.0/20",
      "41.78.16.0/22",
      "41.205.32.0/19",
      "41.210.192.0/18",
      "41.216.236.0/22",
      "41.221.240.0/20",
      "41.222.200.0/22",
      "41.222.236.0/22",
      "41.222.248.0/21",
      "41.223.40.0/22",
      "41.223.100.0/22",
      "41.223.156.0/22",
      "41.223.164.0/22",
      "80.88.9.0/24",
      "102.36.224.0/22",
      "102.64.60.0/22",
      "102.130.64.0/21",
      "102.130.192.0/19",
      "102.203.128.0/22",
      "102.203.139.0/24",
      "102.203.164.0/22",
      "102.203.240.0/21",
      "102.204.164.0/22",
      "102.204.192.0/22",
      "102.205.75.0/24",
      "102.205.146.0/23",
      "102.205.234.0/24",
      "102.206.52.0/22",
      "102.206.56.0/21",
      "102.206.76.0/22",
      "102.206.196.0/22",
      "102.207.128.0/22",
      "102.207.192.0/22",
      "102.207.212.0/22",
      "102.208.92.0/22",
      "102.208.148.0/22",
      "102.209.4.0/22",
      "102.209.154.0/24",
      "102.210.4.0/22",
      "102.210.120.0/22",
      "102.210.169.0/24",
      "102.210.176.0/22",
      "102.210.228.0/22",
      "102.211.55.0/24",
      "102.211.128.0/22",
      "102.211.152.0/22",
      "102.211.200.0/22",
      "102.211.224.0/22",
      "102.212.216.0/22",
      "102.213.12.0/22",
      "102.213.32.0/22",
      "102.213.54.0/24",
      "102.213.96.0/20",
      "102.213.240.0/24",
      "102.214.0.0/22",
      "102.214.36.0/22",
      "102.214.120.0/22",
      "102.214.127.0/24",
      "102.214.236.0/22",
      "102.215.60.0/22",
      "102.215.168.0/22",
      "102.215.180.0/22",
      "102.215.184.0/22",
      "102.216.44.0/22",
      "102.216.48.0/21",
      "102.216.56.0/22",
      "102.216.140.0/22",
      "102.216.168.0/22",
      "102.216.208.0/22",
      "102.216.252.0/22",
      "102.217.116.0/22",
      "102.217.192.0/22",
      "102.218.84.0/22",
      "102.218.92.0/22",
      "102.218.148.0/22",
      "102.218.180.0/22",
      "102.219.30.0/24",
      "102.219.80.0/24",
      "102.219.124.0/22",
      "102.219.184.0/22",
      "102.219.226.0/24",
      "102.220.192.0/22",
      "102.221.52.0/22",
      "102.221.108.0/22",
      "102.221.172.0/22",
      "102.222.16.0/22",
      "102.222.92.0/22",
      "102.223.3.0/24",
      "105.168.0.0/13",
      "129.122.128.0/17",
      "154.65.128.0/17",
      "154.66.80.0/22",
      "154.66.104.0/22",
      "154.71.128.0/17",
      "154.116.128.0/17",
      "154.118.192.0/19",
      "154.127.128.0/17",
      "155.89.0.0/16",
      "160.119.240.0/22",
      "160.224.0.0/15",
      "169.239.32.0/22",
      "169.239.76.0/22",
      "169.239.108.0/22",
      "169.239.132.0/22",
      "169.255.88.0/22",
      "185.148.112.0/22",
      "192.12.111.0/24",
      "196.1.15.0/24",
      "196.6.255.0/24",
      "196.11.189.0/24",
      "196.11.234.0/24",
      "196.13.109.0/24",
      "196.13.204.0/24",
      "196.13.243.0/24",
      "196.29.192.0/20",
      "196.32.192.0/21",
      "196.41.77.0/24",
      "196.43.197.0/24",
      "196.43.210.0/24",
      "196.43.223.0/24",
      "196.45.160.0/22",
      "196.46.21.0/24",
      "196.46.72.0/21",
      "196.49.6.0/24",
      "196.61.76.0/22",
      "196.202.252.0/22",
      "196.216.161.0/24",
      "196.216.248.0/23",
      "196.223.1.0/24",
      "196.223.13.0/24",
      "196.223.19.0/24",
      "196.249.192.0/18",
      "197.148.0.0/18",
      "197.148.88.0/21",
      "197.149.148.0/22",
      "197.157.196.0/22",
      "197.216.0.0/15",
      "197.241.128.0/17",
      "204.8.204.0/24"
    ],
    "ipv6" : [
      "2001:4250::/32",
      "2001:43f8:390::/47",
      "2001:43f8:400::/40",
      "2001:43f8:760::/48",
      "2001:43f8:7c0::/48",
      "2001:43f8:9d0::/48",
      "2001:43f8:a80::/48",
      "2001:43f8:dc0::/48",
      "2001:43f8:1100::/48",
      "2a07:6040::/29",
      "2c0f:300::/32",
      "2c0f:520::/32",
      "2c0f:11c0::/32",
      "2c0f:1a00::/32",
      "2c0f:1c80::/32",
      "2c0f:2700::/32",
      "2c0f:2b80::/32",
      "2c0f:2bc0::/32",
      "2c0f:43a0::/32",
      "2c0f:4520::/32",
      "2c0f:5600::/32",
      "2c0f:6540::/32",
      "2c0f:73c0::/32",
      "2c0f:78c0::/32",
      "2c0f:e968::/32",
      "2c0f:ea28::/32",
      "2c0f:eab0::/32",
      "2c0f:f060::/32",
      "2c0f:f280::/32",
      "2c0f:f740::/32",
      "2c0f:f810::/32",
      "2c0f:f828::/32",
      "2c0f:f888::/32",
      "2c0f:fa38::/32",
      "2c0f:fa60::/32",
      "2c0f:fa80::/32",
      "2c0f:faf0::/32",
      "2c0f:fb58::/32",
      "2c0f:fb70::/32"
    ]
  }
 }
--- a/country/ao/ipv4-aggregated.txt
+++ b/country/ao/ipv4-aggregated.txt
@ -23,10 +23,16 @@
 102.64.60.0/22
 102.130.64.0/21
 102.130.192.0/19
 102.201.200.0/22
 102.201.212.0/22
 102.202.0.0/22
 102.202.4.0/24
 102.202.244.0/22
 102.203.1.0/24
 102.203.128.0/22
 102.203.139.0/24
 102.203.164.0/22
-102.203.240.0/21
+102.203.240.0/20
 102.204.164.0/22
 102.204.192.0/22
 102.205.75.0/24
--- a/country/ao/ipv6-aggregated.txt
+++ b/country/ao/ipv6-aggregated.txt
@ -23,6 +23,7 @@
 2c0f:2bc0::/32
 2c0f:43a0::/32
 2c0f:4520::/32
 2c0f:51a0::/32
 2c0f:5600::/32
 2c0f:6540::/32
 2c0f:73c0::/32
--- a/country/aq/aggregated.json
+++ b/country/aq/aggregated.json
@ -0,0 +1,10 @@
 {
  "country": "Antarctica",
  "countryCode": "AQ",
  "delegationStatus": [ "allocated", "assigned" ],
  "exportMode": "aggregated",
  "prefixes": {
    "ipv4": [ "23.154.160.0/24", "131.143.220.0/23", "209.127.204.0/24" ],
    "ipv6": [ "2604:17c0::/32" ]
  }
 }
--- a/country/aq/ipv4-aggregated.txt
+++ b/country/aq/ipv4-aggregated.txt
@ -0,0 +1,8 @@
 # Country: Antarctica (AQ)
 # Address family: IPv4
 # Delegation status: Allocated || Assigned
 # Export mode: Aggregated
 #
 23.154.160.0/24
 131.143.220.0/23
 209.127.204.0/24
--- a/country/aq/ipv6-aggregated.txt
+++ b/country/aq/ipv6-aggregated.txt
@ -0,0 +1,6 @@
 # Country: Antarctica (AQ)
 # Address family: IPv6
 # Delegation status: Allocated || Assigned
 # Export mode: Aggregated
 #
 2604:17c0::/32
--- a/country/ar/aggregated.json
+++ b/country/ar/aggregated.json
--- a/country/ar/ipv4-aggregated.txt
+++ b/country/ar/ipv4-aggregated.txt
@ -31,6 +31,7 @@
 45.65.224.0/22
 45.65.252.0/24
 45.68.8.0/21
 45.68.132.0/22
 45.70.8.0/22
 45.70.88.0/22
 45.70.116.0/22
@ -171,7 +172,6 @@
 45.179.60.0/24
 45.179.72.0/22
 45.179.92.0/22
 45.179.254.0/23
 45.180.60.0/22
 45.180.76.0/22
 45.180.176.0/23
@ -776,11 +776,11 @@
 179.0.136.0/21
 179.0.144.0/23
 179.0.147.0/24
-179.0.148.0/22
+179.0.148.0/23
 179.0.151.0/24
 179.0.180.0/22
 179.0.184.0/22
 179.0.193.0/24
 179.0.203.0/24
 179.0.224.0/19
 179.1.160.0/20
 179.36.0.0/14
@ -982,7 +982,8 @@
 186.96.192.0/21
 186.100.0.0/16
 186.108.0.0/14
-186.121.144.0/20
+186.121.154.0/23
 186.121.156.0/22
 186.121.168.0/21
 186.121.176.0/20
 186.122.0.0/15
@ -1017,6 +1018,7 @@
 187.62.110.0/23
 187.102.196.0/23
 187.102.216.0/22
 187.102.232.0/22
 187.102.240.0/22
 189.8.112.0/21
 189.45.176.0/22
@ -1065,7 +1067,10 @@
 190.14.156.0/22
 190.14.160.0/19
 190.15.80.0/20
-190.15.192.0/18
+190.15.192.0/19
 190.15.224.0/20
 190.15.240.0/21
 190.15.248.0/23
 190.16.0.0/14
 190.30.0.0/15
 190.48.0.0/14
@ -1158,7 +1163,12 @@
 190.113.56.0/22
 190.113.128.0/18
 190.113.224.0/20
-190.114.64.0/18
+190.114.64.0/19
 190.114.96.0/22
 190.114.100.0/23
 190.114.102.0/24
 190.114.104.0/21
 190.114.112.0/20
 190.114.128.0/18
 190.114.192.0/19
 190.114.232.0/21
@ -1281,7 +1291,6 @@
 200.0.200.0/24
 200.0.208.0/21
 200.0.224.0/19
 200.1.7.0/24
 200.1.32.0/19
 200.1.113.0/24
 200.1.116.0/23
@ -1335,7 +1344,6 @@
 200.10.140.0/24
 200.10.161.0/24
 200.10.180.0/23
 200.10.186.0/24
 200.10.191.0/24
 200.10.196.0/24
 200.10.199.0/24
@ -1510,14 +1518,13 @@
 200.117.0.0/16
 200.122.0.0/17
 200.123.32.0/22
-200.123.38.0/23
+200.123.41.0/24
 200.123.40.0/22
 200.123.45.0/24
 200.123.46.0/23
 200.123.48.0/21
-200.123.56.0/22
+200.123.56.0/23
-200.123.60.0/23
+200.123.58.0/24
-200.123.63.0/24
+200.123.60.0/24
 200.123.64.0/18
 200.123.128.0/18
 200.123.192.0/20
--- a/country/ar/ipv6-aggregated.txt
+++ b/country/ar/ipv6-aggregated.txt
@ -88,10 +88,8 @@
 2801:0:440::/48
 2801:10::/45
 2801:10:1000::/48
 2801:10:2000::/48
 2801:10:4000::/48
 2801:10:4800::/48
 2801:10:8000::/48
 2801:10:d000::/48
 2801:10:e000::/48
 2801:11::/48
@ -99,7 +97,6 @@
 2801:11:6000::/48
 2801:11:7000::/48
 2801:11:b000::/48
 2801:11:c000::/48
 2801:11:d000::/48
 2801:12:5000::/48
 2801:12:8000::/48
@ -182,6 +179,7 @@
 2801:17a::/44
 2801:188::/40
 2801:1a4::/44
 2801:1bd::/40
 2801:1c0::/39
 2801:1dc::/44
 2801:1e0::/41
@ -242,6 +240,7 @@
 2803:c60::/32
 2803:ce0::/32
 2803:d10::/32
 2803:d30::/32
 2803:da0::/32
 2803:dc0::/32
 2803:de0::/32
@ -262,6 +261,7 @@
 2803:11c0::/32
 2803:11e0::/32
 2803:1220::/32
 2803:1230::/32
 2803:1250::/32
 2803:1290::/32
 2803:12e0::/32
@ -329,6 +329,7 @@
 2803:23c0::/32
 2803:2400::/32
 2803:2420::/32
 2803:2430::/32
 2803:2440::/32
 2803:24e0::/32
 2803:2520::/32
@ -349,6 +350,7 @@
 2803:2a40::/32
 2803:2ac0::/32
 2803:2b20::/32
 2803:2b30::/32
 2803:2b60::/32
 2803:2ba0::/32
 2803:2bd0::/32
@ -361,6 +363,7 @@
 2803:2d20::/32
 2803:2d50::/32
 2803:2da0::/32
 2803:2e30::/32
 2803:2e80::/32
 2803:2f20::/32
 2803:2f50::/32
@ -404,6 +407,7 @@
 2803:3c60::/32
 2803:3ca0::/32
 2803:3ce0::/32
 2803:3d30::/32
 2803:3d80::/32
 2803:3de0::/32
 2803:3e00::/32
@ -422,10 +426,11 @@
 2803:40c0::/32
 2803:4100::/32
 2803:4110::/32
 2803:4130::/32
 2803:4140::/32
 2803:4160::/32
 2803:4190::/32
 2803:41e0::/32
 2803:4230::/32
 2803:4260::/32
 2803:4280::/32
 2803:4400::/32
@ -486,7 +491,6 @@
 2803:5400::/32
 2803:5410::/32
 2803:5440::/32
 2803:5460::/32
 2803:5480::/32
 2803:5490::/32
 2803:54d0::/32
@ -528,7 +532,6 @@
 2803:5ca0::/32
 2803:5ce0::/32
 2803:5d10::/32
 2803:5dc0::/32
 2803:5de0::/32
 2803:5e80::/32
 2803:5f10::/32
@ -549,6 +552,7 @@
 2803:61c0::/32
 2803:61e0::/32
 2803:6220::/32
 2803:6230::/32
 2803:6260::/32
 2803:62a0::/32
 2803:6380::/32
@ -596,6 +600,7 @@
 2803:6d40::/32
 2803:6da0::/32
 2803:6dc0::/32
 2803:6e30::/32
 2803:6e40::/32
 2803:6e60::/32
 2803:6ea0::/32
@ -613,6 +618,7 @@
 2803:7160::/32
 2803:71d0::/32
 2803:7220::/32
 2803:7230::/32
 2803:7240::/32
 2803:72a0::/32
 2803:72c0::/32
@ -635,6 +641,7 @@
 2803:75e0::/32
 2803:7600::/32
 2803:7620::/32
 2803:7630::/32
 2803:7660::/32
 2803:76c0::/32
 2803:76e0::/32
@ -655,12 +662,12 @@
 2803:7ac0::/32
 2803:7b20::/32
 2803:7b60::/32
 2803:7c30::/32
 2803:7c40::/32
 2803:7d00::/32
 2803:7d40::/32
 2803:7dc0::/32
 2803:7dd0::/32
 2803:7de0::/32
 2803:7e00::/32
 2803:7e20::/32
 2803:7e40::/32
@ -677,6 +684,7 @@
 2803:80c0::/32
 2803:8110::/32
 2803:8120::/32
 2803:8130::/32
 2803:81a0::/32
 2803:81d0::/32
 2803:81e0::/32
@ -688,6 +696,7 @@
 2803:83c0::/32
 2803:83e0::/32
 2803:8410::/32
 2803:8430::/32
 2803:8440::/32
 2803:8480::/32
 2803:84d0::/32
@ -712,6 +721,7 @@
 2803:8a60::/32
 2803:8a80::/32
 2803:8ae0::/32
 2803:8b30::/32
 2803:8b60::/32
 2803:8bc0::/32
 2803:8c40::/32
@ -780,7 +790,6 @@
 2803:9b40::/32
 2803:9b80::/32
 2803:9be0::/32
 2803:9c00::/32
 2803:9c10::/32
 2803:9c40::/32
 2803:9c80::/32
@ -819,7 +828,6 @@
 2803:a600::/32
 2803:a620::/32
 2803:a680::/32
 2803:a6a0::/32
 2803:a780::/32
 2803:a790::/32
 2803:a7c0::/32
@ -842,6 +850,7 @@
 2803:ad00::/32
 2803:ad10::/32
 2803:ad20::/32
 2803:ad30::/32
 2803:ad90::/32
 2803:ada0::/32
 2803:adc0::/32
@ -856,6 +865,7 @@
 2803:b010::/32
 2803:b020::/32
 2803:b0a0::/32
 2803:b130::/32
 2803:b1d0::/32
 2803:b210::/32
 2803:b220::/32
@ -864,7 +874,6 @@
 2803:b2e0::/32
 2803:b360::/32
 2803:b380::/32
 2803:b410::/32
 2803:b450::/32
 2803:b4a0::/32
 2803:b520::/32
@ -902,6 +911,7 @@
 2803:bc90::/32
 2803:bcc0::/32
 2803:bd00::/32
 2803:bd30::/32
 2803:bd40::/32
 2803:be00::/32
 2803:be10::/32
@ -932,6 +942,7 @@
 2803:c580::/32
 2803:c5e0::/32
 2803:c620::/32
 2803:c630::/32
 2803:c640::/32
 2803:c6a0::/32
 2803:c6c0::/32
@ -946,7 +957,9 @@
 2803:c990::/32
 2803:c9c0::/32
 2803:ca00::/32
 2803:ca30::/32
 2803:ca40::/32
 2803:cb30::/32
 2803:cb60::/32
 2803:cb80::/32
 2803:cbc0::/32
@ -958,9 +971,9 @@
 2803:cd00::/32
 2803:cd10::/32
 2803:cd20::/32
 2803:cd30::/32
 2803:cd40::/32
 2803:cdd0::/32
 2803:cde0::/32
 2803:ce40::/32
 2803:ce60::/32
 2803:ce80::/32
@ -983,6 +996,7 @@
 2803:d410::/32
 2803:d420::/32
 2803:d510::/32
 2803:d530::/32
 2803:d620::/32
 2803:d660::/32
 2803:d690::/32
@ -1012,6 +1026,7 @@
 2803:dc10::/32
 2803:dc80::/32
 2803:dd20::/32
 2803:dd30::/32
 2803:dd40::/32
 2803:de00::/32
 2803:de20::/32
@ -1051,6 +1066,7 @@
 2803:e660::/32
 2803:e6a0::/32
 2803:e720::/32
 2803:e730::/32
 2803:e760::/32
 2803:e7d0::/32
 2803:e810::/32
@ -1063,6 +1079,7 @@
 2803:e9e0::/32
 2803:ea00::/32
 2803:ea20::/32
 2803:ea30::/32
 2803:ea40::/32
 2803:ea80::/32
 2803:eaa0::/32
@ -1101,9 +1118,9 @@
 2803:f300::/32
 2803:f380::/32
 2803:f3e0::/32
 2803:f430::/32
 2803:f460::/32
 2803:f4c0::/32
 2803:f4d0::/32
 2803:f580::/32
 2803:f660::/32
 2803:f680::/32
@ -1115,6 +1132,7 @@
 2803:f7c0::/32
 2803:f820::/32
 2803:f910::/32
 2803:f930::/32
 2803:f9a0::/32
 2803:f9c0::/32
 2803:fa20::/32
--- a/country/as/aggregated.json
+++ b/country/as/aggregated.json
@ -1,19 +1,10 @@
 {
-  "country" : "American Samoa",
+  "country": "American Samoa",
-  "countryCode" : "AS",
+  "countryCode": "AS",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "103.117.168.0/22", "202.70.112.0/20" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2403:1e00::/32", "2403:2140::/32" ]
  "prefixes" : {
    "ipv4" : [
      "103.117.168.0/22",
      "202.70.112.0/20"
    ],
    "ipv6" : [
      "2403:1e00::/32",
      "2403:2140::/32"
    ]
  }
 }
--- a/country/at/aggregated.json
+++ b/country/at/aggregated.json
--- a/country/at/ipv4-aggregated.txt
+++ b/country/at/ipv4-aggregated.txt
@ -36,6 +36,7 @@
 5.253.136.0/22
 5.253.216.0/22
 5.254.184.0/21
 13.140.96.0/19
 31.3.214.0/23
 31.7.92.0/22
 31.12.0.0/21
@ -67,6 +68,7 @@
 45.12.96.0/22
 45.12.160.0/22
 45.12.232.0/22
 45.13.64.0/22
 45.13.244.0/22
 45.14.44.0/22
 45.15.36.0/22
@ -188,6 +190,7 @@
 62.93.64.0/18
 62.99.128.0/17
 62.116.0.0/17
 62.117.128.0/17
 62.122.24.0/22
 62.140.32.0/19
 62.178.0.0/16
@ -196,8 +199,11 @@
 62.240.128.0/19
 62.249.64.0/18
 63.247.208.0/20
 63.251.202.0/24
 64.34.16.0/22
 64.239.60.0/23
 66.203.252.0/24
 66.228.88.0/22
 77.72.160.0/21
 77.74.112.0/21
 77.75.16.0/20
@ -223,6 +229,7 @@
 78.142.64.0/18
 78.142.128.0/18
 78.152.64.0/19
 79.99.140.0/22
 79.143.48.0/20
 79.170.208.0/21
 79.174.20.0/22
@ -239,6 +246,7 @@
 80.108.0.0/15
 80.110.0.0/16
 80.120.0.0/14
 80.224.255.0/24
 80.240.224.0/20
 80.241.16.0/20
 80.243.160.0/20
@ -302,11 +310,13 @@
 84.234.56.0/22
 84.242.8.0/21
 84.247.61.0/24
 85.8.233.0/24
 85.13.0.0/18
 85.31.0.0/19
 85.90.128.0/19
 85.118.184.0/21
 85.124.0.0/14
 85.137.184.0/21
 85.158.224.0/21
 85.159.119.0/24
 85.193.128.0/20
@ -392,7 +402,6 @@
 91.198.45.0/24
 91.198.93.0/24
 91.198.128.0/24
 91.198.142.0/24
 91.198.148.0/24
 91.198.195.0/24
 91.198.240.0/24
@ -424,7 +433,6 @@
 91.208.201.0/24
 91.208.217.0/24
 91.209.2.0/24
 91.209.46.0/24
 91.209.75.0/24
 91.209.89.0/24
 91.209.112.0/24
@ -441,6 +449,7 @@
 91.213.54.0/24
 91.213.77.0/24
 91.213.132.0/24
 91.213.202.0/24
 91.213.204.0/24
 91.213.222.0/24
 91.213.234.0/24
@ -473,7 +482,6 @@
 91.224.66.0/23
 91.224.70.0/23
 91.224.164.0/24
 91.224.187.0/24
 91.225.0.0/24
 91.226.156.0/22
 91.227.33.0/24
@ -483,7 +491,7 @@
 91.227.204.0/23
 91.227.230.0/23
 91.227.236.0/22
-91.227.240.0/23
+91.227.241.0/24
 91.229.57.0/24
 91.230.2.0/23
 91.230.82.0/24
@ -552,12 +560,14 @@
 94.102.96.0/20
 94.124.115.0/24
 94.126.96.0/21
 94.127.18.0/24
 94.127.21.0/24
 94.136.0.0/19
 94.136.96.0/19
 94.140.12.0/23
 94.140.20.0/22
 94.140.26.0/23
-94.142.160.0/21
+94.142.160.0/22
 94.156.245.0/24
 94.177.8.0/23
 94.177.116.0/23
@ -601,6 +611,7 @@
 130.0.64.0/21
 131.130.0.0/16
 134.255.210.0/23
 137.83.86.0/24
 137.208.0.0/16
 138.22.0.0/16
 138.232.0.0/16
@ -623,6 +634,8 @@
 144.65.0.0/16
 144.208.0.0/18
 144.208.128.0/17
 145.11.16.0/21
 145.11.40.0/21
 145.14.248.0/21
 145.40.32.0/19
 145.244.0.0/16
@ -643,29 +656,32 @@
 149.148.0.0/16
 149.154.96.0/21
 149.154.152.0/21
 150.251.128.0/24
 151.236.0.0/19
 152.53.0.0/16
 152.89.72.0/22
 152.89.220.0/22
 152.89.224.0/22
 153.56.192.0/21
 153.92.112.0/21
 155.73.0.0/16
 155.133.24.0/23
 156.58.0.0/16
 156.67.192.0/20
 157.97.68.0/22
-157.173.16.0/21
+157.173.0.0/21
 157.173.16.0/20
 157.177.0.0/16
 157.247.0.0/16
 158.220.0.0/18
 158.255.208.0/21
 159.48.0.0/22
 159.200.206.0/23
 159.255.147.0/24
 160.20.100.0/22
 161.5.0.0/16
 161.108.210.0/24
 161.110.0.0/16
 162.25.0.0/16
 162.211.104.0/22
 162.213.160.0/22
 164.3.0.0/16
@ -695,7 +711,6 @@
 178.251.64.0/21
 178.255.152.0/21
 180.149.40.0/22
 185.0.39.0/24
 185.1.31.0/24
 185.1.43.0/24
 185.2.156.0/22
@ -738,6 +753,7 @@
 185.35.152.0/22
 185.35.180.0/22
 185.36.16.0/22
 185.36.20.0/24
 185.36.92.0/22
 185.37.104.0/22
 185.37.200.0/22
@ -790,6 +806,7 @@
 185.69.160.0/22
 185.69.236.0/22
 185.69.244.0/22
 185.70.228.0/22
 185.71.136.0/24
 185.71.164.0/22
 185.71.252.0/22
@ -819,7 +836,7 @@
 185.87.16.0/22
 185.87.237.0/24
 185.87.238.0/23
-185.88.200.0/23
+185.88.200.0/22
 185.89.48.0/22
 185.89.160.0/22
 185.90.20.0/22
@ -833,7 +850,7 @@
 185.92.164.0/22
 185.92.200.0/22
 185.93.8.0/22
-185.93.212.0/22
+185.93.214.0/23
 185.94.28.0/24
 185.95.208.0/22
 185.96.100.0/22
@ -923,6 +940,7 @@
 185.154.40.0/22
 185.154.80.0/22
 185.154.232.0/22
 185.155.117.0/24
 185.155.124.0/22
 185.156.144.0/22
 185.157.123.0/24
@ -1122,6 +1140,7 @@
 188.214.32.0/21
 188.241.124.0/23
 192.5.162.0/24
 192.26.237.0/24
 192.26.238.0/24
 192.35.206.0/24
 192.35.240.0/22
@ -1186,7 +1205,6 @@
 192.231.67.0/24
 193.0.188.0/24
 193.3.55.0/24
 193.3.158.0/24
 193.9.252.0/23
 193.16.8.0/22
 193.16.155.0/24
@ -1230,7 +1248,6 @@
 193.41.41.0/24
 193.41.94.0/24
 193.41.138.0/23
 193.41.201.0/24
 193.41.207.0/24
 193.41.228.0/24
 193.41.232.0/24
@ -1434,7 +1451,7 @@
 193.228.170.0/23
 193.228.184.0/24
 193.228.192.0/24
-193.228.200.0/22
+193.228.203.0/24
 193.228.207.0/24
 193.228.208.0/20
 193.228.227.0/24
@ -1525,6 +1542,7 @@
 194.59.178.0/24
 194.61.27.0/24
 194.61.36.0/22
 194.62.113.0/24
 194.62.237.0/24
 194.76.210.0/24
 194.76.239.0/24
@ -1657,6 +1675,7 @@
 195.54.172.0/23
 195.58.160.0/19
 195.60.66.0/23
 195.60.85.192/26
 195.60.162.0/23
 195.62.26.0/23
 195.62.31.0/24
@ -1754,7 +1773,6 @@
 195.242.168.0/24
 195.242.175.0/24
 195.242.184.0/24
 195.244.18.0/23
 195.245.92.0/23
 195.245.225.0/24
 195.248.32.0/19
@ -1776,6 +1794,7 @@
 206.225.20.0/22
 207.244.212.0/24
 207.244.220.0/24
 208.88.67.0/24
 209.92.64.0/22
 212.9.128.0/19
 212.11.93.0/24
@ -1801,6 +1820,7 @@
 212.89.160.0/19
 212.95.0.0/19
 212.102.112.0/24
 212.104.133.0/24
 212.104.211.0/24
 212.108.32.0/19
 212.124.128.0/19
--- a/country/at/ipv6-aggregated.txt
+++ b/country/at/ipv6-aggregated.txt
@ -31,13 +31,17 @@
 2001:678:c58::/48
 2001:678:d58::/48
 2001:678:dc0::/48
 2001:678:e00::/48
 2001:678:e90::/48
 2001:678:ea4::/48
 2001:678:f78::/48
 2001:678:1040::/48
 2001:678:10c8::/48
 2001:678:1124::/48
 2001:678:1150::/48
 2001:678:118c::/48
 2001:678:121c::/48
 2001:678:1248::/48
 2001:67c:4c::/48
 2001:67c:98::/48
 2001:67c:ac::/48
@ -60,6 +64,7 @@
 2001:67c:404::/48
 2001:67c:478::/48
 2001:67c:5fc::/48
 2001:67c:644::/48
 2001:67c:668::/48
 2001:67c:704::/48
 2001:67c:734::/48
@ -73,6 +78,7 @@
 2001:67c:91c::/48
 2001:67c:934::/48
 2001:67c:960::/48
 2001:67c:9a0::/48
 2001:67c:9e4::/48
 2001:67c:a58::/48
 2001:67c:c58::/48
@ -102,16 +108,17 @@
 2001:67c:1434::/48
 2001:67c:14bc::/48
 2001:67c:14d4::/48
 2001:67c:1508::/48
 2001:67c:151c::/48
 2001:67c:168c::/48
 2001:67c:16a8::/48
 2001:67c:1750::/48
 2001:67c:1790::/48
 2001:67c:1864::/48
 2001:67c:1870::/48
 2001:67c:1930::/46
 2001:67c:1974::/48
 2001:67c:1b20::/48
 2001:67c:1b44::/48
 2001:67c:1b70::/48
 2001:67c:1ba0::/48
 2001:67c:1bb4::/48
@ -119,7 +126,6 @@
 2001:67c:2078::/48
 2001:67c:2090::/48
 2001:67c:211c::/48
 2001:67c:212c::/48
 2001:67c:2180::/48
 2001:67c:21f8::/48
 2001:67c:2204::/48
@ -148,10 +154,12 @@
 2001:67c:2610::/48
 2001:67c:2694::/48
 2001:67c:26e4::/48
 2001:67c:26e8::/48
 2001:67c:27f0::/48
 2001:67c:2820::/48
 2001:67c:28c0::/48
 2001:67c:28c8::/48
 2001:67c:2938::/48
 2001:67c:29cc::/48
 2001:67c:2a38::/48
 2001:67c:2aa4::/48
@ -177,7 +185,7 @@
 2001:7f8:4a::/48
 2001:7f8:71::/48
 2001:7f8:8d::/48
-2001:7f8:152::/48
+2001:7f8:170::/48
 2001:850::/29
 2001:858::/32
 2001:870::/29
@ -216,7 +224,7 @@
 2a00:1ba0::/32
 2a00:1f30::/29
 2a00:1f58::/29
-2a00:1f88::/32
+2a00:1f88::/29
 2a00:40c0::/29
 2a00:4400::/32
 2a00:4680::/32
@ -235,7 +243,6 @@
 2a00:b220::/32
 2a00:b780::/32
 2a00:cac0::/32
 2a00:d900::/32
 2a00:d9c0::/32
 2a00:e360::/32
 2a00:eb40::/32
@ -350,7 +357,6 @@
 2a04:d200::/29
 2a04:d3c0::/29
 2a04:d540::/29
 2a04:e340::/29
 2a04:f100::/29
 2a04:f680::/29
 2a04:f9c0::/29
@ -371,11 +377,11 @@
 2a05:dd80::/29
 2a05:e3c0::/29
 2a05:f500::/29
 2a05:f540::/29
 2a05:fc00::/29
 2a06:680::/29
 2a06:2f40::/29
 2a06:3980::/29
 2a06:3c40::/29
 2a06:3cc0::/29
 2a06:5680::/29
 2a06:5c40::/29
@ -391,6 +397,7 @@
 2a06:96c0::/29
 2a06:9cc0::/29
 2a06:b340::/29
 2a06:b600::/29
 2a06:c140::/29
 2a06:c4c0::/29
 2a06:c500::/29
@ -418,6 +425,7 @@
 2a07:f780::/29
 2a09:16c0::/29
 2a09:1c40::/29
 2a09:6680::/29
 2a09:b800::/29
 2a09:c940::/29
 2a09:d7c0::/29
@ -442,6 +450,7 @@
 2a0a:cdc0::/32
 2a0a:cf80::/29
 2a0a:f500::/32
 2a0b:d80::/29
 2a0b:1900::/29
 2a0b:2600::/29
 2a0b:37c0::/29
@ -508,7 +517,6 @@
 2a0e:1800::/29
 2a0e:2a00::/29
 2a0e:37c0::/32
 2a0e:6a00::/29
 2a0e:8440::/29
 2a0e:8500::/29
 2a0e:a500::/29
@ -536,6 +544,7 @@
 2a10:1e00::/32
 2a10:2680::/29
 2a10:3f40::/29
 2a10:58c0::/29
 2a10:5e00::/32
 2a10:6b40::/29
 2a10:6c80::/29
@ -552,6 +561,7 @@
 2a10:bd40::/29
 2a10:d100::/32
 2a10:d540::/29
 2a10:db80::/29
 2a10:df80::/29
 2a10:e9c0::/29
 2a10:f8c0::/29
@ -563,6 +573,7 @@
 2a12:3980::/29
 2a12:4780::/32
 2a12:61c0::/29
 2a12:8b80::/32
 2a12:9640::/29
 2a12:af40::/29
 2a12:c140::/29
@ -571,6 +582,7 @@
 2a12:e500::/29
 2a12:ea80::/29
 2a12:f480::/29
 2a12:f840::/29
 2a13:100::/29
 2a13:980::/29
 2a13:1600::/29
@ -584,7 +596,6 @@
 2a13:af40::/32
 2a13:dd00::/29
 2a13:e480::/29
 2a13:f640::/29
 2a14:2c0::/29
 2a14:3fc0::/29
 2a14:7d00::/29
--- a/country/au/aggregated.json
+++ b/country/au/aggregated.json
--- a/country/au/ipv4-aggregated.txt
+++ b/country/au/ipv4-aggregated.txt
@ -69,6 +69,7 @@
 27.121.64.0/21
 27.122.112.0/20
 27.123.24.0/21
 27.123.226.0/24
 27.124.96.0/19
 27.125.208.0/20
 27.126.144.0/21
@ -83,7 +84,6 @@
 36.50.0.0/23
 36.50.38.0/23
 36.50.42.0/24
 36.50.91.0/24
 36.50.98.0/23
 36.50.108.0/24
 36.50.144.0/23
@ -93,7 +93,6 @@
 36.255.72.0/22
 36.255.112.0/22
 37.123.192.0/21
 37.128.240.0/20
 39.0.1.0/24
 42.62.192.0/18
 42.241.0.0/16
@ -191,6 +190,7 @@
 45.64.148.0/22
 45.65.12.0/22
 45.65.60.0/22
 45.74.128.0/20
 45.86.87.0/24
 45.92.80.0/22
 45.92.96.0/22
@ -243,6 +243,8 @@
 45.248.76.0/22
 45.248.140.0/22
 45.248.196.0/22
 45.249.60.0/23
 45.249.62.0/24
 45.249.116.0/22
 45.252.184.0/22
 45.252.252.0/22
@ -302,6 +304,7 @@
 64.15.32.0/20
 64.251.192.0/20
 66.203.240.0/21
 66.226.144.0/20
 66.234.160.0/20
 67.213.140.0/22
 68.65.228.0/22
@ -313,6 +316,7 @@
 82.115.8.0/22
 82.115.12.0/23
 82.115.16.0/20
 85.204.106.0/24
 86.54.202.0/23
 87.121.72.0/22
 87.121.92.0/22
@ -359,7 +363,6 @@
 103.2.192.0/21
 103.2.240.0/22
 103.3.144.0/22
 103.3.160.0/22
 103.3.196.0/22
 103.3.216.0/22
 103.3.236.0/22
@ -387,7 +390,6 @@
 103.6.3.0/24
 103.6.12.0/22
 103.6.24.0/23
 103.6.35.0/24
 103.6.105.0/24
 103.6.116.0/24
 103.6.188.0/22
@ -423,7 +425,8 @@
 103.10.8.0/24
 103.10.11.0/24
 103.10.32.0/22
-103.10.48.0/22
+103.10.48.0/23
 103.10.51.0/24
 103.10.72.0/22
 103.10.82.0/24
 103.10.108.0/24
@ -523,7 +526,6 @@
 103.19.216.0/24
 103.19.218.0/24
 103.20.17.0/24
 103.20.18.0/23
 103.20.20.0/24
 103.20.22.0/23
 103.20.36.0/22
@ -540,7 +542,6 @@
 103.21.17.0/24
 103.21.20.0/22
 103.21.48.0/22
 103.21.56.0/23
 103.21.108.0/22
 103.21.128.0/21
 103.21.144.0/22
@ -632,7 +633,7 @@
 103.35.80.0/22
 103.35.92.0/22
 103.35.112.0/23
-103.35.128.0/22
+103.35.130.0/23
 103.35.224.0/21
 103.36.0.0/21
 103.36.12.0/23
@ -682,10 +683,8 @@
 103.42.236.0/22
 103.43.38.0/23
 103.43.88.0/22
 103.43.92.0/24
 103.43.116.0/22
 103.43.137.0/24
 103.43.138.0/23
 103.43.176.0/22
 103.43.253.0/24
 103.43.254.0/23
@ -831,7 +830,7 @@
 103.67.167.0/24
 103.67.177.0/24
 103.67.249.0/24
-103.67.250.0/23
+103.67.250.0/24
 103.68.92.0/24
 103.68.105.0/24
 103.68.124.0/24
@ -952,7 +951,7 @@
 103.81.124.0/22
 103.81.216.0/23
 103.81.219.0/24
-103.81.244.0/23
+103.81.245.0/24
 103.82.108.0/22
 103.82.124.0/24
 103.82.136.0/22
@ -984,7 +983,6 @@
 103.86.188.0/23
 103.86.190.0/24
 103.87.38.0/23
 103.87.91.0/24
 103.87.163.0/24
 103.87.203.0/24
 103.87.208.0/22
@ -996,7 +994,6 @@
 103.88.139.0/24
 103.88.144.0/21
 103.88.154.0/24
 103.88.163.0/24
 103.88.180.0/23
 103.88.183.0/24
 103.89.9.0/24
@ -1023,7 +1020,8 @@
 103.92.131.0/24
 103.92.140.0/22
 103.92.220.0/22
-103.93.24.0/22
+103.93.24.0/23
 103.93.26.0/24
 103.93.68.0/22
 103.93.80.0/23
 103.93.82.0/24
@ -1064,7 +1062,6 @@
 103.97.52.0/22
 103.97.155.0/24
 103.97.170.0/23
 103.97.173.0/24
 103.97.217.0/24
 103.97.218.0/23
 103.97.220.0/22
@ -1128,7 +1125,6 @@
 103.104.80.0/22
 103.104.156.0/22
 103.104.164.0/22
 103.104.200.0/23
 103.104.222.0/23
 103.104.230.0/24
 103.104.236.0/22
@ -1174,7 +1170,6 @@
 103.109.140.0/22
 103.109.232.0/24
 103.110.28.0/23
 103.110.50.0/23
 103.110.82.0/24
 103.110.108.0/24
 103.110.131.0/24
@ -1183,7 +1178,6 @@
 103.110.194.0/24
 103.111.16.0/22
 103.111.24.0/22
 103.111.78.0/24
 103.111.87.0/24
 103.111.127.0/24
 103.111.163.0/24
@ -1195,7 +1189,6 @@
 103.112.102.0/23
 103.112.104.0/23
 103.112.176.0/24
 103.112.188.0/24
 103.112.200.0/22
 103.113.1.0/24
 103.113.169.0/24
@ -1246,7 +1239,7 @@
 103.118.154.0/23
 103.118.161.0/24
 103.118.162.0/23
-103.119.32.0/23
+103.119.32.0/24
 103.119.222.0/24
 103.119.253.0/24
 103.120.7.0/24
@ -1311,7 +1304,6 @@
 103.131.162.0/24
 103.131.198.0/23
 103.131.208.0/22
 103.131.220.0/24
 103.131.223.0/24
 103.131.232.0/22
 103.132.126.0/23
@ -1339,7 +1331,6 @@
 103.135.71.0/24
 103.135.84.0/22
 103.135.98.0/23
 103.135.106.0/24
 103.135.188.0/24
 103.135.231.0/24
 103.135.246.0/23
@ -1347,7 +1338,7 @@
 103.136.86.0/24
 103.136.100.0/22
 103.136.120.0/22
-103.136.140.0/22
+103.136.140.0/24
 103.136.144.0/22
 103.136.190.0/23
 103.136.214.0/23
@ -1378,7 +1369,7 @@
 103.139.123.0/24
 103.139.153.0/24
 103.139.218.0/24
-103.139.228.0/22
+103.139.230.0/23
 103.139.249.0/24
 103.139.252.0/24
 103.140.32.0/23
@ -1392,7 +1383,7 @@
 103.140.172.0/23
 103.140.198.0/24
 103.140.202.0/23
-103.140.214.0/23
+103.140.215.0/24
 103.140.218.0/24
 103.140.222.0/23
 103.141.14.0/23
@ -1489,7 +1480,6 @@
 103.150.71.0/24
 103.150.77.0/24
 103.150.134.0/23
 103.150.144.0/23
 103.150.171.0/24
 103.150.176.0/23
 103.150.198.0/24
@ -1564,7 +1554,6 @@
 103.157.103.0/24
 103.157.106.0/23
 103.157.108.0/22
 103.157.136.0/23
 103.157.140.0/23
 103.157.244.0/23
 103.158.6.0/23
@ -1611,7 +1600,6 @@
 103.165.47.0/24
 103.165.97.0/24
 103.165.180.0/24
 103.165.182.0/23
 103.166.3.0/24
 103.166.16.0/23
 103.166.56.0/23
@ -1671,7 +1659,6 @@
 103.173.149.0/24
 103.173.176.0/24
 103.173.235.0/24
 103.173.248.0/24
 103.174.3.0/24
 103.174.6.0/23
 103.174.48.0/23
@ -1691,7 +1678,6 @@
 103.176.120.0/24
 103.176.216.0/22
 103.176.220.0/23
 103.177.85.0/24
 103.177.158.0/23
 103.177.160.0/23
 103.177.193.0/24
@ -1812,7 +1798,6 @@
 103.204.104.0/22
 103.204.117.0/24
 103.204.219.0/24
 103.204.224.0/23
 103.204.228.0/23
 103.204.240.0/22
 103.205.28.0/22
@ -1829,7 +1814,6 @@
 103.207.154.0/23
 103.208.2.0/24
 103.208.4.0/22
 103.208.22.0/24
 103.208.92.0/23
 103.208.155.0/24
 103.208.164.0/22
@ -1877,7 +1861,6 @@
 103.212.216.0/22
 103.212.240.0/22
 103.213.100.0/22
 103.213.120.0/23
 103.213.200.0/24
 103.213.229.0/24
 103.214.28.0/22
@ -1889,8 +1872,8 @@
 103.215.12.0/24
 103.215.15.0/24
 103.215.22.0/23
 103.215.64.0/22
 103.215.88.0/22
 103.215.128.0/22
 103.215.132.0/23
 103.215.160.0/22
 103.216.133.0/24
@ -1901,7 +1884,6 @@
 103.217.100.0/22
 103.217.106.0/24
 103.217.164.0/22
 103.217.174.0/23
 103.217.248.0/24
 103.219.7.0/24
 103.219.62.0/23
@ -1952,7 +1934,6 @@
 103.226.219.0/24
 103.226.220.0/22
 103.226.244.0/23
 103.226.247.0/24
 103.227.20.0/22
 103.227.28.0/22
 103.227.60.0/23
@ -1962,7 +1943,6 @@
 103.227.200.0/22
 103.227.232.0/24
 103.227.234.0/23
 103.228.16.0/24
 103.228.104.0/22
 103.228.133.0/24
 103.228.164.0/22
@ -2014,7 +1994,6 @@
 103.234.112.0/23
 103.234.163.0/24
 103.234.194.0/24
 103.234.248.0/22
 103.235.20.0/24
 103.235.22.0/24
 103.235.36.0/22
@ -2079,7 +2058,6 @@
 103.244.128.0/22
 103.244.196.0/22
 103.244.200.0/22
 103.245.75.0/24
 103.245.84.0/22
 103.245.146.0/24
 103.245.152.0/22
@ -2127,7 +2105,6 @@
 103.249.49.0/24
 103.249.50.0/23
 103.249.57.0/24
 103.249.66.0/23
 103.249.68.0/24
 103.249.70.0/23
 103.249.124.0/22
@ -2194,6 +2171,8 @@
 110.20.0.0/14
 110.32.0.0/15
 110.34.52.0/22
 110.36.57.0/24
 110.36.232.0/23
 110.44.24.0/21
 110.50.16.0/21
 110.76.136.0/22
@ -2251,7 +2230,6 @@
 113.11.232.0/22
 113.20.0.0/20
 113.20.24.0/22
 113.20.128.0/22
 113.21.32.0/20
 113.29.208.0/21
 113.29.240.0/21
@ -2354,7 +2332,7 @@
 118.151.216.0/22
 118.208.0.0/14
 119.2.56.0/21
-119.10.128.0/20
+119.10.128.0/21
 119.11.0.0/17
 119.12.80.0/21
 119.12.208.0/20
@ -2648,6 +2626,7 @@
 145.34.0.0/16
 146.11.0.0/16
 146.19.0.0/24
 146.19.9.0/24
 146.19.135.0/24
 146.19.145.0/24
 146.88.16.0/23
@ -2657,7 +2636,8 @@
 146.88.144.0/23
 146.116.0.0/16
 146.118.0.0/16
-146.144.0.0/16
+146.144.0.0/21
 146.144.8.0/23
 146.178.0.0/16
 146.195.0.0/16
 146.196.0.0/19
@ -2699,6 +2679,15 @@
 151.158.22.0/23
 151.158.38.0/23
 151.158.40.0/23
 151.158.62.0/23
 151.158.68.0/23
 151.158.98.0/23
 151.158.128.0/23
 151.158.163.0/24
 151.158.182.0/24
 151.158.191.0/24
 151.158.219.0/24
 151.158.231.0/24
 151.178.0.0/16
 152.65.192.0/18
 152.76.0.0/16
@ -2707,6 +2696,7 @@
 152.98.0.0/16
 152.147.0.0/16
 153.107.0.0/16
 154.8.120.0/22
 155.35.226.0/24
 155.60.0.0/16
 155.71.0.0/16
@ -2729,7 +2719,6 @@
 157.20.102.0/23
 157.20.112.0/23
 157.20.140.0/23
 157.85.0.0/18
 157.85.72.0/21
 157.85.80.0/20
 157.85.128.0/18
@ -2790,13 +2779,26 @@
 160.191.226.0/23
 160.202.140.0/22
 160.206.0.0/16
-160.222.0.0/17
+160.222.64.0/18
 160.222.128.0/18
 160.222.196.0/22
 160.222.200.0/21
 160.222.208.0/20
 160.222.224.0/19
 160.231.128.0/18
 160.236.12.0/23
 160.236.50.0/23
 160.236.56.0/23
 160.236.63.0/24
 160.236.69.0/24
 160.236.107.0/24
 160.236.108.0/24
 160.236.124.0/24
 160.236.160.0/23
 160.236.164.0/24
 160.236.212.0/23
 160.236.217.0/24
 160.236.236.0/24
 160.250.34.0/24
 160.250.70.0/23
 160.250.72.0/24
@ -2819,6 +2821,13 @@
 161.152.0.0/16
 161.248.8.0/24
 161.248.70.0/23
 162.4.84.0/24
 162.4.122.0/23
 162.4.155.0/24
 162.4.206.0/23
 162.4.210.0/23
 162.4.220.0/23
 162.4.250.0/23
 162.12.240.0/22
 162.145.0.0/16
 162.146.0.0/15
@ -2846,6 +2855,15 @@
 163.47.196.0/22
 163.47.216.0/22
 163.47.252.0/22
 163.52.19.0/24
 163.52.20.0/23
 163.52.34.0/24
 163.52.52.0/23
 163.52.65.0/24
 163.52.79.0/24
 163.52.83.0/24
 163.52.88.0/22
 163.52.110.0/23
 163.53.20.0/22
 163.53.32.0/22
 163.53.68.0/22
@ -2864,6 +2882,17 @@
 163.61.220.0/23
 163.122.0.0/16
 163.127.0.0/16
 163.128.39.0/24
 163.128.69.0/24
 163.128.92.0/23
 163.128.95.0/24
 163.128.97.0/24
 163.128.119.0/24
 163.128.134.0/23
 163.128.194.0/24
 163.128.202.0/23
 163.128.244.0/23
 163.128.247.0/24
 163.189.0.0/16
 163.223.22.0/23
 163.223.109.0/24
@ -2934,6 +2963,7 @@
 168.140.208.0/20
 168.140.224.0/20
 168.151.40.0/23
 168.151.232.0/21
 168.152.0.0/15
 168.186.0.0/16
 168.198.0.0/16
@ -2941,6 +2971,7 @@
 168.252.0.0/16
 169.201.0.0/16
 170.157.0.0/16
 172.255.214.0/23
 173.234.104.0/21
 175.32.0.0/13
 175.41.40.0/22
@ -2994,7 +3025,7 @@
 180.216.0.0/16
 180.222.0.0/19
 180.222.160.0/20
-180.222.192.0/21
+180.222.192.0/22
 180.233.124.0/22
 180.233.128.0/22
 180.235.108.0/22
@ -3038,6 +3069,7 @@
 185.254.56.0/22
 188.209.155.0/24
 188.209.156.0/22
 188.241.220.0/24
 188.253.0.0/19
 188.253.96.0/19
 192.12.76.0/24
@ -3087,6 +3119,7 @@
 192.67.12.0/24
 192.67.84.0/24
 192.67.171.0/24
 192.67.217.0/24
 192.68.132.0/24
 192.69.116.0/24
 192.70.135.0/24
@ -3228,7 +3261,6 @@
 192.207.248.0/24
 192.231.59.0/24
 192.231.127.0/24
 192.231.135.0/24
 192.231.136.0/24
 192.231.166.0/23
 192.231.168.0/24
@ -3305,7 +3337,6 @@
 202.1.233.0/24
 202.1.234.0/23
 202.1.237.0/24
 202.1.238.0/24
 202.2.0.0/22
 202.2.56.0/22
 202.2.92.0/22
@ -3523,6 +3554,7 @@
 202.58.226.0/24
 202.58.229.0/24
 202.58.230.0/23
 202.58.233.0/24
 202.58.235.0/24
 202.58.240.0/23
 202.58.246.0/23
@ -3538,7 +3570,6 @@
 202.60.64.0/19
 202.61.4.0/22
 202.61.12.0/22
 202.61.72.0/22
 202.61.92.0/22
 202.61.109.0/24
 202.61.116.0/24
@ -3553,11 +3584,13 @@
 202.66.160.0/22
 202.67.64.0/18
 202.68.64.0/20
-202.68.96.0/19
+202.68.96.0/20
 202.68.112.0/21
 202.68.124.0/22
 202.68.160.0/20
 202.69.132.0/22
 202.69.208.0/20
-202.70.128.0/23
+202.70.129.0/24
 202.70.141.0/24
 202.70.142.0/23
 202.71.160.0/20
@ -3571,7 +3604,6 @@
 202.74.44.0/24
 202.74.46.0/24
 202.74.49.0/24
 202.74.57.0/24
 202.74.61.0/24
 202.74.64.0/21
 202.74.128.0/18
@ -3617,7 +3649,6 @@
 202.92.64.0/18
 202.92.208.0/22
 202.92.240.0/21
 202.92.248.0/22
 202.93.4.0/23
 202.93.96.0/20
 202.93.152.0/24
@ -3643,7 +3674,6 @@
 202.125.104.0/23
 202.125.160.0/20
 202.126.96.0/20
 202.127.210.0/23
 202.128.96.0/23
 202.128.102.0/23
 202.128.106.0/24
@ -4064,7 +4094,7 @@
 203.11.220.0/24
 203.11.224.0/19
 203.12.0.0/20
-203.12.28.0/23
+203.12.29.0/24
 203.12.36.0/24
 203.12.38.0/23
 203.12.40.0/23
@ -4114,7 +4144,9 @@
 203.13.38.0/24
 203.13.41.0/24
 203.13.43.0/24
-203.13.64.0/21
+203.13.64.0/22
 203.13.68.0/24
 203.13.70.0/23
 203.13.74.0/23
 203.13.76.0/23
 203.13.90.0/23
@ -4231,7 +4263,6 @@
 203.16.200.0/22
 203.16.204.0/24
 203.16.208.0/21
 203.16.225.0/24
 203.16.227.0/24
 203.16.229.0/24
 203.16.230.0/23
@ -4394,7 +4425,6 @@
 203.20.72.0/24
 203.20.78.0/23
 203.20.81.0/24
 203.20.87.0/24
 203.20.88.0/24
 203.20.94.0/24
 203.20.96.0/24
@ -4532,7 +4562,6 @@
 203.23.125.0/24
 203.23.127.0/24
 203.23.129.0/24
 203.23.131.0/24
 203.23.136.0/24
 203.23.138.0/23
 203.23.142.0/24
@ -4550,7 +4579,6 @@
 203.23.232.0/23
 203.23.236.0/22
 203.23.245.0/24
 203.23.246.0/23
 203.23.250.0/24
 203.23.252.0/23
 203.24.0.0/21
@ -4596,12 +4624,13 @@
 203.24.194.0/24
 203.24.201.0/24
 203.24.206.0/23
-203.24.208.0/22
+203.24.208.0/24
 203.24.210.0/23
 203.24.240.0/24
 203.24.242.0/23
 203.25.0.0/20
 203.25.17.0/24
-203.25.22.0/23
+203.25.22.0/24
 203.25.24.0/22
 203.25.31.0/24
 203.25.32.0/22
@ -4670,12 +4699,11 @@
 203.26.100.0/24
 203.26.107.0/24
 203.26.110.0/24
-203.26.112.0/23
+203.26.112.0/24
 203.26.118.0/24
 203.26.120.0/22
 203.26.124.0/23
 203.26.130.0/24
 203.26.132.0/23
 203.26.136.0/24
 203.26.138.0/23
 203.26.142.0/24
@ -4698,7 +4726,6 @@
 203.26.219.0/24
 203.26.225.0/24
 203.26.235.0/24
 203.26.237.0/24
 203.26.245.0/24
 203.26.248.0/21
 203.27.5.0/24
@ -4735,7 +4762,6 @@
 203.27.114.0/23
 203.27.116.0/24
 203.27.118.0/24
 203.27.124.0/24
 203.27.126.0/23
 203.27.128.0/18
 203.27.192.0/23
@ -4768,9 +4794,7 @@
 203.28.46.0/23
 203.28.48.0/22
 203.28.52.0/24
 203.28.58.0/23
 203.28.63.0/24
 203.28.70.0/23
 203.28.75.0/24
 203.28.79.0/24
 203.28.80.0/22
@ -4862,7 +4886,6 @@
 203.30.0.0/20
 203.30.18.0/23
 203.30.24.0/24
 203.30.33.0/24
 203.30.34.0/23
 203.30.44.0/22
 203.30.56.0/24
@ -4952,7 +4975,6 @@
 203.31.205.0/24
 203.31.206.0/23
 203.31.216.0/24
 203.31.218.0/24
 203.31.227.0/24
 203.31.230.0/23
 203.31.232.0/23
@ -5081,7 +5103,6 @@
 203.34.75.0/24
 203.34.78.0/23
 203.34.88.0/24
 203.34.97.0/24
 203.34.100.0/23
 203.34.104.0/24
 203.34.109.0/24
@ -5101,7 +5122,6 @@
 203.34.190.0/24
 203.34.212.0/24
 203.34.218.0/24
 203.34.220.0/23
 203.34.223.0/24
 203.34.224.0/21
 203.34.235.0/24
@ -5153,7 +5173,8 @@
 203.55.122.0/24
 203.55.124.0/22
 203.55.130.0/24
-203.55.132.0/22
+203.55.132.0/24
 203.55.134.0/23
 203.55.138.0/24
 203.55.142.0/23
 203.55.144.0/24
@ -5239,7 +5260,6 @@
 203.57.10.0/24
 203.57.15.0/24
 203.57.23.0/24
 203.57.27.0/24
 203.57.29.0/24
 203.57.36.0/23
 203.57.38.0/24
@ -5283,7 +5303,6 @@
 203.62.64.0/18
 203.62.128.0/23
 203.62.132.0/22
 203.62.143.0/24
 203.62.148.0/22
 203.62.157.0/24
 203.62.158.0/23
@ -5291,7 +5310,6 @@
 203.62.162.0/24
 203.62.164.0/24
 203.62.166.0/23
 203.62.171.0/24
 203.62.184.0/22
 203.62.189.0/24
 203.62.196.0/24
@ -5401,7 +5419,6 @@
 203.129.128.0/19
 203.130.160.0/20
 203.131.0.0/18
 203.132.0.0/22
 203.132.8.0/21
 203.132.64.0/19
 203.132.224.0/19
@ -5414,7 +5431,9 @@
 203.143.64.0/19
 203.143.160.0/20
 203.143.192.0/18
-203.144.0.0/19
+203.144.4.0/22
 203.144.8.0/21
 203.144.16.0/20
 203.147.92.0/22
 203.147.96.0/21
 203.147.108.0/23
@ -5489,7 +5508,7 @@
 203.192.64.0/19
 203.193.192.0/19
 203.194.0.0/18
-203.195.127.0/24
+203.195.126.0/23
 203.196.32.0/19
 203.196.92.0/22
 203.201.0.0/19
@ -5529,6 +5548,7 @@
 204.15.40.0/23
 204.15.171.0/24
 204.48.62.0/23
 204.75.18.0/23
 204.75.142.0/24
 204.79.133.0/24
 204.145.97.0/24
@ -5578,10 +5598,11 @@
 210.185.64.0/18
 210.193.128.0/17
 210.215.0.0/16
-210.247.192.0/19
+210.247.208.0/20
 210.247.224.0/20
 211.26.0.0/15
 211.28.0.0/14
 212.23.208.0/24
 212.87.192.0/22
 212.90.100.0/22
 212.107.28.0/22
@ -5594,6 +5615,7 @@
 216.118.0.0/18
 216.157.157.0/24
 216.157.158.0/23
 216.176.238.0/23
 216.235.244.0/22
 218.100.0.0/22
 218.100.12.0/23
--- a/country/au/ipv6-aggregated.txt
+++ b/country/au/ipv6-aggregated.txt
@ -5,7 +5,6 @@
 #
 2001:360::/32
 2001:388::/32
 2001:67c:25ec::/48
 2001:7fa:9::/48
 2001:7fa:a::/47
 2001:7fa:c::/47
@ -64,7 +63,6 @@
 2001:df0:f8::/47
 2001:df0:fa::/48
 2001:df0:fd::/48
 2001:df0:fe::/48
 2001:df0:100::/40
 2001:df0:201::/48
 2001:df0:204::/48
@ -76,7 +74,7 @@
 2001:df0:215::/48
 2001:df0:218::/47
 2001:df0:224::/48
-2001:df0:226::/47
+2001:df0:226::/48
 2001:df0:228::/48
 2001:df0:233::/48
 2001:df0:238::/48
@ -109,14 +107,13 @@
 2001:df0:2e2::/48
 2001:df0:2fa::/48
 2001:df0:2fe::/48
-2001:df0:402::/47
+2001:df0:403::/48
 2001:df0:40a::/48
 2001:df0:40d::/48
 2001:df0:415::/48
 2001:df0:41a::/48
 2001:df0:41c::/48
 2001:df0:441::/48
 2001:df0:447::/48
 2001:df0:460::/48
 2001:df0:466::/48
 2001:df0:500::/40
@ -164,13 +161,11 @@
 2001:df0:7e40::/48
 2001:df0:7e80::/48
 2001:df0:7ec0::/48
 2001:df0:8100::/48
 2001:df0:8200::/48
 2001:df0:8b00::/48
 2001:df0:9380::/48
 2001:df0:94c0::/48
 2001:df0:9500::/48
 2001:df0:9680::/48
 2001:df0:9780::/48
 2001:df0:9c00::/48
 2001:df0:9d00::/48
@ -199,7 +194,6 @@
 2001:df0:d100::/48
 2001:df0:d640::/48
 2001:df0:d680::/46
 2001:df0:d780::/48
 2001:df0:d7c0::/48
 2001:df0:da40::/48
 2001:df0:db00::/46
@ -217,7 +211,6 @@
 2001:df1:80::/48
 2001:df1:480::/48
 2001:df1:a80::/48
 2001:df1:b80::/48
 2001:df1:d40::/48
 2001:df1:1180::/48
 2001:df1:1300::/48
@ -260,7 +253,6 @@
 2001:df1:7d00::/48
 2001:df1:8100::/48
 2001:df1:8440::/48
 2001:df1:86c0::/48
 2001:df1:8700::/48
 2001:df1:8800::/48
 2001:df1:8ac0::/48
@ -291,7 +283,6 @@
 2001:df1:d800::/48
 2001:df1:de00::/48
 2001:df1:df00::/48
 2001:df1:e240::/48
 2001:df1:e700::/48
 2001:df1:e800::/48
 2001:df1:ec00::/48
@ -339,7 +330,6 @@
 2001:df2:7e00::/48
 2001:df2:8380::/48
 2001:df2:8b80::/48
 2001:df2:9400::/48
 2001:df2:98c0::/48
 2001:df2:9940::/48
 2001:df2:9a00::/48
@ -368,7 +358,6 @@
 2001:df2:ed00::/48
 2001:df2:ee00::/47
 2001:df2:f180::/48
 2001:df2:f480::/48
 2001:df2:f500::/48
 2001:df2:f540::/48
 2001:df2:f5c0::/48
@ -399,7 +388,6 @@
 2001:df3:3b40::/48
 2001:df3:3b80::/48
 2001:df3:4300::/48
 2001:df3:4740::/48
 2001:df3:4ac0::/48
 2001:df3:4e40::/48
 2001:df3:5400::/48
@ -410,7 +398,6 @@
 2001:df3:6f40::/48
 2001:df3:70c0::/48
 2001:df3:7300::/48
 2001:df3:7780::/48
 2001:df3:7880::/48
 2001:df3:7900::/48
 2001:df3:7e00::/48
@ -451,7 +438,6 @@
 2001:df3:d5c0::/48
 2001:df3:dd00::/48
 2001:df3:de00::/48
 2001:df3:dec0::/48
 2001:df3:e140::/48
 2001:df3:e580::/48
 2001:df3:e780::/48
@ -555,7 +541,7 @@
 2001:df5:1d80::/48
 2001:df5:2200::/48
 2001:df5:2340::/48
-2001:df5:27c0::/48
+2001:df5:27c0::/47
 2001:df5:28c0::/48
 2001:df5:2b00::/48
 2001:df5:2d00::/48
@ -582,7 +568,6 @@
 2001:df5:6c40::/48
 2001:df5:6cc0::/48
 2001:df5:6d00::/48
 2001:df5:6dc0::/48
 2001:df5:6f00::/48
 2001:df5:71c0::/48
 2001:df5:7500::/48
@ -604,7 +589,6 @@
 2001:df5:b980::/48
 2001:df5:bbc0::/48
 2001:df5:bd40::/48
 2001:df5:c800::/48
 2001:df5:c9c0::/48
 2001:df5:cb00::/48
 2001:df5:cc00::/48
@ -679,15 +663,22 @@
 2001:df6:ad80::/48
 2001:df6:ae80::/48
 2001:df6:b200::/48
 2001:df6:b240::/48
 2001:df6:b600::/48
 2001:df6:bbc0::/48
 2001:df6:bf40::/48
 2001:df6:c1c0::/48
 2001:df6:c200::/48
 2001:df6:c500::/48
 2001:df6:cbc0::/48
 2001:df6:cd80::/48
 2001:df6:d040::/48
 2001:df6:d480::/48
 2001:df6:d500::/48
 2001:df6:d900::/48
 2001:df6:e500::/47
 2001:df6:e580::/47
 2001:df6:e5c0::/48
 2001:df6:e680::/48
 2001:df6:ee00::/48
 2001:df6:f200::/48
@ -698,20 +689,25 @@
 2001:df6:fc00::/48
 2001:df6:fe00::/48
 2001:df6:ff00::/48
 2001:df7:1c0::/48
 2001:df7:b80::/48
 2001:df7:d00::/48
 2001:df7:f00::/48
 2001:df7:1200::/48
 2001:df7:1400::/48
 2001:df7:14c0::/48
 2001:df7:1580::/48
-2001:df7:1680::/48
+2001:df7:1d40::/48
 2001:df7:21c0::/48
 2001:df7:2280::/48
 2001:df7:2400::/48
 2001:df7:2800::/48
 2001:df7:2880::/48
 2001:df7:2a00::/48
 2001:df7:2f40::/48
 2001:df7:3200::/48
 2001:df7:3300::/48
 2001:df7:3540::/48
 2001:df7:3640::/48
 2001:df7:3900::/48
 2001:df7:3e00::/48
 2001:df7:4200::/48
@ -720,11 +716,19 @@
 2001:df7:4e00::/48
 2001:df7:4f00::/48
 2001:df7:5100::/48
 2001:df7:5ac0::/48
 2001:df7:5b00::/48
 2001:df7:5bc0::/48
 2001:df7:5f00::/48
 2001:df7:6140::/44
 2001:df7:6200::/48
 2001:df7:68c0::/48
 2001:df7:6a00::/48
 2001:df7:6b40::/48
 2001:df7:6c80::/48
 2001:df7:6d40::/48
 2001:df7:6f40::/48
 2001:df7:71c0::/48
 2001:df7:7580::/48
 2001:df7:7600::/48
 2001:df7:8f80::/48
@ -735,7 +739,6 @@
 2001:df7:a380::/48
 2001:df7:ad00::/48
 2001:df7:ae80::/48
 2001:df7:af80::/48
 2001:df7:b680::/48
 2001:df7:ba80::/48
 2001:df7:bb80::/48
@ -751,12 +754,11 @@
 2001:df7:d980::/48
 2001:df7:da80::/48
 2001:df7:e800::/48
 2001:df7:e900::/48
 2001:df7:ea00::/48
 2001:df7:ec00::/48
 2001:df7:ee80::/48
 2001:df7:ef00::/48
-2001:df8::/31
+2001:df9::/32
 2001:16c0::/29
 2001:4478::/30
 2001:44b8::/32
@ -878,7 +880,6 @@
 2400:c500::/32
 2400:cba0::/32
 2400:cc00::/32
 2400:d2c0::/32
 2400:d400::/32
 2400:d480::/32
 2400:d500::/32
@ -987,7 +988,6 @@
 2401:8180::/32
 2401:81c0::/32
 2401:8220::/32
 2401:84a0::/32
 2401:8560::/31
 2401:8760::/32
 2401:8a80::/32
@ -996,7 +996,6 @@
 2401:8fe0::/32
 2401:9040::/32
 2401:9080::/32
 2401:9300::/32
 2401:9ba0::/32
 2401:9c60::/32
 2401:9cc0::/32
@ -1111,7 +1110,6 @@
 2402:3380::/32
 2402:3420::/32
 2402:34c0::/32
 2402:3540::/32
 2402:3600::/32
 2402:3660::/32
 2402:3680::/32
@ -1128,26 +1126,51 @@
 2402:4880::/32
 2402:48e0::/32
 2402:49a0::/32
 2402:49e0::/32
 2402:4a60::/32
 2402:4c20::/32
 2402:4c80::/32
 2402:4d40::/32
 2402:5200::/32
 2402:5280::/32
 2402:5360::/32
 2402:53a0::/32
 2402:5420::/32
 2402:5480::/32
 2402:5540::/32
 2402:5600::/32
 2402:56a0::/32
 2402:58a0::/32
 2402:5ac0::/32
 2402:5c60::/32
 2402:5d40::/32
 2402:5d60::/32
 2402:5e60::/32
 2402:61e0::/32
 2402:6240::/32
 2402:6260::/32
 2402:63c0::/32
 2402:63e0::/32
 2402:6400::/32
 2402:6500::/32
 2402:6560::/32
 2402:6580::/32
 2402:65a0::/32
 2402:6600::/32
 2402:6720::/32
 2402:6780::/32
 2402:6820::/32
 2402:6900::/32
 2402:6940::/32
 2402:69a0::/32
 2402:6a20::/32
 2402:6b80::/32
 2402:6be0::/32
 2402:6c40::/32
 2402:6d60::/32
 2402:6de0::/32
 2402:6ea0::/32
 2402:6f20::/32
 2402:7280::/32
 2402:7340::/32
 2402:7400::/32
@ -1160,7 +1183,6 @@
 2402:7bc0::/32
 2402:7c40::/32
 2402:7e80::/32
 2402:7fc0::/32
 2402:8000::/32
 2402:8480::/32
 2402:8700::/32
@ -1197,7 +1219,6 @@
 2402:cb40::/32
 2402:d100::/32
 2402:d180::/32
 2402:d240::/32
 2402:d800::/32
 2402:d840::/32
 2402:d900::/32
@ -1336,7 +1357,6 @@
 2404:8e80::/32
 2404:8f00::/32
 2404:9400::/32
 2404:94c0::/32
 2404:9540::/32
 2404:9600::/31
 2404:9700::/32
@ -1437,7 +1457,7 @@
 2405:d840::/32
 2405:db00::/32
 2405:dc00::/32
-2405:e180::/32
+2405:e180::/28
 2405:e400::/32
 2405:e480::/32
 2405:e680::/32
@ -1464,7 +1484,6 @@
 2406:35c0::/32
 2406:3600::/32
 2406:3a00::/32
 2406:3a80::/32
 2406:3b00::/32
 2406:3c00::/32
 2406:3c40::/32
@ -1531,7 +1550,6 @@
 2406:d300::/32
 2406:d3c0::/32
 2406:d500::/31
 2406:ddc0::/32
 2406:e600::/32
 2406:e940::/32
 2406:eb80::/32
@ -1556,7 +1574,6 @@
 2407:2080::/32
 2407:20c0::/32
 2407:2200::/32
 2407:2740::/32
 2407:2980::/32
 2407:2b40::/32
 2407:2c80::/32
@ -1591,6 +1608,7 @@
 2407:7500::/32
 2407:7800::/32
 2407:8280::/32
 2407:8300::/32
 2407:8380::/32
 2407:8400::/32
 2407:8600::/32
@ -1605,7 +1623,6 @@
 2407:a200::/32
 2407:a240::/32
 2407:a280::/32
 2407:a580::/32
 2407:ab00::/32
 2407:ac80::/32
 2407:ad40::/32
@ -1627,7 +1644,6 @@
 2407:dc00::/32
 2407:e400::/32
 2407:e700::/32
 2407:ec00::/32
 2407:ee00::/32
 2407:f6c0::/32
 2407:fac0::/32
--- a/country/aw/aggregated.json
+++ b/country/aw/aggregated.json
@ -1,30 +1,10 @@
 {
-  "country" : "Aruba",
+  "country": "Aruba",
-  "countryCode" : "AW",
+  "countryCode": "AW",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "138.255.252.0/22", "170.84.254.0/24", "179.61.32.0/19", "181.41.0.0/18", "186.96.200.0/21", "186.96.224.0/20", "186.96.240.0/21", "186.189.0.0/18", "186.189.128.0/18", "190.12.224.0/19", "190.104.96.0/20", "201.229.0.0/17" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2800:ad0::/32", "2801:19:5800::/48", "2803:b640::/32" ]
  "prefixes" : {
    "ipv4" : [
      "138.255.252.0/22",
      "170.84.254.0/24",
      "179.61.32.0/19",
      "181.41.0.0/18",
      "186.96.200.0/21",
      "186.96.224.0/20",
      "186.96.240.0/21",
      "186.189.0.0/18",
      "186.189.128.0/18",
      "190.12.224.0/19",
      "190.104.96.0/20",
      "201.229.0.0/17"
    ],
    "ipv6" : [
      "2800:ad0::/32",
      "2801:19:5800::/48",
      "2803:b640::/32"
    ]
  }
 }
--- a/country/ax/aggregated.json
+++ b/country/ax/aggregated.json
@ -1,20 +1,10 @@
 {
-  "country" : "Åland Islands",
+  "country": "Åland Islands",
-  "countryCode" : "AX",
+  "countryCode": "AX",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "91.210.154.0/24", "185.84.30.0/23", "217.29.224.0/20" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2a04:e100::/29", "2a0d:79c0::/32" ]
  "prefixes" : {
    "ipv4" : [
      "91.210.154.0/24",
      "185.84.30.0/23",
      "217.29.224.0/20"
    ],
    "ipv6" : [
      "2a04:e100::/29",
      "2a0d:79c0::/32"
    ]
  }
 }
--- a/country/az/aggregated.json
+++ b/country/az/aggregated.json
@ -1,264 +1,10 @@
 {
-  "country" : "Azerbaijan",
+  "country": "Azerbaijan",
-  "countryCode" : "AZ",
+  "countryCode": "AZ",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "5.10.240.0/20", "5.44.32.0/21", "5.133.224.0/20", "5.134.48.0/20", "5.178.0.0/20", "5.191.0.0/16", "5.197.0.0/16", "5.250.192.0/19", "5.252.48.0/22", "31.170.224.0/19", "31.171.0.0/17", "31.222.225.0/24", "37.18.58.0/24", "37.26.0.0/18", "37.32.64.0/20", "37.61.0.0/17", "37.114.128.0/18", "37.128.200.0/21", "45.15.43.0/24", "45.136.164.0/22", "46.18.64.0/21", "46.22.224.0/20", "46.23.96.0/20", "46.28.237.0/24", "46.32.160.0/19", "46.228.176.0/20", "62.164.144.0/24", "62.212.224.0/19", "62.217.128.0/19", "77.81.56.0/21", "77.81.248.0/21", "77.244.112.0/20", "78.109.48.0/21", "78.111.48.0/20", "80.69.48.0/20", "81.17.80.0/20", "81.21.80.0/20", "81.30.97.0/24", "82.194.0.0/19", "85.132.0.0/17", "85.158.144.0/21", "88.151.192.0/21", "89.23.124.0/24", "89.37.16.0/21", "89.37.32.0/21", "89.40.30.0/24", "89.41.0.0/21", "89.124.248.0/23", "89.147.192.0/18", "89.219.36.0/22", "89.219.40.0/21", "89.219.48.0/20", "89.219.132.0/23", "89.219.155.0/24", "89.219.156.0/22", "89.219.160.0/24", "89.219.163.0/24", "89.219.164.0/22", "89.219.169.0/24", "89.219.170.0/23", "89.219.172.0/22", "89.219.176.0/20", "91.103.137.0/24", "91.132.192.0/22", "91.135.240.0/20", "91.191.192.0/20", "91.201.200.0/24", "91.209.225.0/24", "91.216.134.0/24", "91.218.56.0/24", "91.220.216.0/24", "91.234.235.0/24", "91.240.27.0/24", "91.242.0.0/19", "92.39.80.0/20", "93.88.80.0/20", "93.114.130.0/24", "93.184.224.0/20", "94.20.0.0/16", "95.86.128.0/18", "95.142.150.0/24", "109.68.222.0/24", "109.104.102.0/23", "109.127.0.0/18", "109.205.160.0/21", "109.205.208.0/21", "109.235.192.0/21", "109.237.112.0/20", "109.239.16.0/20", "130.0.8.0/21", "130.193.74.0/24", "131.117.128.0/20", "134.19.208.0/20", "149.126.112.0/20", "149.255.144.0/20", "153.56.144.0/24", "158.181.32.0/20", "160.202.24.0/22", "164.40.238.0/24", "164.215.96.0/21", "167.150.216.0/24", "176.28.80.0/21", "178.76.0.0/18", "178.237.64.0/20", "185.12.16.0/22", "185.18.244.0/22", "185.26.184.0/22", "185.30.88.0/22", "185.32.44.0/22", "185.34.72.0/22", "185.36.200.0/22", "185.40.32.0/22", "185.40.156.0/22", "185.40.176.0/22", "185.41.200.0/22", "185.43.188.0/22", "185.47.4.0/22", "185.52.128.0/22", "185.55.36.0/22", "185.65.119.0/24", "185.77.3.0/24", "185.77.248.0/24", "185.80.172.0/22", "185.81.80.0/21", "185.81.216.0/22", "185.83.124.0/22", "185.91.208.0/22", "185.92.224.0/22", "185.93.90.0/23", "185.96.124.0/22", "185.105.196.0/22", "185.112.192.0/22", "185.118.48.0/22", "185.127.40.0/24", "185.129.0.0/22", "185.129.92.0/22", "185.136.207.0/24", "185.138.12.0/22", "185.143.196.0/22", "185.146.112.0/22", "185.161.224.0/22", "185.163.131.0/24", "185.193.132.0/22", "185.213.123.0/24", "185.220.180.0/22", "185.222.92.0/22", "185.230.199.0/24", "185.233.35.0/24", "185.233.180.0/22", "188.64.8.0/21", "188.65.162.0/24", "188.72.128.0/18", "188.213.212.0/24", "188.227.208.0/20", "188.253.128.0/17", "193.8.62.0/23", "193.8.72.0/23", "193.41.128.0/24", "193.42.156.0/24", "193.105.123.0/24", "193.143.231.0/24", "194.39.184.0/24", "194.39.241.0/24", "194.39.243.0/24", "194.135.152.0/21", "194.135.160.0/19", "194.164.222.0/24", "194.164.224.0/24", "194.213.119.0/24", "195.26.8.0/23", "195.28.6.0/23", "195.216.230.0/24", "204.77.7.0/24", "208.122.23.0/24", "212.47.128.0/19", "212.102.123.0/24", "213.142.158.0/24", "213.154.0.0/19", "213.172.64.0/19", "217.14.96.0/20", "217.18.88.0/24", "217.25.16.0/20", "217.64.16.0/20", "217.168.176.0/20", "217.179.72.0/23", "217.179.126.0/24" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:3400::/29", "2001:3c00::/29", "2a00:41a0::/32", "2a00:48c0::/32", "2a00:7da0::/32", "2a00:8d40::/32", "2a00:9100::/32", "2a00:c0a0::/32", "2a00:f260::/32", "2a01:49e0::/32", "2a01:4ba0::/29", "2a01:6480::/32", "2a01:8c60::/32", "2a01:9240::/32", "2a01:f000::/29", "2a02:4380::/32", "2a02:67a0::/32", "2a02:e3c0::/29", "2a02:ecc0::/29", "2a03:8c0::/32", "2a03:4480::/32", "2a03:6020::/32", "2a03:6160::/32", "2a03:7740::/32", "2a03:ba40::/32", "2a03:c900::/32", "2a04:48c0::/29", "2a04:4b80::/29", "2a04:8380::/29", "2a04:9e40::/29", "2a04:c840::/29", "2a04:d380::/29", "2a05:440::/32", "2a05:8200::/29", "2a05:82c0::/29", "2a05:8340::/29", "2a05:9b40::/29", "2a05:f200::/29", "2a06:2d40::/29", "2a06:91c0::/29", "2a07:4900::/29", "2a07:9500::/29", "2a07:f140::/29", "2a09:ce80::/29", "2a0a:8080::/29", "2a0b:9840::/29", "2a0b:aec0::/29", "2a0b:f5c0::/29", "2a0b:f9c0::/29", "2a0b:fa40::/29", "2a0c:a200::/29", "2a0c:ed00::/29", "2a0d:2700::/29", "2a0d:4dc0::/32", "2a0d:d700::/29", "2a0e:9ec0::/29", "2a0e:ef40::/29", "2a0f:1300::/29", "2a0f:4a40::/29", "2a0f:7040::/32", "2a10:25c0::/29", "2a10:d880::/29", "2a12:8bc0::/29", "2a12:d1c0::/29", "2a12:f4c0::/29", "2a13:35c0::/29", "2a13:37c0::/29", "2a13:3f00::/32", "2a13:65c0::/29", "2a13:6f40::/29", "2a13:72c0::/29", "2a13:8700::/29", "2a13:9c80::/29", "2a13:a080::/29", "2a13:d400::/29", "2a14:d380::/29", "2a14:de00::/29" ]
  "prefixes" : {
    "ipv4" : [
      "5.10.240.0/20",
      "5.44.32.0/21",
      "5.133.224.0/20",
      "5.134.48.0/20",
      "5.178.0.0/20",
      "5.191.0.0/16",
      "5.197.0.0/16",
      "5.250.192.0/19",
      "5.252.48.0/22",
      "31.170.224.0/19",
      "31.171.0.0/17",
      "31.222.225.0/24",
      "37.18.58.0/24",
      "37.26.0.0/18",
      "37.32.64.0/20",
      "37.61.0.0/17",
      "37.114.128.0/18",
      "37.128.200.0/21",
      "45.15.43.0/24",
      "45.136.164.0/22",
      "46.18.64.0/21",
      "46.22.224.0/20",
      "46.23.96.0/20",
      "46.28.237.0/24",
      "46.32.160.0/19",
      "46.228.176.0/20",
      "62.164.144.0/24",
      "62.212.224.0/19",
      "62.217.128.0/19",
      "77.81.56.0/21",
      "77.81.248.0/21",
      "77.244.112.0/20",
      "78.109.48.0/21",
      "78.111.48.0/20",
      "80.69.48.0/20",
      "81.17.80.0/20",
      "81.21.80.0/20",
      "81.30.97.0/24",
      "82.194.0.0/19",
      "85.132.0.0/17",
      "85.158.144.0/21",
      "88.151.192.0/21",
      "89.23.124.0/24",
      "89.37.16.0/21",
      "89.37.32.0/21",
      "89.40.30.0/24",
      "89.41.0.0/21",
      "89.147.192.0/18",
      "89.219.36.0/22",
      "89.219.40.0/21",
      "89.219.48.0/20",
      "89.219.132.0/23",
      "89.219.155.0/24",
      "89.219.156.0/22",
      "89.219.160.0/24",
      "89.219.163.0/24",
      "89.219.164.0/22",
      "89.219.169.0/24",
      "89.219.170.0/23",
      "89.219.172.0/22",
      "89.219.176.0/20",
      "91.103.137.0/24",
      "91.132.192.0/22",
      "91.135.240.0/20",
      "91.191.192.0/20",
      "91.201.200.0/24",
      "91.209.225.0/24",
      "91.216.134.0/24",
      "91.218.56.0/24",
      "91.220.216.0/24",
      "91.234.235.0/24",
      "91.240.27.0/24",
      "91.242.0.0/19",
      "92.39.80.0/20",
      "93.88.80.0/20",
      "93.114.130.0/24",
      "93.184.224.0/20",
      "94.20.0.0/16",
      "95.86.128.0/18",
      "109.104.102.0/23",
      "109.127.0.0/18",
      "109.175.133.0/24",
      "109.205.160.0/21",
      "109.205.208.0/21",
      "109.235.192.0/21",
      "109.237.112.0/20",
      "109.239.16.0/20",
      "130.0.8.0/21",
      "130.193.74.0/24",
      "131.117.128.0/20",
      "134.19.208.0/20",
      "149.126.112.0/20",
      "149.255.144.0/20",
      "158.181.32.0/20",
      "160.202.24.0/22",
      "164.215.96.0/21",
      "167.150.216.0/24",
      "176.28.80.0/21",
      "178.76.0.0/18",
      "178.237.64.0/20",
      "185.12.16.0/22",
      "185.18.244.0/22",
      "185.26.184.0/22",
      "185.30.88.0/22",
      "185.32.44.0/22",
      "185.34.72.0/22",
      "185.36.200.0/22",
      "185.40.32.0/22",
      "185.40.156.0/22",
      "185.40.176.0/22",
      "185.41.200.0/22",
      "185.43.188.0/22",
      "185.47.4.0/22",
      "185.52.128.0/22",
      "185.55.36.0/22",
      "185.77.3.0/24",
      "185.77.248.0/24",
      "185.80.172.0/22",
      "185.81.80.0/21",
      "185.81.216.0/22",
      "185.83.124.0/22",
      "185.91.208.0/22",
      "185.92.224.0/22",
      "185.93.90.0/23",
      "185.96.124.0/22",
      "185.105.196.0/22",
      "185.112.192.0/22",
      "185.118.48.0/22",
      "185.129.0.0/22",
      "185.129.92.0/22",
      "185.136.207.0/24",
      "185.138.12.0/22",
      "185.143.196.0/22",
      "185.146.112.0/22",
      "185.161.224.0/22",
      "185.193.132.0/22",
      "185.220.180.0/22",
      "185.222.92.0/22",
      "185.230.199.0/24",
      "185.233.35.0/24",
      "185.233.180.0/22",
      "188.64.8.0/21",
      "188.65.162.0/24",
      "188.72.128.0/18",
      "188.213.212.0/24",
      "188.227.208.0/20",
      "188.253.128.0/17",
      "193.8.62.0/23",
      "193.8.72.0/23",
      "193.41.128.0/24",
      "193.42.156.0/24",
      "193.105.123.0/24",
      "193.143.231.0/24",
      "194.39.184.0/24",
      "194.39.241.0/24",
      "194.39.243.0/24",
      "194.135.152.0/21",
      "194.135.160.0/19",
      "194.164.222.0/24",
      "194.164.224.0/24",
      "195.26.8.0/23",
      "195.28.6.0/23",
      "195.216.230.0/24",
      "204.77.7.0/24",
      "208.122.23.0/24",
      "212.47.128.0/19",
      "212.102.123.0/24",
      "213.142.158.0/24",
      "213.154.0.0/19",
      "213.172.64.0/19",
      "217.14.96.0/20",
      "217.18.88.0/24",
      "217.25.16.0/20",
      "217.64.16.0/20",
      "217.168.176.0/20",
      "217.179.126.0/24"
    ],
    "ipv6" : [
      "2001:3400::/29",
      "2001:3c00::/29",
      "2a00:41a0::/32",
      "2a00:48c0::/32",
      "2a00:7da0::/32",
      "2a00:8d40::/32",
      "2a00:9100::/32",
      "2a00:c0a0::/32",
      "2a00:f260::/32",
      "2a01:49e0::/32",
      "2a01:4ba0::/29",
      "2a01:6480::/32",
      "2a01:8c60::/32",
      "2a01:9240::/32",
      "2a01:f000::/29",
      "2a02:4380::/32",
      "2a02:67a0::/32",
      "2a02:e3c0::/29",
      "2a02:ecc0::/29",
      "2a03:8c0::/32",
      "2a03:4480::/32",
      "2a03:6020::/32",
      "2a03:6160::/32",
      "2a03:7740::/32",
      "2a03:ba40::/32",
      "2a03:c900::/32",
      "2a04:48c0::/29",
      "2a04:4b80::/29",
      "2a04:8380::/29",
      "2a04:9e40::/29",
      "2a04:c840::/29",
      "2a04:d380::/29",
      "2a05:8200::/29",
      "2a05:82c0::/29",
      "2a05:8340::/29",
      "2a05:9b40::/29",
      "2a05:e8c0::/29",
      "2a05:f200::/29",
      "2a06:91c0::/29",
      "2a07:4900::/29",
      "2a07:9500::/29",
      "2a07:f140::/29",
      "2a09:ce80::/29",
      "2a0a:8080::/29",
      "2a0b:f5c0::/29",
      "2a0b:f9c0::/29",
      "2a0b:fa40::/29",
      "2a0c:a200::/29",
      "2a0c:ed00::/29",
      "2a0d:2700::/29",
      "2a0d:4dc0::/32",
      "2a0d:d700::/29",
      "2a0e:9ec0::/29",
      "2a0e:ef40::/29",
      "2a0f:1300::/29",
      "2a0f:4a40::/29",
      "2a0f:7040::/32",
      "2a10:25c0::/29",
      "2a10:d880::/29",
      "2a12:8bc0::/29",
      "2a12:d1c0::/29",
      "2a13:35c0::/29",
      "2a13:37c0::/29",
      "2a13:3f00::/32",
      "2a13:65c0::/29",
      "2a13:6f40::/29",
      "2a13:72c0::/29",
      "2a13:8700::/29",
      "2a13:9c80::/29",
      "2a13:a080::/29",
      "2a13:d400::/29",
      "2a14:d380::/29",
      "2a14:de00::/29"
    ]
  }
 }
--- a/country/az/ipv4-aggregated.txt
+++ b/country/az/ipv4-aggregated.txt
@ -50,6 +50,7 @@
 89.37.32.0/21
 89.40.30.0/24
 89.41.0.0/21
 89.124.248.0/23
 89.147.192.0/18
 89.219.36.0/22
 89.219.40.0/21
@ -82,9 +83,10 @@
 93.184.224.0/20
 94.20.0.0/16
 95.86.128.0/18
 95.142.150.0/24
 109.68.222.0/24
 109.104.102.0/23
 109.127.0.0/18
 109.175.133.0/24
 109.205.160.0/21
 109.205.208.0/21
 109.235.192.0/21
@ -96,8 +98,10 @@
 134.19.208.0/20
 149.126.112.0/20
 149.255.144.0/20
 153.56.144.0/24
 158.181.32.0/20
 160.202.24.0/22
 164.40.238.0/24
 164.215.96.0/21
 167.150.216.0/24
 176.28.80.0/21
@ -118,6 +122,7 @@
 185.47.4.0/22
 185.52.128.0/22
 185.55.36.0/22
 185.65.119.0/24
 185.77.3.0/24
 185.77.248.0/24
 185.80.172.0/22
@ -131,6 +136,7 @@
 185.105.196.0/22
 185.112.192.0/22
 185.118.48.0/22
 185.127.40.0/24
 185.129.0.0/22
 185.129.92.0/22
 185.136.207.0/24
@ -138,7 +144,9 @@
 185.143.196.0/22
 185.146.112.0/22
 185.161.224.0/22
 185.163.131.0/24
 185.193.132.0/22
 185.213.123.0/24
 185.220.180.0/22
 185.222.92.0/22
 185.230.199.0/24
@ -163,6 +171,7 @@
 194.135.160.0/19
 194.164.222.0/24
 194.164.224.0/24
 194.213.119.0/24
 195.26.8.0/23
 195.28.6.0/23
 195.216.230.0/24
@ -178,4 +187,5 @@
 217.25.16.0/20
 217.64.16.0/20
 217.168.176.0/20
 217.179.72.0/23
 217.179.126.0/24
--- a/country/az/ipv6-aggregated.txt
+++ b/country/az/ipv6-aggregated.txt
@ -35,18 +35,21 @@
 2a04:9e40::/29
 2a04:c840::/29
 2a04:d380::/29
 2a05:440::/32
 2a05:8200::/29
 2a05:82c0::/29
 2a05:8340::/29
 2a05:9b40::/29
 2a05:e8c0::/29
 2a05:f200::/29
 2a06:2d40::/29
 2a06:91c0::/29
 2a07:4900::/29
 2a07:9500::/29
 2a07:f140::/29
 2a09:ce80::/29
 2a0a:8080::/29
 2a0b:9840::/29
 2a0b:aec0::/29
 2a0b:f5c0::/29
 2a0b:f9c0::/29
 2a0b:fa40::/29
@ -64,6 +67,7 @@
 2a10:d880::/29
 2a12:8bc0::/29
 2a12:d1c0::/29
 2a12:f4c0::/29
 2a13:35c0::/29
 2a13:37c0::/29
 2a13:3f00::/32
--- a/country/ba/aggregated.json
+++ b/country/ba/aggregated.json
@ -1,207 +1,10 @@
 {
-  "country" : "Bosnia & Herzegovina",
+  "country": "Bosnia & Herzegovina",
-  "countryCode" : "BA",
+  "countryCode": "BA",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "5.43.64.0/18", "5.133.0.0/21", "5.133.128.0/19", "5.149.64.0/19", "5.152.232.0/21", "5.154.168.0/23", "5.154.228.0/23", "5.154.248.0/22", "31.47.0.0/19", "31.176.128.0/17", "31.185.112.0/20", "31.216.184.0/21", "31.223.128.0/19", "31.223.208.0/20", "37.8.128.0/20", "37.19.24.0/21", "37.203.64.0/18", "37.205.24.0/21", "37.208.32.0/21", "45.14.36.0/22", "45.82.88.0/22", "45.131.116.0/22", "45.148.123.0/24", "45.156.248.0/22", "46.35.128.0/19", "46.36.160.0/19", "46.229.252.0/24", "46.239.0.0/18", "46.255.27.0/24", "62.68.96.0/19", "62.101.144.0/20", "62.113.0.0/19", "77.74.224.0/21", "77.77.192.0/18", "77.78.192.0/18", "77.221.0.0/19", "77.238.192.0/19", "77.239.0.0/19", "77.239.64.0/19", "78.28.128.0/18", "79.142.0.0/20", "79.142.180.0/22", "79.143.160.0/20", "80.65.64.0/19", "80.80.32.0/20", "80.87.240.0/20", "80.242.112.0/20", "81.93.64.0/19", "81.94.0.0/20", "82.117.232.0/21", "82.118.0.0/20", "85.8.227.0/24", "85.92.224.0/19", "85.94.128.0/19", "85.158.32.0/21", "85.209.96.0/22", "85.235.84.0/22", "87.247.136.0/22", "87.250.96.0/19", "89.111.192.0/18", "89.124.12.0/22", "89.146.128.0/18", "91.191.0.0/18", "91.198.219.0/24", "91.205.68.0/22", "91.208.255.0/24", "91.212.4.0/24", "92.36.128.0/17", "92.240.32.0/19", "92.241.128.0/19", "93.157.192.0/21", "93.180.96.0/19", "93.180.144.0/21", "94.250.0.0/17", "95.133.140.0/22", "95.133.232.0/22", "95.156.128.0/18", "109.94.104.0/22", "109.105.192.0/20", "109.163.128.0/18", "109.165.128.0/17", "109.175.0.0/17", "109.175.236.0/22", "109.205.32.0/21", "109.237.32.0/20", "128.65.104.0/21", "134.90.128.0/21", "141.170.192.0/20", "146.255.128.0/19", "159.20.16.0/21", "164.40.224.0/21", "171.22.20.0/22", "176.108.56.0/21", "176.119.220.0/24", "178.77.0.0/18", "178.209.0.0/19", "178.210.184.0/21", "178.236.80.0/20", "185.1.133.0/24", "185.6.104.0/22", "185.12.76.0/22", "185.12.168.0/22", "185.13.240.0/22", "185.14.124.0/22", "185.15.64.0/22", "185.16.12.0/22", "185.17.44.0/22", "185.18.152.0/22", "185.24.160.0/22", "185.24.208.0/22", "185.26.176.0/22", "185.32.172.0/22", "185.35.156.0/22", "185.36.68.0/22", "185.36.84.0/22", "185.38.144.0/22", "185.39.0.0/22", "185.48.172.0/22", "185.50.56.0/22", "185.58.92.0/22", "185.65.107.0/24", "185.65.120.0/22", "185.69.28.0/22", "185.84.144.0/22", "185.91.156.0/22", "185.98.0.0/22", "185.99.0.0/22", "185.125.120.0/22", "185.150.192.0/22", "185.164.32.0/22", "185.173.28.0/22", "185.187.4.0/22", "185.202.76.0/22", "185.210.180.0/22", "185.212.108.0/22", "185.237.128.0/22", "188.124.192.0/19", "188.127.96.0/19", "188.246.64.0/19", "193.16.157.0/24", "193.222.144.0/22", "194.41.40.0/22", "194.53.156.0/22", "194.99.16.0/22", "195.130.32.0/19", "195.222.32.0/19", "209.162.200.0/24", "212.39.96.0/19", "212.47.45.0/24", "212.125.144.0/20", "213.91.64.0/18", "213.155.24.0/22", "213.196.112.0/20", "217.9.20.0/22", "217.23.192.0/20", "217.24.128.0/20", "217.71.48.0/20", "217.75.192.0/20", "217.197.136.0/21" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:678:1108::/48", "2001:7f8:d7::/48", "2a00:fe8::/32", "2a00:1a98::/32", "2a00:1b80::/29", "2a00:71a0::/29", "2a00:8620::/32", "2a00:8ca0::/32", "2a00:cb00::/32", "2a00:ed60::/32", "2a00:f7c0::/29", "2a01:478::/29", "2a01:a6e0::/32", "2a02:17a8::/32", "2a02:2030::/32", "2a02:21c0::/32", "2a02:27b0::/32", "2a02:28b8::/29", "2a02:6020::/29", "2a03:3320::/32", "2a03:7160::/32", "2a03:8960::/32", "2a03:9240::/32", "2a03:bd40::/29", "2a03:cb80::/29", "2a03:cc80::/29", "2a03:f180::/32", "2a03:fac0::/29", "2a04:f2c0::/29", "2a04:ff80::/29", "2a05:1f80::/29", "2a07:5080::/29", "2a0a:ac0::/29", "2a0c:1600::/32", "2a0e:5400::/29", "2a0e:6580::/32", "2a0e:8ac0::/29", "2a14:ce80::/29" ]
  "prefixes" : {
    "ipv4" : [
      "5.43.64.0/18",
      "5.133.0.0/21",
      "5.133.128.0/19",
      "5.149.64.0/19",
      "5.152.232.0/21",
      "5.154.168.0/23",
      "5.154.228.0/23",
      "5.154.248.0/22",
      "31.47.0.0/19",
      "31.176.128.0/17",
      "31.185.112.0/20",
      "31.216.184.0/21",
      "31.223.128.0/19",
      "31.223.208.0/20",
      "37.8.128.0/20",
      "37.19.24.0/21",
      "37.203.64.0/18",
      "37.205.24.0/21",
      "37.208.32.0/21",
      "45.14.36.0/22",
      "45.82.88.0/22",
      "45.131.116.0/22",
      "45.148.123.0/24",
      "45.156.248.0/22",
      "46.35.128.0/19",
      "46.36.160.0/19",
      "46.229.252.0/24",
      "46.239.0.0/18",
      "46.255.27.0/24",
      "62.68.96.0/19",
      "62.101.144.0/20",
      "62.113.0.0/19",
      "77.74.224.0/21",
      "77.77.192.0/18",
      "77.78.192.0/18",
      "77.221.0.0/19",
      "77.238.192.0/19",
      "77.239.0.0/19",
      "77.239.64.0/19",
      "78.28.128.0/18",
      "79.142.0.0/20",
      "79.142.180.0/22",
      "79.143.160.0/20",
      "80.65.64.0/19",
      "80.80.32.0/20",
      "80.87.240.0/20",
      "80.242.112.0/20",
      "81.93.64.0/19",
      "81.94.0.0/20",
      "82.117.232.0/21",
      "82.118.0.0/20",
      "85.92.224.0/19",
      "85.94.128.0/19",
      "85.158.32.0/21",
      "85.209.96.0/22",
      "85.235.84.0/22",
      "87.247.136.0/22",
      "87.250.96.0/19",
      "89.111.192.0/18",
      "89.124.12.0/22",
      "89.146.128.0/18",
      "91.191.0.0/18",
      "91.198.219.0/24",
      "91.205.68.0/22",
      "91.208.255.0/24",
      "91.212.4.0/24",
      "92.36.128.0/17",
      "92.240.32.0/19",
      "92.241.128.0/19",
      "93.157.192.0/21",
      "93.180.96.0/19",
      "93.180.144.0/21",
      "94.250.0.0/17",
      "95.156.128.0/18",
      "109.94.104.0/22",
      "109.105.192.0/20",
      "109.163.128.0/18",
      "109.165.128.0/17",
      "109.175.0.0/17",
      "109.175.236.0/22",
      "109.205.32.0/21",
      "109.237.32.0/20",
      "128.65.104.0/21",
      "134.90.128.0/21",
      "141.170.192.0/20",
      "146.255.128.0/19",
      "159.20.16.0/21",
      "164.40.224.0/21",
      "171.22.20.0/22",
      "176.108.56.0/21",
      "176.119.220.0/24",
      "178.77.0.0/18",
      "178.209.0.0/19",
      "178.210.184.0/21",
      "178.236.80.0/20",
      "185.1.133.0/24",
      "185.6.104.0/22",
      "185.12.76.0/22",
      "185.12.168.0/22",
      "185.13.240.0/22",
      "185.14.124.0/22",
      "185.15.64.0/22",
      "185.16.12.0/22",
      "185.17.44.0/22",
      "185.18.152.0/22",
      "185.24.160.0/22",
      "185.24.208.0/22",
      "185.26.176.0/22",
      "185.32.172.0/22",
      "185.35.156.0/22",
      "185.36.68.0/22",
      "185.36.84.0/22",
      "185.38.144.0/22",
      "185.39.0.0/22",
      "185.48.172.0/22",
      "185.50.56.0/22",
      "185.58.92.0/22",
      "185.65.107.0/24",
      "185.65.120.0/22",
      "185.69.28.0/22",
      "185.84.144.0/22",
      "185.91.156.0/22",
      "185.98.0.0/22",
      "185.99.0.0/22",
      "185.125.120.0/22",
      "185.150.192.0/22",
      "185.164.32.0/22",
      "185.173.28.0/22",
      "185.187.4.0/22",
      "185.202.76.0/22",
      "185.210.180.0/22",
      "185.212.108.0/22",
      "185.237.128.0/22",
      "188.124.192.0/19",
      "188.127.96.0/19",
      "188.246.64.0/19",
      "193.16.157.0/24",
      "193.222.144.0/22",
      "194.41.40.0/22",
      "194.53.156.0/22",
      "194.99.16.0/22",
      "195.130.32.0/19",
      "195.222.32.0/19",
      "209.162.200.0/24",
      "212.39.96.0/19",
      "212.125.144.0/20",
      "213.91.64.0/18",
      "213.155.24.0/22",
      "213.196.112.0/20",
      "217.9.20.0/22",
      "217.23.192.0/20",
      "217.24.128.0/20",
      "217.71.48.0/20",
      "217.75.192.0/20",
      "217.197.136.0/21"
    ],
    "ipv6" : [
      "2001:678:1108::/48",
      "2001:7f8:d7::/48",
      "2a00:fe8::/32",
      "2a00:1a98::/32",
      "2a00:1b80::/29",
      "2a00:71a0::/29",
      "2a00:8620::/32",
      "2a00:8ca0::/32",
      "2a00:cb00::/32",
      "2a00:ed60::/32",
      "2a00:f7c0::/29",
      "2a01:478::/29",
      "2a01:a6e0::/32",
      "2a02:17a8::/32",
      "2a02:2030::/32",
      "2a02:21c0::/32",
      "2a02:27b0::/32",
      "2a02:28b8::/29",
      "2a02:6020::/29",
      "2a03:3320::/32",
      "2a03:7160::/32",
      "2a03:8960::/32",
      "2a03:9240::/32",
      "2a03:bd40::/29",
      "2a03:cb80::/29",
      "2a03:cc80::/29",
      "2a03:f180::/32",
      "2a03:fac0::/29",
      "2a04:f2c0::/29",
      "2a04:ff80::/29",
      "2a05:1f80::/29",
      "2a0a:ac0::/29",
      "2a0c:1600::/32",
      "2a0e:5400::/29",
      "2a0e:6580::/32",
      "2a0e:8ac0::/29",
      "2a14:ce80::/29"
    ]
  }
 }
--- a/country/ba/ipv4-aggregated.txt
+++ b/country/ba/ipv4-aggregated.txt
@ -54,6 +54,7 @@
 81.94.0.0/20
 82.117.232.0/21
 82.118.0.0/20
 85.8.227.0/24
 85.92.224.0/19
 85.94.128.0/19
 85.158.32.0/21
@ -76,6 +77,8 @@
 93.180.96.0/19
 93.180.144.0/21
 94.250.0.0/17
 95.133.140.0/22
 95.133.232.0/22
 95.156.128.0/18
 109.94.104.0/22
 109.105.192.0/20
@ -148,6 +151,7 @@
 195.222.32.0/19
 209.162.200.0/24
 212.39.96.0/19
 212.47.45.0/24
 212.125.144.0/20
 213.91.64.0/18
 213.155.24.0/22
--- a/country/ba/ipv6-aggregated.txt
+++ b/country/ba/ipv6-aggregated.txt
@ -34,6 +34,7 @@
 2a04:f2c0::/29
 2a04:ff80::/29
 2a05:1f80::/29
 2a07:5080::/29
 2a0a:ac0::/29
 2a0c:1600::/32
 2a0e:5400::/29
--- a/country/bb/aggregated.json
+++ b/country/bb/aggregated.json
@ -1,49 +1,10 @@
 {
-  "country" : "Barbados",
+  "country": "Barbados",
-  "countryCode" : "BB",
+  "countryCode": "BB",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "23.236.0.0/20", "64.119.192.0/20", "65.48.128.0/17", "69.73.192.0/18", "69.80.0.0/18", "72.22.128.0/19", "72.51.64.0/18", "104.153.128.0/21", "104.200.96.0/20", "104.218.176.0/22", "162.212.12.0/22", "162.220.136.0/21", "162.246.104.0/21", "192.65.160.0/21", "192.171.120.0/21", "192.214.112.0/20", "192.235.48.0/20", "196.1.160.0/20", "196.3.192.0/19", "198.56.56.0/21", "198.245.160.0/24", "198.246.229.0/24", "198.246.230.0/24", "199.7.112.0/21", "199.47.52.0/22", "199.58.152.0/22", "199.254.104.0/21", "200.50.64.0/19", "205.214.192.0/19", "216.110.96.0/19" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2600:8400::/28", "2602:fe45::/36", "2604:a180::/32", "2620:11c:1000::/40" ]
  "prefixes" : {
    "ipv4" : [
      "23.236.0.0/20",
      "64.119.192.0/20",
      "65.48.128.0/17",
      "69.73.192.0/18",
      "69.80.0.0/18",
      "72.22.128.0/19",
      "72.51.64.0/18",
      "104.153.128.0/21",
      "104.200.96.0/20",
      "104.218.176.0/22",
      "162.212.12.0/22",
      "162.220.136.0/21",
      "162.246.104.0/21",
      "192.65.160.0/21",
      "192.171.120.0/21",
      "192.214.112.0/20",
      "192.235.48.0/20",
      "196.1.160.0/20",
      "196.3.192.0/19",
      "198.56.56.0/21",
      "198.245.160.0/24",
      "198.246.229.0/24",
      "198.246.230.0/24",
      "199.7.112.0/21",
      "199.47.52.0/22",
      "199.58.152.0/22",
      "199.254.104.0/21",
      "200.50.64.0/19",
      "205.214.192.0/19",
      "216.110.96.0/19"
    ],
    "ipv6" : [
      "2600:8400::/28",
      "2602:fe45::/36",
      "2604:a180::/32",
      "2620:11c:1000::/40"
    ]
  }
 }
--- a/country/bd/aggregated.json
+++ b/country/bd/aggregated.json
--- a/country/bd/ipv4-aggregated.txt
+++ b/country/bd/ipv4-aggregated.txt
@ -6,6 +6,7 @@
 14.1.100.0/22
 14.128.12.0/22
 27.54.144.0/21
 27.123.224.0/23
 27.123.252.0/22
 27.124.70.0/23
 27.131.12.0/22
@ -26,7 +27,6 @@
 36.50.146.0/24
 36.50.179.0/24
 36.50.182.0/23
 36.50.198.0/23
 36.50.238.0/23
 36.50.240.0/23
 36.50.250.0/23
@ -49,6 +49,7 @@
 43.239.72.0/22
 43.240.100.0/22
 43.242.0.0/22
 43.242.4.0/23
 43.243.204.0/22
 43.245.118.0/24
 43.245.120.0/22
@ -86,7 +87,6 @@
 45.126.72.0/22
 45.127.48.0/22
 45.127.244.0/22
 45.137.20.0/22
 45.248.148.0/22
 45.248.152.0/22
 45.249.104.0/22
@ -464,7 +464,7 @@
 103.92.160.0/23
 103.92.204.0/22
 103.92.208.0/24
-103.92.212.0/22
+103.92.212.0/23
 103.92.216.0/22
 103.92.234.0/24
 103.93.18.0/24
@ -480,7 +480,8 @@
 103.95.38.0/24
 103.95.96.0/22
 103.95.108.0/23
-103.95.208.0/22
+103.95.208.0/23
 103.95.211.0/24
 103.96.36.0/22
 103.96.68.0/22
 103.96.89.0/24
@ -887,7 +888,6 @@
 103.145.28.0/23
 103.145.44.0/23
 103.145.57.0/24
 103.145.64.0/23
 103.145.70.0/23
 103.145.74.0/24
 103.145.76.0/23
@ -958,7 +958,6 @@
 103.149.186.0/23
 103.150.6.0/23
 103.150.18.0/23
 103.150.20.0/23
 103.150.26.0/23
 103.150.38.0/24
 103.150.40.0/23
@ -968,9 +967,7 @@
 103.150.68.0/23
 103.150.166.0/23
 103.150.234.0/23
 103.150.254.0/23
 103.151.0.0/23
 103.151.10.0/23
 103.151.30.0/23
 103.151.60.0/23
 103.151.74.0/23
@ -1064,7 +1061,7 @@
 103.158.132.0/23
 103.158.158.0/23
 103.158.206.0/23
-103.158.210.0/23
+103.158.211.0/24
 103.158.248.0/23
 103.159.0.0/23
 103.159.2.0/24
@ -1111,7 +1108,6 @@
 103.162.228.0/22
 103.162.244.0/23
 103.163.30.0/23
 103.163.50.0/23
 103.163.72.0/23
 103.163.96.0/23
 103.163.116.0/23
@ -1153,7 +1149,7 @@
 103.166.250.0/23
 103.166.252.0/23
 103.167.14.0/23
-103.167.16.0/22
+103.167.16.0/23
 103.167.21.0/24
 103.167.40.0/23
 103.167.58.0/23
@ -1202,7 +1198,6 @@
 103.172.190.0/24
 103.172.216.0/23
 103.173.2.0/23
 103.173.10.0/23
 103.173.30.0/23
 103.173.36.0/23
 103.173.52.0/23
@ -1545,6 +1540,7 @@
 103.240.4.0/23
 103.240.44.0/22
 103.240.248.0/22
 103.241.194.0/23
 103.242.8.0/23
 103.242.20.0/22
 103.242.102.0/23
@ -1559,7 +1555,6 @@
 103.244.49.0/24
 103.244.140.0/22
 103.244.162.0/24
 103.244.184.0/22
 103.244.247.0/24
 103.245.96.0/22
 103.245.108.0/22
@ -1638,6 +1633,7 @@
 118.179.192.0/19
 119.10.168.0/21
 119.15.154.0/23
 119.15.156.0/22
 119.18.144.0/21
 119.30.32.0/20
 119.40.80.0/20
@ -1655,7 +1651,6 @@
 122.102.32.0/21
 122.144.8.0/21
 122.152.48.0/21
 122.248.0.0/20
 123.0.16.0/20
 123.49.0.0/18
 123.108.240.0/21
@ -1732,6 +1727,23 @@
 150.242.104.0/22
 151.158.16.0/23
 151.158.30.0/23
 151.158.44.0/23
 151.158.48.0/22
 151.158.70.0/23
 151.158.86.0/23
 151.158.90.0/23
 151.158.100.0/23
 151.158.110.0/23
 151.158.112.0/23
 151.158.120.0/23
 151.158.124.0/23
 151.158.152.0/22
 151.158.158.0/23
 151.158.164.0/23
 151.158.172.0/23
 151.158.196.0/23
 151.158.210.0/23
 151.158.216.0/23
 155.35.34.0/23
 155.35.46.0/23
 157.10.28.0/23
@ -1753,7 +1765,6 @@
 157.15.196.0/24
 157.15.222.0/23
 157.15.228.0/23
 157.20.42.0/23
 157.20.54.0/23
 157.20.56.0/23
 157.20.74.0/23
@ -1810,10 +1821,23 @@
 160.191.148.0/22
 160.191.162.0/23
 160.191.188.0/23
 160.191.200.0/24
 160.191.210.0/23
 160.191.212.0/24
 160.202.144.0/22
 160.236.8.0/22
 160.236.14.0/23
 160.236.24.0/23
 160.236.45.0/24
 160.236.58.0/23
 160.236.66.0/23
 160.236.72.0/23
 160.236.118.0/23
 160.236.134.0/23
 160.236.144.0/22
 160.236.184.0/23
 160.236.220.0/23
 160.236.230.0/24
 160.236.233.0/24
 160.238.0.0/24
 160.238.16.0/22
 160.238.33.0/24
@ -1852,11 +1876,41 @@
 161.248.241.0/24
 161.248.244.0/22
 161.248.248.0/23
 162.4.6.0/23
 162.4.22.0/23
 162.4.34.0/23
 162.4.48.0/23
 162.4.59.0/24
 162.4.60.0/23
 162.4.64.0/23
 162.4.88.0/23
 162.4.112.0/23
 162.4.178.0/23
 162.4.186.0/23
 162.4.208.0/23
 162.4.214.0/23
 162.4.216.0/23
 162.4.222.0/23
 162.4.228.0/23
 162.12.212.0/22
 163.47.32.0/21
 163.47.80.0/21
 163.47.144.0/22
 163.47.156.0/22
 163.52.10.0/23
 163.52.22.0/23
 163.52.24.0/23
 163.52.30.0/23
 163.52.42.0/23
 163.52.56.0/23
 163.52.64.0/24
 163.52.96.0/23
 163.52.126.0/23
 163.52.128.0/23
 163.52.152.0/23
 163.52.167.0/24
 163.52.168.0/23
 163.52.172.0/23
 163.53.140.0/22
 163.53.148.0/22
 163.53.180.0/22
@ -1877,6 +1931,17 @@
 163.61.216.0/23
 163.61.236.0/23
 163.61.240.0/23
 163.128.24.0/23
 163.128.78.0/23
 163.128.94.0/24
 163.128.108.0/23
 163.128.126.0/23
 163.128.140.0/23
 163.128.144.0/23
 163.128.150.0/23
 163.128.188.0/23
 163.128.210.0/23
 163.128.216.0/23
 163.223.20.0/23
 163.223.34.0/23
 163.223.38.0/23
@ -1947,14 +2012,15 @@
 182.161.67.0/24
 182.163.96.0/19
 182.252.64.0/19
 185.222.56.0/22
 192.26.110.0/24
 192.86.12.0/24
 192.140.252.0/22
 192.144.80.0/22
 192.144.86.0/23
 192.144.88.0/22
 192.232.58.0/23
 192.232.60.0/22
 198.15.27.0/24
 198.56.24.0/23
 202.0.94.0/24
 202.1.28.0/23
@ -2001,7 +2067,6 @@
 202.79.16.0/21
 202.83.124.0/22
 202.84.32.0/20
 202.84.64.0/21
 202.86.216.0/21
 202.90.200.0/22
 202.91.40.0/22
@ -2075,7 +2140,7 @@
 210.56.144.0/23
 210.79.180.0/22
 210.87.64.0/23
-210.87.68.0/22
+210.87.70.0/23
 220.152.112.0/22
 220.158.204.0/22
 220.247.128.0/22
--- a/country/bd/ipv6-aggregated.txt
+++ b/country/bd/ipv6-aggregated.txt
@ -389,7 +389,6 @@
 2001:df2:d180::/48
 2001:df2:d6c0::/48
 2001:df2:db40::/48
 2001:df2:df80::/48
 2001:df2:e080::/48
 2001:df2:e180::/48
 2001:df2:e640::/48
@ -398,7 +397,6 @@
 2001:df2:ec80::/48
 2001:df2:ed80::/48
 2001:df2:ee40::/48
 2001:df2:ee80::/48
 2001:df2:ef80::/48
 2001:df2:efc0::/48
 2001:df2:f780::/48
@ -440,7 +438,6 @@
 2001:df3:3ac0::/48
 2001:df3:3bc0::/48
 2001:df3:3d40::/48
 2001:df3:3dc0::/48
 2001:df3:3e40::/48
 2001:df3:4240::/48
 2001:df3:43c0::/48
@ -448,8 +445,6 @@
 2001:df3:47c0::/48
 2001:df3:4c80::/48
 2001:df3:4d40::/48
 2001:df3:4d80::/48
 2001:df3:4e80::/48
 2001:df3:5080::/48
 2001:df3:50c0::/48
 2001:df3:51c0::/48
@ -472,7 +467,6 @@
 2001:df3:7040::/48
 2001:df3:73c0::/48
 2001:df3:74c0::/48
 2001:df3:7940::/48
 2001:df3:7c40::/48
 2001:df3:7ec0::/48
 2001:df3:81c0::/48
@ -482,7 +476,6 @@
 2001:df3:8e40::/48
 2001:df3:9340::/48
 2001:df3:9680::/48
 2001:df3:9980::/48
 2001:df3:9bc0::/48
 2001:df3:9c40::/48
 2001:df3:9fc0::/48
@ -571,6 +564,7 @@
 2001:df4:6640::/48
 2001:df4:6880::/48
 2001:df4:69c0::/48
 2001:df4:74c0::/48
 2001:df4:7bc0::/48
 2001:df4:7c40::/48
 2001:df4:82c0::/48
@ -585,7 +579,6 @@
 2001:df4:8f80::/48
 2001:df4:9040::/48
 2001:df4:9080::/48
 2001:df4:90c0::/48
 2001:df4:9340::/48
 2001:df4:a040::/48
 2001:df4:a3c0::/48
@ -663,7 +656,7 @@
 2001:df5:4d40::/48
 2001:df5:4f40::/48
 2001:df5:4f80::/48
-2001:df5:5140::/48
+2001:df5:5140::/47
 2001:df5:5480::/48
 2001:df5:5840::/48
 2001:df5:5a80::/48
@ -805,7 +798,6 @@
 2001:df6:7a80::/48
 2001:df6:7bc0::/48
 2001:df6:7c80::/48
 2001:df6:7e80::/48
 2001:df6:7fc0::/48
 2001:df6:8040::/48
 2001:df6:81c0::/48
@ -822,56 +814,111 @@
 2001:df6:9480::/48
 2001:df6:96c0::/48
 2001:df6:9880::/48
 2001:df6:98c0::/48
 2001:df6:9900::/48
 2001:df6:9940::/48
 2001:df6:9d80::/48
 2001:df6:9ec0::/48
 2001:df6:a080::/48
 2001:df6:a280::/48
 2001:df6:a300::/48
 2001:df6:a4c0::/48
 2001:df6:a580::/48
 2001:df6:a940::/48
 2001:df6:b0c0::/48
 2001:df6:b140::/48
 2001:df6:b180::/48
 2001:df6:b280::/48
 2001:df6:b340::/48
 2001:df6:b540::/48
 2001:df6:b900::/48
 2001:df6:ba40::/48
 2001:df6:bd80::/48
 2001:df6:be40::/48
 2001:df6:bec0::/48
 2001:df6:c600::/48
 2001:df6:ca40::/48
 2001:df6:cd40::/48
 2001:df6:d180::/48
 2001:df6:d580::/48
 2001:df6:d600::/48
 2001:df6:d800::/48
 2001:df6:db40::/48
 2001:df6:ddc0::/48
 2001:df6:de00::/48
 2001:df6:de80::/48
 2001:df6:dfc0::/48
 2001:df6:e080::/48
 2001:df6:e540::/48
 2001:df6:e940::/48
 2001:df6:ea40::/48
 2001:df6:f380::/48
 2001:df6:f4c0::/48
 2001:df6:f680::/48
 2001:df6:f6c0::/48
 2001:df6:f840::/48
 2001:df6:f8c0::/48
 2001:df6:fa80::/48
 2001:df6:fc40::/48
 2001:df6:fdc0::/48
 2001:df6:fe80::/48
 2001:df7:2c0::/48
 2001:df7:4c0::/48
 2001:df7:540::/48
 2001:df7:10c0::/48
 2001:df7:1240::/48
 2001:df7:1540::/48
 2001:df7:1640::/48
 2001:df7:1840::/48
 2001:df7:1b80::/48
 2001:df7:1c80::/48
 2001:df7:2080::/48
 2001:df7:2180::/48
 2001:df7:2240::/48
 2001:df7:2300::/47
 2001:df7:2340::/48
 2001:df7:2580::/48
 2001:df7:2780::/48
 2001:df7:2a80::/48
 2001:df7:2bc0::/48
 2001:df7:2d80::/48
 2001:df7:3380::/48
 2001:df7:3580::/48
 2001:df7:35c0::/48
 2001:df7:3880::/48
 2001:df7:38c0::/48
 2001:df7:3b80::/48
 2001:df7:3d40::/48
 2001:df7:4300::/48
 2001:df7:4500::/48
 2001:df7:4780::/48
 2001:df7:4880::/48
 2001:df7:4a40::/48
 2001:df7:4a80::/48
 2001:df7:4fc0::/48
 2001:df7:5440::/48
 2001:df7:5480::/48
 2001:df7:5700::/48
 2001:df7:58c0::/48
 2001:df7:5b80::/48
 2001:df7:5e80::/48
 2001:df7:5f40::/48
 2001:df7:5f80::/48
 2001:df7:61c0::/48
 2001:df7:62c0::/48
 2001:df7:64c0::/48
 2001:df7:6840::/48
 2001:df7:6f80::/48
 2001:df7:6fc0::/48
 2001:df7:7280::/48
 2001:df7:7540::/48
 2001:df7:7980::/48
 2001:df7:7cc0::/48
 2001:df7:81c0::/48
 2001:df7:8280::/48
 2001:df7:82c0::/48
 2001:df7:8300::/48
 2001:df7:8340::/48
 2001:df7:8500::/48
 2001:df7:8b80::/48
 2001:df7:8e80::/48
@ -917,8 +964,6 @@
 2400:3ae0::/32
 2400:3b60::/32
 2400:3dc0::/32
 2400:3e60::/32
 2400:4520::/32
 2400:47c0::/32
 2400:48a0::/32
 2400:4ac0::/32
@ -976,21 +1021,17 @@
 2400:a2c0::/32
 2400:a3a0::/32
 2400:a460::/32
 2400:a540::/32
 2400:a720::/32
 2400:a740::/32
 2400:a760::/32
 2400:a7c0::/32
 2400:a7e0::/32
 2400:aac0::/32
 2400:aba0::/32
 2400:ac20::/32
 2400:ad40::/32
 2400:ae20::/32
 2400:af40::/32
 2400:afc0::/32
 2400:b040::/32
 2400:b140::/32
 2400:b240::/32
 2400:b340::/32
 2400:b360::/32
@ -1033,8 +1074,6 @@
 2400:e9e0::/32
 2400:eb20::/32
 2400:eb80::/32
 2400:f260::/32
 2400:f2e0::/32
 2400:f6a0::/32
 2400:f8c0::/32
 2400:f940::/32
@ -1120,7 +1159,6 @@
 2401:9960::/32
 2401:9c00::/32
 2401:9f40::/32
 2401:a0e0::/32
 2401:a220::/32
 2401:a2c0::/32
 2401:a5a0::/32
@ -1132,7 +1170,6 @@
 2401:b2a0::/32
 2401:b620::/32
 2401:b640::/32
 2401:b860::/32
 2401:b8c0::/32
 2401:bac0::/32
 2401:bee0::/32
@ -1146,11 +1183,9 @@
 2401:cde0::/32
 2401:cf20::/32
 2401:cf60::/32
 2401:cfa0::/32
 2401:d160::/32
 2401:d1e0::/32
 2401:d260::/32
 2401:d2e0::/32
 2401:d380::/32
 2401:dec0::/32
 2401:dee0::/32
@ -1230,19 +1265,33 @@
 2402:48c0::/32
 2402:4940::/32
 2402:49c0::/32
 2402:4b20::/32
 2402:4da0::/32
 2402:5380::/32
 2402:5440::/32
 2402:5460::/32
 2402:54c0::/32
 2402:55c0::/32
 2402:5720::/32
 2402:5840::/32
 2402:58e0::/32
 2402:5b20::/32
 2402:5ba0::/32
 2402:5e80::/32
 2402:5fc0::/32
 2402:6220::/32
 2402:62a0::/32
 2402:6480::/32
 2402:6520::/32
 2402:68a0::/32
 2402:68c0::/32
 2402:68e0::/32
 2402:6920::/32
 2402:69e0::/32
 2402:6ee0::/32
 2402:76c0::/32
 2402:77c0::/32
 2402:7e40::/32
 2402:8040::/32
 2402:8340::/32
 2402:8640::/32
 2402:88c0::/32
@ -1270,8 +1319,6 @@
 2402:c0c0::/32
 2402:c140::/32
 2402:c1c0::/32
 2402:c440::/32
 2402:c6c0::/32
 2402:c8c0::/32
 2402:ca40::/32
 2402:cdc0::/32
@ -1280,7 +1327,6 @@
 2402:e1c0::/32
 2402:e4c0::/32
 2402:e6c0::/32
 2402:e840::/32
 2402:ea40::/32
 2402:f040::/32
 2402:f1c0::/32
@ -1290,10 +1336,10 @@
 2402:fd40::/32
 2402:fec0::/32
 2403:140::/32
 2403:680::/32
 2403:10c0::/32
 2403:1940::/32
 2403:1e40::/32
 2403:21c0::/32
 2403:2c40::/32
 2403:2d40::/32
 2403:2e40::/32
@ -1346,7 +1392,6 @@
 2403:dd00::/32
 2403:dfc0::/32
 2403:e100::/32
 2403:e6c0::/32
 2403:e740::/32
 2403:eb00::/32
 2403:eb40::/32
@ -1367,7 +1412,6 @@
 2404:9c0::/32
 2404:b00::/32
 2404:d00::/32
 2404:dc0::/32
 2404:1140::/32
 2404:1380::/32
 2404:16c0::/32
@ -1404,7 +1448,6 @@
 2404:5280::/32
 2404:52c0::/32
 2404:5340::/32
 2404:53c0::/32
 2404:57c0::/32
 2404:5b40::/32
 2404:5bc0::/32
@ -1419,7 +1462,6 @@
 2404:6280::/32
 2404:6440::/32
 2404:6480::/32
 2404:67c0::/32
 2404:6840::/32
 2404:6940::/32
 2404:69c0::/32
@ -1432,7 +1474,6 @@
 2404:7e40::/32
 2404:7ec0::/32
 2404:8340::/32
 2404:8440::/32
 2404:86c0::/32
 2404:88c0::/32
 2404:8940::/32
@ -1507,6 +1548,7 @@
 2405:d340::/32
 2405:d440::/32
 2405:db40::/32
 2405:dbc0::/32
 2405:de80::/32
 2405:e340::/32
 2405:e6c0::/32
@ -1514,11 +1556,9 @@
 2405:f200::/32
 2405:f280::/32
 2405:f2c0::/32
 2405:fb40::/32
 2406:2c0::/32
 2406:b00::/32
 2406:c80::/32
 2406:1140::/32
 2406:1400::/32
 2406:2500::/32
 2406:25c0::/32
@ -1610,7 +1650,6 @@
 2407:b2c0::/32
 2407:cac0::/32
 2407:d700::/32
 2407:dd40::/32
 2407:e740::/32
 2407:e7c0::/32
 2407:ea40::/32
@ -1625,4 +1664,3 @@
 2407:fe80::/32
 2407:fec0::/32
 2407:ff80::/32
 2a0c:ac00::/29
--- a/country/be/aggregated.json
+++ b/country/be/aggregated.json
--- a/country/be/ipv4-aggregated.txt
+++ b/country/be/ipv4-aggregated.txt
@ -50,7 +50,7 @@
 45.138.120.0/22
 45.138.168.0/22
 45.148.49.0/24
-45.149.64.0/22
+45.149.64.0/23
 45.149.96.0/22
 45.152.68.0/22
 45.152.80.0/22
@ -128,8 +128,11 @@
 80.91.144.0/20
 80.200.0.0/15
 80.236.128.0/17
 80.248.141.0/24
 80.248.142.0/23
 81.11.128.0/17
 81.82.0.0/15
 81.85.61.0/24
 81.92.112.0/20
 81.95.112.0/20
 81.164.0.0/15
@ -154,6 +157,7 @@
 84.17.128.0/19
 84.38.249.0/24
 84.192.0.0/13
 85.8.228.0/24
 85.10.64.0/18
 85.26.0.0/17
 85.27.0.0/17
@ -192,6 +196,7 @@
 89.44.166.0/23
 89.47.38.0/23
 89.106.240.0/21
 89.107.144.0/21
 89.207.154.0/24
 89.207.184.0/21
 89.250.176.0/20
@ -207,6 +212,7 @@
 91.199.15.0/24
 91.199.110.0/24
 91.202.32.0/22
 91.206.75.0/24
 91.206.84.0/23
 91.206.250.0/23
 91.208.12.0/24
@ -281,6 +287,7 @@
 94.198.160.0/21
 94.224.0.0/14
 95.36.80.0/20
 95.111.134.0/24
 95.128.96.0/21
 95.130.40.0/21
 95.171.160.0/19
@ -328,8 +335,8 @@
 149.126.56.0/21
 149.134.0.0/16
 149.154.192.0/18
-150.251.0.0/16
+150.251.0.0/20
-151.216.128.0/17
+152.55.156.0/22
 152.152.0.0/16
 153.89.0.0/16
 153.98.0.0/16
@ -342,6 +349,7 @@
 163.163.0.0/16
 164.15.0.0/16
 164.35.0.0/16
 164.37.50.0/23
 164.138.104.0/21
 167.150.90.0/23
 170.255.0.0/16
@ -374,6 +382,7 @@
 185.2.92.0/22
 185.3.160.0/22
 185.3.216.0/22
 185.4.132.0/22
 185.15.138.0/24
 185.16.240.0/22
 185.18.8.0/22
@ -419,7 +428,6 @@
 185.58.96.0/22
 185.59.16.0/22
 185.59.168.0/22
 185.59.196.0/22
 185.61.72.0/22
 185.64.64.0/22
 185.64.164.0/22
@ -461,9 +469,8 @@
 185.107.208.0/22
 185.111.196.0/22
 185.111.204.0/22
-185.114.48.0/22
+185.114.50.0/23
 185.115.216.0/22
 185.116.72.0/22
 185.119.156.0/22
 185.120.164.0/22
 185.122.248.0/22
@ -476,6 +483,7 @@
 185.135.191.0/24
 185.136.208.0/22
 185.137.40.0/22
 185.138.40.0/22
 185.138.96.0/22
 185.139.44.0/22
 185.141.208.0/22
@ -504,7 +512,6 @@
 185.166.248.0/22
 185.167.48.0/22
 185.171.64.0/22
 185.171.168.0/22
 185.172.4.0/22
 185.174.4.0/22
 185.174.64.0/22
@ -536,14 +543,15 @@
 185.205.232.0/22
 185.206.122.0/24
 185.213.64.0/22
 185.213.121.0/24
 185.214.4.0/22
 185.217.63.0/24
 185.218.199.0/24
 185.219.96.0/22
 185.221.184.0/22
 185.223.224.0/22
 185.224.236.0/22
 185.225.160.0/24
 185.226.156.0/22
 185.226.167.0/24
 185.230.104.0/24
 185.233.218.0/24
@ -787,7 +795,6 @@
 194.145.155.0/24
 194.146.23.0/24
 194.146.121.0/24
 194.147.40.0/22
 194.150.224.0/23
 194.165.51.0/24
 194.176.106.0/24
@ -800,6 +807,7 @@
 195.0.0.0/17
 195.13.0.0/19
 195.13.56.0/23
 195.14.5.0/24
 195.14.31.0/24
 195.16.0.0/19
 195.18.24.0/24
@ -836,6 +844,7 @@
 195.200.24.0/23
 195.200.201.0/24
 195.207.0.0/16
 195.222.105.0/24
 195.225.100.0/22
 195.225.164.0/22
 195.225.220.0/22
@ -901,7 +910,7 @@
 217.19.224.0/20
 217.21.176.0/20
 217.22.48.0/20
-217.30.16.0/20
+217.30.16.0/21
 217.64.240.0/20
 217.66.0.0/20
 217.72.224.0/20
--- a/country/be/ipv6-aggregated.txt
+++ b/country/be/ipv6-aggregated.txt
@ -17,7 +17,6 @@
 2001:678:c30::/48
 2001:678:c44::/48
 2001:678:c6c::/48
 2001:678:e7c::/48
 2001:678:e8c::/48
 2001:678:f30::/48
 2001:678:101c::/48
@ -69,6 +68,7 @@
 2001:7f8:26::/48
 2001:7f8:d2::/48
 2001:7f8:12d::/48
 2001:7fc:1::/48
 2001:9b8::/32
 2001:1598::/32
 2001:3d80::/29
@ -81,7 +81,6 @@
 2a00:1258::/32
 2a00:1458::/32
 2a00:1528::/32
 2a00:1868::/32
 2a00:1ad8::/32
 2a00:1c98::/32
 2a00:1cf8::/29
@ -126,7 +125,6 @@
 2a02:c8::/32
 2a02:2b8::/32
 2a02:310::/32
 2a02:4a0::/32
 2a02:578::/32
 2a02:6e0::/32
 2a02:d08::/29
@ -151,6 +149,7 @@
 2a02:7860::/29
 2a02:a000::/26
 2a02:af00::/29
 2a02:c500::/29
 2a03:1980::/29
 2a03:1a20::/32
 2a03:2200::/32
@ -184,8 +183,8 @@
 2a04:91c0::/29
 2a04:9ec0::/29
 2a04:9f80::/29
 2a04:a600::/29
 2a04:b5c0::/29
 2a04:dbe0::/30
 2a05::/29
 2a05:200::/29
 2a05:3c0::/29
@ -239,7 +238,6 @@
 2a09:eb80::/29
 2a0a:3c0::/32
 2a0a:800::/29
 2a0a:1940::/29
 2a0a:2500::/32
 2a0a:2a00::/32
 2a0a:2ec0::/29
@ -251,7 +249,6 @@
 2a0a:7880::/29
 2a0a:90c0::/29
 2a0a:b400::/31
 2a0a:df00::/29
 2a0a:f900::/29
 2a0b:e80::/29
 2a0b:4600::/32
@ -268,7 +265,6 @@
 2a0c:7400::/29
 2a0c:9c40::/32
 2a0c:b640::/29
 2a0d:5040::/29
 2a0d:61c0::/29
 2a0d:6e40::/29
 2a0d:e640::/29
@ -313,6 +309,7 @@
 2a12:c240::/29
 2a12:c640::/29
 2a12:d140::/29
 2a12:fdc0::/29
 2a13:1c40::/29
 2a13:1fc0::/29
 2a13:40c0::/29
--- a/country/bf/aggregated.json
+++ b/country/bf/aggregated.json
@ -1,92 +1,10 @@
 {
-  "country" : "Burkina Faso",
+  "country": "Burkina Faso",
-  "countryCode" : "BF",
+  "countryCode": "BF",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.78.48.0/21", "41.138.96.0/19", "41.203.224.0/20", "41.216.144.0/20", "41.223.232.0/22", "102.23.0.0/18", "102.36.164.0/22", "102.67.96.0/19", "102.67.172.0/22", "102.68.32.0/21", "102.68.100.0/22", "102.68.125.0/24", "102.68.188.0/22", "102.69.152.0/22", "102.176.176.0/22", "102.178.0.0/15", "102.180.0.0/16", "102.202.132.0/22", "102.204.24.0/22", "102.204.125.0/24", "102.207.224.0/22", "102.208.240.0/24", "102.209.188.0/23", "102.211.121.0/24", "102.212.160.0/23", "102.214.40.0/22", "102.214.64.0/22", "102.216.120.0/22", "102.219.0.0/22", "102.219.92.0/24", "102.222.56.0/22", "102.222.120.0/22", "102.223.174.0/23", "105.235.176.0/20", "129.45.128.0/17", "154.65.60.0/22", "154.66.160.0/20", "160.226.184.0/22", "165.16.208.0/20", "192.12.116.0/24", "192.136.55.0/24", "192.136.56.0/23", "196.13.207.0/24", "196.28.240.0/20", "196.43.247.0/24", "196.49.19.0/24", "196.49.74.0/24", "196.60.76.0/24", "196.223.47.0/24", "197.239.64.0/18", "212.52.128.0/19" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:43f8:3d0::/48", "2001:43f8:a50::/48", "2001:43f8:b60::/47", "2001:43f8:1190::/48", "2001:43fd:3000::/48", "2001:43fd:4000::/48", "2001:43ff:5000::/48", "2c0f:ca0::/32", "2c0f:1a40::/32", "2c0f:1c40::/32", "2c0f:39c0::/32", "2c0f:43c0::/32", "2c0f:4ac0::/32", "2c0f:5700::/32", "2c0f:5a40::/32", "2c0f:7840::/32", "2c0f:7ec0::/32", "2c0f:e948::/32", "2c0f:ea50::/32", "2c0f:eb58::/32", "2c0f:ec58::/32", "2c0f:ecb8::/32", "2c0f:ecc8::/32", "2c0f:ee00::/32", "2c0f:eed0::/32", "2c0f:f138::/32", "2c0f:f8b0::/32", "2c0f:fd80::/32" ]
  "prefixes" : {
    "ipv4" : [
      "41.78.48.0/21",
      "41.138.96.0/19",
      "41.203.224.0/20",
      "41.216.144.0/20",
      "41.223.232.0/22",
      "102.23.0.0/18",
      "102.36.164.0/22",
      "102.67.96.0/19",
      "102.67.172.0/22",
      "102.68.32.0/21",
      "102.68.100.0/22",
      "102.68.125.0/24",
      "102.68.188.0/22",
      "102.69.152.0/22",
      "102.176.176.0/22",
      "102.178.0.0/15",
      "102.180.0.0/16",
      "102.204.24.0/22",
      "102.204.125.0/24",
      "102.207.224.0/22",
      "102.208.240.0/24",
      "102.209.188.0/23",
      "102.211.121.0/24",
      "102.212.160.0/23",
      "102.214.40.0/22",
      "102.214.64.0/22",
      "102.216.120.0/22",
      "102.219.0.0/22",
      "102.219.92.0/24",
      "102.222.56.0/22",
      "102.222.120.0/22",
      "102.223.174.0/23",
      "105.235.176.0/20",
      "129.45.128.0/17",
      "154.65.60.0/22",
      "154.66.160.0/20",
      "160.226.184.0/22",
      "165.16.208.0/20",
      "192.12.116.0/24",
      "192.136.55.0/24",
      "192.136.56.0/23",
      "196.13.207.0/24",
      "196.28.240.0/20",
      "196.43.247.0/24",
      "196.49.19.0/24",
      "196.49.74.0/24",
      "196.60.76.0/24",
      "196.223.47.0/24",
      "197.239.64.0/18",
      "212.52.128.0/19"
    ],
    "ipv6" : [
      "2001:43f8:3d0::/48",
      "2001:43f8:a50::/48",
      "2001:43f8:b60::/47",
      "2001:43f8:1190::/48",
      "2001:43fd:3000::/48",
      "2001:43fd:4000::/48",
      "2001:43ff:5000::/48",
      "2c0f:1a40::/32",
      "2c0f:1c40::/32",
      "2c0f:39c0::/32",
      "2c0f:43c0::/32",
      "2c0f:4ac0::/32",
      "2c0f:5700::/32",
      "2c0f:5a40::/32",
      "2c0f:7840::/32",
      "2c0f:7ec0::/32",
      "2c0f:e948::/32",
      "2c0f:ea50::/32",
      "2c0f:eb58::/32",
      "2c0f:ec58::/32",
      "2c0f:ecb8::/32",
      "2c0f:ecc8::/32",
      "2c0f:ee00::/32",
      "2c0f:eed0::/32",
      "2c0f:f138::/32",
      "2c0f:f8b0::/32",
      "2c0f:fd80::/32"
    ]
  }
 }
--- a/country/bf/ipv4-aggregated.txt
+++ b/country/bf/ipv4-aggregated.txt
@ -20,6 +20,7 @@
 102.176.176.0/22
 102.178.0.0/15
 102.180.0.0/16
 102.202.132.0/22
 102.204.24.0/22
 102.204.125.0/24
 102.207.224.0/22
--- a/country/bf/ipv6-aggregated.txt
+++ b/country/bf/ipv6-aggregated.txt
@ -10,6 +10,7 @@
 2001:43fd:3000::/48
 2001:43fd:4000::/48
 2001:43ff:5000::/48
 2c0f:ca0::/32
 2c0f:1a40::/32
 2c0f:1c40::/32
 2c0f:39c0::/32
--- a/country/bg/aggregated.json
+++ b/country/bg/aggregated.json
--- a/country/bg/ipv4-aggregated.txt
+++ b/country/bg/ipv4-aggregated.txt
@ -8,6 +8,8 @@
 2.58.92.0/24
 2.58.95.0/24
 2.59.252.0/22
 2.152.88.0/24
 2.152.92.0/23
 5.32.128.0/21
 5.53.128.0/17
 5.61.96.0/20
@ -27,7 +29,6 @@
 31.13.196.0/22
 31.13.200.0/21
 31.13.208.0/23
 31.13.212.0/24
 31.13.215.0/24
 31.13.216.0/21
 31.13.224.0/20
@ -55,7 +56,8 @@
 37.209.168.0/21
 45.8.72.0/23
 45.8.92.0/22
-45.9.156.0/22
+45.9.157.0/24
 45.9.158.0/23
 45.9.208.0/22
 45.10.188.0/22
 45.12.253.0/24
@ -86,7 +88,8 @@
 45.88.90.0/23
 45.89.244.0/22
 45.90.88.0/22
-45.91.192.0/22
+45.91.192.0/23
 45.91.194.0/24
 45.95.0.0/22
 45.128.4.0/22
 45.128.88.0/22
@ -142,6 +145,7 @@
 62.68.90.0/24
 62.73.64.0/18
 62.133.59.0/24
 62.171.228.0/22
 62.176.64.0/18
 62.182.112.0/21
 62.192.132.0/22
@ -149,6 +153,7 @@
 62.204.128.0/19
 62.221.128.0/19
 62.233.37.0/24
 64.30.158.0/24
 77.70.0.0/17
 77.71.0.0/17
 77.76.0.0/18
@ -195,6 +200,7 @@
 80.68.159.0/24
 80.72.64.0/19
 80.75.211.0/24
 80.75.215.0/24
 80.76.49.0/24
 80.76.50.0/23
 80.78.224.0/20
@ -242,7 +248,6 @@
 84.38.250.0/24
 84.40.64.0/18
 84.43.128.0/17
 84.54.49.0/24
 84.54.50.0/23
 84.54.128.0/18
 84.201.192.0/20
@ -259,6 +264,7 @@
 84.238.192.0/18
 84.242.128.0/18
 84.252.0.0/18
 85.8.205.0/24
 85.11.128.0/18
 85.14.0.0/18
 85.31.44.0/22
@ -364,7 +370,7 @@
 87.121.52.0/24
 87.121.54.0/24
 87.121.58.0/24
-87.121.60.0/22
+87.121.62.0/23
 87.121.64.0/23
 87.121.69.0/24
 87.121.70.0/23
@ -381,7 +387,8 @@
 87.121.112.0/22
 87.121.118.0/23
 87.121.120.0/21
-87.121.128.0/21
+87.121.128.0/22
 87.121.132.0/23
 87.121.144.0/22
 87.121.150.0/23
 87.121.152.0/21
@ -449,7 +456,7 @@
 91.92.219.0/24
 91.92.232.0/22
 91.92.246.0/23
-91.92.250.0/23
+91.92.251.0/24
 91.92.252.0/22
 91.132.60.0/22
 91.139.128.0/17
@ -488,6 +495,7 @@
 91.208.63.0/24
 91.209.8.0/24
 91.209.146.0/24
 91.210.41.0/24
 91.210.88.0/22
 91.210.164.0/22
 91.210.188.0/22
@ -500,7 +508,6 @@
 91.212.233.0/24
 91.212.235.0/24
 91.213.12.0/24
 91.213.152.0/24
 91.215.152.0/22
 91.215.216.0/22
 91.216.57.0/24
@ -510,13 +517,13 @@
 91.216.253.0/24
 91.217.148.0/24
 91.217.205.0/24
 91.217.241.0/24
 91.218.80.0/22
 91.220.8.0/24
 91.220.189.0/24
 91.222.20.0/22
 91.223.66.0/24
 91.223.123.0/24
 91.226.182.0/23
 91.228.38.0/24
 91.229.132.0/22
 91.230.6.0/23
@ -587,7 +594,8 @@
 93.123.104.0/22
 93.123.109.0/24
 93.123.110.0/24
-93.123.112.0/22
+93.123.112.0/24
 93.123.114.0/23
 93.123.116.0/24
 93.123.118.0/24
 93.123.120.0/21
@ -629,6 +637,7 @@
 94.125.100.0/22
 94.126.224.0/22
 94.131.16.0/22
 94.131.48.0/22
 94.139.192.0/19
 94.142.255.0/24
 94.154.160.0/22
@ -683,7 +692,6 @@
 94.156.226.0/24
 94.156.232.0/23
 94.156.236.0/23
 94.156.238.0/24
 94.156.244.0/24
 94.156.249.0/24
 94.156.250.0/23
@ -699,8 +707,9 @@
 95.87.0.0/18
 95.87.192.0/18
 95.111.0.0/17
 95.128.196.0/23
 95.128.198.0/24
 95.140.208.0/20
 95.141.253.0/24
 95.158.128.0/18
 95.164.0.0/16
 95.168.224.0/19
@ -735,6 +744,8 @@
 130.204.0.0/16
 138.226.220.0/22
 141.98.4.0/22
 141.226.84.0/23
 141.226.86.0/24
 145.255.192.0/19
 147.78.76.0/22
 147.78.100.0/22
@ -825,8 +836,10 @@
 185.56.84.0/22
 185.58.20.0/22
 185.60.64.0/22
 185.60.220.0/24
 185.62.0.0/24
 185.64.20.0/22
 185.65.117.0/24
 185.68.44.0/22
 185.72.56.0/22
 185.73.56.0/22
@ -847,6 +860,7 @@
 185.96.164.0/22
 185.96.252.0/22
 185.97.72.0/22
 185.98.132.0/24
 185.104.192.0/22
 185.108.140.0/22
 185.108.188.0/22
@ -915,6 +929,7 @@
 185.200.156.0/22
 185.201.36.0/22
 185.201.80.0/22
 185.201.170.0/24
 185.204.52.0/22
 185.204.164.0/22
 185.205.208.0/24
@ -1024,6 +1039,7 @@
 193.22.103.0/24
 193.22.248.0/24
 193.24.114.0/24
 193.24.121.0/24
 193.24.240.0/22
 193.25.162.0/23
 193.25.216.0/22
@ -1063,6 +1079,7 @@
 193.93.24.0/22
 193.104.79.0/24
 193.104.165.0/24
 193.104.254.0/24
 193.105.60.0/24
 193.105.148.0/24
 193.105.196.0/24
@ -1075,7 +1092,6 @@
 193.110.132.0/24
 193.110.159.0/24
 193.110.216.0/21
 193.111.89.0/24
 193.111.194.0/23
 193.111.208.0/24
 193.111.210.0/24
@ -1137,6 +1153,7 @@
 194.31.204.0/23
 194.31.223.0/24
 194.32.210.0/24
 194.33.28.0/24
 194.34.12.0/24
 194.38.36.0/22
 194.40.250.0/23
@ -1216,6 +1233,7 @@
 195.93.214.0/23
 195.93.236.0/23
 195.95.155.0/24
 195.95.156.0/24
 195.96.224.0/19
 195.110.24.0/23
 195.128.134.0/24
@ -1259,6 +1277,8 @@
 195.246.240.0/23
 195.250.60.0/24
 198.60.193.0/24
 204.137.13.0/24
 212.2.32.0/21
 212.5.32.0/19
 212.5.128.0/19
 212.21.128.0/19
@ -1278,7 +1298,6 @@
 212.73.134.0/24
 212.73.136.0/21
 212.73.144.0/22
 212.73.149.0/24
 212.73.151.0/24
 212.73.155.0/24
 212.73.156.0/22
@ -1299,15 +1318,16 @@
 212.233.128.0/17
 213.16.32.0/19
 213.91.128.0/17
-213.130.64.0/21
+213.130.64.0/22
 213.130.70.0/23
 213.130.72.0/23
 213.130.75.0/24
 213.130.76.0/22
 213.130.80.0/21
 213.130.92.0/22
 213.134.2.0/24
 213.145.96.0/19
 213.149.128.0/19
 213.155.30.0/23
 213.167.0.0/19
 213.169.32.0/19
 213.191.160.0/19
--- a/country/bg/ipv6-aggregated.txt
+++ b/country/bg/ipv6-aggregated.txt
@ -17,7 +17,6 @@
 2001:678:97c::/48
 2001:678:9e0::/48
 2001:678:cc4::/48
 2001:678:f08::/48
 2001:678:ff8::/48
 2001:67c:e4::/48
 2001:67c:51c::/48
@ -30,6 +29,7 @@
 2001:67c:15cc::/48
 2001:67c:15e0::/48
 2001:67c:16b8::/48
 2001:67c:1874::/48
 2001:67c:1bfc::/48
 2001:67c:20d0::/47
 2001:67c:2154::/48
@ -176,6 +176,7 @@
 2a0b:8a00::/29
 2a0b:8a40::/29
 2a0b:8dc0::/29
 2a0b:b180::/29
 2a0b:b4c0::/29
 2a0b:cc00::/32
 2a0b:ce40::/32
@ -239,6 +240,7 @@
 2a11:8a00::/29
 2a11:9d40::/29
 2a11:c8c0::/29
 2a11:eb00::/29
 2a12:21c0::/29
 2a12:4700::/29
 2a12:59c0::/29
--- a/country/bh/aggregated.json
+++ b/country/bh/aggregated.json
@ -1,86 +1,10 @@
 {
-  "country" : "Bahrain",
+  "country": "Bahrain",
-  "countryCode" : "BH",
+  "countryCode": "BH",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "31.217.249.0/24", "37.131.0.0/17", "45.11.72.0/22", "46.42.64.0/18", "46.184.128.0/17", "46.235.208.0/21", "62.209.0.0/19", "77.69.128.0/17", "77.92.168.0/21", "77.92.176.0/22", "77.92.184.0/21", "78.110.64.0/20", "79.171.240.0/21", "80.88.240.0/20", "80.95.208.0/20", "80.241.144.0/20", "81.22.16.0/20", "82.194.32.0/19", "83.136.56.0/21", "84.255.128.0/18", "85.158.128.0/21", "87.236.48.0/21", "87.236.136.0/21", "87.237.192.0/21", "87.252.96.0/21", "87.252.104.0/23", "87.252.126.0/23", "88.201.0.0/17", "89.31.192.0/21", "89.148.0.0/18", "91.189.188.0/22", "93.188.192.0/21", "94.76.0.0/18", "94.79.192.0/18", "95.84.64.0/18", "109.63.0.0/17", "109.161.128.0/17", "143.223.179.0/24", "178.132.32.0/20", "185.3.120.0/22", "185.7.8.0/22", "185.33.176.0/22", "185.34.228.0/22", "185.36.88.0/22", "185.49.160.0/22", "185.143.124.0/22", "185.156.236.0/22", "185.165.176.0/22", "185.236.132.0/22", "188.116.192.0/18", "188.137.128.0/20", "188.137.144.0/21", "193.25.204.0/24", "193.188.12.0/23", "193.188.96.0/19", "217.17.224.0/19" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:1a40::/29", "2a00:6600::/29", "2a00:dde0::/32", "2a01:4600::/32", "2a01:4900::/29", "2a01:5d80::/32", "2a01:e9c0::/29", "2a02:2578::/32", "2a02:c3c0::/29", "2a02:c400::/29", "2a02:d080::/29", "2a03:1c00::/29", "2a04:8ac0::/29", "2a0e:6700::/29", "2a14:7180::/29" ]
  "prefixes" : {
    "ipv4" : [
      "31.217.249.0/24",
      "37.131.0.0/17",
      "45.11.72.0/22",
      "46.42.64.0/18",
      "46.184.128.0/17",
      "46.235.208.0/21",
      "62.209.0.0/19",
      "77.69.128.0/17",
      "77.83.88.0/22",
      "77.92.168.0/21",
      "77.92.176.0/20",
      "78.110.64.0/20",
      "79.171.240.0/21",
      "80.88.240.0/20",
      "80.95.208.0/20",
      "80.241.144.0/20",
      "81.22.16.0/20",
      "82.194.32.0/19",
      "83.136.56.0/21",
      "84.255.128.0/18",
      "85.158.128.0/21",
      "87.236.48.0/21",
      "87.236.136.0/21",
      "87.237.192.0/21",
      "87.252.96.0/21",
      "87.252.104.0/23",
      "87.252.126.0/23",
      "88.201.0.0/17",
      "89.31.192.0/21",
      "89.148.0.0/18",
      "91.189.188.0/22",
      "93.188.192.0/21",
      "94.76.0.0/18",
      "94.79.192.0/18",
      "95.84.64.0/18",
      "109.63.0.0/17",
      "109.161.128.0/17",
      "143.223.179.0/24",
      "178.132.32.0/20",
      "185.3.120.0/22",
      "185.7.8.0/22",
      "185.33.176.0/22",
      "185.34.228.0/22",
      "185.36.88.0/22",
      "185.49.160.0/22",
      "185.143.124.0/22",
      "185.156.236.0/22",
      "185.165.176.0/22",
      "185.236.132.0/22",
      "188.116.192.0/18",
      "188.137.128.0/20",
      "188.137.144.0/21",
      "193.25.204.0/24",
      "193.188.12.0/23",
      "193.188.96.0/19",
      "217.17.224.0/19"
    ],
    "ipv6" : [
      "2001:1a40::/29",
      "2a00:6600::/29",
      "2a00:dde0::/32",
      "2a01:4600::/32",
      "2a01:4900::/29",
      "2a01:5d80::/32",
      "2a01:e9c0::/29",
      "2a02:2578::/32",
      "2a02:c3c0::/29",
      "2a02:c400::/29",
      "2a02:d080::/29",
      "2a03:1c00::/29",
      "2a04:8ac0::/29",
      "2a0e:6700::/29",
      "2a14:7180::/29"
    ]
  }
 }
--- a/country/bh/ipv4-aggregated.txt
+++ b/country/bh/ipv4-aggregated.txt
@ -11,9 +11,9 @@
 46.235.208.0/21
 62.209.0.0/19
 77.69.128.0/17
 77.83.88.0/22
 77.92.168.0/21
-77.92.176.0/20
+77.92.176.0/22
 77.92.184.0/21
 78.110.64.0/20
 79.171.240.0/21
 80.88.240.0/20
--- a/country/bi/aggregated.json
+++ b/country/bi/aggregated.json
@ -1,34 +1,10 @@
 {
-  "country" : "Burundi",
+  "country": "Burundi",
-  "countryCode" : "BI",
+  "countryCode": "BI",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.79.44.0/22", "41.79.224.0/22", "102.134.96.0/20", "154.73.40.0/22", "154.73.104.0/22", "154.117.192.0/18", "154.119.0.0/19", "196.2.8.0/21", "196.13.223.0/24", "196.49.3.0/24", "196.223.36.0/24", "197.157.192.0/22" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:43f8:990::/47", "2c0f:ef70::/32", "2c0f:f6a8::/32", "2c0f:f788::/32", "2c0f:f908::/32", "2c0f:fd78::/32" ]
  "prefixes" : {
    "ipv4" : [
      "41.79.44.0/22",
      "41.79.224.0/22",
      "102.134.96.0/20",
      "154.73.40.0/22",
      "154.73.104.0/22",
      "154.117.192.0/18",
      "154.119.0.0/19",
      "196.2.8.0/21",
      "196.13.223.0/24",
      "196.49.3.0/24",
      "196.223.3.0/24",
      "196.223.36.0/24",
      "197.157.192.0/22"
    ],
    "ipv6" : [
      "2001:43f8:990::/47",
      "2c0f:ef70::/32",
      "2c0f:f6a8::/32",
      "2c0f:f788::/32",
      "2c0f:f908::/32",
      "2c0f:fd78::/32"
    ]
  }
 }
--- a/country/bi/ipv4-aggregated.txt
+++ b/country/bi/ipv4-aggregated.txt
@ -13,6 +13,5 @@
 196.2.8.0/21
 196.13.223.0/24
 196.49.3.0/24
 196.223.3.0/24
 196.223.36.0/24
 197.157.192.0/22
--- a/country/bj/aggregated.json
+++ b/country/bj/aggregated.json
@ -1,66 +1,10 @@
 {
-  "country" : "Benin",
+  "country": "Benin",
-  "countryCode" : "BJ",
+  "countryCode": "BJ",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.74.0.0/20", "41.79.216.0/22", "41.85.160.0/19", "41.86.224.0/19", "41.138.88.0/22", "41.191.84.0/22", "41.216.32.0/19", "41.222.192.0/22", "41.223.248.0/22", "45.221.224.0/19", "81.91.224.0/20", "102.38.128.0/19", "102.202.108.0/22", "102.203.12.0/22", "102.207.72.0/22", "102.207.112.0/22", "102.209.80.0/22", "102.214.143.0/24", "102.214.247.0/24", "102.215.88.0/22", "102.215.93.0/24", "102.215.124.0/22", "102.215.136.0/22", "102.222.216.0/22", "137.255.0.0/16", "154.65.28.0/22", "154.66.128.0/20", "154.127.32.0/20", "156.0.212.0/22", "160.119.144.0/22", "164.160.140.0/22", "196.49.8.0/24", "196.49.110.0/24", "196.60.118.0/24", "196.192.16.0/20", "196.223.40.0/24", "196.251.152.0/22", "197.234.216.0/21" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:4320::/32", "2001:43f8:9a0::/48", "2001:43f8:af0::/47", "2001:43f8:1730::/47", "2c0f:2480::/32", "2c0f:52c0::/32", "2c0f:53c0::/32", "2c0f:6a80::/32", "2c0f:e900::/32", "2c0f:f018::/32", "2c0f:f188::/32", "2c0f:f1d0::/32", "2c0f:f770::/32", "2c0f:f818::/32", "2c0f:f9f8::/32" ]
  "prefixes" : {
    "ipv4" : [
      "41.74.0.0/20",
      "41.79.216.0/22",
      "41.85.160.0/19",
      "41.86.224.0/19",
      "41.138.88.0/22",
      "41.191.84.0/22",
      "41.216.32.0/19",
      "41.222.192.0/22",
      "41.223.248.0/22",
      "45.221.224.0/19",
      "81.91.224.0/20",
      "102.38.128.0/19",
      "102.207.72.0/22",
      "102.207.112.0/22",
      "102.209.80.0/22",
      "102.214.143.0/24",
      "102.214.247.0/24",
      "102.215.88.0/22",
      "102.215.93.0/24",
      "102.215.124.0/22",
      "102.215.136.0/22",
      "102.222.216.0/22",
      "137.255.0.0/16",
      "154.65.28.0/22",
      "154.66.128.0/20",
      "154.127.32.0/20",
      "156.0.212.0/22",
      "160.119.144.0/22",
      "164.160.140.0/22",
      "196.49.8.0/24",
      "196.49.110.0/24",
      "196.60.118.0/24",
      "196.192.16.0/20",
      "196.223.40.0/24",
      "196.251.152.0/22",
      "197.234.216.0/21"
    ],
    "ipv6" : [
      "2001:4320::/32",
      "2001:43f8:9a0::/48",
      "2001:43f8:af0::/47",
      "2001:43f8:1730::/47",
      "2c0f:2480::/32",
      "2c0f:52c0::/32",
      "2c0f:53c0::/32",
      "2c0f:6a80::/32",
      "2c0f:e900::/32",
      "2c0f:f018::/32",
      "2c0f:f188::/32",
      "2c0f:f1d0::/32",
      "2c0f:f770::/32",
      "2c0f:f818::/32",
      "2c0f:f9f8::/32"
    ]
  }
 }
--- a/country/bj/ipv4-aggregated.txt
+++ b/country/bj/ipv4-aggregated.txt
@ -15,6 +15,8 @@
 45.221.224.0/19
 81.91.224.0/20
 102.38.128.0/19
 102.202.108.0/22
 102.203.12.0/22
 102.207.72.0/22
 102.207.112.0/22
 102.209.80.0/22
--- a/country/bl/aggregated.json
+++ b/country/bl/aggregated.json
@ -1,21 +1,10 @@
 {
-  "country" : "St. Barthélemy",
+  "country": "St. Barthélemy",
-  "countryCode" : "BL",
+  "countryCode": "BL",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "23.135.232.0/24", "149.112.20.0/24", "206.83.45.0/24" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:504:111::/48", "2602:fb77::/48", "2602:fc69::/36" ]
  "prefixes" : {
    "ipv4" : [
      "23.135.232.0/24",
      "149.112.20.0/24",
      "206.83.45.0/24"
    ],
    "ipv6" : [
      "2001:504:111::/48",
      "2602:fb77::/48",
      "2602:fc69::/36"
    ]
  }
 }
--- a/country/bm/aggregated.json
+++ b/country/bm/aggregated.json
@ -1,72 +1,10 @@
 {
-  "country" : "Bermuda",
+  "country": "Bermuda",
-  "countryCode" : "BM",
+  "countryCode": "BM",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "31.47.88.0/21", "45.42.144.0/22", "64.89.168.0/22", "64.147.80.0/20", "66.55.112.0/20", "66.97.172.0/23", "69.17.192.0/19", "74.114.240.0/22", "76.8.32.0/20", "104.218.168.0/21", "142.54.192.0/21", "162.219.233.0/24", "162.221.212.0/22", "162.255.216.0/21", "185.198.104.0/22", "192.40.84.0/22", "192.156.199.0/24", "196.1.107.0/24", "196.12.64.0/18", "198.182.170.0/24", "198.186.235.0/24", "198.187.171.0/24", "198.207.16.0/21", "199.15.228.0/22", "199.16.248.0/22", "199.27.70.0/23", "199.68.192.0/22", "199.87.170.0/23", "199.96.64.0/22", "199.193.228.0/22", "200.1.160.0/24", "200.10.165.0/24", "200.10.166.0/24", "204.13.24.0/21", "205.211.8.0/23", "206.53.176.0/20", "206.188.128.0/19", "207.2.96.0/21", "207.228.128.0/18", "208.64.0.0/23", "208.64.6.0/23", "208.75.200.0/22", "208.82.164.0/22", "208.89.228.0/22", "209.240.32.0/20", "216.239.108.0/22", "216.249.32.0/20" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:508::/32", "2001:4910::/32", "2604:140::/32", "2605:e80::/32", "2605:5b80::/32", "2606:480::/32", "2606:b80::/32", "2606:1ec0::/32", "2606:9e00::/32", "2607:18c0::/32", "2a0a:1a40::/32" ]
  "prefixes" : {
    "ipv4" : [
      "31.47.88.0/21",
      "45.42.144.0/22",
      "64.89.168.0/22",
      "64.147.80.0/20",
      "66.55.112.0/20",
      "66.97.172.0/23",
      "69.17.192.0/19",
      "74.114.240.0/22",
      "76.8.32.0/20",
      "104.218.168.0/21",
      "142.54.192.0/21",
      "162.219.233.0/24",
      "162.221.212.0/22",
      "162.255.216.0/21",
      "185.198.104.0/22",
      "192.40.84.0/22",
      "192.156.199.0/24",
      "196.1.107.0/24",
      "196.12.64.0/18",
      "198.182.170.0/24",
      "198.186.235.0/24",
      "198.187.171.0/24",
      "198.207.16.0/21",
      "199.15.228.0/22",
      "199.16.248.0/22",
      "199.27.70.0/23",
      "199.68.192.0/22",
      "199.87.170.0/23",
      "199.96.64.0/22",
      "199.193.228.0/22",
      "200.1.160.0/24",
      "200.10.165.0/24",
      "200.10.166.0/24",
      "204.13.24.0/21",
      "205.211.8.0/23",
      "206.53.176.0/20",
      "206.188.128.0/19",
      "207.2.96.0/21",
      "207.228.128.0/18",
      "208.64.0.0/23",
      "208.64.6.0/23",
      "208.75.200.0/22",
      "208.82.164.0/22",
      "208.89.228.0/22",
      "209.240.32.0/20",
      "216.239.108.0/22",
      "216.249.32.0/20"
    ],
    "ipv6" : [
      "2001:508::/32",
      "2001:4910::/32",
      "2604:140::/32",
      "2605:e80::/32",
      "2606:480::/32",
      "2606:b80::/32",
      "2606:1ec0::/32",
      "2606:9e00::/32",
      "2607:18c0::/32",
      "2a0a:1a40::/32"
    ]
  }
 }
--- a/country/bm/ipv6-aggregated.txt
+++ b/country/bm/ipv6-aggregated.txt
@ -7,6 +7,7 @@
 2001:4910::/32
 2604:140::/32
 2605:e80::/32
 2605:5b80::/32
 2606:480::/32
 2606:b80::/32
 2606:1ec0::/32
--- a/country/bn/aggregated.json
+++ b/country/bn/aggregated.json
@ -1,59 +1,10 @@
 {
-  "country" : "Brunei",
+  "country": "Brunei",
-  "countryCode" : "BN",
+  "countryCode": "BN",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "43.225.40.0/22", "43.225.136.0/22", "43.251.128.0/22", "45.126.140.0/22", "45.127.140.0/22", "58.97.144.0/20", "61.6.192.0/18", "103.4.188.0/22", "103.12.208.0/23", "103.16.120.0/22", "103.17.24.0/22", "103.18.172.0/22", "103.20.24.0/22", "103.42.208.0/22", "103.139.109.0/24", "103.162.82.0/24", "103.170.170.0/24", "103.224.96.0/22", "103.230.64.0/22", "118.103.248.0/21", "119.160.128.0/18", "139.5.184.0/22", "156.31.0.0/16", "158.161.0.0/16", "185.8.100.0/22", "185.100.40.0/22", "192.94.122.0/24", "195.128.4.0/22", "202.59.230.0/24", "202.86.24.0/21", "202.90.36.0/24", "202.93.208.0/20", "202.152.64.0/19", "202.160.0.0/19", "202.160.32.0/20" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:df1:ba00::/48", "2001:df1:f800::/48", "2001:df2:8000::/48", "2001:df5:4800::/48", "2001:df6:1a80::/48", "2400:9400::/32", "2404:8980::/32", "2405:1700::/32", "2406:7800::/31" ]
  "prefixes" : {
    "ipv4" : [
      "43.225.40.0/22",
      "43.225.136.0/22",
      "43.251.128.0/22",
      "45.126.140.0/22",
      "45.127.140.0/22",
      "58.97.144.0/20",
      "61.6.192.0/18",
      "103.4.188.0/22",
      "103.12.208.0/23",
      "103.16.120.0/22",
      "103.17.24.0/22",
      "103.18.172.0/22",
      "103.20.24.0/22",
      "103.42.208.0/22",
      "103.139.109.0/24",
      "103.162.82.0/24",
      "103.170.170.0/24",
      "103.224.96.0/22",
      "103.230.64.0/22",
      "118.103.248.0/21",
      "119.160.128.0/18",
      "139.5.184.0/22",
      "156.31.0.0/16",
      "158.161.0.0/16",
      "185.8.100.0/22",
      "185.100.40.0/22",
      "192.94.122.0/24",
      "195.128.4.0/22",
      "202.59.230.0/24",
      "202.86.24.0/21",
      "202.90.36.0/24",
      "202.93.208.0/20",
      "202.152.64.0/19",
      "202.160.0.0/19",
      "202.160.32.0/20"
    ],
    "ipv6" : [
      "2001:df1:ba00::/48",
      "2001:df1:f800::/48",
      "2001:df2:8000::/48",
      "2001:df5:4800::/48",
      "2001:df6:1a80::/48",
      "2400:9400::/32",
      "2404:8980::/32",
      "2405:1700::/32",
      "2406:7800::/31"
    ]
  }
 }
--- a/country/bo/aggregated.json
+++ b/country/bo/aggregated.json
@ -1,171 +1,10 @@
 {
-  "country" : "Bolivia",
+  "country": "Bolivia",
-  "countryCode" : "BO",
+  "countryCode": "BO",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "45.4.98.0/23", "45.5.13.0/24", "45.68.0.0/22", "45.70.180.0/22", "45.163.18.0/23", "45.183.184.0/22", "45.225.75.0/24", "45.226.32.0/22", "45.229.195.0/24", "45.229.244.0/23", "45.232.46.0/23", "45.236.192.0/22", "131.0.0.0/22", "131.0.196.0/22", "132.251.224.0/19", "138.36.76.0/22", "143.0.101.0/24", "143.137.112.0/22", "143.137.228.0/22", "160.20.225.0/24", "161.22.128.0/17", "161.56.0.0/16", "161.138.0.0/16", "166.114.0.0/16", "167.157.0.0/16", "167.250.135.0/24", "168.197.240.0/22", "168.205.96.0/22", "168.228.132.0/22", "170.82.244.0/23", "170.239.120.0/22", "170.245.35.0/24", "170.247.160.0/22", "177.222.32.0/19", "177.222.96.0/19", "179.0.30.0/24", "179.42.80.0/22", "179.58.0.0/15", "179.60.112.0/20", "181.114.64.0/18", "181.114.160.0/19", "181.115.128.0/17", "181.177.128.0/18", "181.188.128.0/18", "181.191.68.0/22", "181.227.0.0/16", "186.0.156.0/22", "186.2.0.0/17", "186.27.0.0/17", "186.121.192.0/18", "186.195.247.0/24", "187.102.200.0/22", "190.0.248.0/21", "190.3.184.0/21", "190.11.64.0/19", "190.14.64.0/18", "190.52.48.0/21", "190.99.92.0/22", "190.103.64.0/20", "190.104.0.0/19", "190.106.240.0/20", "190.107.32.0/19", "190.109.224.0/19", "190.110.241.0/24", "190.111.152.0/22", "190.111.178.0/24", "190.129.0.0/16", "190.171.192.0/18", "190.180.0.0/17", "190.181.0.0/18", "190.186.0.0/16", "190.211.224.0/20", "191.241.62.0/23", "192.223.64.0/18", "192.245.121.0/24", "200.7.160.0/20", "200.9.165.0/24", "200.9.166.0/23", "200.9.168.0/24", "200.10.156.0/23", "200.12.248.0/21", "200.13.152.0/21", "200.33.113.0/24", "200.58.64.0/19", "200.58.160.0/19", "200.73.96.0/21", "200.75.160.0/20", "200.85.128.0/21", "200.85.140.0/22", "200.85.144.0/21", "200.87.0.0/16", "200.90.144.0/21", "200.105.128.0/18", "200.105.192.0/19", "200.106.244.0/23", "200.107.240.0/21", "200.110.48.0/20", "200.119.192.0/19", "201.131.41.0/24", "201.131.45.0/24", "201.150.160.0/19", "201.222.64.0/18" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:1378::/32", "2800:88::/32", "2800:320::/32", "2800:390::/32", "2800:cd0::/32", "2801:0:170::/48", "2801:10:2800::/48", "2801:10:5000::/48", "2801:10:9800::/48", "2801:11:a800::/48", "2801:12:1000::/48", "2801:12:d000::/48", "2801:13:3000::/48", "2801:14:6000::/48", "2801:14:c000::/48", "2801:16:9000::/48", "2801:17:7000::/48", "2801:18:7000::/48", "2801:18:9800::/48", "2801:18:a000::/48", "2801:18:a800::/48", "2801:18:d000::/48", "2801:19:a000::/48", "2801:19:d000::/48", "2801:1a:7000::/48", "2801:1d:d000::/48", "2801:104::/40", "2803:b60::/32", "2803:be0::/32", "2803:1180::/32", "2803:1330::/32", "2803:1920::/32", "2803:2030::/32", "2803:2110::/32", "2803:2690::/32", "2803:2880::/32", "2803:2950::/32", "2803:3820::/32", "2803:38c0::/32", "2803:3e20::/32", "2803:3ea0::/32", "2803:48d0::/32", "2803:4ac0::/32", "2803:5700::/32", "2803:5c00::/32", "2803:5e00::/32", "2803:6250::/32", "2803:7680::/32", "2803:8de0::/32", "2803:8ec0::/32", "2803:9400::/32", "2803:9a30::/32", "2803:a230::/32", "2803:acd0::/32", "2803:c6e0::/32", "2803:dc90::/32", "2803:fa00::/32" ]
  "prefixes" : {
    "ipv4" : [
      "45.4.98.0/23",
      "45.5.13.0/24",
      "45.68.0.0/22",
      "45.70.180.0/22",
      "45.163.18.0/23",
      "45.183.184.0/22",
      "45.225.75.0/24",
      "45.226.32.0/22",
      "45.229.195.0/24",
      "45.229.244.0/23",
      "45.232.46.0/23",
      "45.236.192.0/22",
      "131.0.0.0/22",
      "131.0.196.0/22",
      "132.251.224.0/19",
      "138.36.76.0/22",
      "143.0.101.0/24",
      "143.137.112.0/22",
      "143.137.228.0/22",
      "160.20.225.0/24",
      "161.22.128.0/17",
      "161.56.0.0/16",
      "161.138.0.0/16",
      "166.114.0.0/16",
      "167.157.0.0/16",
      "167.250.135.0/24",
      "168.197.240.0/22",
      "168.205.96.0/22",
      "168.228.132.0/22",
      "170.82.244.0/23",
      "170.239.120.0/22",
      "170.245.35.0/24",
      "170.247.160.0/22",
      "177.222.32.0/19",
      "177.222.96.0/19",
      "179.0.30.0/24",
      "179.42.80.0/22",
      "179.58.0.0/15",
      "179.60.112.0/20",
      "181.114.64.0/18",
      "181.114.160.0/19",
      "181.115.128.0/17",
      "181.177.128.0/18",
      "181.188.128.0/18",
      "181.191.68.0/22",
      "181.227.0.0/16",
      "186.0.156.0/22",
      "186.2.0.0/17",
      "186.27.0.0/17",
      "186.121.192.0/18",
      "186.195.247.0/24",
      "187.102.200.0/22",
      "190.0.248.0/21",
      "190.3.184.0/21",
      "190.11.64.0/19",
      "190.14.64.0/18",
      "190.52.48.0/21",
      "190.99.92.0/22",
      "190.103.64.0/20",
      "190.104.0.0/19",
      "190.106.240.0/20",
      "190.107.32.0/19",
      "190.109.224.0/19",
      "190.110.241.0/24",
      "190.111.152.0/22",
      "190.111.178.0/24",
      "190.129.0.0/16",
      "190.171.192.0/18",
      "190.180.0.0/17",
      "190.181.0.0/18",
      "190.186.0.0/16",
      "190.211.224.0/20",
      "191.241.62.0/23",
      "192.223.64.0/18",
      "192.245.121.0/24",
      "200.7.160.0/20",
      "200.9.165.0/24",
      "200.9.166.0/23",
      "200.9.168.0/24",
      "200.10.156.0/23",
      "200.12.248.0/21",
      "200.13.152.0/21",
      "200.33.113.0/24",
      "200.58.64.0/19",
      "200.58.160.0/19",
      "200.73.96.0/21",
      "200.75.160.0/20",
      "200.85.128.0/21",
      "200.85.140.0/22",
      "200.85.144.0/21",
      "200.87.0.0/16",
      "200.90.144.0/21",
      "200.105.128.0/18",
      "200.105.192.0/19",
      "200.106.244.0/23",
      "200.107.240.0/21",
      "200.110.48.0/20",
      "200.119.192.0/19",
      "201.131.41.0/24",
      "201.131.45.0/24",
      "201.150.160.0/19",
      "201.222.64.0/18"
    ],
    "ipv6" : [
      "2001:1378::/32",
      "2800:88::/32",
      "2800:320::/32",
      "2800:390::/32",
      "2800:cd0::/32",
      "2801:0:170::/48",
      "2801:10:2800::/48",
      "2801:10:5000::/48",
      "2801:10:9800::/48",
      "2801:11:a800::/48",
      "2801:12:1000::/48",
      "2801:12:d000::/48",
      "2801:13:3000::/48",
      "2801:14:6000::/48",
      "2801:14:c000::/48",
      "2801:16:9000::/48",
      "2801:17:7000::/48",
      "2801:18:7000::/48",
      "2801:18:9800::/48",
      "2801:18:a000::/48",
      "2801:18:a800::/48",
      "2801:18:d000::/48",
      "2801:19:a000::/48",
      "2801:19:d000::/48",
      "2801:1a:7000::/48",
      "2801:1d:d000::/48",
      "2801:104::/40",
      "2803:b60::/32",
      "2803:be0::/32",
      "2803:1180::/32",
      "2803:1920::/32",
      "2803:2030::/32",
      "2803:2110::/32",
      "2803:2690::/32",
      "2803:2880::/32",
      "2803:2950::/32",
      "2803:3820::/32",
      "2803:38c0::/32",
      "2803:3e20::/32",
      "2803:3ea0::/32",
      "2803:48d0::/32",
      "2803:4ac0::/32",
      "2803:5700::/32",
      "2803:5c00::/32",
      "2803:5e00::/32",
      "2803:6250::/32",
      "2803:7680::/32",
      "2803:8de0::/32",
      "2803:8ec0::/32",
      "2803:9400::/32",
      "2803:acd0::/32",
      "2803:c6e0::/32",
      "2803:dc90::/32",
      "2803:fa00::/32"
    ]
  }
 }
--- a/country/bo/ipv6-aggregated.txt
+++ b/country/bo/ipv6-aggregated.txt
@ -33,6 +33,7 @@
 2803:b60::/32
 2803:be0::/32
 2803:1180::/32
 2803:1330::/32
 2803:1920::/32
 2803:2030::/32
 2803:2110::/32
@ -53,6 +54,8 @@
 2803:8de0::/32
 2803:8ec0::/32
 2803:9400::/32
 2803:9a30::/32
 2803:a230::/32
 2803:acd0::/32
 2803:c6e0::/32
 2803:dc90::/32
--- a/country/bq/aggregated.json
+++ b/country/bq/aggregated.json
@ -1,33 +1,10 @@
 {
-  "country" : "Caribbean Netherlands",
+  "country": "Caribbean Netherlands",
-  "countryCode" : "BQ",
+  "countryCode": "BQ",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "138.185.208.0/22", "143.0.32.0/22", "161.0.80.0/20", "186.159.96.0/20", "190.4.64.0/20", "190.97.112.0/21", "190.107.248.0/21", "190.123.16.0/22", "193.17.35.0/24", "200.6.144.0/21", "200.71.248.0/21", "200.107.84.0/22" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2800:b00::/32", "2803:1600::/32", "2803:4900::/32", "2803:a000::/32", "2803:f640::/32", "2a10:cdc0::/29" ]
  "prefixes" : {
    "ipv4" : [
      "138.185.208.0/22",
      "143.0.32.0/22",
      "161.0.80.0/20",
      "186.159.96.0/20",
      "190.4.64.0/20",
      "190.97.112.0/21",
      "190.107.248.0/21",
      "190.123.16.0/22",
      "193.17.35.0/24",
      "200.6.144.0/21",
      "200.71.248.0/21",
      "200.107.84.0/22"
    ],
    "ipv6" : [
      "2800:b00::/32",
      "2803:1600::/32",
      "2803:4900::/32",
      "2803:a000::/32",
      "2803:f640::/32",
      "2a10:cdc0::/29"
    ]
  }
 }
--- a/country/br/aggregated.json
+++ b/country/br/aggregated.json
--- a/country/br/ipv4-aggregated.txt
+++ b/country/br/ipv4-aggregated.txt
@ -56,8 +56,7 @@
 45.6.64.0/19
 45.6.96.0/21
 45.6.108.0/22
-45.6.112.0/21
+45.6.112.0/20
 45.6.124.0/22
 45.6.128.0/22
 45.6.136.0/22
 45.6.144.0/20
@ -326,7 +325,7 @@
 45.166.248.0/22
 45.167.4.0/22
 45.167.8.0/22
-45.167.16.0/24
+45.167.16.0/23
 45.167.28.0/22
 45.167.32.0/19
 45.167.64.0/20
@ -393,6 +392,7 @@
 45.169.232.0/22
 45.169.240.0/22
 45.169.248.0/23
 45.169.252.0/24
 45.169.254.0/23
 45.170.0.0/21
 45.170.16.0/21
@ -636,8 +636,7 @@
 45.179.208.0/20
 45.179.224.0/20
 45.179.240.0/22
-45.179.248.0/22
+45.179.248.0/21
 45.179.252.0/23
 45.180.0.0/21
 45.180.12.0/22
 45.180.16.0/22
@ -699,7 +698,7 @@
 45.182.0.0/20
 45.182.16.0/22
 45.182.24.0/22
-45.182.32.0/22
+45.182.32.0/21
 45.182.40.0/24
 45.182.42.0/24
 45.182.44.0/22
@ -722,7 +721,7 @@
 45.182.232.0/22
 45.182.240.0/20
 45.183.0.0/22
-45.183.8.0/21
+45.183.8.0/22
 45.183.16.0/20
 45.183.32.0/21
 45.183.48.0/22
@ -1201,6 +1200,7 @@
 45.234.40.0/21
 45.234.48.0/21
 45.234.56.0/22
 45.234.63.0/24
 45.234.64.0/20
 45.234.80.0/22
 45.234.92.0/22
@ -1338,6 +1338,7 @@
 93.158.236.0/22
 99.198.80.0/20
 103.68.206.0/23
 103.151.110.0/23
 128.201.0.0/22
 128.201.8.0/21
 128.201.16.0/22
@ -1501,7 +1502,7 @@
 131.221.120.0/21
 131.221.128.0/20
 131.221.148.0/22
-131.221.156.0/22
+131.221.152.0/21
 131.221.160.0/22
 131.221.168.0/21
 131.221.176.0/20
@ -1601,7 +1602,9 @@
 138.36.248.0/22
 138.59.20.0/22
 138.59.28.0/22
-138.59.32.0/19
+138.59.32.0/20
 138.59.48.0/21
 138.59.56.0/22
 138.59.68.0/22
 138.59.72.0/21
 138.59.80.0/20
@ -2020,7 +2023,7 @@
 152.237.0.0/18
 152.237.96.0/19
 152.237.128.0/18
-152.237.208.0/20
+152.237.192.0/19
 152.239.0.0/18
 152.239.64.0/19
 152.239.96.0/20
@ -2089,7 +2092,7 @@
 164.163.208.0/21
 164.163.220.0/22
 164.163.224.0/20
-164.163.242.0/23
+164.163.242.0/24
 164.163.248.0/21
 167.249.0.0/21
 167.249.12.0/22
@ -2561,7 +2564,6 @@
 170.83.36.0/22
 170.83.40.0/21
 170.83.48.0/22
 170.83.56.0/23
 170.83.60.0/22
 170.83.64.0/21
 170.83.72.0/22
@ -2603,6 +2605,7 @@
 170.84.236.0/22
 170.84.240.0/21
 170.84.248.0/22
 170.84.255.0/24
 170.150.0.0/21
 170.150.16.0/21
 170.150.24.0/22
@ -2957,7 +2960,8 @@
 177.23.144.0/20
 177.23.160.0/19
 177.23.192.0/18
-177.24.0.0/13
+177.24.0.0/14
 177.30.0.0/15
 177.32.0.0/14
 177.36.0.0/20
 177.36.16.0/21
@ -3064,9 +3068,13 @@
 177.93.160.0/19
 177.93.192.0/18
 177.94.0.0/15
-177.96.0.0/12
+177.96.0.0/13
 177.104.0.0/14
 177.108.0.0/15
 177.110.0.0/16
 177.112.0.0/13
-177.120.0.0/14
+177.120.0.0/15
 177.123.0.0/16
 177.124.0.0/18
 177.124.64.0/20
 177.124.80.0/22
@ -3125,7 +3133,10 @@
 177.153.0.0/16
 177.154.0.0/15
 177.156.0.0/14
-177.160.0.0/12
+177.160.0.0/14
 177.164.0.0/15
 177.167.0.0/16
 177.168.0.0/13
 177.177.48.0/20
 177.177.96.0/20
 177.177.192.0/20
@ -3185,9 +3196,11 @@
 179.0.108.0/22
 179.0.112.0/20
 179.0.128.0/24
 179.0.150.0/24
 179.0.160.0/20
 179.0.176.0/22
 179.0.188.0/22
 179.0.194.0/23
 179.0.206.0/23
 179.10.0.0/15
 179.16.0.0/15
@ -3447,6 +3460,7 @@
 186.26.80.0/20
 186.26.96.0/20
 186.64.63.0/24
 186.65.72.0/21
 186.65.92.0/22
 186.65.104.0/22
 186.96.248.0/22
@ -3472,11 +3486,7 @@
 186.195.252.0/22
 186.196.0.0/14
 186.200.0.0/13
-186.208.0.0/18
+186.208.0.0/16
 186.208.64.0/20
 186.208.80.0/21
 186.208.96.0/19
 186.208.128.0/17
 186.209.0.0/18
 186.209.64.0/20
 186.209.80.0/21
@ -3861,6 +3871,7 @@
 189.201.232.0/21
 189.201.248.0/22
 190.2.64.0/20
 190.2.184.0/22
 190.3.160.0/21
 190.5.208.0/22
 190.7.176.0/20
@ -4003,14 +4014,7 @@
 191.8.0.0/13
 191.16.0.0/12
 191.32.0.0/14
-191.36.0.0/17
+191.36.0.0/16
 191.36.128.0/18
 191.36.192.0/19
 191.36.224.0/21
 191.36.232.0/22
 191.36.236.0/24
 191.36.238.0/23
 191.36.240.0/20
 191.37.0.0/17
 191.37.128.0/18
 191.37.192.0/19
@ -4092,6 +4096,7 @@
 192.80.209.0/24
 192.83.207.0/24
 192.91.254.0/24
 192.100.157.0/24
 192.100.168.0/24
 192.100.177.0/24
 192.100.206.0/24
@ -4180,6 +4185,7 @@
 192.231.175.0/24
 192.231.176.0/24
 192.245.30.0/24
 195.190.151.0/24
 198.17.120.0/23
 198.17.231.0/24
 198.17.232.0/24
@ -4215,6 +4221,7 @@
 200.2.88.0/23
 200.2.100.0/22
 200.3.16.0/20
 200.3.114.0/24
 200.3.196.0/22
 200.3.242.0/24
 200.4.96.0/19
@ -4259,6 +4266,7 @@
 200.9.144.0/24
 200.9.148.0/23
 200.9.154.0/23
 200.9.156.0/24
 200.9.160.0/22
 200.9.164.0/24
 200.9.174.0/23
@ -4266,7 +4274,6 @@
 200.9.199.0/24
 200.9.200.0/24
 200.9.202.0/23
 200.9.206.0/23
 200.9.214.0/24
 200.9.220.0/22
 200.9.224.0/24
@ -4287,6 +4294,8 @@
 200.10.192.0/23
 200.10.206.0/24
 200.10.227.0/24
 200.10.234.0/24
 200.10.236.0/23
 200.10.239.0/24
 200.10.245.0/24
 200.11.0.0/20
@ -4469,7 +4478,7 @@
 200.141.192.0/18
 200.142.0.0/17
 200.142.128.0/18
-200.142.192.0/19
+200.142.192.0/20
 200.142.224.0/21
 200.142.232.0/22
 200.142.240.0/20
@ -4553,13 +4562,15 @@
 200.194.176.0/21
 200.194.188.0/22
 200.194.192.0/19
-200.194.224.0/20
+200.194.232.0/21
 200.194.248.0/21
 200.195.0.0/16
 200.196.0.0/16
 200.198.0.0/15
 200.200.0.0/15
-200.202.0.0/16
+200.202.0.0/18
 200.202.96.0/19
 200.202.128.0/17
 200.203.16.0/20
 200.203.32.0/19
 200.203.64.0/18
@ -4588,7 +4599,13 @@
 200.219.48.0/22
 200.219.56.0/21
 200.219.80.0/20
-200.219.128.0/17
+200.219.128.0/21
 200.219.136.0/22
 200.219.140.0/23
 200.219.143.0/24
 200.219.144.0/20
 200.219.160.0/19
 200.219.192.0/18
 200.220.0.0/15
 200.222.0.0/17
 200.222.128.0/19
@ -4608,7 +4625,7 @@
 200.228.0.0/16
 200.229.32.0/19
 200.229.64.0/18
-200.229.128.0/20
+200.229.128.0/21
 200.229.156.0/22
 200.229.160.0/19
 200.229.192.0/20
@ -4778,8 +4795,10 @@
 201.131.2.0/24
 201.131.5.0/24
 201.131.10.0/23
 201.131.15.0/24
 201.131.24.0/21
 201.131.46.0/24
 201.131.64.0/24
 201.131.68.0/22
 201.131.80.0/21
 201.131.92.0/22
@ -4901,6 +4920,7 @@
 208.52.162.0/23
 209.127.140.0/23
 209.172.6.0/23
 212.47.35.0/24
 213.163.246.0/23
 216.98.208.0/20
 216.245.133.0/24
--- a/country/br/ipv6-aggregated.txt
+++ b/country/br/ipv6-aggregated.txt
--- a/country/bs/aggregated.json
+++ b/country/bs/aggregated.json
@ -1,47 +1,10 @@
 {
-  "country" : "Bahamas",
+  "country": "Bahamas",
-  "countryCode" : "BS",
+  "countryCode": "BS",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "23.128.212.0/24", "23.185.48.0/24", "23.190.112.0/24", "24.51.64.0/18", "24.206.0.0/19", "24.231.32.0/19", "24.244.128.0/18", "64.66.0.0/20", "64.150.192.0/18", "65.75.64.0/18", "66.85.2.0/24", "66.226.160.0/19", "69.4.160.0/20", "104.166.32.0/20", "108.60.224.0/19", "141.193.84.0/22", "142.248.248.0/23", "161.199.175.0/24", "165.140.144.0/22", "170.117.211.0/24", "192.231.36.0/24", "204.236.64.0/18", "208.87.32.0/21", "209.126.78.0/24", "216.137.0.0/20", "216.181.104.0/23" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2602:80a:5000::/40", "2602:fc27::/36", "2607:300::/32", "2607:fe68::/32", "2610:180::/32", "2620:cf:2000::/48" ]
  "prefixes" : {
    "ipv4" : [
      "23.128.212.0/24",
      "23.185.48.0/24",
      "23.190.112.0/24",
      "24.51.64.0/18",
      "24.206.0.0/19",
      "24.231.32.0/19",
      "24.244.128.0/18",
      "64.66.0.0/20",
      "64.150.192.0/18",
      "65.75.64.0/18",
      "66.85.2.0/24",
      "66.226.160.0/19",
      "69.4.160.0/20",
      "104.166.32.0/20",
      "108.60.224.0/19",
      "141.193.84.0/22",
      "142.248.248.0/23",
      "161.199.175.0/24",
      "165.140.144.0/22",
      "170.117.211.0/24",
      "192.231.36.0/24",
      "204.236.64.0/18",
      "208.87.32.0/21",
      "209.126.78.0/24",
      "216.137.0.0/20",
      "216.181.104.0/23"
    ],
    "ipv6" : [
      "2602:80a:5000::/40",
      "2602:fc27::/36",
      "2607:300::/32",
      "2607:fe68::/32",
      "2610:180::/32",
      "2620:cf:2000::/48"
    ]
  }
 }
--- a/country/bt/aggregated.json
+++ b/country/bt/aggregated.json
@ -1,81 +1,10 @@
 {
-  "country" : "Bhutan",
+  "country": "Bhutan",
-  "countryCode" : "BT",
+  "countryCode": "BT",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "36.50.37.0/24", "43.226.8.0/22", "43.229.124.0/22", "43.230.208.0/24", "43.241.136.0/22", "45.64.248.0/22", "103.7.252.0/22", "103.29.224.0/22", "103.71.40.0/22", "103.78.111.0/24", "103.78.116.0/23", "103.80.108.0/22", "103.97.87.0/24", "103.117.80.0/24", "103.119.126.0/24", "103.127.254.0/24", "103.129.62.0/23", "103.133.216.0/22", "103.151.231.0/24", "103.161.248.0/23", "103.166.42.0/23", "103.179.206.0/23", "103.197.176.0/22", "103.234.126.0/23", "103.245.240.0/22", "103.252.84.0/24", "118.103.136.0/21", "119.2.96.0/19", "138.252.94.0/24", "157.10.120.0/21", "157.10.128.0/23", "157.10.136.0/21", "157.10.144.0/22", "160.30.184.0/23", "160.191.60.0/23", "160.236.194.0/24", "162.4.252.0/24", "163.52.32.0/23", "163.128.96.0/24", "163.128.114.0/24", "163.223.203.0/24", "163.227.12.0/23", "163.227.18.0/23", "163.227.20.0/22", "163.227.24.0/21", "163.227.68.0/23", "202.89.24.0/21", "202.144.128.0/19", "220.158.236.0/22" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:dea:4000::/47", "2001:deb:8000::/48", "2001:df0:eb80::/48", "2001:df2:a8c0::/48", "2001:df3:e180::/48", "2001:df4:3440::/48", "2001:df5:a300::/48", "2001:df5:acc0::/48", "2001:df5:d880::/47", "2001:df5:e700::/48", "2001:df6:3ec0::/48", "2001:df6:d9c0::/48", "2001:df7:4940::/48", "2001:df7:63c0::/48", "2400:1440::/32", "2400:4e60::/32", "2400:50c0::/32", "2401:5f40::/32", "2401:b760::/32", "2401:fe20::/32", "2402:70e0::/32", "2403:580::/32", "2403:8700::/32", "2404:5540::/32", "2405:d000::/32", "2405:ec00::/31", "2407:5040::/32" ]
  "prefixes" : {
    "ipv4" : [
      "36.50.37.0/24",
      "43.229.124.0/22",
      "43.230.208.0/24",
      "43.241.136.0/22",
      "45.64.248.0/22",
      "103.7.252.0/22",
      "103.29.224.0/22",
      "103.71.40.0/22",
      "103.78.111.0/24",
      "103.78.116.0/23",
      "103.80.108.0/22",
      "103.97.87.0/24",
      "103.117.80.0/24",
      "103.119.126.0/24",
      "103.127.254.0/24",
      "103.129.62.0/23",
      "103.133.216.0/22",
      "103.151.231.0/24",
      "103.161.248.0/23",
      "103.166.42.0/23",
      "103.179.206.0/23",
      "103.197.176.0/22",
      "103.234.126.0/23",
      "103.245.240.0/22",
      "103.252.84.0/24",
      "118.103.136.0/21",
      "119.2.96.0/19",
      "138.252.94.0/24",
      "157.10.120.0/21",
      "157.10.128.0/23",
      "157.10.136.0/21",
      "157.10.144.0/22",
      "160.30.184.0/23",
      "160.191.60.0/23",
      "163.223.203.0/24",
      "163.227.12.0/23",
      "163.227.18.0/23",
      "163.227.20.0/22",
      "163.227.24.0/21",
      "163.227.68.0/23",
      "202.89.24.0/21",
      "202.144.128.0/19",
      "220.158.236.0/22"
    ],
    "ipv6" : [
      "2001:dea:4000::/47",
      "2001:deb:8000::/48",
      "2001:df0:eb80::/48",
      "2001:df2:a8c0::/48",
      "2001:df3:e180::/48",
      "2001:df4:3440::/48",
      "2001:df5:a300::/48",
      "2001:df5:acc0::/48",
      "2001:df5:d880::/47",
      "2001:df5:e700::/48",
      "2001:df6:3ec0::/48",
      "2400:1440::/32",
      "2400:4e60::/32",
      "2400:50c0::/32",
      "2401:5f40::/32",
      "2401:b760::/32",
      "2401:fe20::/32",
      "2403:580::/32",
      "2403:8700::/32",
      "2404:5540::/32",
      "2405:d000::/32",
      "2405:ec00::/31",
      "2407:5040::/32"
    ]
  }
 }
--- a/country/bt/ipv4-aggregated.txt
+++ b/country/bt/ipv4-aggregated.txt
@ -4,6 +4,7 @@
 # Export mode: Aggregated
 #
 36.50.37.0/24
 43.226.8.0/22
 43.229.124.0/22
 43.230.208.0/24
 43.241.136.0/22
@ -37,6 +38,11 @@
 157.10.144.0/22
 160.30.184.0/23
 160.191.60.0/23
 160.236.194.0/24
 162.4.252.0/24
 163.52.32.0/23
 163.128.96.0/24
 163.128.114.0/24
 163.223.203.0/24
 163.227.12.0/23
 163.227.18.0/23
--- a/country/bt/ipv6-aggregated.txt
+++ b/country/bt/ipv6-aggregated.txt
@ -14,12 +14,16 @@
 2001:df5:d880::/47
 2001:df5:e700::/48
 2001:df6:3ec0::/48
 2001:df6:d9c0::/48
 2001:df7:4940::/48
 2001:df7:63c0::/48
 2400:1440::/32
 2400:4e60::/32
 2400:50c0::/32
 2401:5f40::/32
 2401:b760::/32
 2401:fe20::/32
 2402:70e0::/32
 2403:580::/32
 2403:8700::/32
 2404:5540::/32
--- a/country/bw/aggregated.json
+++ b/country/bw/aggregated.json
@ -1,86 +1,10 @@
 {
-  "country" : "Botswana",
+  "country": "Botswana",
-  "countryCode" : "BW",
+  "countryCode": "BW",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.74.48.0/20", "41.75.0.0/20", "41.76.240.0/21", "41.77.88.0/21", "41.79.32.0/22", "41.79.136.0/22", "41.87.160.0/19", "41.138.72.0/21", "41.190.244.0/22", "41.191.64.0/22", "41.191.216.0/22", "41.216.208.0/21", "41.223.72.0/22", "41.223.140.0/22", "41.223.192.0/22", "83.143.24.0/21", "102.134.84.0/22", "102.134.160.0/20", "102.141.112.0/21", "102.165.128.0/19", "102.201.232.0/22", "102.202.66.0/23", "102.202.190.0/23", "102.204.97.0/24", "102.204.208.0/22", "102.205.8.0/23", "102.205.122.0/24", "102.207.236.0/22", "102.208.32.0/22", "102.208.192.0/22", "102.210.158.0/24", "102.210.252.0/24", "102.211.140.0/22", "102.214.126.0/24", "102.215.0.0/22", "102.219.75.0/24", "102.219.206.0/24", "102.222.8.0/22", "102.222.48.0/22", "102.222.173.0/24", "105.235.240.0/20", "129.205.192.0/18", "154.0.16.0/21", "154.70.144.0/21", "154.73.36.0/22", "154.73.84.0/22", "156.38.4.0/22", "156.38.16.0/20", "168.167.0.0/16", "169.255.80.0/22", "196.2.2.0/24", "196.45.164.0/22", "196.49.24.0/24", "196.60.4.0/24", "196.61.208.0/21", "196.216.163.0/24", "197.231.192.0/22" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:43f8:2a0::/48", "2001:43f8:17c0::/48", "2001:43fd:8800::/48", "2001:43ff:6800::/48", "2c0f:1020::/32", "2c0f:1340::/32", "2c0f:1840::/32", "2c0f:30c0::/32", "2c0f:33c0::/32", "2c0f:4780::/32", "2c0f:e970::/32", "2c0f:e9d8::/32", "2c0f:f160::/32", "2c0f:f250::/32", "2c0f:f328::/32", "2c0f:f678::/32", "2c0f:f718::/32", "2c0f:f728::/32", "2c0f:f9c0::/32", "2c0f:fac8::/32", "2c0f:ff00::/32" ]
  "prefixes" : {
    "ipv4" : [
      "41.74.48.0/20",
      "41.75.0.0/20",
      "41.76.240.0/21",
      "41.77.88.0/21",
      "41.79.32.0/22",
      "41.79.136.0/22",
      "41.87.160.0/19",
      "41.138.72.0/21",
      "41.190.244.0/22",
      "41.191.64.0/22",
      "41.191.216.0/22",
      "41.216.208.0/21",
      "41.223.72.0/22",
      "41.223.140.0/22",
      "41.223.192.0/22",
      "83.143.24.0/21",
      "102.134.84.0/22",
      "102.134.160.0/20",
      "102.141.112.0/21",
      "102.165.128.0/19",
      "102.204.208.0/22",
      "102.205.8.0/23",
      "102.205.122.0/24",
      "102.207.236.0/22",
      "102.208.32.0/22",
      "102.208.192.0/22",
      "102.210.158.0/24",
      "102.210.252.0/24",
      "102.211.140.0/22",
      "102.214.126.0/24",
      "102.215.0.0/22",
      "102.219.75.0/24",
      "102.219.206.0/24",
      "102.222.8.0/22",
      "102.222.48.0/22",
      "102.222.173.0/24",
      "105.235.240.0/20",
      "129.205.192.0/18",
      "154.0.16.0/21",
      "154.70.144.0/21",
      "154.73.36.0/22",
      "154.73.84.0/22",
      "156.38.4.0/22",
      "156.38.16.0/20",
      "168.167.0.0/16",
      "169.255.80.0/22",
      "196.2.2.0/24",
      "196.45.164.0/22",
      "196.49.24.0/24",
      "196.60.4.0/24",
      "196.61.208.0/21",
      "196.216.163.0/24",
      "197.231.192.0/22"
    ],
    "ipv6" : [
      "2001:43f8:2a0::/48",
      "2001:43f8:17c0::/48",
      "2c0f:1340::/32",
      "2c0f:1840::/32",
      "2c0f:30c0::/32",
      "2c0f:33c0::/32",
      "2c0f:4780::/32",
      "2c0f:e970::/32",
      "2c0f:e9d8::/32",
      "2c0f:f160::/32",
      "2c0f:f250::/32",
      "2c0f:f328::/32",
      "2c0f:f678::/32",
      "2c0f:f718::/32",
      "2c0f:f728::/32",
      "2c0f:f9c0::/32",
      "2c0f:fac8::/32",
      "2c0f:ff00::/32"
    ]
  }
 }
--- a/country/bw/ipv4-aggregated.txt
+++ b/country/bw/ipv4-aggregated.txt
@ -23,6 +23,10 @@
 102.134.160.0/20
 102.141.112.0/21
 102.165.128.0/19
 102.201.232.0/22
 102.202.66.0/23
 102.202.190.0/23
 102.204.97.0/24
 102.204.208.0/22
 102.205.8.0/23
 102.205.122.0/24
--- a/country/bw/ipv6-aggregated.txt
+++ b/country/bw/ipv6-aggregated.txt
@ -5,6 +5,9 @@
 #
 2001:43f8:2a0::/48
 2001:43f8:17c0::/48
 2001:43fd:8800::/48
 2001:43ff:6800::/48
 2c0f:1020::/32
 2c0f:1340::/32
 2c0f:1840::/32
 2c0f:30c0::/32
--- a/country/by/aggregated.json
+++ b/country/by/aggregated.json
@ -1,147 +1,10 @@
 {
-  "country" : "Belarus",
+  "country": "Belarus",
-  "countryCode" : "BY",
+  "countryCode": "BY",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "5.44.44.0/24", "5.100.192.0/19", "31.24.88.0/21", "31.130.200.0/21", "37.17.0.0/17", "37.44.64.0/18", "37.45.0.0/16", "37.212.0.0/14", "45.128.205.0/24", "45.129.186.0/24", "46.16.35.0/24", "46.28.96.0/21", "46.53.128.0/17", "46.56.0.0/16", "46.175.168.0/21", "46.182.48.0/21", "46.191.0.0/17", "46.216.0.0/16", "62.182.102.0/24", "77.74.32.0/21", "78.140.252.0/22", "79.98.48.0/21", "79.170.104.0/21", "80.94.160.0/20", "80.94.224.0/20", "80.249.80.0/20", "81.30.80.0/20", "81.91.190.0/23", "82.209.192.0/18", "83.137.197.0/24", "86.57.128.0/17", "87.232.64.0/21", "87.252.224.0/19", "91.90.222.0/23", "91.149.128.0/18", "91.215.176.0/22", "91.220.250.0/24", "93.84.0.0/15", "93.125.0.0/17", "93.177.124.0/24", "93.189.224.0/23", "93.191.96.0/21", "95.128.64.0/21", "95.130.80.0/21", "103.167.18.0/23", "109.68.218.0/24", "109.71.190.0/24", "109.126.128.0/18", "128.65.0.0/18", "128.140.240.0/20", "134.17.0.0/16", "155.212.244.0/24", "164.177.192.0/18", "176.60.0.0/16", "176.118.152.0/21", "178.120.0.0/13", "178.154.0.0/17", "178.159.44.0/22", "178.159.240.0/21", "178.163.128.0/17", "178.168.128.0/17", "178.172.128.0/17", "185.6.24.0/22", "185.11.76.0/22", "185.15.156.0/22", "185.20.112.0/22", "185.32.224.0/22", "185.47.152.0/23", "185.49.68.0/22", "185.53.72.0/22", "185.61.104.0/22", "185.65.136.0/23", "185.66.68.0/22", "185.70.12.0/22", "185.99.142.0/23", "185.123.184.0/22", "185.128.200.0/22", "185.137.116.0/22", "185.152.136.0/22", "185.158.216.0/22", "185.179.80.0/22", "185.183.120.0/22", "185.186.208.0/22", "185.203.152.0/22", "185.204.116.0/22", "185.227.96.0/22", "185.244.50.0/24", "185.251.38.0/24", "185.255.76.0/22", "193.17.173.0/24", "193.58.255.0/24", "193.151.40.0/22", "193.176.180.0/22", "194.62.64.0/24", "194.117.83.0/24", "194.158.192.0/19", "195.50.0.0/19", "195.137.160.0/24", "195.137.180.0/24", "195.210.8.0/24", "195.222.64.0/19", "212.98.160.0/19", "213.184.224.0/19", "217.21.32.0/19", "217.23.112.0/20" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:67c:57c::/48", "2001:67c:1058::/48", "2001:67c:2268::/48", "2001:7f8:5a::/48", "2001:7f8:8b::/48", "2001:7f9:10::/48", "2a00:1760::/29", "2a00:6440::/32", "2a00:c820::/29", "2a01:6e40::/32", "2a02:bf0::/32", "2a02:2208::/29", "2a02:d240::/29", "2a02:e300::/29", "2a03:3000::/29", "2a03:9120::/32", "2a03:9b60::/32", "2a03:c740::/32", "2a04:2e80::/29", "2a04:9b40::/29", "2a04:cc40::/29", "2a06:4800::/29", "2a07:200::/29", "2a0a:7d80::/29", "2a0a:eac0::/29", "2a0a:f240::/29", "2a0b:8680::/29", "2a0c:b1c0::/29", "2a0d:2d00::/32", "2a10:dc0::/29", "2a14:2bc0::/29", "2a14:3cc0::/29" ]
  "prefixes" : {
    "ipv4" : [
      "5.100.192.0/19",
      "31.24.88.0/21",
      "31.130.200.0/21",
      "37.17.0.0/17",
      "37.44.64.0/18",
      "37.45.0.0/16",
      "37.212.0.0/14",
      "45.128.205.0/24",
      "46.16.35.0/24",
      "46.28.96.0/21",
      "46.53.128.0/17",
      "46.56.0.0/16",
      "46.175.168.0/21",
      "46.182.48.0/21",
      "46.191.0.0/17",
      "46.216.0.0/16",
      "62.182.102.0/24",
      "77.74.32.0/21",
      "78.140.252.0/22",
      "79.98.48.0/21",
      "79.170.104.0/21",
      "80.94.160.0/20",
      "80.94.224.0/20",
      "80.249.80.0/20",
      "81.30.80.0/20",
      "81.91.190.0/23",
      "82.209.192.0/18",
      "83.137.197.0/24",
      "86.57.128.0/17",
      "87.252.224.0/19",
      "91.90.222.0/23",
      "91.149.128.0/18",
      "91.215.176.0/22",
      "91.220.250.0/24",
      "93.84.0.0/15",
      "93.125.0.0/17",
      "93.177.124.0/24",
      "93.189.224.0/23",
      "93.191.96.0/21",
      "95.128.64.0/21",
      "95.130.80.0/21",
      "109.71.190.0/24",
      "109.126.128.0/18",
      "128.65.0.0/18",
      "128.140.240.0/20",
      "134.17.0.0/16",
      "155.212.244.0/24",
      "164.177.192.0/18",
      "176.60.0.0/16",
      "176.118.152.0/21",
      "178.120.0.0/13",
      "178.154.0.0/17",
      "178.159.44.0/22",
      "178.159.240.0/21",
      "178.163.128.0/17",
      "178.168.128.0/17",
      "178.172.128.0/17",
      "185.6.24.0/22",
      "185.11.76.0/22",
      "185.15.156.0/22",
      "185.20.112.0/22",
      "185.32.224.0/22",
      "185.47.152.0/23",
      "185.49.68.0/22",
      "185.53.72.0/22",
      "185.61.104.0/22",
      "185.65.136.0/23",
      "185.66.68.0/22",
      "185.70.12.0/22",
      "185.99.142.0/23",
      "185.123.184.0/22",
      "185.128.200.0/22",
      "185.137.116.0/22",
      "185.152.136.0/22",
      "185.158.216.0/22",
      "185.179.80.0/22",
      "185.183.120.0/22",
      "185.186.208.0/22",
      "185.203.152.0/22",
      "185.204.116.0/22",
      "185.227.96.0/22",
      "185.244.50.0/24",
      "185.251.38.0/24",
      "185.255.76.0/22",
      "193.17.173.0/24",
      "193.58.255.0/24",
      "193.105.82.0/24",
      "193.151.40.0/22",
      "193.176.180.0/22",
      "194.62.64.0/24",
      "194.117.83.0/24",
      "194.158.192.0/19",
      "195.50.0.0/19",
      "195.137.160.0/24",
      "195.137.180.0/24",
      "195.210.8.0/24",
      "195.222.64.0/19",
      "212.98.160.0/19",
      "213.184.224.0/19",
      "217.21.32.0/19",
      "217.23.112.0/20"
    ],
    "ipv6" : [
      "2001:67c:57c::/48",
      "2001:67c:1058::/48",
      "2001:67c:2268::/48",
      "2001:7f8:5a::/48",
      "2001:7f8:8b::/48",
      "2a00:1760::/29",
      "2a00:6440::/32",
      "2a00:c820::/29",
      "2a01:6e40::/32",
      "2a02:bf0::/32",
      "2a02:2208::/29",
      "2a02:d240::/29",
      "2a02:e300::/29",
      "2a03:3000::/29",
      "2a03:9120::/32",
      "2a03:9b60::/32",
      "2a03:c740::/32",
      "2a04:2e80::/29",
      "2a04:9b40::/29",
      "2a04:cc40::/29",
      "2a06:4800::/29",
      "2a07:200::/29",
      "2a0a:7d80::/29",
      "2a0a:eac0::/29",
      "2a0a:f240::/29",
      "2a0b:8680::/29",
      "2a0c:b1c0::/29",
      "2a0d:2d00::/32",
      "2a10:dc0::/29",
      "2a14:2bc0::/29",
      "2a14:3cc0::/29"
    ]
  }
 }
--- a/country/by/ipv4-aggregated.txt
+++ b/country/by/ipv4-aggregated.txt
@ -3,6 +3,7 @@
 # Delegation status: Allocated || Assigned
 # Export mode: Aggregated
 #
 5.44.44.0/24
 5.100.192.0/19
 31.24.88.0/21
 31.130.200.0/21
@ -11,6 +12,7 @@
 37.45.0.0/16
 37.212.0.0/14
 45.128.205.0/24
 45.129.186.0/24
 46.16.35.0/24
 46.28.96.0/21
 46.53.128.0/17
@ -32,6 +34,7 @@
 82.209.192.0/18
 83.137.197.0/24
 86.57.128.0/17
 87.232.64.0/21
 87.252.224.0/19
 91.90.222.0/23
 91.149.128.0/18
@ -44,6 +47,8 @@
 93.191.96.0/21
 95.128.64.0/21
 95.130.80.0/21
 103.167.18.0/23
 109.68.218.0/24
 109.71.190.0/24
 109.126.128.0/18
 128.65.0.0/18
@ -89,7 +94,6 @@
 185.255.76.0/22
 193.17.173.0/24
 193.58.255.0/24
 193.105.82.0/24
 193.151.40.0/22
 193.176.180.0/22
 194.62.64.0/24
--- a/country/by/ipv6-aggregated.txt
+++ b/country/by/ipv6-aggregated.txt
@ -8,6 +8,7 @@
 2001:67c:2268::/48
 2001:7f8:5a::/48
 2001:7f8:8b::/48
 2001:7f9:10::/48
 2a00:1760::/29
 2a00:6440::/32
 2a00:c820::/29
--- a/country/bz/aggregated.json
+++ b/country/bz/aggregated.json
@ -1,172 +1,10 @@
 {
-  "country" : "Belize",
+  "country": "Belize",
-  "countryCode" : "BZ",
+  "countryCode": "BZ",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "2.56.44.0/22", "2.59.10.0/23", "5.253.160.0/22", "45.67.176.0/22", "45.70.228.0/22", "45.70.240.0/22", "45.87.220.0/22", "45.136.44.0/22", "45.145.76.0/22", "45.151.24.0/22", "45.180.120.0/22", "45.225.42.0/24", "45.228.156.0/24", "45.234.88.0/22", "82.115.15.0/24", "83.150.236.0/22", "85.209.136.0/22", "91.90.162.0/24", "91.209.70.0/24", "91.226.97.0/24", "91.245.232.0/23", "93.115.60.0/23", "121.127.33.0/24", "131.161.148.0/22", "131.255.40.0/22", "138.97.156.0/22", "138.99.120.0/22", "138.99.208.0/22", "138.185.76.0/22", "141.98.92.0/22", "148.224.24.0/22", "152.89.8.0/22", "153.55.176.0/20", "160.238.136.0/22", "167.249.200.0/22", "168.90.244.0/22", "168.195.76.0/22", "168.197.208.0/22", "170.0.180.0/22", "170.247.220.0/22", "170.254.16.0/22", "171.22.36.0/22", "179.42.192.0/18", "179.51.252.0/22", "179.60.144.0/21", "179.63.216.0/21", "181.177.64.0/18", "181.233.124.0/22", "185.130.44.0/22", "185.131.222.0/23", "185.142.217.0/24", "185.142.218.0/24", "185.145.114.0/24", "185.156.200.0/22", "185.221.220.0/24", "185.240.253.0/24", "186.65.88.0/22", "188.119.88.0/22", "190.97.98.0/24", "190.102.96.0/22", "190.102.112.0/21", "190.124.40.0/22", "190.197.0.0/17", "190.211.145.0/24", "190.211.146.0/23", "190.211.148.0/24", "191.97.80.0/21", "193.168.180.0/22", "193.203.37.0/24", "193.203.38.0/24", "194.38.28.0/22", "195.80.32.0/22", "199.231.235.0/24", "200.10.194.0/24", "200.32.192.0/18", "200.123.208.0/21", "202.181.177.0/24", "203.23.103.0/24", "203.24.109.0/24", "203.29.54.0/23", "203.30.188.0/22", "209.145.40.0/24" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2800:410::/32", "2803:b4::/32", "2803:160::/32", "2803:2280::/32", "2803:2840::/32", "2803:3d00::/32", "2803:44c0::/32", "2803:6480::/32", "2803:7420::/32", "2803:7900::/32", "2803:9880::/32", "2803:9a00::/32", "2803:9a40::/32", "2803:a420::/32", "2803:a8c0::/32", "2803:b080::/32", "2803:b720::/32", "2803:d000::/32", "2803:d520::/32", "2803:d5c0::/32", "2803:e510::/32", "2a05:840::/30", "2a05:2ac0::/29", "2a05:64c0::/29", "2a07:180::/32", "2a07:e00::/29", "2a07:a0c0::/29" ]
  "prefixes" : {
    "ipv4" : [
      "2.56.44.0/22",
      "2.59.10.0/23",
      "5.253.160.0/22",
      "45.67.176.0/22",
      "45.70.228.0/22",
      "45.70.240.0/22",
      "45.87.220.0/22",
      "45.136.44.0/22",
      "45.145.76.0/22",
      "45.151.24.0/22",
      "45.180.120.0/22",
      "45.225.42.0/24",
      "45.228.156.0/24",
      "45.234.88.0/22",
      "46.102.152.0/24",
      "46.102.252.0/23",
      "82.115.15.0/24",
      "83.150.236.0/22",
      "85.204.74.0/24",
      "85.209.136.0/22",
      "86.104.15.0/24",
      "86.104.28.0/23",
      "86.105.1.0/24",
      "86.105.5.0/24",
      "86.105.18.0/24",
      "86.105.227.0/24",
      "86.105.235.0/24",
      "86.106.93.0/24",
      "86.106.102.0/24",
      "86.106.131.0/24",
      "86.107.42.0/24",
      "86.107.170.0/23",
      "89.32.40.0/24",
      "89.33.64.0/24",
      "89.34.111.0/24",
      "89.35.32.0/24",
      "89.35.56.0/24",
      "89.35.178.0/24",
      "89.37.226.0/24",
      "89.42.212.0/24",
      "89.43.60.0/24",
      "89.43.202.0/23",
      "89.44.103.0/24",
      "89.45.67.0/24",
      "91.90.162.0/24",
      "91.209.70.0/24",
      "91.226.97.0/24",
      "91.245.232.0/23",
      "92.114.35.0/24",
      "92.114.92.0/24",
      "93.113.45.0/24",
      "93.113.131.0/24",
      "93.115.38.0/24",
      "93.115.60.0/23",
      "93.115.201.0/24",
      "93.117.137.0/24",
      "93.119.123.0/24",
      "94.177.12.0/24",
      "94.177.112.0/24",
      "94.177.123.0/24",
      "121.127.33.0/24",
      "131.161.148.0/22",
      "131.255.40.0/22",
      "138.97.156.0/22",
      "138.99.120.0/22",
      "138.99.208.0/22",
      "138.185.76.0/22",
      "141.98.92.0/22",
      "148.224.24.0/22",
      "152.89.8.0/22",
      "153.55.176.0/20",
      "160.238.136.0/22",
      "167.249.200.0/22",
      "168.90.244.0/22",
      "168.195.76.0/22",
      "168.197.208.0/22",
      "170.0.180.0/22",
      "170.247.220.0/22",
      "170.254.16.0/22",
      "171.22.36.0/22",
      "176.223.111.0/24",
      "176.223.112.0/23",
      "176.223.165.0/24",
      "179.42.192.0/18",
      "179.51.252.0/22",
      "179.60.144.0/21",
      "179.63.216.0/21",
      "181.177.64.0/18",
      "181.233.124.0/22",
      "185.77.128.0/22",
      "185.130.44.0/22",
      "185.131.222.0/23",
      "185.142.217.0/24",
      "185.142.218.0/24",
      "185.145.114.0/24",
      "185.156.200.0/22",
      "185.221.220.0/24",
      "185.240.253.0/24",
      "186.65.88.0/22",
      "188.119.88.0/22",
      "188.211.168.0/24",
      "188.213.204.0/24",
      "188.215.1.0/24",
      "188.215.92.0/24",
      "188.240.234.0/24",
      "188.241.39.0/24",
      "188.241.68.0/24",
      "190.102.96.0/22",
      "190.102.112.0/21",
      "190.124.40.0/22",
      "190.197.0.0/17",
      "190.211.145.0/24",
      "190.211.146.0/23",
      "190.211.148.0/24",
      "191.97.80.0/21",
      "193.168.180.0/22",
      "193.203.37.0/24",
      "193.203.38.0/24",
      "194.38.28.0/22",
      "195.80.32.0/22",
      "199.231.235.0/24",
      "200.10.194.0/24",
      "200.32.192.0/18",
      "200.123.208.0/21",
      "202.181.177.0/24",
      "203.23.103.0/24",
      "203.24.109.0/24",
      "203.29.54.0/23",
      "203.30.188.0/22",
      "209.145.40.0/24"
    ],
    "ipv6" : [
      "2001:67c:255c::/48",
      "2800:410::/32",
      "2803:b4::/32",
      "2803:160::/32",
      "2803:2280::/32",
      "2803:2840::/32",
      "2803:3d00::/32",
      "2803:44c0::/32",
      "2803:6480::/32",
      "2803:7420::/32",
      "2803:7900::/32",
      "2803:9880::/32",
      "2803:9a00::/32",
      "2803:9a40::/32",
      "2803:a420::/32",
      "2803:a8c0::/32",
      "2803:b080::/32",
      "2803:b720::/32",
      "2803:d000::/32",
      "2803:d520::/32",
      "2803:d5c0::/32",
      "2803:e510::/32",
      "2a05:840::/30",
      "2a05:6200::/29",
      "2a07:180::/32",
      "2a07:e00::/29",
      "2a07:a0c0::/29"
    ]
  }
 }
--- a/country/bz/ipv4-aggregated.txt
+++ b/country/bz/ipv4-aggregated.txt
@ -17,52 +17,14 @@
 45.225.42.0/24
 45.228.156.0/24
 45.234.88.0/22
 46.102.152.0/24
 46.102.252.0/23
 82.115.15.0/24
 83.150.236.0/22
 85.204.74.0/24
 85.209.136.0/22
 86.104.15.0/24
 86.104.28.0/23
 86.105.1.0/24
 86.105.5.0/24
 86.105.18.0/24
 86.105.227.0/24
 86.105.235.0/24
 86.106.93.0/24
 86.106.102.0/24
 86.106.131.0/24
 86.107.42.0/24
 86.107.170.0/23
 89.32.40.0/24
 89.33.64.0/24
 89.34.111.0/24
 89.35.32.0/24
 89.35.56.0/24
 89.35.178.0/24
 89.37.226.0/24
 89.42.212.0/24
 89.43.60.0/24
 89.43.202.0/23
 89.44.103.0/24
 89.45.67.0/24
 91.90.162.0/24
 91.209.70.0/24
 91.226.97.0/24
 91.245.232.0/23
 92.114.35.0/24
 92.114.92.0/24
 93.113.45.0/24
 93.113.131.0/24
 93.115.38.0/24
 93.115.60.0/23
 93.115.201.0/24
 93.117.137.0/24
 93.119.123.0/24
 94.177.12.0/24
 94.177.112.0/24
 94.177.123.0/24
 121.127.33.0/24
 131.161.148.0/22
 131.255.40.0/22
@ -83,16 +45,12 @@
 170.247.220.0/22
 170.254.16.0/22
 171.22.36.0/22
 176.223.111.0/24
 176.223.112.0/23
 176.223.165.0/24
 179.42.192.0/18
 179.51.252.0/22
 179.60.144.0/21
 179.63.216.0/21
 181.177.64.0/18
 181.233.124.0/22
 185.77.128.0/22
 185.130.44.0/22
 185.131.222.0/23
 185.142.217.0/24
@ -103,13 +61,7 @@
 185.240.253.0/24
 186.65.88.0/22
 188.119.88.0/22
-188.211.168.0/24
+190.97.98.0/24
 188.213.204.0/24
 188.215.1.0/24
 188.215.92.0/24
 188.240.234.0/24
 188.241.39.0/24
 188.241.68.0/24
 190.102.96.0/22
 190.102.112.0/21
 190.124.40.0/22
--- a/country/bz/ipv6-aggregated.txt
+++ b/country/bz/ipv6-aggregated.txt
@ -3,7 +3,6 @@
 # Delegation status: Allocated || Assigned
 # Export mode: Aggregated
 #
 2001:67c:255c::/48
 2800:410::/32
 2803:b4::/32
 2803:160::/32
@ -26,7 +25,8 @@
 2803:d5c0::/32
 2803:e510::/32
 2a05:840::/30
-2a05:6200::/29
+2a05:2ac0::/29
 2a05:64c0::/29
 2a07:180::/32
 2a07:e00::/29
 2a07:a0c0::/29
--- a/country/ca/aggregated.json
+++ b/country/ca/aggregated.json
--- a/country/ca/ipv4-aggregated.txt
+++ b/country/ca/ipv4-aggregated.txt
--- a/country/ca/ipv6-aggregated.txt
+++ b/country/ca/ipv6-aggregated.txt
@ -91,14 +91,12 @@
 2602:808:9000::/44
 2602:809:6000::/44
 2602:80a:3000::/44
 2602:80b:7000::/44
 2602:80c:e000::/40
 2602:80e:9000::/44
 2602:80f:f000::/44
 2602:810:8000::/44
 2602:812:2000::/44
 2602:812:6000::/44
 2602:812:d000::/40
 2602:814:3000::/40
 2602:814:7000::/40
 2602:814:8000::/44
@ -109,6 +107,42 @@
 2602:817:c000::/44
 2602:81d::/44
 2602:81d:1000::/40
 2602:81d:7000::/44
 2602:81d:b000::/44
 2602:81e:1000::/44
 2602:f2ee::/36
 2602:f2fe::/40
 2602:f2ff::/40
 2602:f311::/40
 2602:f314::/40
 2602:f31b::/40
 2602:f31c::/40
 2602:f32a::/40
 2602:f332::/40
 2602:f350::/36
 2602:f35e::/40
 2602:f37c::/40
 2602:f382::/40
 2602:f384::/36
 2602:f38d::/36
 2602:f3a4::/40
 2602:f3aa::/36
 2602:f3b9::/36
 2602:f3c4::/36
 2602:f3c5::/40
 2602:f3d1::/40
 2602:f3d2::/40
 2602:f3d6::/40
 2602:f3ef::/40
 2602:f3f1::/36
 2602:f417::/40
 2602:f41a::/40
 2602:f41c::/36
 2602:f432::/40
 2602:f446::/40
 2602:f44a::/40
 2602:f452::/36
 2602:f462::/36
 2602:f47a::/40
 2602:f49f::/40
 2602:f4b1::/40
@ -134,21 +168,18 @@
 2602:f633::/40
 2602:f657::/36
 2602:f65e::/40
 2602:f674::/40
 2602:f692::/36
 2602:f69f::/40
 2602:f6aa::/36
 2602:f6b4::/40
 2602:f6c1::/36
-2602:f6f1::/36
+2602:f6f1::/32
 2602:f71c::/40
 2602:f72c::/36
 2602:f730::/40
 2602:f736::/36
 2602:f738::/40
 2602:f739::/40
 2602:f743::/36
 2602:f754::/36
 2602:f758::/40
 2602:f75b::/36
 2602:f772::/36
@ -157,12 +188,11 @@
 2602:f7a0::/36
 2602:f7c2::/36
 2602:f7cc::/32
 2602:f7e0::/36
 2602:f7f4::/36
 2602:f7f6::/40
 2602:f805::/36
 2602:f812::/40
-2602:f816::/40
+2602:f816::/36
 2602:f847::/44
 2602:f85b::/40
 2602:f865::/36
@ -236,7 +266,6 @@
 2602:fb21::/40
 2602:fb24::/40
 2602:fb25::/40
 2602:fb26::/36
 2602:fb28::/40
 2602:fb36::/36
 2602:fb41::/36
@ -279,7 +308,6 @@
 2602:fcdd::/36
 2602:fce6::/36
 2602:fcf9::/36
 2602:fd03::/36
 2602:fd08::/36
 2602:fd0c::/36
 2602:fd0d::/36
@ -292,7 +320,7 @@
 2602:fd3b::/36
 2602:fd4b::/36
 2602:fd50::/32
-2602:fd51::/36
+2602:fd51::/40
 2602:fd52::/36
 2602:fd53::/36
 2602:fd5a::/36
@ -325,6 +353,7 @@
 2602:fdf8::/36
 2602:fdf9::/36
 2602:fe08::/36
 2602:fe0f::/36
 2602:fe11::/36
 2602:fe1a::/36
 2602:fe1c::/36
@ -340,7 +369,6 @@
 2602:fe6a::/36
 2602:fe74::/36
 2602:fe77::/36
 2602:fe7f::/36
 2602:fe81::/36
 2602:fe8b::/32
 2602:fe98::/36
@ -389,7 +417,6 @@
 2604:920::/32
 2604:b60::/32
 2604:d40::/32
 2604:d60::/32
 2604:dc0::/32
 2604:e80::/32
 2604:ea0::/32
@ -404,7 +431,6 @@
 2604:16a0::/32
 2604:1700::/32
 2604:1740::/32
 2604:17c0::/32
 2604:1860::/32
 2604:18a0::/32
 2604:18e0::/32
@ -415,9 +441,7 @@
 2604:1ec0::/36
 2604:1f80::/32
 2604:2060::/32
 2604:23c0::/32
 2604:2460::/32
 2604:2560::/32
 2604:2580::/32
 2604:2840::/32
 2604:2a20::/32
@ -481,6 +505,7 @@
 2604:9e80::/32
 2604:a280::/32
 2604:a3c0::/32
 2604:a500::/32
 2604:a5c0::/32
 2604:a640::/32
 2604:a740::/32
@ -502,6 +527,7 @@
 2604:e3c0::/32
 2604:e440::/32
 2604:eac0::/32
 2604:ec40::/32
 2604:ef00::/32
 2604:f000::/32
 2604:f680::/32
@ -551,6 +577,7 @@
 2605:6b00::/32
 2605:6b40::/32
 2605:6fc0::/32
 2605:71c0::/32
 2605:7200::/32
 2605:7400::/32
 2605:7480::/32
@ -588,8 +615,8 @@
 2605:bac0::/32
 2605:bc40::/32
 2605:c500::/32
 2605:c580::/32
 2605:c700::/32
 2605:c980::/32
 2605:cac0::/32
 2605:cb40::/32
 2605:cf00::/32
@ -617,7 +644,6 @@
 2606:880::/32
 2606:a80::/32
 2606:b40::/32
 2606:10c0::/32
 2606:1140::/32
 2606:12c0::/32
 2606:16c0::/32
@ -635,11 +661,13 @@
 2606:3100::/32
 2606:3140::/32
 2606:3740::/32
 2606:3780::/32
 2606:3c00::/32
 2606:4280::/32
 2606:4380::/32
 2606:4580::/32
 2606:4740::/32
 2606:49c0::/32
 2606:4ac0::/32
 2606:5040::/32
 2606:5300::/32
@ -648,6 +676,7 @@
 2606:5fc0::/32
 2606:6080::/32
 2606:60c0::/32
 2606:6180::/32
 2606:6200::/32
 2606:6280::/32
 2606:6300::/32
@ -724,8 +753,6 @@
 2607::/32
 2607:100::/32
 2607:180::/32
 2607:2c0::/32
 2607:680::/32
 2607:7c0::/32
 2607:a00::/32
 2607:d80::/32
@ -746,6 +773,7 @@
 2607:3840::/32
 2607:3a40::/36
 2607:3ac0::/32
 2607:3b80::/32
 2607:3f40::/32
 2607:4100::/32
 2607:42c0::/32
@ -757,6 +785,7 @@
 2607:4c00::/32
 2607:5300::/32
 2607:5340::/32
 2607:5900::/32
 2607:5940::/32
 2607:5e00::/32
 2607:6500::/32
@ -876,6 +905,7 @@
 2620:0:230::/48
 2620:0:810::/48
 2620:0:bd0::/48
 2620:0:1a40::/48
 2620:0:1af0::/48
 2620:0:2220::/44
 2620:0:22e0::/48
@ -909,16 +939,17 @@
 2620:32:4000::/48
 2620:35:4000::/44
 2620:35:8000::/48
 2620:35:a000::/48
 2620:36:4000::/44
 2620:36:c000::/48
 2620:3d:c000::/48
 2620:41:4000::/48
 2620:42:c000::/48
 2620:42:e000::/48
 2620:44:e000::/48
 2620:45::/48
 2620:45:2000::/48
 2620:46:4000::/48
 2620:46:6000::/48
 2620:49::/44
 2620:4b::/48
 2620:4b:a000::/48
@ -962,6 +993,7 @@
 2620:90:2000::/48
 2620:91:e000::/48
 2620:92:c000::/48
 2620:93:8000::/48
 2620:96:4000::/44
 2620:9a::/48
 2620:9a:2000::/48
@ -987,6 +1019,7 @@
 2620:c1:6000::/48
 2620:c4:c000::/48
 2620:c8:2000::/48
 2620:c8:a000::/48
 2620:ca:6000::/48
 2620:cd:6000::/48
 2620:d2:6000::/48
@ -1046,6 +1079,7 @@
 2620:129:7000::/44
 2620:12a::/40
 2620:12a:a000::/44
 2620:12b::/44
 2620:12b:5000::/40
 2620:12b:6000::/44
 2620:12d:1000::/44
@ -1084,7 +1118,6 @@
 2a00:1ce0::/32
 2a00:5de0::/29
 2a01:3e0::/29
 2a01:7f60::/32
 2a01:e940::/29
 2a02:2468::/32
 2a02:2818::/32
@ -1093,6 +1126,7 @@
 2a04:a380::/29
 2a05:4c40::/29
 2a05:79c0::/29
 2a05:ccc0::/29
 2a06:3e00::/29
 2a07:ff80::/32
 2a0a:e340::/29
--- a/country/cd/aggregated.json
+++ b/country/cd/aggregated.json
@ -1,118 +1,10 @@
 {
-  "country" : "Congo - Kinshasa",
+  "country": "Congo - Kinshasa",
-  "countryCode" : "CD",
+  "countryCode": "CD",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.77.220.0/22", "41.78.192.0/21", "41.79.232.0/22", "41.189.192.0/19", "41.190.80.0/22", "41.190.232.0/22", "41.215.252.0/22", "41.222.196.0/22", "41.222.216.0/22", "41.223.104.0/22", "41.243.0.0/16", "45.221.4.0/22", "102.23.116.0/22", "102.36.144.0/24", "102.36.168.0/22", "102.36.180.0/24", "102.64.76.0/22", "102.67.60.0/22", "102.68.56.0/21", "102.68.152.0/22", "102.69.180.0/22", "102.135.176.0/21", "102.202.248.0/22", "102.203.4.0/22", "102.204.126.0/24", "102.205.123.0/24", "102.205.208.0/22", "102.206.8.0/24", "102.206.64.0/22", "102.206.156.0/22", "102.206.240.0/22", "102.207.144.0/23", "102.207.190.0/24", "102.207.248.0/23", "102.208.120.0/22", "102.209.212.0/22", "102.210.164.0/22", "102.210.170.0/24", "102.210.253.0/24", "102.212.12.0/24", "102.212.212.0/22", "102.213.120.0/22", "102.213.196.0/22", "102.216.240.0/22", "102.217.16.0/22", "102.217.140.0/22", "102.220.56.0/22", "102.221.96.0/23", "102.222.228.0/22", "102.223.128.0/22", "102.223.176.0/22", "102.223.208.0/22", "154.72.52.0/22", "154.73.20.0/22", "156.0.88.0/22", "156.0.198.0/24", "164.160.48.0/22", "169.159.208.0/20", "169.239.72.0/22", "169.239.156.0/22", "169.239.212.0/22", "169.255.64.0/22", "169.255.188.0/22", "169.255.204.0/22", "192.145.188.0/22", "193.110.104.0/23", "196.1.137.0/24", "196.13.110.0/24", "196.41.67.0/24", "196.49.68.0/23", "196.49.76.0/23", "196.60.64.0/24", "196.60.78.0/24", "196.60.92.0/24", "196.61.72.0/22", "196.200.192.0/20", "196.216.216.0/23", "196.223.28.0/24", "197.149.184.0/22", "197.157.208.0/22", "197.189.0.0/17", "197.215.220.0/22", "197.231.252.0/22" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:43f8:3c0::/47", "2001:43f8:1460::/48", "2001:43ff:6000::/48", "2c0f:8a0::/32", "2c0f:e00::/28", "2c0f:fc0::/32", "2c0f:19c0::/32", "2c0f:4400::/32", "2c0f:5bc0::/32", "2c0f:60c0::/32", "2c0f:6340::/32", "2c0f:6580::/32", "2c0f:7800::/32", "2c0f:ea70::/32", "2c0f:eac8::/32", "2c0f:ebb0::/32", "2c0f:eca0::/32", "2c0f:eca8::/32", "2c0f:ed00::/32", "2c0f:ee08::/32", "2c0f:f558::/32", "2c0f:f978::/32", "2c0f:ff10::/32" ]
  "prefixes" : {
    "ipv4" : [
      "41.77.220.0/22",
      "41.78.192.0/21",
      "41.79.232.0/22",
      "41.189.192.0/19",
      "41.190.80.0/22",
      "41.190.232.0/22",
      "41.215.252.0/22",
      "41.222.196.0/22",
      "41.222.216.0/22",
      "41.223.104.0/22",
      "41.243.0.0/16",
      "45.221.4.0/22",
      "102.23.116.0/22",
      "102.36.144.0/24",
      "102.36.168.0/22",
      "102.36.180.0/24",
      "102.64.76.0/22",
      "102.67.60.0/22",
      "102.68.56.0/21",
      "102.68.152.0/22",
      "102.69.180.0/22",
      "102.135.176.0/21",
      "102.204.126.0/24",
      "102.205.123.0/24",
      "102.205.208.0/22",
      "102.206.8.0/24",
      "102.206.64.0/22",
      "102.206.156.0/22",
      "102.206.240.0/22",
      "102.207.144.0/23",
      "102.207.190.0/24",
      "102.207.248.0/23",
      "102.208.120.0/22",
      "102.209.212.0/22",
      "102.210.164.0/22",
      "102.210.170.0/24",
      "102.210.253.0/24",
      "102.212.12.0/24",
      "102.212.212.0/22",
      "102.213.120.0/22",
      "102.213.196.0/22",
      "102.216.240.0/22",
      "102.217.16.0/22",
      "102.217.140.0/22",
      "102.220.56.0/22",
      "102.221.96.0/23",
      "102.222.228.0/22",
      "102.223.128.0/22",
      "102.223.176.0/22",
      "102.223.208.0/22",
      "154.72.52.0/22",
      "154.73.20.0/22",
      "156.0.88.0/22",
      "156.0.198.0/24",
      "164.160.48.0/22",
      "169.159.208.0/20",
      "169.239.72.0/22",
      "169.239.156.0/22",
      "169.239.212.0/22",
      "169.255.64.0/22",
      "169.255.188.0/22",
      "169.255.204.0/22",
      "192.145.188.0/22",
      "193.110.104.0/23",
      "196.1.137.0/24",
      "196.13.110.0/24",
      "196.41.67.0/24",
      "196.49.68.0/23",
      "196.49.76.0/23",
      "196.60.64.0/24",
      "196.60.78.0/24",
      "196.60.92.0/24",
      "196.61.72.0/22",
      "196.200.192.0/20",
      "196.216.216.0/23",
      "196.223.28.0/24",
      "197.149.184.0/22",
      "197.157.208.0/22",
      "197.189.0.0/17",
      "197.215.220.0/22",
      "197.231.252.0/22"
    ],
    "ipv6" : [
      "2001:43f8:3c0::/47",
      "2001:43f8:1460::/48",
      "2001:43ff:6000::/48",
      "2c0f:e00::/28",
      "2c0f:fc0::/32",
      "2c0f:19c0::/32",
      "2c0f:4400::/32",
      "2c0f:5bc0::/32",
      "2c0f:60c0::/32",
      "2c0f:6340::/32",
      "2c0f:6580::/32",
      "2c0f:7800::/32",
      "2c0f:ea70::/32",
      "2c0f:eac8::/32",
      "2c0f:ebb0::/32",
      "2c0f:eca0::/32",
      "2c0f:eca8::/32",
      "2c0f:ed00::/32",
      "2c0f:ee08::/32",
      "2c0f:f558::/32",
      "2c0f:f978::/32",
      "2c0f:ff10::/32"
    ]
  }
 }
--- a/country/cd/ipv4-aggregated.txt
+++ b/country/cd/ipv4-aggregated.txt
@ -25,6 +25,8 @@
 102.68.152.0/22
 102.69.180.0/22
 102.135.176.0/21
 102.202.248.0/22
 102.203.4.0/22
 102.204.126.0/24
 102.205.123.0/24
 102.205.208.0/22
--- a/country/cd/ipv6-aggregated.txt
+++ b/country/cd/ipv6-aggregated.txt
@ -6,6 +6,7 @@
 2001:43f8:3c0::/47
 2001:43f8:1460::/48
 2001:43ff:6000::/48
 2c0f:8a0::/32
 2c0f:e00::/28
 2c0f:fc0::/32
 2c0f:19c0::/32
--- a/country/cf/aggregated.json
+++ b/country/cf/aggregated.json
@ -1,19 +1,10 @@
 {
-  "country" : "Central African Republic",
+  "country": "Central African Republic",
-  "countryCode" : "CF",
+  "countryCode": "CF",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.78.120.0/22", "41.223.184.0/22", "102.205.60.0/23", "169.239.96.0/22", "197.242.176.0/21" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ ]
  "prefixes" : {
    "ipv4" : [
      "41.78.120.0/22",
      "41.223.184.0/22",
      "102.205.60.0/23",
      "169.239.96.0/22",
      "197.242.176.0/21"
    ],
    "ipv6" : [ ]
  }
 }
--- a/country/cg/aggregated.json
+++ b/country/cg/aggregated.json
@ -1,47 +1,10 @@
 {
-  "country" : "Congo - Brazzaville",
+  "country": "Congo - Brazzaville",
-  "countryCode" : "CG",
+  "countryCode": "CG",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.75.64.0/20", "102.64.116.0/22", "102.129.64.0/19", "102.141.0.0/18", "102.204.124.0/24", "102.209.72.0/22", "102.213.232.0/22", "102.220.244.0/22", "102.223.220.0/22", "160.113.0.0/16", "164.160.16.0/22", "169.255.72.0/22", "169.255.120.0/22", "196.43.240.0/24", "196.49.56.0/24", "196.49.60.0/24", "196.60.56.0/24", "196.223.32.0/24", "197.149.136.0/22", "197.157.252.0/22", "197.214.128.0/17", "197.255.176.0/20" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:43f8:6a0::/46", "2001:43fc:f000::/48", "2c0f:1180::/32", "2c0f:7600::/32", "2c0f:ead8::/32", "2c0f:ef58::/32", "2c0f:f048::/32", "2c0f:f220::/32", "2c0f:f568::/32", "2c0f:f920::/32" ]
  "prefixes" : {
    "ipv4" : [
      "41.75.64.0/20",
      "102.64.116.0/22",
      "102.129.64.0/19",
      "102.141.0.0/18",
      "102.204.124.0/24",
      "102.209.72.0/22",
      "102.213.232.0/22",
      "102.220.244.0/22",
      "102.223.220.0/22",
      "160.113.0.0/16",
      "164.160.16.0/22",
      "169.255.72.0/22",
      "169.255.120.0/22",
      "196.43.240.0/24",
      "196.49.56.0/24",
      "196.49.60.0/24",
      "196.60.56.0/24",
      "196.223.32.0/24",
      "197.149.136.0/22",
      "197.157.252.0/22",
      "197.214.128.0/17",
      "197.255.176.0/20"
    ],
    "ipv6" : [
      "2001:43f8:6a0::/46",
      "2001:43fc:f000::/48",
      "2c0f:1180::/32",
      "2c0f:7600::/32",
      "2c0f:ead8::/32",
      "2c0f:ef58::/32",
      "2c0f:f048::/32",
      "2c0f:f220::/32",
      "2c0f:f568::/32",
      "2c0f:f920::/32"
    ]
  }
 }
--- a/country/ch/aggregated.json
+++ b/country/ch/aggregated.json
--- a/country/ch/ipv4-aggregated.txt
+++ b/country/ch/ipv4-aggregated.txt
@ -30,16 +30,19 @@
 5.153.240.0/21
 5.154.170.0/24
 5.154.186.0/24
 5.159.193.0/24
 5.159.194.0/24
 5.172.128.0/20
 5.180.116.0/22
 5.180.132.0/22
 5.181.13.0/24
 5.182.61.0/24
 5.182.62.0/24
 5.182.248.0/22
 5.183.0.0/21
 5.187.36.0/23
 5.187.56.0/21
 5.226.144.0/21
 5.249.168.0/21
 5.252.136.0/22
 5.253.208.0/22
 5.255.56.0/24
@ -116,7 +119,6 @@
 45.88.24.0/22
 45.89.0.0/22
 45.91.204.0/22
 45.91.228.0/24
 45.92.108.0/22
 45.93.88.0/22
 45.94.88.0/22
@ -138,6 +140,7 @@
 45.142.224.0/22
 45.143.124.0/22
 45.143.156.0/23
 45.143.188.0/22
 45.143.212.0/22
 45.144.20.0/22
 45.146.194.0/23
@ -149,7 +152,7 @@
 45.149.236.0/22
 45.150.248.0/22
 45.151.84.0/23
-45.151.212.0/22
+45.151.212.0/23
 45.153.89.0/24
 45.153.136.0/22
 45.154.200.0/22
@ -235,6 +238,7 @@
 62.106.93.0/24
 62.108.128.0/19
 62.121.192.0/18
 62.129.136.0/23
 62.133.56.0/24
 62.164.181.0/24
 62.164.185.0/24
@ -288,7 +292,9 @@
 79.135.104.0/22
 79.141.80.0/20
 79.142.128.0/20
 80.47.32.0/19
 80.67.144.0/20
 80.73.252.0/24
 80.74.128.0/19
 80.75.112.0/20
 80.75.192.0/20
@ -301,6 +307,7 @@
 80.86.192.0/20
 80.89.208.0/20
 80.94.144.0/20
 80.173.148.0/22
 80.208.128.0/18
 80.218.0.0/15
 80.241.96.0/20
@ -317,6 +324,8 @@
 81.23.64.0/20
 81.27.86.0/24
 81.62.0.0/15
 81.85.56.0/24
 81.85.88.0/22
 81.88.176.0/20
 81.90.184.0/22
 81.92.96.0/20
@ -356,7 +365,8 @@
 84.16.64.0/19
 84.20.32.0/19
 84.55.192.0/18
-84.72.0.0/14
+84.72.0.0/15
 84.74.0.0/16
 84.226.0.0/15
 84.234.16.0/20
 84.241.64.0/18
@ -366,6 +376,7 @@
 84.254.96.0/20
 85.0.0.0/13
 85.8.128.0/24
 85.31.144.0/22
 85.90.0.0/19
 85.118.216.0/21
 85.119.0.0/21
@ -475,6 +486,7 @@
 91.198.154.0/24
 91.198.173.0/24
 91.198.229.0/24
 91.198.230.0/24
 91.199.66.0/24
 91.199.76.0/24
 91.199.85.0/24
@ -520,7 +532,6 @@
 91.209.169.0/24
 91.209.170.0/24
 91.209.204.0/24
 91.210.70.0/24
 91.211.1.0/24
 91.212.29.0/24
 91.212.43.0/24
@ -544,7 +555,6 @@
 91.213.159.0/24
 91.213.171.0/24
 91.213.194.0/24
 91.213.202.0/24
 91.213.227.0/24
 91.214.168.0/22
 91.214.188.0/22
@ -559,7 +569,6 @@
 91.218.38.0/24
 91.218.175.0/24
 91.220.23.0/24
 91.220.40.0/24
 91.220.62.0/24
 91.220.64.0/24
 91.220.77.0/24
@ -589,6 +598,7 @@
 91.229.102.0/23
 91.229.140.0/24
 91.230.140.0/23
 91.230.216.0/24
 91.230.249.0/24
 91.231.204.0/24
 91.231.232.0/24
@ -604,7 +614,6 @@
 91.238.144.0/24
 91.238.226.0/24
 91.239.52.0/24
 91.239.75.0/24
 91.240.18.0/23
 91.245.160.0/20
 91.245.218.0/24
@ -668,6 +677,7 @@
 94.156.200.0/22
 94.158.28.0/22
 94.176.192.0/23
 94.177.26.0/24
 94.177.100.0/22
 94.177.122.0/24
 94.177.140.0/22
@ -678,8 +688,11 @@
 94.231.80.0/20
 94.244.192.0/18
 94.247.216.0/21
 95.36.96.0/21
 95.128.32.0/21
 95.128.80.0/21
 95.128.157.0/24
 95.128.199.0/24
 95.130.200.0/21
 95.143.48.0/20
 95.152.64.0/18
@ -729,6 +742,7 @@
 129.194.0.0/15
 130.59.0.0/16
 130.60.0.0/16
 130.78.96.0/20
 130.82.0.0/16
 130.92.0.0/16
 130.125.0.0/16
@ -736,7 +750,9 @@
 131.102.0.0/16
 131.117.0.0/17
 131.152.0.0/16
 131.222.200.0/24
 134.21.0.0/16
 134.82.64.0/20
 134.90.216.0/21
 136.144.20.0/23
 136.144.36.0/22
@ -745,7 +761,8 @@
 137.62.0.0/16
 137.138.0.0/16
 137.156.0.0/16
-138.81.0.0/16
+138.81.0.0/17
 138.81.128.0/18
 138.124.0.0/17
 138.124.154.0/23
 138.124.176.0/24
@ -767,11 +784,12 @@
 139.28.96.0/22
 139.149.0.0/16
 139.178.0.0/18
 141.171.0.0/16
 141.195.80.0/20
 141.249.0.0/16
 142.228.10.0/24
 143.180.0.0/16
 143.223.96.0/22
 143.246.140.0/22
 144.2.64.0/18
 144.85.0.0/16
 144.178.107.0/24
@ -801,7 +819,6 @@
 146.247.8.0/21
 146.248.0.0/16
 147.60.0.0/16
 147.75.128.0/20
 147.78.136.0/22
 147.78.192.0/22
 147.78.208.0/22
@ -818,6 +835,7 @@
 149.133.0.0/16
 150.205.0.0/16
 150.213.0.0/16
 150.251.56.0/23
 151.120.0.0/16
 151.145.192.0/19
 151.183.0.0/16
@ -826,11 +844,12 @@
 152.88.0.0/16
 152.89.80.0/22
 152.96.0.0/16
-153.51.0.0/17
+153.75.48.0/20
 153.75.128.0/19
 153.92.41.0/24
 153.92.47.0/24
 153.108.0.0/15
-154.14.0.0/15
+155.2.64.0/18
 155.2.224.0/19
 155.66.0.0/16
 155.105.0.0/16
@ -896,6 +915,7 @@
 161.20.0.0/16
 161.62.0.0/16
 161.78.0.0/16
 161.104.192.0/19
 162.12.200.0/22
 162.21.0.0/16
 162.23.0.0/16
@ -953,10 +973,12 @@
 178.237.80.0/20
 178.238.0.0/22
 178.238.160.0/20
 178.239.38.0/24
 178.250.24.0/21
 178.250.56.0/21
 178.250.128.0/21
 178.251.124.0/22
 179.237.64.0/18
 185.0.30.0/23
 185.0.40.0/26
 185.1.59.0/24
@ -971,14 +993,17 @@
 185.2.200.0/22
 185.5.32.0/22
 185.5.56.0/22
 185.5.131.0/24
 185.6.168.0/22
 185.7.213.0/24
 185.8.208.0/22
 185.10.52.0/22
 185.10.224.0/22
 185.10.242.0/24
 185.11.56.0/22
 185.11.168.0/22
-185.12.4.0/22
+185.12.4.0/23
 185.12.6.0/24
 185.12.128.0/22
 185.14.156.0/22
 185.15.137.0/24
@ -1022,7 +1047,6 @@
 185.35.60.0/22
 185.35.252.0/22
 185.36.220.0/22
 185.36.224.0/22
 185.37.72.0/22
 185.38.64.0/22
 185.39.32.0/22
@ -1063,6 +1087,7 @@
 185.58.128.0/22
 185.59.52.0/22
 185.60.52.0/22
 185.60.180.0/23
 185.62.80.0/22
 185.62.104.0/22
 185.62.168.0/22
@ -1173,6 +1198,7 @@
 185.96.76.0/22
 185.97.100.0/22
 185.97.136.0/22
 185.98.24.0/24
 185.98.28.0/22
 185.98.72.0/22
 185.98.120.0/22
@ -1197,7 +1223,6 @@
 185.110.72.0/22
 185.110.88.0/22
 185.110.100.0/22
 185.110.152.0/22
 185.110.184.0/22
 185.110.196.0/22
 185.110.220.0/22
@ -1227,6 +1252,7 @@
 185.125.196.0/22
 185.125.212.0/22
 185.126.220.0/22
 185.127.43.0/24
 185.127.112.0/22
 185.127.172.0/22
 185.127.204.0/22
@ -1298,6 +1324,7 @@
 185.165.128.0/22
 185.165.208.0/22
 185.166.80.0/22
 185.166.93.0/24
 185.166.96.0/22
 185.166.192.0/22
 185.167.4.0/22
@ -1323,6 +1350,7 @@
 185.173.128.0/24
 185.174.140.0/22
 185.174.216.0/22
 185.176.134.0/24
 185.176.224.0/22
 185.176.236.0/22
 185.177.60.0/22
@ -1344,7 +1372,6 @@
 185.187.120.0/22
 185.187.228.0/22
 185.188.15.0/24
 185.188.18.0/24
 185.188.44.0/22
 185.188.52.0/22
 185.188.152.0/22
@ -1456,6 +1483,7 @@
 185.235.156.0/22
 185.235.188.0/22
 185.237.24.0/22
 185.237.93.0/24
 185.237.108.0/22
 185.237.112.0/21
 185.237.120.0/22
@ -1848,7 +1876,6 @@
 193.110.20.0/22
 193.110.85.0/24
 193.110.95.0/24
 193.111.92.0/24
 193.111.202.0/23
 193.111.233.0/24
 193.128.7.0/24
@ -1915,6 +1942,7 @@
 193.164.24.0/22
 193.164.145.0/24
 193.164.244.0/23
 193.168.165.0/24
 193.168.212.0/22
 193.169.2.0/23
 193.169.82.0/23
@ -1923,7 +1951,6 @@
 193.169.186.0/23
 193.178.156.0/23
 193.188.8.0/22
 193.188.134.112/29
 193.188.224.0/20
 193.188.240.0/21
 193.192.224.0/19
@ -1931,6 +1958,7 @@
 193.194.138.0/23
 193.200.5.0/24
 193.200.79.0/24
 193.200.115.0/24
 193.200.144.0/24
 193.200.157.0/24
 193.200.181.0/24
@ -1939,6 +1967,7 @@
 193.200.196.0/24
 193.200.220.0/24
 193.200.223.0/24
 193.201.22.0/24
 193.201.33.0/24
 193.201.122.0/23
 193.201.150.192/26
@ -1989,6 +2018,7 @@
 193.223.254.0/23
 193.227.101.0/24
 193.227.224.0/23
 193.227.226.0/24
 193.228.103.0/24
 193.228.197.0/24
 193.228.198.0/24
@ -2102,6 +2132,7 @@
 194.5.228.0/22
 194.6.160.0/19
 194.6.247.0/24
 194.8.15.0/24
 194.8.78.0/23
 194.9.12.0/23
 194.9.34.0/23
@ -2134,7 +2165,6 @@
 194.11.218.0/23
 194.11.221.0/24
 194.11.222.0/23
 194.11.228.0/23
 194.11.232.0/23
 194.11.236.0/23
 194.11.238.0/24
@ -2197,7 +2227,6 @@
 194.56.0.0/18
 194.56.64.0/21
 194.56.96.0/19
 194.56.128.0/20
 194.56.152.0/21
 194.56.160.0/21
 194.56.174.0/23
@ -2244,6 +2273,7 @@
 194.116.180.0/23
 194.116.196.0/23
 194.116.210.0/23
 194.116.254.0/23
 194.117.50.64/26
 194.117.78.0/24
 194.117.90.0/24
@ -2346,7 +2376,6 @@
 194.182.160.0/19
 194.187.88.0/22
 194.191.0.0/16
 194.204.64.0/19
 194.209.0.0/16
 194.213.7.0/24
 194.230.0.0/16
@ -2387,9 +2416,11 @@
 195.48.0.0/16
 195.49.0.0/17
 195.60.80.192/27
 195.60.91.128/26
 195.60.93.128/26
 195.60.192.0/22
 195.62.86.0/23
 195.64.114.0/24
 195.64.128.0/23
 195.64.134.0/23
 195.64.138.0/23
@ -2475,7 +2506,6 @@
 195.234.136.0/24
 195.234.163.0/24
 195.234.176.0/24
 195.234.180.0/24
 195.234.224.0/22
 195.238.253.0/24
 195.242.84.0/23
@ -2494,6 +2524,8 @@
 195.250.44.0/23
 195.250.46.0/24
 195.250.52.0/24
 195.253.224.0/22
 195.253.252.0/22
 195.254.144.0/23
 195.254.186.0/23
 198.99.148.0/24
@ -2513,6 +2545,7 @@
 199.53.0.0/16
 199.91.16.0/20
 199.103.106.0/24
 199.104.14.0/23
 202.20.98.0/24
 202.20.111.0/24
 202.38.4.0/23
@ -2541,8 +2574,8 @@
 212.41.64.0/18
 212.41.192.0/19
 212.42.128.0/19
 212.43.128.0/19
 212.45.192.0/19
 212.47.53.0/24
 212.47.160.0/19
 212.51.128.0/19
 212.55.192.0/19
@ -2593,6 +2626,8 @@
 213.167.224.0/22
 213.170.212.0/22
 213.173.40.0/21
 213.177.189.0/24
 213.177.190.0/24
 213.180.160.0/19
 213.184.88.0/22
 213.188.32.0/19
@ -2648,3 +2683,4 @@
 217.197.101.0/24
 217.197.128.0/21
 217.197.208.0/20
 220.42.0.0/15
--- a/country/ch/ipv6-aggregated.txt
+++ b/country/ch/ipv6-aggregated.txt
@ -42,7 +42,9 @@
 2001:678:ec4::/48
 2001:678:f9c::/48
 2001:678:fbc::/48
 2001:678:12a4::/48
 2001:67c:8::/48
 2001:67c:88::/48
 2001:67c:94::/48
 2001:67c:c0::/48
 2001:67c:c8::/48
@ -73,6 +75,7 @@
 2001:67c:500::/48
 2001:67c:534::/48
 2001:67c:58c::/48
 2001:67c:5b0::/48
 2001:67c:5d8::/48
 2001:67c:5dc::/48
 2001:67c:638::/48
@ -87,12 +90,6 @@
 2001:67c:920::/48
 2001:67c:938::/48
 2001:67c:990::/48
 2001:67c:99c::/48
 2001:67c:9a0::/48
 2001:67c:9a4::/48
 2001:67c:9a8::/48
 2001:67c:9ac::/48
 2001:67c:9b0::/48
 2001:67c:a7c::/48
 2001:67c:ac0::/48
 2001:67c:bf4::/48
@ -124,7 +121,6 @@
 2001:67c:15dc::/48
 2001:67c:16dc::/48
 2001:67c:16e0::/48
 2001:67c:1730::/48
 2001:67c:1780::/48
 2001:67c:17a4::/48
 2001:67c:17b0::/48
@ -135,6 +131,7 @@
 2001:67c:19e0::/48
 2001:67c:19fc::/48
 2001:67c:1bd0::/48
 2001:67c:2030::/48
 2001:67c:2068::/48
 2001:67c:20ac::/48
 2001:67c:20f8::/48
@ -145,12 +142,14 @@
 2001:67c:22dc::/48
 2001:67c:22e8::/48
 2001:67c:2350::/48
 2001:67c:23b4::/48
 2001:67c:2488::/48
 2001:67c:2540::/48
 2001:67c:258c::/48
 2001:67c:2614::/48
 2001:67c:2640::/48
 2001:67c:2648::/48
 2001:67c:264c::/48
 2001:67c:273c::/48
 2001:67c:2904::/48
 2001:67c:2984::/48
@ -197,6 +196,7 @@
 2001:7f8:14a::/48
 2001:7f8:15c::/48
 2001:7f8:16c::/48
 2001:7f8:172::/48
 2001:8a8::/29
 2001:8e0::/29
 2001:918::/29
@ -234,7 +234,7 @@
 2a00:10c0::/32
 2a00:1128::/32
 2a00:17c8::/29
-2a00:17e0::/32
+2a00:17e0::/29
 2a00:1840::/32
 2a00:41c0::/29
 2a00:4740::/32
@ -303,8 +303,7 @@
 2a01:528::/29
 2a01:5d8::/29
 2a01:6a8::/32
-2a01:760::/29
+2a01:760::/28
 2a01:768::/32
 2a01:41c0::/32
 2a01:4540::/29
 2a01:4640::/29
@ -338,7 +337,6 @@
 2a01:b540::/29
 2a01:b7c0::/29
 2a01:b920::/32
 2a01:ba40::/32
 2a01:bd00::/32
 2a01:bd20::/32
 2a01:bf00::/32
@ -444,9 +442,11 @@
 2a03:9660::/32
 2a03:97a0::/32
 2a03:a360::/32
 2a03:abc0::/29
 2a03:b240::/29
 2a03:b680::/29
 2a03:b940::/32
 2a03:b980::/29
 2a03:bd80::/29
 2a03:c8c0::/29
 2a03:d380::/32
@ -465,7 +465,6 @@
 2a04:5640::/29
 2a04:5a40::/29
 2a04:5c80::/29
 2a04:6d40::/29
 2a04:7640::/29
 2a04:97c0::/29
 2a04:a2c0::/29
@ -484,6 +483,7 @@
 2a04:f340::/29
 2a05:80::/29
 2a05:d00::/29
 2a05:1180::/32
 2a05:1280::/29
 2a05:14c0::/29
 2a05:1e00::/29
@ -496,6 +496,7 @@
 2a05:4740::/29
 2a05:4880::/29
 2a05:51c0::/29
 2a05:53c0::/29
 2a05:5d00::/29
 2a05:61c0::/29
 2a05:6a00::/29
@ -533,7 +534,6 @@
 2a06:3f40::/29
 2a06:5100::/29
 2a06:56c0::/29
 2a06:5880::/29
 2a06:6400::/29
 2a06:6540::/29
 2a06:6700::/29
@ -553,7 +553,6 @@
 2a06:e880::/29
 2a06:fa00::/29
 2a07:600::/29
 2a07:2140::/29
 2a07:2640::/30
 2a07:2900::/27
 2a07:2d40::/29
@ -567,7 +566,6 @@
 2a07:6cc0::/29
 2a07:6d80::/29
 2a07:7940::/29
 2a07:7980::/29
 2a07:7a80::/29
 2a07:7cc0::/29
 2a07:8700::/29
@ -582,10 +580,10 @@
 2a07:c180::/29
 2a07:dfc0::/29
 2a07:e100::/32
 2a07:e640::/29
 2a09:4c0::/29
 2a09:900::/29
 2a09:f00::/29
 2a09:1640::/29
 2a09:2200::/29
 2a09:2440::/29
 2a09:2940::/29
@ -633,6 +631,7 @@
 2a0a:de00::/32
 2a0a:df80::/29
 2a0a:e5c0::/29
 2a0a:e7c0::/32
 2a0a:fb00::/32
 2a0b:80::/29
 2a0b:1200::/29
@ -660,6 +659,7 @@
 2a0b:6fc0::/29
 2a0b:76c0::/32
 2a0b:7800::/29
 2a0b:8300::/29
 2a0b:83c0::/29
 2a0b:9640::/29
 2a0b:9d40::/29
@ -715,6 +715,7 @@
 2a0d:5240::/29
 2a0d:5380::/29
 2a0d:6580::/29
 2a0d:7a00::/29
 2a0d:7b40::/29
 2a0d:7c00::/29
 2a0d:8580::/32
@ -735,7 +736,6 @@
 2a0d:ed80::/32
 2a0e:1080::/29
 2a0e:1540::/29
 2a0e:1ac0::/29
 2a0e:2400::/29
 2a0e:2b80::/32
 2a0e:3080::/29
@ -770,6 +770,7 @@
 2a0f:6cc0::/29
 2a0f:7a00::/29
 2a0f:7e00::/29
 2a0f:8140::/29
 2a0f:9180::/29
 2a0f:98c0::/29
 2a0f:9900::/29
@ -831,6 +832,8 @@
 2a12:1fc0::/29
 2a12:44c0::/29
 2a12:5a40::/29
 2a12:5ec0::/32
 2a12:62c0::/29
 2a12:87c0::/29
 2a12:9a40::/29
 2a12:af80::/29
@ -863,7 +866,6 @@
 2a14:5040::/29
 2a14:5300::/32
 2a14:5440::/29
 2a14:6080::/29
 2a14:6640::/29
 2a14:6d40::/29
 2a14:8080::/29
--- a/country/ci/aggregated.json
+++ b/country/ci/aggregated.json
@ -1,263 +1,10 @@
 {
-  "country" : "Côte d’Ivoire",
+  "country": "Côte d’Ivoire",
-  "countryCode" : "CI",
+  "countryCode": "CI",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "41.66.0.0/18", "41.67.64.0/20", "41.67.88.0/21", "41.67.96.0/19", "41.73.16.0/20", "41.74.96.0/20", "41.75.16.0/20", "41.75.32.0/20", "41.76.136.0/21", "41.76.160.0/21", "41.76.232.0/21", "41.77.160.0/21", "41.77.216.0/22", "41.77.248.0/21", "41.78.12.0/22", "41.78.44.0/22", "41.78.68.0/22", "41.78.92.0/22", "41.78.104.0/22", "41.78.132.0/22", "41.78.144.0/22", "41.78.152.0/22", "41.78.160.0/22", "41.78.176.0/21", "41.78.236.0/22", "41.79.0.0/22", "41.79.12.0/22", "41.79.84.0/22", "41.79.100.0/22", "41.79.112.0/22", "41.79.140.0/22", "41.84.160.0/19", "41.87.32.0/19", "41.139.64.0/18", "41.189.32.0/19", "41.189.96.0/19", "41.189.128.0/19", "41.190.160.0/19", "41.190.192.0/19", "41.190.240.0/22", "41.190.252.0/22", "41.191.0.0/18", "41.191.68.0/22", "41.191.92.0/22", "41.191.108.0/22", "41.191.112.0/22", "41.191.208.0/22", "41.202.64.0/18", "41.205.160.0/19", "41.206.64.0/19", "41.206.224.0/19", "41.207.0.0/19", "41.207.192.0/19", "41.207.224.0/22", "41.209.128.0/18", "41.211.192.0/18", "41.215.192.0/20", "41.215.224.0/21", "41.216.0.0/19", "41.216.240.0/20", "41.217.196.0/22", "41.217.208.0/22", "41.217.248.0/21", "41.219.192.0/18", "41.221.112.0/20", "41.222.80.0/21", "41.223.0.0/22", "41.223.12.0/22", "41.223.68.0/22", "41.223.188.0/22", "41.223.208.0/22", "41.242.132.0/22", "41.242.176.0/20", "41.245.0.0/17", "45.221.27.0/24", "62.193.160.0/19", "81.22.64.0/19", "102.22.100.0/22", "102.67.192.0/18", "102.130.224.0/21", "102.135.184.0/22", "102.135.191.0/24", "102.136.0.0/14", "102.201.192.0/23", "102.201.210.0/24", "102.203.40.0/22", "102.205.12.0/22", "102.205.72.0/23", "102.206.120.0/22", "102.207.0.0/22", "102.207.8.0/21", "102.208.128.0/22", "102.208.172.0/22", "102.209.216.0/21", "102.210.16.0/22", "102.210.80.0/22", "102.210.208.0/24", "102.211.232.0/22", "102.212.4.0/22", "102.212.188.0/22", "102.213.112.0/22", "102.213.172.0/22", "102.215.224.0/21", "102.215.252.0/22", "102.216.80.0/22", "102.216.100.0/22", "102.216.204.0/22", "102.217.104.0/22", "102.221.152.0/24", "102.222.82.0/23", "102.223.28.0/22", "102.223.249.0/24", "102.223.252.0/23", "105.235.0.0/17", "154.0.24.0/21", "154.0.144.0/21", "154.65.56.0/22", "154.66.96.0/22", "154.66.116.0/22", "154.66.212.0/22", "154.68.0.0/18", "154.71.32.0/19", "154.71.64.0/18", "154.72.0.0/22", "154.72.112.0/20", "154.73.100.0/22", "154.119.128.0/20", "154.232.0.0/14", "156.0.204.0/22", "160.20.213.0/24", "160.20.217.0/24", "160.20.221.0/24", "160.20.226.0/23", "160.120.0.0/16", "160.154.0.0/15", "160.226.178.0/24", "160.238.11.0/24", "160.238.50.0/24", "160.238.57.0/24", "160.238.101.0/24", "164.160.32.0/22", "164.160.40.0/22", "164.160.100.0/22", "169.239.64.0/22", "169.255.16.0/22", "169.255.84.0/22", "169.255.156.0/22", "192.12.110.0/24", "192.47.36.0/24", "192.51.240.0/24", "192.70.201.0/24", "192.75.236.0/24", "192.91.200.0/24", "192.145.176.0/22", "192.145.230.0/24", "193.17.215.0/24", "193.221.218.0/24", "195.166.224.0/19", "196.1.119.0/24", "196.3.180.0/22", "196.6.0.0/24", "196.6.200.0/24", "196.6.218.0/23", "196.10.0.0/24", "196.10.122.0/23", "196.10.137.0/24", "196.10.251.0/24", "196.13.191.0/24", "196.22.8.0/22", "196.29.208.0/20", "196.32.160.0/19", "196.32.228.0/23", "196.40.128.0/20", "196.41.75.0/24", "196.43.217.0/24", "196.43.227.0/24", "196.43.233.0/24", "196.43.245.0/24", "196.44.48.0/20", "196.45.0.0/20", "196.45.64.0/19", "196.45.240.0/20", "196.46.17.0/24", "196.46.24.0/24", "196.46.116.0/22", "196.47.128.0/18", "196.49.0.0/24", "196.180.0.0/14", "196.192.120.0/22", "196.192.125.0/24", "196.192.126.0/23", "196.192.128.0/21", "196.192.136.0/22", "196.200.208.0/20", "196.201.0.0/24", "196.201.12.0/22", "196.201.64.0/19", "196.201.160.0/19", "196.201.248.0/21", "196.216.171.0/24", "196.216.184.0/22", "196.216.204.0/24", "196.216.214.0/24", "196.216.226.0/23", "196.216.244.0/24", "196.216.254.0/24", "196.223.4.0/24", "196.223.11.0/24", "196.223.26.0/24", "196.223.46.0/24", "196.250.64.0/18", "197.148.192.0/19", "197.149.132.0/22", "197.149.140.0/22", "197.149.152.0/22", "197.149.164.0/22", "197.149.172.0/22", "197.155.208.0/20", "197.155.240.0/21", "197.157.236.0/22", "197.157.248.0/22", "197.159.192.0/18", "197.214.120.0/21", "197.215.224.0/20", "197.220.32.0/19", "197.231.212.0/22", "197.231.224.0/22", "197.231.240.0/22", "197.234.228.0/22", "197.234.248.0/21", "197.239.192.0/18", "197.242.208.0/20", "197.242.224.0/20", "213.136.96.0/19" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2001:42d8::/32", "2001:43f8:940::/47", "2001:43f8:b20::/48", "2001:43f8:b70::/48", "2001:43f8:14a0::/48", "2001:43f8:1630::/48", "2001:43ff:a000::/48", "2c0e:7f80::/27", "2c0f:1120::/32", "2c0f:4c40::/32", "2c0f:7c00::/32", "2c0f:e800::/32", "2c0f:ec60::/32", "2c0f:ecf0::/32", "2c0f:ef80::/32", "2c0f:f230::/32", "2c0f:f4d0::/32", "2c0f:f5d8::/32" ]
  "prefixes" : {
    "ipv4" : [
      "41.66.0.0/18",
      "41.67.64.0/20",
      "41.67.88.0/21",
      "41.67.96.0/19",
      "41.73.16.0/20",
      "41.74.96.0/20",
      "41.75.16.0/20",
      "41.75.32.0/20",
      "41.76.136.0/21",
      "41.76.160.0/21",
      "41.76.232.0/21",
      "41.77.160.0/21",
      "41.77.216.0/22",
      "41.77.248.0/21",
      "41.78.12.0/22",
      "41.78.44.0/22",
      "41.78.68.0/22",
      "41.78.92.0/22",
      "41.78.104.0/22",
      "41.78.132.0/22",
      "41.78.144.0/22",
      "41.78.152.0/22",
      "41.78.160.0/22",
      "41.78.176.0/21",
      "41.78.236.0/22",
      "41.79.0.0/22",
      "41.79.12.0/22",
      "41.79.84.0/22",
      "41.79.100.0/22",
      "41.79.112.0/22",
      "41.79.140.0/22",
      "41.84.160.0/19",
      "41.87.32.0/19",
      "41.139.64.0/18",
      "41.189.32.0/19",
      "41.189.96.0/19",
      "41.189.128.0/19",
      "41.190.160.0/19",
      "41.190.192.0/19",
      "41.190.240.0/22",
      "41.190.252.0/22",
      "41.191.0.0/18",
      "41.191.68.0/22",
      "41.191.92.0/22",
      "41.191.108.0/22",
      "41.191.112.0/22",
      "41.191.208.0/22",
      "41.202.64.0/18",
      "41.205.160.0/19",
      "41.206.64.0/19",
      "41.206.224.0/19",
      "41.207.0.0/19",
      "41.207.192.0/19",
      "41.207.224.0/22",
      "41.209.128.0/18",
      "41.211.192.0/18",
      "41.215.192.0/20",
      "41.215.224.0/21",
      "41.216.0.0/19",
      "41.216.240.0/20",
      "41.217.196.0/22",
      "41.217.208.0/22",
      "41.217.248.0/21",
      "41.219.192.0/18",
      "41.221.112.0/20",
      "41.222.80.0/21",
      "41.223.0.0/22",
      "41.223.12.0/22",
      "41.223.68.0/22",
      "41.223.188.0/22",
      "41.223.208.0/22",
      "41.242.132.0/22",
      "41.242.176.0/20",
      "41.245.0.0/17",
      "45.221.27.0/24",
      "62.193.160.0/19",
      "81.22.64.0/19",
      "102.22.100.0/22",
      "102.67.192.0/18",
      "102.130.224.0/21",
      "102.135.184.0/22",
      "102.135.191.0/24",
      "102.136.0.0/14",
      "102.205.12.0/22",
      "102.205.72.0/23",
      "102.206.120.0/22",
      "102.207.0.0/22",
      "102.207.8.0/21",
      "102.208.128.0/22",
      "102.208.172.0/22",
      "102.209.216.0/21",
      "102.210.16.0/22",
      "102.210.80.0/22",
      "102.210.208.0/24",
      "102.211.232.0/22",
      "102.212.4.0/22",
      "102.212.188.0/22",
      "102.213.112.0/22",
      "102.213.172.0/22",
      "102.215.224.0/21",
      "102.215.252.0/22",
      "102.216.80.0/22",
      "102.216.100.0/22",
      "102.216.204.0/22",
      "102.217.104.0/22",
      "102.221.152.0/24",
      "102.222.82.0/23",
      "102.223.28.0/22",
      "102.223.249.0/24",
      "102.223.252.0/23",
      "105.235.0.0/17",
      "154.0.24.0/21",
      "154.0.144.0/21",
      "154.65.56.0/22",
      "154.66.96.0/22",
      "154.66.116.0/22",
      "154.66.212.0/22",
      "154.68.0.0/18",
      "154.71.32.0/19",
      "154.71.64.0/18",
      "154.72.0.0/22",
      "154.72.112.0/20",
      "154.73.100.0/22",
      "154.119.128.0/20",
      "154.232.0.0/14",
      "156.0.204.0/22",
      "160.20.213.0/24",
      "160.20.217.0/24",
      "160.20.221.0/24",
      "160.20.226.0/23",
      "160.120.0.0/16",
      "160.154.0.0/15",
      "160.226.178.0/24",
      "160.238.11.0/24",
      "160.238.50.0/24",
      "160.238.57.0/24",
      "160.238.101.0/24",
      "164.160.32.0/22",
      "164.160.40.0/22",
      "164.160.100.0/22",
      "169.239.64.0/22",
      "169.255.16.0/22",
      "169.255.84.0/22",
      "169.255.156.0/22",
      "192.12.110.0/24",
      "192.47.36.0/24",
      "192.51.240.0/24",
      "192.70.201.0/24",
      "192.75.236.0/24",
      "192.91.200.0/24",
      "192.145.176.0/22",
      "192.145.230.0/24",
      "193.17.215.0/24",
      "193.221.218.0/24",
      "195.166.224.0/19",
      "196.1.119.0/24",
      "196.3.180.0/22",
      "196.6.0.0/24",
      "196.6.200.0/24",
      "196.6.218.0/23",
      "196.10.0.0/24",
      "196.10.122.0/23",
      "196.10.137.0/24",
      "196.10.251.0/24",
      "196.13.191.0/24",
      "196.22.8.0/22",
      "196.29.208.0/20",
      "196.32.160.0/19",
      "196.32.228.0/23",
      "196.40.128.0/20",
      "196.41.75.0/24",
      "196.43.217.0/24",
      "196.43.227.0/24",
      "196.43.233.0/24",
      "196.43.245.0/24",
      "196.44.48.0/20",
      "196.45.0.0/20",
      "196.45.64.0/19",
      "196.45.240.0/20",
      "196.46.17.0/24",
      "196.46.24.0/24",
      "196.46.116.0/22",
      "196.47.128.0/18",
      "196.49.0.0/24",
      "196.180.0.0/14",
      "196.192.120.0/22",
      "196.192.125.0/24",
      "196.192.126.0/23",
      "196.192.128.0/21",
      "196.192.136.0/22",
      "196.200.208.0/20",
      "196.201.0.0/24",
      "196.201.12.0/22",
      "196.201.64.0/19",
      "196.201.160.0/19",
      "196.201.248.0/21",
      "196.216.171.0/24",
      "196.216.184.0/22",
      "196.216.204.0/24",
      "196.216.214.0/24",
      "196.216.226.0/23",
      "196.216.244.0/24",
      "196.216.254.0/24",
      "196.223.4.0/24",
      "196.223.11.0/24",
      "196.223.26.0/24",
      "196.223.46.0/24",
      "196.250.64.0/18",
      "197.148.192.0/19",
      "197.149.132.0/22",
      "197.149.140.0/22",
      "197.149.152.0/22",
      "197.149.164.0/22",
      "197.149.172.0/22",
      "197.155.208.0/20",
      "197.155.240.0/21",
      "197.157.236.0/22",
      "197.157.248.0/22",
      "197.159.192.0/18",
      "197.214.120.0/21",
      "197.215.224.0/20",
      "197.220.32.0/19",
      "197.231.212.0/22",
      "197.231.224.0/22",
      "197.231.240.0/22",
      "197.234.228.0/22",
      "197.234.248.0/21",
      "197.239.192.0/18",
      "197.242.208.0/20",
      "197.242.224.0/20",
      "213.136.96.0/19"
    ],
    "ipv6" : [
      "2001:42d8::/32",
      "2001:43f8:940::/47",
      "2001:43f8:b20::/48",
      "2001:43f8:b70::/48",
      "2001:43f8:14a0::/48",
      "2001:43f8:1630::/48",
      "2001:43ff:a000::/48",
      "2c0e:7f80::/27",
      "2c0f:4c40::/32",
      "2c0f:7c00::/32",
      "2c0f:e800::/32",
      "2c0f:ec60::/32",
      "2c0f:ecf0::/32",
      "2c0f:ef80::/32",
      "2c0f:f230::/32",
      "2c0f:f4d0::/32",
      "2c0f:f5d8::/32"
    ]
  }
 }
--- a/country/ci/ipv4-aggregated.txt
+++ b/country/ci/ipv4-aggregated.txt
@ -86,6 +86,9 @@
 102.135.184.0/22
 102.135.191.0/24
 102.136.0.0/14
 102.201.192.0/23
 102.201.210.0/24
 102.203.40.0/22
 102.205.12.0/22
 102.205.72.0/23
 102.206.120.0/22
--- a/country/ci/ipv6-aggregated.txt
+++ b/country/ci/ipv6-aggregated.txt
@ -11,6 +11,7 @@
 2001:43f8:1630::/48
 2001:43ff:a000::/48
 2c0e:7f80::/27
 2c0f:1120::/32
 2c0f:4c40::/32
 2c0f:7c00::/32
 2c0f:e800::/32
--- a/country/ck/aggregated.json
+++ b/country/ck/aggregated.json
@ -1,19 +1,10 @@
 {
-  "country" : "Cook Islands",
+  "country": "Cook Islands",
-  "countryCode" : "CK",
+  "countryCode": "CK",
-  "delegationStatus" : [
+  "delegationStatus": [ "allocated", "assigned" ],
-    "allocated",
+  "exportMode": "aggregated",
-    "assigned"
+  "prefixes": {
-  ],
+    "ipv4": [ "116.199.200.0/23", "202.65.32.0/19" ],
-  "exportMode" : "aggregated",
+    "ipv6": [ "2401:4d20::/32", "2407:5800::/32" ]
  "prefixes" : {
    "ipv4" : [
      "116.199.200.0/23",
      "202.65.32.0/19"
    ],
    "ipv6" : [
      "2401:4d20::/32",
      "2407:5800::/32"
    ]
  }
 }
--- a/country/cl/aggregated.json
+++ b/country/cl/aggregated.json
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
trick77	4d61ffcc62	Update 20260915-0151	2026-09-15 03:51:21 +02:00
trick77	c372d67da6	Update 20260913-0150	2026-09-13 03:50:34 +02:00
trick77	a14272dbef	Update 20260912-0151	2026-09-12 03:51:08 +02:00
trick77	1b43de9b63	Update 20260911-0152	2026-09-11 03:52:05 +02:00
trick77	700c0c82b5	Update 20260910-0152	2026-09-10 03:53:02 +02:00
trick77	787cc187b4	Update 20260909-0153	2026-09-09 03:53:44 +02:00
trick77	8a47796717	Update 20260908-0152	2026-09-08 03:52:45 +02:00
trick77	7a25e84741	Update 20260907-0152	2026-09-07 03:52:09 +02:00
trick77	73b552aed2	Update 20260906-0155	2026-09-06 03:55:04 +02:00
trick77	99f5ba2b2f	Update 20260905-0156	2026-09-05 03:56:07 +02:00
trick77	1bbafd092c	Update 20260904-0157	2026-09-04 03:57:52 +02:00
trick77	10c84e0462	Update 20260903-0152	2026-09-03 03:52:39 +02:00
trick77	b7d39ecf23	Update 20260902-0150	2026-09-02 03:50:20 +02:00
trick77	1dc224416b	Update 20260901-0152	2026-09-01 03:52:13 +02:00
trick77	3307feda62	Update 20260830-0151	2026-08-30 03:51:05 +02:00
trick77	317fa560c7	Update 20260829-0150	2026-08-29 03:50:09 +02:00
trick77	7443b1e07c	Update 20260828-0155	2026-08-28 03:55:22 +02:00
trick77	82b8f97605	Update 20260827-0150	2026-08-27 03:50:40 +02:00
trick77	51bcbfa643	Update 20260826-0152	2026-08-26 03:52:12 +02:00
trick77	78e6fb11bd	Update 20260825-0151	2026-08-25 03:51:11 +02:00
trick77	e897fd695e	Update 20260824-2215	2026-08-25 00:15:49 +02:00
trick77	97013be8ba	Update 20260823-0153	2026-08-23 03:53:47 +02:00
trick77	565f340606	Update 20260822-0154	2026-08-22 03:54:53 +02:00
trick77	4fe5f1e437	Update 20260821-0156	2026-08-21 03:56:56 +02:00
trick77	4a878ed5b0	Update 20260820-0155	2026-08-20 03:55:40 +02:00
trick77	435aef84df	Update 20260819-0153	2026-08-19 03:53:59 +02:00
trick77	c602cebf85	Update 20260818-0153	2026-08-18 03:53:37 +02:00
trick77	d780475c88	Update 20260817-0154	2026-08-17 03:54:57 +02:00
trick77	4c76e8e001	Update 20260816-0154	2026-08-16 03:54:12 +02:00
trick77	02e7a6b302	Update 20260815-0157	2026-08-15 03:57:02 +02:00
trick77	3ef3c4eeb7	Update 20260814-0155	2026-08-14 03:55:43 +02:00
trick77	e0128ef606	Update 20260813-0208	2026-08-13 04:08:46 +02:00
trick77	797206a41b	Update 20260812-0153	2026-08-12 03:53:45 +02:00
trick77	faae33dce2	Update 20260811-0154	2026-08-11 03:54:29 +02:00
trick77	2a1540b85c	Update 20260809-0153	2026-08-09 03:53:13 +02:00
trick77	a2db74a1a9	Update 20260808-0152	2026-08-08 03:52:58 +02:00
trick77	ba25beb8df	Update 20260807-0156	2026-08-07 03:56:34 +02:00
trick77	147f9e2f2a	Update 20260806-0155	2026-08-06 03:55:15 +02:00
trick77	7d05e83d7a	Update 20260805-0204	2026-08-05 04:04:28 +02:00
trick77	0f52c1423b	Update 20260804-1104	2026-08-04 13:04:57 +02:00
trick77	dc9ef5b699	Update 20260802-0153	2026-08-02 03:53:25 +02:00
trick77	207d62ad60	Update 20260801-0153	2026-08-01 03:54:00 +02:00
trick77	545f263bac	Update 20260731-0154	2026-07-31 03:54:43 +02:00
trick77	dcfae9d0a4	Update 20260730-0159	2026-07-30 03:59:07 +02:00
trick77	938632d079	Update 20260729-0152	2026-07-29 03:52:28 +02:00
trick77	342b4a7d85	Update 20260728-0155	2026-07-28 03:55:57 +02:00
trick77	907924b2fb	Update 20260727-0156	2026-07-27 03:56:56 +02:00
trick77	d21f702aa7	Update 20260726-0208	2026-07-26 04:08:38 +02:00
trick77	cdeda12962	Update 20260725-0154	2026-07-25 03:54:22 +02:00
trick77	120f7b3326	Update 20260724-0156	2026-07-24 03:56:46 +02:00
trick77	201c8da310	Update 20260723-0159	2026-07-23 03:59:20 +02:00
trick77	780cf6f6cb	Update 20260722-0152	2026-07-22 03:52:33 +02:00
trick77	1ec080e86d	Update 20260721-0152	2026-07-21 03:52:07 +02:00
trick77	8e72dbb42c	Update 20260720-0214	2026-07-20 04:14:17 +02:00
trick77	b54cf06100	Update 20260719-0152	2026-07-19 03:52:31 +02:00
trick77	408e5eb652	Update 20260718-0155	2026-07-18 03:55:33 +02:00
trick77	550953b26d	Update 20260717-0156	2026-07-17 03:56:37 +02:00
trick77	c22eb5771f	Update 20260716-0152	2026-07-16 03:52:52 +02:00
trick77	204d5946ba	Update 20260715-0154	2026-07-15 03:54:36 +02:00
trick77	caaa371492	Update 20260714-0153	2026-07-14 03:53:13 +02:00
trick77	934dc97266	Update 20260712-0227	2026-07-12 04:28:01 +02:00
trick77	abb8fb405b	Update 20260711-0227	2026-07-11 04:27:27 +02:00
trick77	8245e60f2e	Update 20260710-0703	2026-07-10 09:03:07 +02:00
trick77	553f78e539	Update 20260710-0303	2026-07-10 05:03:11 +02:00
trick77	a565f8c726	Update 20260708-0154	2026-07-08 03:54:22 +02:00
trick77	1e533e9603	Update 20260707-0204	2026-07-07 04:04:13 +02:00
trick77	cf570d25b9	Update 20260705-0215	2026-07-05 04:15:52 +02:00
trick77	365862ba89	Update 20260704-0212	2026-07-04 04:12:43 +02:00
trick77	8fe2c92a24	Update 20260703-0200	2026-07-03 04:00:51 +02:00
trick77	fd14820dc3	Update 20260702-0152	2026-07-02 03:52:31 +02:00
trick77	9ebc811cdc	Update 20260701-0151	2026-07-01 03:51:04 +02:00
trick77	eff225be49	Update 20260630-0152	2026-06-30 03:52:05 +02:00
trick77	a1cb6cfabb	Update 20260629-0156	2026-06-29 03:56:08 +02:00
trick77	3addefc154	Update 20260628-0211	2026-06-28 04:11:05 +02:00
trick77	73d6e3b4de	Update 20260627-0152	2026-06-27 03:52:03 +02:00
trick77	355f121e09	Update 20260626-0203	2026-06-26 04:03:20 +02:00
trick77	5fef604ea6	Update 20260625-0152	2026-06-25 03:52:57 +02:00
trick77	759e5bcc8a	Update 20260623-0157	2026-06-23 03:57:57 +02:00
trick77	c6aa5bb3d8	Update 20260621-0159	2026-06-21 03:59:44 +02:00
trick77	8eef9641e3	Update 20260620-0214	2026-06-20 04:14:46 +02:00
trick77	d0d73e4a23	Update 20260619-0155	2026-06-19 03:55:59 +02:00
trick77	b3419377e0	Update 20260618-0157	2026-06-18 03:57:05 +02:00
trick77	755b372ea4	Update 20260617-0151	2026-06-17 03:51:58 +02:00
trick77	2d8a62db85	Update 20260616-0215	2026-06-16 04:15:53 +02:00
trick77	6bafbe441c	Update 20260614-0153	2026-06-14 03:53:25 +02:00
trick77	1bc00aea06	Update 20260613-0154	2026-06-13 03:54:59 +02:00
trick77	bbf148536f	Update 20260612-0154	2026-06-12 03:54:17 +02:00
trick77	bb40d9ea6a	Update 20260611-0153	2026-06-11 03:53:08 +02:00
trick77	85a90fc19f	Update 20260610-0153	2026-06-10 03:53:57 +02:00
trick77	1e55bc9f58	Update 20260609-0228	2026-06-09 04:28:18 +02:00
trick77	c1c2d02e78	Update 20260607-0150	2026-06-07 03:50:25 +02:00
trick77	68e44dbf12	Update 20260606-0211	2026-06-06 04:11:51 +02:00
trick77	761a66ad60	Update 20260605-0154	2026-06-05 03:54:07 +02:00
trick77	e2cab43a08	Update 20260604-0155	2026-06-04 03:55:58 +02:00
trick77	47a6864423	Update 20260603-0216	2026-06-03 04:16:24 +02:00
trick77	564b3050c8	Update 20260602-0152	2026-06-02 03:52:46 +02:00
trick77	e11de68f0d	Update 20260531-0151	2026-05-31 03:51:30 +02:00
trick77	42ab12c3f6	Update 20260530-0156	2026-05-30 03:56:35 +02:00
trick77	a663702c5c	Update 20260529-0536	2026-05-29 07:36:45 +02:00
trick77	872a46bc07	Update 20260528-0213	2026-05-28 04:13:58 +02:00
trick77	4a75549c4f	Update 20260527-0153	2026-05-27 03:53:37 +02:00
trick77	02fc055574	Update 20260526-0151	2026-05-26 03:51:11 +02:00
trick77	86d9581a89	Update 20260525-0150	2026-05-25 03:50:33 +02:00
trick77	82056e40df	Update 20260524-0149	2026-05-24 03:49:15 +02:00
trick77	7107aeec7a	Update 20260523-0150	2026-05-23 03:50:23 +02:00
trick77	bab9196964	Update 20260522-0149	2026-05-22 03:49:17 +02:00
trick77	42599dfdd0	Update 20260521-0152	2026-05-21 03:52:08 +02:00
trick77	559873818d	Update 20260520-0150	2026-05-20 03:50:46 +02:00
trick77	8e491bb916	Update 20260519-0150	2026-05-19 03:50:03 +02:00
trick77	635f3c6723	Update 20260517-0150	2026-05-17 03:50:11 +02:00
trick77	28b516c1e7	Update 20260516-0149	2026-05-16 03:49:40 +02:00
trick77	65ec3de947	Update 20260515-0149	2026-05-15 03:49:05 +02:00
trick77	88f4de0c5b	Update 20260514-0150	2026-05-14 03:50:09 +02:00
trick77	f853faea48	Update 20260513-0156	2026-05-13 03:56:13 +02:00
trick77	f473a967e6	Update 20260512-0151	2026-05-12 03:51:40 +02:00
trick77	fe8393f22b	Update 20260510-0152	2026-05-10 03:52:48 +02:00
trick77	535a4037ef	Update 20260509-0154	2026-05-09 03:54:09 +02:00
trick77	512ce048db	Update 20260508-0209	2026-05-08 04:10:02 +02:00
trick77	a3128f4f9d	Update 20260507-0149	2026-05-07 03:49:51 +02:00
trick77	b95fe72214	Update 20260506-0152	2026-05-06 03:52:55 +02:00
trick77	675824ffda	Update 20260505-0154	2026-05-05 03:54:50 +02:00
trick77	66ff746444	Update 20260504-0154	2026-05-04 03:54:57 +02:00
trick77	6100ecc580	Update 20260503-0156	2026-05-03 03:56:13 +02:00
trick77	d3e0ef4610	Update 20260502-0149	2026-05-02 03:49:52 +02:00
trick77	cd1a5aad04	Update 20260501-0153	2026-05-01 03:53:46 +02:00
trick77	e3a63893fc	Update 20260430-0149	2026-04-30 03:49:11 +02:00
trick77	98071b3c0a	Update 20260429-0213	2026-04-29 04:13:34 +02:00
trick77	34087b15a7	Update 20260428-0150	2026-04-28 03:50:34 +02:00
trick77	145632c5a1	Update 20260426-0150	2026-04-26 03:50:58 +02:00
trick77	7d822ac947	Update 20260425-0150	2026-04-25 03:50:50 +02:00
trick77	f461626944	Update 20260424-0156	2026-04-24 03:56:58 +02:00
trick77	bc23287609	Update 20260423-0152	2026-04-23 03:52:29 +02:00
trick77	2f37b8a49d	Update 20260422-0157	2026-04-22 03:57:47 +02:00
trick77	5a764d761e	Update 20260421-0155	2026-04-21 03:55:38 +02:00
trick77	e6fe74ec29	Update 20260419-0156	2026-04-19 03:56:37 +02:00
trick77	45fee178e3	Update 20260418-0200	2026-04-18 04:00:56 +02:00
trick77	fff4ce8560	Update 20260417-0207	2026-04-17 04:07:40 +02:00
trick77	5a9a05046b	Update 20260416-0215	2026-04-16 04:15:58 +02:00
trick77	c1fec127bf	Update 20260415-0157	2026-04-15 03:57:04 +02:00
trick77	43600a4de6	Update 20260414-0157	2026-04-14 03:57:47 +02:00
trick77	1a6f7d7835	Update 20260412-0155	2026-04-12 03:55:36 +02:00
trick77	a4e68370cd	Update 20260411-0223	2026-04-11 04:23:07 +02:00
trick77	77093ca0d5	Update 20260410-0200	2026-04-10 04:00:05 +02:00
trick77	00e3cf6c2d	Update 20260409-0159	2026-04-09 03:59:33 +02:00
trick77	0229663a93	Update 20260408-0159	2026-04-08 03:59:32 +02:00
trick77	e6e8de1661	Update 20260407-0201	2026-04-07 04:01:51 +02:00
trick77	cae23c1ab2	Update 20260405-0606	2026-04-05 08:06:38 +02:00
trick77	e629b153f7	Update 20260404-0152	2026-04-04 03:52:56 +02:00
trick77	8e2a1c381f	Update 20260403-0158	2026-04-03 03:58:21 +02:00
trick77	609495915c	Update 20260402-0153	2026-04-02 03:53:52 +02:00
trick77	b660967b05	Update 20260401-0200	2026-04-01 04:00:42 +02:00
trick77	709e54a43e	Update 20260331-0211	2026-03-31 04:11:51 +02:00
trick77	25a3f28ba1	Update 20260329-0151	2026-03-29 03:51:34 +02:00
trick77	312f1c734d	Update 20260328-0249	2026-03-28 03:49:16 +01:00
trick77	9942a970d5	Update 20260327-0246	2026-03-27 03:46:14 +01:00
trick77	2b8f3a7127	Update 20260326-0246	2026-03-26 03:46:34 +01:00
trick77	64398ad11e	Update 20260325-0252	2026-03-25 03:52:10 +01:00
trick77	71b26d31cd	Update 20260324-0307	2026-03-24 04:07:32 +01:00
trick77	9fda01a375	Update 20260323-0246	2026-03-23 03:46:45 +01:00
trick77	561c966f98	Update 20260322-0246	2026-03-22 03:46:39 +01:00
trick77	c51d66b09f	Update 20260321-0247	2026-03-21 03:47:04 +01:00
trick77	ff9bc2b65a	Update 20260320-0247	2026-03-20 03:47:47 +01:00
trick77	721f86e003	Update 20260319-0247	2026-03-19 03:47:10 +01:00
trick77	646774a123	Update 20260318-0249	2026-03-18 03:49:20 +01:00
trick77	42fec47199	Update 20260317-0247	2026-03-17 03:47:31 +01:00
trick77	ebb9845b07	Update 20260315-0247	2026-03-15 03:47:36 +01:00
trick77	59ff998990	Update 20260314-0247	2026-03-14 03:47:05 +01:00
trick77	b2587a3431	Update 20260313-0247	2026-03-13 03:47:56 +01:00
trick77	7bcc752f4a	Update 20260312-0247	2026-03-12 03:47:23 +01:00
trick77	939e2a2c11	Update 20260311-0246	2026-03-11 03:46:18 +01:00
trick77	518d26bfcb	Update 20260310-0247	2026-03-10 03:47:28 +01:00
trick77	7c8ed361db	Update 20260308-0621	2026-03-08 07:21:18 +01:00
trick77	d8bf960d61	Update 20260307-0247	2026-03-07 03:47:05 +01:00
trick77	fa563d9bc9	Update 20260306-0247	2026-03-06 03:47:31 +01:00
trick77	02d9430b5a	Update 20260305-0255	2026-03-05 03:55:53 +01:00
trick77	6b7d173335	Update 20260304-0253	2026-03-04 03:53:03 +01:00
trick77	ede32951f5	Update 20260303-0251	2026-03-03 03:51:50 +01:00
trick77	13f352fa2a	Update 20260302-0247	2026-03-02 03:47:37 +01:00
trick77	04f7cd921f	Update 20260301-0248	2026-03-01 03:48:11 +01:00
trick77	7e746b9e63	Remove MIGRATION.md	2026-02-28 13:17:11 +01:00
trick77	35e3a7436d	Update README.md	2026-02-28 13:16:28 +01:00
trick77	794e4c530b	Update 20260228-0246	2026-02-28 03:46:54 +01:00
trick77	23814c9f0e	Update 20260227-0253	2026-02-27 03:53:27 +01:00
trick77	e208fccbb0	Update 20260226-0245	2026-02-26 03:45:41 +01:00
trick77	47ee19a32a	Update 20260225-0248	2026-02-25 03:48:51 +01:00
trick77	d6e1f8d51e	Update 20260224-0246	2026-02-24 03:46:23 +01:00
trick77	a40de1959b	Update 20260222-0245	2026-02-22 03:45:50 +01:00
trick77	9d302ca085	Update 20260221-0246	2026-02-21 03:46:50 +01:00
trick77	6cae09a4f9	Update 20260220-0248	2026-02-20 03:48:48 +01:00
trick77	62a3d90518	Update 20260219-0245	2026-02-19 03:45:28 +01:00
trick77	d0320871b2	Update 20260218-0245	2026-02-18 03:45:30 +01:00
trick77	f6fd2b9842	Update 20260217-0246	2026-02-17 03:46:16 +01:00
trick77	718b6ec213	Update 20260215-0248	2026-02-15 03:48:42 +01:00
trick77	f09ef0b049	Update 20260214-0249	2026-02-14 03:49:56 +01:00
trick77	c8f54f7a4a	Update 20260213-0243	2026-02-13 03:43:31 +01:00
trick77	5d11ab5f4c	Update 20260212-0242	2026-02-12 03:43:00 +01:00
trick77	6056728471	Update 20260211-0243	2026-02-11 03:43:10 +01:00
trick77	4f30a68db6	Update 20260210-0243	2026-02-10 03:43:12 +01:00
trick77	80973e5297	Update 20260208-0244	2026-02-08 03:44:27 +01:00
trick77	2209ad58ce	Update 20260207-0242	2026-02-07 03:42:44 +01:00
trick77	abb9a52795	Update 20260206-0244	2026-02-06 03:44:06 +01:00
trick77	251166e324	Update 20260205-0243	2026-02-05 03:44:01 +01:00
trick77	3d4b2598e0	Update 20260204-0252	2026-02-04 03:52:52 +01:00
trick77	9a2f372e71	Update 20260203-0248	2026-02-03 03:48:35 +01:00
trick77	9621315df2	Update 20260202-0242	2026-02-02 03:42:12 +01:00
trick77	6745bab5f3	Update 20260201-0242	2026-02-01 03:42:48 +01:00
trick77	118ff0713f	Update 20260131-0241	2026-01-31 03:41:40 +01:00
trick77	8a12f6adc7	Update 20260130-0243	2026-01-30 03:43:26 +01:00
trick77	709027b0d2	Update 20260129-0242	2026-01-29 03:42:09 +01:00
trick77	93c27ad31f	Update 20260128-0242	2026-01-28 03:42:59 +01:00
trick77	036727f526	Update 20260127-0240	2026-01-27 03:40:59 +01:00
trick77	2360ac01d8	Update 20260126-0608	2026-01-26 07:08:30 +01:00
trick77	aa1e9f8bba	Update 20260126-0243	2026-01-26 03:43:07 +01:00
trick77	fdede4605a	Update 20260125-0241	2026-01-25 03:41:23 +01:00
trick77	bccfa5c87c	Update 20260124-0244	2026-01-24 03:44:38 +01:00
trick77	ff2944eca0	Update README.md	2026-01-23 20:20:18 +01:00
trick77	4d5bfb3966	Update 20260123-0240	2026-01-23 03:40:55 +01:00
trick77	290325ea87	Update 20260122-0238	2026-01-22 03:38:25 +01:00
trick77	ad5e716358	Update 20260121-0238	2026-01-21 03:38:42 +01:00
trick77	41a1ef11ca	Update 20260120-0240	2026-01-20 03:40:21 +01:00
trick77	9d7ce2c0ab	Update 20260119-0302	2026-01-19 04:03:02 +01:00
trick77	f3763eda92	Update README.md	2026-01-18 23:47:02 +01:00
trick77	9d2fbf86b0	Update 20260118-1606	2026-01-18 17:06:26 +01:00
trick77	5cacf17333	Update README.md	2026-01-17 16:03:49 +01:00