diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt
index b402455d..241cf641 100644
--- a/METADATA-VERSION.txt
+++ b/METADATA-VERSION.txt
@@ -2,4 +2,4 @@
 # It can be a commit, branch or tag of the https://github.com/google/libphonenumber project
 #
 # For more information, look at the phing tasks in build.xml
-v8.13.30
+v8.13.31
diff --git a/src/carrier/data/en/234.php b/src/carrier/data/en/234.php
index a1cf6279..14d78c12 100644
--- a/src/carrier/data/en/234.php
+++ b/src/carrier/data/en/234.php
@@ -25,6 +25,7 @@
   234704 => 'MTN',
   234705 => 'Glo',
   234706 => 'MTN',
+  234707 => 'MTN',
   234708 => 'Airtel',
   234709 => 'Multilinks',
   234801 => 'MAFAB',
diff --git a/src/carrier/data/en/33.php b/src/carrier/data/en/33.php
index dd6fa7b0..211d9eb2 100644
--- a/src/carrier/data/en/33.php
+++ b/src/carrier/data/en/33.php
@@ -278,7 +278,12 @@
   3375705 => 'Mobiweb telecom limited',
   3375706 => 'Nordnet',
   3375707 => 'Keyyo',
-  3375714 => 'AIF',
+  3375708 => 'SFR',
+  3375709 => 'SFR',
+  3375710 => 'SFR',
+  3375711 => 'SFR',
+  3375712 => 'SFR',
+  3375714 => 'SFR',
   3375715 => 'AIF',
   3375717 => 'Keyyo',
   337572 => 'Mobiquithings',
diff --git a/src/carrier/data/en/420.php b/src/carrier/data/en/420.php
index 49d32d46..cbb881d9 100644
--- a/src/carrier/data/en/420.php
+++ b/src/carrier/data/en/420.php
@@ -49,6 +49,7 @@
   4207058 => 'T-Mobile',
   4207059 => 'T-Mobile',
   420706 => 'DataCell',
+  42071 => 'O2',
   42072 => 'O2',
   4207300 => 'T-Mobile',
   4207301 => 'T-Mobile',
diff --git a/src/carrier/data/en/592.php b/src/carrier/data/en/592.php
index 04d3ae68..343fdb3f 100644
--- a/src/carrier/data/en/592.php
+++ b/src/carrier/data/en/592.php
@@ -50,5 +50,6 @@
   592709 => 'GTT',
   59271 => 'E-Networks',
   59272 => 'GTT',
+  59273 => 'E-Networks',
   59274 => 'GTT',
 );
diff --git a/src/carrier/data/en/65.php b/src/carrier/data/en/65.php
index 6d405b85..fa86482a 100644
--- a/src/carrier/data/en/65.php
+++ b/src/carrier/data/en/65.php
@@ -53,6 +53,9 @@
   658082 => 'SingTel',
   658083 => 'M1',
   658084 => 'SingTel',
+  658090 => 'SingTel',
+  658091 => 'M1',
+  658092 => 'Simba',
   6581 => 'StarHub',
   65810 => 'M1',
   65812 => 'SingTel',
diff --git a/src/carrier/data/en/676.php b/src/carrier/data/en/676.php
index db9dfe0c..7b1a7fd9 100644
--- a/src/carrier/data/en/676.php
+++ b/src/carrier/data/en/676.php
@@ -11,6 +11,7 @@
  */
 
 return array (
+  67654 => 'Toko Wireless',
   676554 => 'Toko Wireless',
   676555 => 'Toko Wireless',
   676556 => 'Toko Wireless',
diff --git a/src/carrier/data/en/977.php b/src/carrier/data/en/977.php
index d691235b..5ae2dbe1 100644
--- a/src/carrier/data/en/977.php
+++ b/src/carrier/data/en/977.php
@@ -11,6 +11,7 @@
  */
 
 return array (
+  97790 => 'NCell',
   977960 => 'STM Telecom',
   977961 => 'Smart Telecom',
   977962 => 'Smart Telecom',
diff --git a/src/data/PhoneNumberMetadata_BM.php b/src/data/PhoneNumberMetadata_BM.php
index e735606a..2e5ae3b1 100644
--- a/src/data/PhoneNumberMetadata_BM.php
+++ b/src/data/PhoneNumberMetadata_BM.php
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '441909\\d{4}|441(?:[2378]\\d|5[0-39]|92)\\d{5}',
+    'NationalNumberPattern' => '441(?:[2378]\\d|5[0-39]|9[02])\\d{5}',
     'ExampleNumber' => '4413701234',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_CZ.php b/src/data/PhoneNumberMetadata_CZ.php
index 91930a03..26df3578 100644
--- a/src/data/PhoneNumberMetadata_CZ.php
+++ b/src/data/PhoneNumberMetadata_CZ.php
@@ -40,7 +40,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '7060\\d{5}|(?:60[1-8]|7(?:0[2-5]|[2379]\\d))\\d{6}',
+    'NationalNumberPattern' => '(?:60[1-8]\\d|7(?:0(?:[2-5]\\d|60)|190|[2379]\\d\\d))\\d{5}',
     'ExampleNumber' => '601123456',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_EH.php b/src/data/PhoneNumberMetadata_EH.php
index 7cdc4de6..f2f2b280 100644
--- a/src/data/PhoneNumberMetadata_EH.php
+++ b/src/data/PhoneNumberMetadata_EH.php
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-2]|5[01]|8[0-3]))\\d{6}',
+    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
     'ExampleNumber' => '650123456',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_GY.php b/src/data/PhoneNumberMetadata_GY.php
index 31debbfd..1afad513 100644
--- a/src/data/PhoneNumberMetadata_GY.php
+++ b/src/data/PhoneNumberMetadata_GY.php
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[01]\\d|2[156]|49))\\d{4}',
+    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[01]\\d|2[156]|31|49))\\d{4}',
     'ExampleNumber' => '6091234',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_JE.php b/src/data/PhoneNumberMetadata_JE.php
index 347f167a..ca52b08a 100644
--- a/src/data/PhoneNumberMetadata_JE.php
+++ b/src/data/PhoneNumberMetadata_JE.php
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97[7-9]))\\d{5}',
+    'NationalNumberPattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97\\d))\\d{5}',
     'ExampleNumber' => '7797712345',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_LS.php b/src/data/PhoneNumberMetadata_LS.php
index 0f6f3467..b8288595 100644
--- a/src/data/PhoneNumberMetadata_LS.php
+++ b/src/data/PhoneNumberMetadata_LS.php
@@ -47,7 +47,7 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '800[256]\\d{4}',
+    'NationalNumberPattern' => '800[1256]\\d{4}',
     'ExampleNumber' => '80021234',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_MA.php b/src/data/PhoneNumberMetadata_MA.php
index 8201d08e..b7a54542 100644
--- a/src/data/PhoneNumberMetadata_MA.php
+++ b/src/data/PhoneNumberMetadata_MA.php
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-2]|5[01]|8[0-3]))\\d{6}',
+    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
     'ExampleNumber' => '650123456',
     'PossibleLength' => 
     array (
@@ -164,8 +164,7 @@
       'format' => '$1-$2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '5(?:2[2-489]|3[5-9]|9)|8(?:0[89]|92)',
-        1 => '5(?:2(?:[2-49]|8[235-9])|3[5-9]|9)|8(?:0[89]|92)',
+        0 => '5(?:2[2-46-9]|3[3-9]|9)|8(?:0[89]|92)',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/data/PhoneNumberMetadata_NG.php b/src/data/PhoneNumberMetadata_NG.php
index 7ced30ec..5896fbbb 100644
--- a/src/data/PhoneNumberMetadata_NG.php
+++ b/src/data/PhoneNumberMetadata_NG.php
@@ -49,7 +49,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:702[0-24-9]|819[01])\\d{6}|(?:7(?:0[13-689]|[12]\\d)|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-6]))\\d{7}',
+    'NationalNumberPattern' => '(?:702[0-24-9]|819[01])\\d{6}|(?:7(?:0[13-9]|[12]\\d)|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-6]))\\d{7}',
     'ExampleNumber' => '8021234567',
     'PossibleLength' => 
     array (
@@ -199,7 +199,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[3-7]|8[2-9]',
+        0 => '[3-6]|7(?:0[0-689]|[1-79])|8[2-9]',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/data/PhoneNumberMetadata_NP.php b/src/data/PhoneNumberMetadata_NP.php
index da4fab7e..83485820 100644
--- a/src/data/PhoneNumberMetadata_NP.php
+++ b/src/data/PhoneNumberMetadata_NP.php
@@ -43,7 +43,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '9(?:6[0-3]|7[024-6]|8[0-24-68])\\d{7}',
+    'NationalNumberPattern' => '9(?:00|6[0-3]|7[024-6]|8[0-24-68])\\d{7}',
     'ExampleNumber' => '9841234567',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_OM.php b/src/data/PhoneNumberMetadata_OM.php
index dc1676b0..d9edbfb7 100644
--- a/src/data/PhoneNumberMetadata_OM.php
+++ b/src/data/PhoneNumberMetadata_OM.php
@@ -39,7 +39,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '1505\\d{4}|(?:7(?:[1289]\\d|6[7-9]|7[0-5])|9(?:0[1-9]|[1-9]\\d))\\d{5}',
+    'NationalNumberPattern' => '(?:1505|90[1-9]\\d)\\d{4}|(?:7[126-9]|9[1-9])\\d{6}',
     'ExampleNumber' => '92123456',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php
index 158fd9af..c53d52a2 100644
--- a/src/data/PhoneNumberMetadata_SG.php
+++ b/src/data/PhoneNumberMetadata_SG.php
@@ -39,7 +39,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '895[0-2]\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
+    'NationalNumberPattern' => '8(?:09|95)[0-2]\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
     'ExampleNumber' => '81234567',
     'PossibleLength' => 
     array (
@@ -173,7 +173,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[369]|8(?:0[1-8]|[1-9])',
+        0 => '[369]|8(?:0[1-9]|[1-9])',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
@@ -224,7 +224,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[369]|8(?:0[1-8]|[1-9])',
+        0 => '[369]|8(?:0[1-9]|[1-9])',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/data/PhoneNumberMetadata_TO.php b/src/data/PhoneNumberMetadata_TO.php
index ab0097d5..46daac1d 100644
--- a/src/data/PhoneNumberMetadata_TO.php
+++ b/src/data/PhoneNumberMetadata_TO.php
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:55[4-6]|6(?:[09]\\d|3[02]|8[15-9])|(?:7\\d|8[46-9])\\d|999)\\d{4}',
+    'NationalNumberPattern' => '(?:5(?:4[0-5]|5[4-6])|6(?:[09]\\d|3[02]|8[15-9])|(?:7\\d|8[46-9])\\d|999)\\d{4}',
     'ExampleNumber' => '7715123',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php
index b3fc2c25..24e9ead0 100644
--- a/src/data/PhoneNumberMetadata_US.php
+++ b/src/data/PhoneNumberMetadata_US.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[237-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[237-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLength' => 
     array (
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[237-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[237-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLength' => 
     array (
diff --git a/src/geocoding/data/Map.php b/src/geocoding/data/Map.php
index 3ee61421..15810157 100644
--- a/src/geocoding/data/Map.php
+++ b/src/geocoding/data/Map.php
@@ -112,133 +112,132 @@
     68 => 359,
     69 => 36,
     70 => 370,
-    71 => 371,
-    72 => 372,
-    73 => 373,
-    74 => 374,
-    75 => 375,
-    76 => 380,
-    77 => 381,
-    78 => 382,
-    79 => 383,
-    80 => 385,
-    81 => 386,
-    82 => 387,
-    83 => 389,
-    84 => 39,
-    85 => 40,
-    86 => 41,
-    87 => 420,
-    88 => 421,
-    89 => 43,
-    90 => 44,
-    91 => 46,
-    92 => 47,
-    93 => 48,
-    94 => 49,
-    95 => 501,
-    96 => 504,
-    97 => 51,
-    98 => 52,
-    99 => 53,
-    100 => 54,
-    101 => 55,
-    102 => 56,
-    103 => 57,
-    104 => 58,
-    105 => 592,
-    106 => 593,
-    107 => 595,
-    108 => 598,
-    109 => 599,
-    110 => 60,
-    111 => 61,
-    112 => 62,
-    113 => 63,
-    114 => 64,
-    115 => 66,
-    116 => 670,
-    117 => 672,
-    118 => 673,
-    119 => 675,
-    120 => 676,
-    121 => 678,
-    122 => 679,
-    123 => 680,
-    124 => 682,
-    125 => 685,
-    126 => 686,
-    127 => 688,
-    128 => 689,
-    129 => 690,
-    130 => 7,
-    131 => 81,
-    132 => 82,
-    133 => 84,
-    134 => 850,
-    135 => 8610,
-    136 => 86130,
-    137 => 86131,
-    138 => 86132,
-    139 => 86133,
-    140 => 86134,
-    141 => 86135,
-    142 => 86136,
-    143 => 86137,
-    144 => 86138,
-    145 => 86139,
-    146 => 86145,
-    147 => 86147,
-    148 => 86150,
-    149 => 86151,
-    150 => 86152,
-    151 => 86153,
-    152 => 86155,
-    153 => 86156,
-    154 => 86157,
-    155 => 86158,
-    156 => 86159,
-    157 => 86170,
-    158 => 86176,
-    159 => 86177,
-    160 => 86178,
-    161 => 86180,
-    162 => 86181,
-    163 => 86182,
-    164 => 86183,
-    165 => 86184,
-    166 => 86185,
-    167 => 86186,
-    168 => 86187,
-    169 => 86188,
-    170 => 86189,
-    171 => 86,
-    172 => 880,
-    173 => 886,
-    174 => 90,
-    175 => 91,
-    176 => 92,
-    177 => 93,
-    178 => 94,
-    179 => 95,
-    180 => 960,
-    181 => 961,
-    182 => 962,
-    183 => 963,
-    184 => 966,
-    185 => 967,
-    186 => 968,
-    187 => 970,
-    188 => 971,
-    189 => 972,
-    190 => 975,
-    191 => 976,
-    192 => 98,
-    193 => 992,
-    194 => 993,
-    195 => 994,
-    196 => 995,
-    197 => 996,
+    71 => 372,
+    72 => 373,
+    73 => 374,
+    74 => 375,
+    75 => 380,
+    76 => 381,
+    77 => 382,
+    78 => 383,
+    79 => 385,
+    80 => 386,
+    81 => 387,
+    82 => 389,
+    83 => 39,
+    84 => 40,
+    85 => 41,
+    86 => 420,
+    87 => 421,
+    88 => 43,
+    89 => 44,
+    90 => 46,
+    91 => 47,
+    92 => 48,
+    93 => 49,
+    94 => 501,
+    95 => 504,
+    96 => 51,
+    97 => 52,
+    98 => 53,
+    99 => 54,
+    100 => 55,
+    101 => 56,
+    102 => 57,
+    103 => 58,
+    104 => 592,
+    105 => 593,
+    106 => 595,
+    107 => 598,
+    108 => 599,
+    109 => 60,
+    110 => 61,
+    111 => 62,
+    112 => 63,
+    113 => 64,
+    114 => 66,
+    115 => 670,
+    116 => 672,
+    117 => 673,
+    118 => 675,
+    119 => 676,
+    120 => 678,
+    121 => 679,
+    122 => 680,
+    123 => 682,
+    124 => 685,
+    125 => 686,
+    126 => 688,
+    127 => 689,
+    128 => 690,
+    129 => 7,
+    130 => 81,
+    131 => 82,
+    132 => 84,
+    133 => 850,
+    134 => 8610,
+    135 => 86130,
+    136 => 86131,
+    137 => 86132,
+    138 => 86133,
+    139 => 86134,
+    140 => 86135,
+    141 => 86136,
+    142 => 86137,
+    143 => 86138,
+    144 => 86139,
+    145 => 86145,
+    146 => 86147,
+    147 => 86150,
+    148 => 86151,
+    149 => 86152,
+    150 => 86153,
+    151 => 86155,
+    152 => 86156,
+    153 => 86157,
+    154 => 86158,
+    155 => 86159,
+    156 => 86170,
+    157 => 86176,
+    158 => 86177,
+    159 => 86178,
+    160 => 86180,
+    161 => 86181,
+    162 => 86182,
+    163 => 86183,
+    164 => 86184,
+    165 => 86185,
+    166 => 86186,
+    167 => 86187,
+    168 => 86188,
+    169 => 86189,
+    170 => 86,
+    171 => 880,
+    172 => 886,
+    173 => 90,
+    174 => 91,
+    175 => 92,
+    176 => 93,
+    177 => 94,
+    178 => 95,
+    179 => 960,
+    180 => 961,
+    181 => 962,
+    182 => 963,
+    183 => 966,
+    184 => 967,
+    185 => 968,
+    186 => 970,
+    187 => 971,
+    188 => 972,
+    189 => 975,
+    190 => 976,
+    191 => 98,
+    192 => 992,
+    193 => 993,
+    194 => 994,
+    195 => 995,
+    196 => 996,
   ),
   'es' => 
   array (
diff --git a/src/geocoding/data/en/371.php b/src/geocoding/data/en/371.php
deleted file mode 100644
index 40431f65..00000000
--- a/src/geocoding/data/en/371.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * This file has been @generated by a phing task by {@link GeneratePhonePrefixData}.
- * See [README.md](README.md#generating-data) for more information.
- *
- * Pull requests changing data in these files will not be accepted. See the
- * [FAQ in the README](README.md#problems-with-invalid-numbers] on how to make
- * metadata changes.
- *
- * Do not modify this file directly!
- */
-
-return array (
-  37161 => 'Jūrmala',
-  37162 => 'Valmiera',
-  371630 => 'Jelgava',
-  371631 => 'Tukums',
-  371632 => 'Talsi',
-  371633 => 'Kuldiga',
-  371634 => 'Liepaja',
-  371635 => 'Ventspils',
-  371636 => 'Ventspils',
-  371637 => 'Dobele',
-  371638 => 'Saldus',
-  371639 => 'Bauska',
-  371640 => 'Limbaži',
-  371641 => 'Cēsis',
-  371642 => 'Valmiera',
-  371643 => 'Alūksne',
-  371644 => 'Gulbene',
-  371645 => 'Balvi',
-  371646 => 'Rēzekne',
-  371647 => 'Valka',
-  371648 => 'Madona',
-  371649 => 'Aizkraukle',
-  371650 => 'Ogre',
-  371651 => 'Aizkraukle',
-  371652 => 'Jēkabpils',
-  371653 => 'Preiļi',
-  371654 => 'Daugavpils',
-  371655 => 'Ogre',
-  371656 => 'Krāslava',
-  371657 => 'Ludza',
-  371658 => 'Daugavpils',
-  371659 => 'Cēsis',
-  37166 => 'Riga',
-  37167 => 'Riga',
-  371682 => 'Valmiera',
-  371683 => 'Jēkabpils',
-  371684 => 'Liepāja',
-  371686 => 'Jelgava',
-  37169 => 'Riga',
-);
diff --git a/src/timezone/data/map_data.php b/src/timezone/data/map_data.php
index 65507142..e7666e26 100644
--- a/src/timezone/data/map_data.php
+++ b/src/timezone/data/map_data.php
@@ -1428,6 +1428,7 @@
   1725 => 'America/Los_Angeles',
   1726 => 'America/Chicago',
   1727 => 'America/New_York',
+  1728 => 'America/New_York',
   1730 => 'America/Chicago',
   1731 => 'America/Chicago',
   1732 => 'America/New_York',