diff --git a/source-data/GeoIP2-Precision-Enterprise-Test.json b/source-data/GeoIP2-Precision-Enterprise-Test.json
index 260451e..bd0046f 100644
--- a/source-data/GeoIP2-Precision-Enterprise-Test.json
+++ b/source-data/GeoIP2-Precision-Enterprise-Test.json
@@ -221,6 +221,7 @@
                }
             },
             {
+               "confidence" : 60,
                "geoname_id" : 3333217,
                "iso_code" : "WBK",
                "names" : {
@@ -1796,6 +1797,91 @@
         ]
       }
    },
+   {
+       "::214.61.39.7/128": {
+          "city": {
+            "confidence": 40,
+            "geoname_id": 5089478,
+            "names": {
+              "en": "Merrimack",
+              "ja": "メリマック",
+              "pt-BR": "East Merrimack",
+              "ru": "Мерримак"
+            }
+          },
+          "continent": {
+            "code": "NA",
+            "geoname_id": 6255149,
+            "names": {
+              "de": "Nordamerika",
+              "en": "North America",
+              "es": "Norteamérica",
+              "fr": "Amérique du Nord",
+              "ja": "北アメリカ",
+              "pt-BR": "América do Norte",
+              "ru": "Северная Америка",
+              "zh-CN": "北美洲"
+            }
+          },
+          "country": {
+            "confidence": 99,
+            "geoname_id": 6252001,
+            "iso_code": "US",
+            "names": {
+              "de": "USA",
+              "en": "United States",
+              "es": "Estados Unidos",
+              "fr": "États Unis",
+              "ja": "アメリカ",
+              "pt-BR": "EUA",
+              "ru": "США",
+              "zh-CN": "美国"
+            }
+          },
+          "location": {
+            "accuracy_radius": 10,
+            "latitude": 42.8651,
+            "longitude": -71.4934,
+            "metro_code": 506,
+            "time_zone": "America/New_York"
+          },
+          "postal": {
+            "code": "03054",
+            "confidence": 40
+          },
+          "registered_country": {
+            "geoname_id": 6252001,
+            "iso_code": "US",
+            "names": {
+              "de": "USA",
+              "en": "United States",
+              "es": "Estados Unidos",
+              "fr": "États Unis",
+              "ja": "アメリカ",
+              "pt-BR": "EUA",
+              "ru": "США",
+              "zh-CN": "美国"
+            }
+          },
+          "subdivisions": [
+            {
+              "confidence": 80,
+              "geoname_id": 5090174,
+              "iso_code": "NH",
+              "names": {
+                "de": "New Hampshire",
+                "en": "New Hampshire",
+                "es": "Nueva Hampshire",
+                "fr": "New Hampshire",
+                "ja": "ニューハンプシャー州",
+                "pt-BR": "New Hampshire",
+                "ru": "Нью-Гэмпшир",
+                "zh-CN": "新罕布什尔州"
+              }
+            }
+        ]
+      }
+   },
    {
       "::214.61.39.4/128": {
          "city": {
diff --git a/test-data/GeoIP2-Anonymous-IP-Test.mmdb b/test-data/GeoIP2-Anonymous-IP-Test.mmdb
index 959e0c9..13774b7 100644
Binary files a/test-data/GeoIP2-Anonymous-IP-Test.mmdb and b/test-data/GeoIP2-Anonymous-IP-Test.mmdb differ
diff --git a/test-data/GeoIP2-City-Test.mmdb b/test-data/GeoIP2-City-Test.mmdb
index 70314d1..bc208fb 100644
Binary files a/test-data/GeoIP2-City-Test.mmdb and b/test-data/GeoIP2-City-Test.mmdb differ
diff --git a/test-data/GeoIP2-Connection-Type-Test.mmdb b/test-data/GeoIP2-Connection-Type-Test.mmdb
index 3ddb3d8..2440cad 100644
Binary files a/test-data/GeoIP2-Connection-Type-Test.mmdb and b/test-data/GeoIP2-Connection-Type-Test.mmdb differ
diff --git a/test-data/GeoIP2-Country-Test.mmdb b/test-data/GeoIP2-Country-Test.mmdb
index 692a4e2..efe9f5d 100644
Binary files a/test-data/GeoIP2-Country-Test.mmdb and b/test-data/GeoIP2-Country-Test.mmdb differ
diff --git a/test-data/GeoIP2-DensityIncome-Test.mmdb b/test-data/GeoIP2-DensityIncome-Test.mmdb
index 7af6b8b..0da5dfb 100644
Binary files a/test-data/GeoIP2-DensityIncome-Test.mmdb and b/test-data/GeoIP2-DensityIncome-Test.mmdb differ
diff --git a/test-data/GeoIP2-Domain-Test.mmdb b/test-data/GeoIP2-Domain-Test.mmdb
index 9ccf748..fb079b0 100644
Binary files a/test-data/GeoIP2-Domain-Test.mmdb and b/test-data/GeoIP2-Domain-Test.mmdb differ
diff --git a/test-data/GeoIP2-Enterprise-Test.mmdb b/test-data/GeoIP2-Enterprise-Test.mmdb
index 319818b..2e69921 100644
Binary files a/test-data/GeoIP2-Enterprise-Test.mmdb and b/test-data/GeoIP2-Enterprise-Test.mmdb differ
diff --git a/test-data/GeoIP2-IP-Risk-Test.mmdb b/test-data/GeoIP2-IP-Risk-Test.mmdb
index 0a69fc9..1d86026 100644
Binary files a/test-data/GeoIP2-IP-Risk-Test.mmdb and b/test-data/GeoIP2-IP-Risk-Test.mmdb differ
diff --git a/test-data/GeoIP2-ISP-Test.mmdb b/test-data/GeoIP2-ISP-Test.mmdb
index f1e7eb7..dd37963 100644
Binary files a/test-data/GeoIP2-ISP-Test.mmdb and b/test-data/GeoIP2-ISP-Test.mmdb differ
diff --git a/test-data/GeoIP2-Precision-Enterprise-Test.mmdb b/test-data/GeoIP2-Precision-Enterprise-Test.mmdb
index 6a603c4..70bf3e9 100644
Binary files a/test-data/GeoIP2-Precision-Enterprise-Test.mmdb and b/test-data/GeoIP2-Precision-Enterprise-Test.mmdb differ
diff --git a/test-data/GeoIP2-Static-IP-Score-Test.mmdb b/test-data/GeoIP2-Static-IP-Score-Test.mmdb
index 384d6ee..b1ef1cf 100644
Binary files a/test-data/GeoIP2-Static-IP-Score-Test.mmdb and b/test-data/GeoIP2-Static-IP-Score-Test.mmdb differ
diff --git a/test-data/GeoIP2-User-Count-Test.mmdb b/test-data/GeoIP2-User-Count-Test.mmdb
index c0b38e3..e672b40 100644
Binary files a/test-data/GeoIP2-User-Count-Test.mmdb and b/test-data/GeoIP2-User-Count-Test.mmdb differ
diff --git a/test-data/GeoLite2-ASN-Test.mmdb b/test-data/GeoLite2-ASN-Test.mmdb
index 309524c..9945436 100644
Binary files a/test-data/GeoLite2-ASN-Test.mmdb and b/test-data/GeoLite2-ASN-Test.mmdb differ
diff --git a/test-data/GeoLite2-City-Test.mmdb b/test-data/GeoLite2-City-Test.mmdb
index 78010ae..8b9bc14 100644
Binary files a/test-data/GeoLite2-City-Test.mmdb and b/test-data/GeoLite2-City-Test.mmdb differ
diff --git a/test-data/GeoLite2-Country-Test.mmdb b/test-data/GeoLite2-Country-Test.mmdb
index bbdf4f6..884ea87 100644
Binary files a/test-data/GeoLite2-Country-Test.mmdb and b/test-data/GeoLite2-Country-Test.mmdb differ
diff --git a/test-data/MaxMind-DB-no-ipv4-search-tree.mmdb b/test-data/MaxMind-DB-no-ipv4-search-tree.mmdb
index f0bdfee..d69e53e 100644
Binary files a/test-data/MaxMind-DB-no-ipv4-search-tree.mmdb and b/test-data/MaxMind-DB-no-ipv4-search-tree.mmdb differ
diff --git a/test-data/MaxMind-DB-string-value-entries.mmdb b/test-data/MaxMind-DB-string-value-entries.mmdb
index ab60fc2..573c89e 100644
Binary files a/test-data/MaxMind-DB-string-value-entries.mmdb and b/test-data/MaxMind-DB-string-value-entries.mmdb differ
diff --git a/test-data/MaxMind-DB-test-decoder.mmdb b/test-data/MaxMind-DB-test-decoder.mmdb
index 09cee41..5e270f1 100644
Binary files a/test-data/MaxMind-DB-test-decoder.mmdb and b/test-data/MaxMind-DB-test-decoder.mmdb differ
diff --git a/test-data/MaxMind-DB-test-ipv4-24.mmdb b/test-data/MaxMind-DB-test-ipv4-24.mmdb
index 7ae7433..3f35e3c 100644
Binary files a/test-data/MaxMind-DB-test-ipv4-24.mmdb and b/test-data/MaxMind-DB-test-ipv4-24.mmdb differ
diff --git a/test-data/MaxMind-DB-test-ipv4-28.mmdb b/test-data/MaxMind-DB-test-ipv4-28.mmdb
index 2393b2b..c92b44d 100644
Binary files a/test-data/MaxMind-DB-test-ipv4-28.mmdb and b/test-data/MaxMind-DB-test-ipv4-28.mmdb differ
diff --git a/test-data/MaxMind-DB-test-ipv4-32.mmdb b/test-data/MaxMind-DB-test-ipv4-32.mmdb
index 0f4fedb..7631729 100644
Binary files a/test-data/MaxMind-DB-test-ipv4-32.mmdb and b/test-data/MaxMind-DB-test-ipv4-32.mmdb differ
diff --git a/test-data/MaxMind-DB-test-ipv6-24.mmdb b/test-data/MaxMind-DB-test-ipv6-24.mmdb
index 0b4cae1..32067f1 100644
Binary files a/test-data/MaxMind-DB-test-ipv6-24.mmdb and b/test-data/MaxMind-DB-test-ipv6-24.mmdb differ
diff --git a/test-data/MaxMind-DB-test-ipv6-28.mmdb b/test-data/MaxMind-DB-test-ipv6-28.mmdb
index cb190dc..cdb289f 100644
Binary files a/test-data/MaxMind-DB-test-ipv6-28.mmdb and b/test-data/MaxMind-DB-test-ipv6-28.mmdb differ
diff --git a/test-data/MaxMind-DB-test-ipv6-32.mmdb b/test-data/MaxMind-DB-test-ipv6-32.mmdb
index 11fd661..68b60ee 100644
Binary files a/test-data/MaxMind-DB-test-ipv6-32.mmdb and b/test-data/MaxMind-DB-test-ipv6-32.mmdb differ
diff --git a/test-data/MaxMind-DB-test-metadata-pointers.mmdb b/test-data/MaxMind-DB-test-metadata-pointers.mmdb
index 6ced8d8..722cd8e 100644
Binary files a/test-data/MaxMind-DB-test-metadata-pointers.mmdb and b/test-data/MaxMind-DB-test-metadata-pointers.mmdb differ
diff --git a/test-data/MaxMind-DB-test-mixed-24.mmdb b/test-data/MaxMind-DB-test-mixed-24.mmdb
index 8a937e6..d4bc5fc 100644
Binary files a/test-data/MaxMind-DB-test-mixed-24.mmdb and b/test-data/MaxMind-DB-test-mixed-24.mmdb differ
diff --git a/test-data/MaxMind-DB-test-mixed-28.mmdb b/test-data/MaxMind-DB-test-mixed-28.mmdb
index 1075f0b..7d9e6bb 100644
Binary files a/test-data/MaxMind-DB-test-mixed-28.mmdb and b/test-data/MaxMind-DB-test-mixed-28.mmdb differ
diff --git a/test-data/MaxMind-DB-test-mixed-32.mmdb b/test-data/MaxMind-DB-test-mixed-32.mmdb
index 7ea2972..c0d0ce4 100644
Binary files a/test-data/MaxMind-DB-test-mixed-32.mmdb and b/test-data/MaxMind-DB-test-mixed-32.mmdb differ
diff --git a/test-data/MaxMind-DB-test-nested.mmdb b/test-data/MaxMind-DB-test-nested.mmdb
index 259ca02..aa34912 100644
Binary files a/test-data/MaxMind-DB-test-nested.mmdb and b/test-data/MaxMind-DB-test-nested.mmdb differ