diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt
index d4244d50c..8000ecc5c 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.12.43
+v8.12.44
diff --git a/src/carrier/data/en/238.php b/src/carrier/data/en/238.php
index 4d202452a..5f64ec7f7 100644
--- a/src/carrier/data/en/238.php
+++ b/src/carrier/data/en/238.php
@@ -11,10 +11,7 @@
  */
 
 return array (
-  23833 => 'T+',
   23836 => 'CVMOVEL',
-  23843 => 'T+',
-  23846 => 'CVMOVEL',
   23851 => 'T+',
   23852 => 'T+',
   23853 => 'T+',
diff --git a/src/carrier/data/en/248.php b/src/carrier/data/en/248.php
index 63cd3cf7d..2b7a03398 100644
--- a/src/carrier/data/en/248.php
+++ b/src/carrier/data/en/248.php
@@ -11,6 +11,8 @@
  */
 
 return array (
+  24821 => 'Intelvision',
+  24822 => 'Intelvision',
   24825 => 'CWS',
   24826 => 'CWS',
   24827 => 'Airtel',
diff --git a/src/data/PhoneNumberMetadata_AG.php b/src/data/PhoneNumberMetadata_AG.php
index 81d3c2575..afde66a62 100644
--- a/src/data/PhoneNumberMetadata_AG.php
+++ b/src/data/PhoneNumberMetadata_AG.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_AI.php b/src/data/PhoneNumberMetadata_AI.php
index 8b6d7dd1f..5022eae45 100644
--- a/src/data/PhoneNumberMetadata_AI.php
+++ b/src/data/PhoneNumberMetadata_AI.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_AS.php b/src/data/PhoneNumberMetadata_AS.php
index eaf382460..fc4dcf95b 100644
--- a/src/data/PhoneNumberMetadata_AS.php
+++ b/src/data/PhoneNumberMetadata_AS.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_BB.php b/src/data/PhoneNumberMetadata_BB.php
index 50f8b7f88..ed354a388 100644
--- a/src/data/PhoneNumberMetadata_BB.php
+++ b/src/data/PhoneNumberMetadata_BB.php
@@ -83,7 +83,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_BM.php b/src/data/PhoneNumberMetadata_BM.php
index 3db124be3..45e4c6548 100644
--- a/src/data/PhoneNumberMetadata_BM.php
+++ b/src/data/PhoneNumberMetadata_BM.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_BS.php b/src/data/PhoneNumberMetadata_BS.php
index 03a7e172b..4cc3a18bc 100644
--- a/src/data/PhoneNumberMetadata_BS.php
+++ b/src/data/PhoneNumberMetadata_BS.php
@@ -83,7 +83,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_CA.php b/src/data/PhoneNumberMetadata_CA.php
index e79e8b5da..6d24a4165 100644
--- a/src/data/PhoneNumberMetadata_CA.php
+++ b/src/data/PhoneNumberMetadata_CA.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|(?:5(?:00|2[12]|33|44|66|77|88)|622)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|(?:5(?:00|2[1256]|33|44|66|77|88)|622)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_CV.php b/src/data/PhoneNumberMetadata_CV.php
index ffcb030aa..01dc9db29 100644
--- a/src/data/PhoneNumberMetadata_CV.php
+++ b/src/data/PhoneNumberMetadata_CV.php
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:[34][36]|5[1-389]|9\\d)\\d{5}',
+    'NationalNumberPattern' => '(?:36|5[1-389]|9\\d)\\d{5}',
     'ExampleNumber' => '9911234',
     'PossibleLength' => 
     array (
@@ -88,9 +88,10 @@
   ),
   'voip' => 
   array (
+    'NationalNumberPattern' => '(?:3[3-5]|4[356])\\d{5}',
+    'ExampleNumber' => '3401234',
     'PossibleLength' => 
     array (
-      0 => -1,
     ),
     'PossibleLengthLocalOnly' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_DM.php b/src/data/PhoneNumberMetadata_DM.php
index 42bcbb865..4ae09d042 100644
--- a/src/data/PhoneNumberMetadata_DM.php
+++ b/src/data/PhoneNumberMetadata_DM.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_DO.php b/src/data/PhoneNumberMetadata_DO.php
index 8a06cf84a..164d2e616 100644
--- a/src/data/PhoneNumberMetadata_DO.php
+++ b/src/data/PhoneNumberMetadata_DO.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_GD.php b/src/data/PhoneNumberMetadata_GD.php
index 0543314ff..912343a8f 100644
--- a/src/data/PhoneNumberMetadata_GD.php
+++ b/src/data/PhoneNumberMetadata_GD.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_GU.php b/src/data/PhoneNumberMetadata_GU.php
index 0905d1dff..6be01918b 100644
--- a/src/data/PhoneNumberMetadata_GU.php
+++ b/src/data/PhoneNumberMetadata_GU.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_JM.php b/src/data/PhoneNumberMetadata_JM.php
index 08493205d..874f0c420 100644
--- a/src/data/PhoneNumberMetadata_JM.php
+++ b/src/data/PhoneNumberMetadata_JM.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_KN.php b/src/data/PhoneNumberMetadata_KN.php
index 56c33e6a5..9d754db54 100644
--- a/src/data/PhoneNumberMetadata_KN.php
+++ b/src/data/PhoneNumberMetadata_KN.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_KY.php b/src/data/PhoneNumberMetadata_KY.php
index 74c991723..119b0b7d0 100644
--- a/src/data/PhoneNumberMetadata_KY.php
+++ b/src/data/PhoneNumberMetadata_KY.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '345(?:2(?:22|3[23]|44|66)|333|444|6(?:23|38|40)|7(?:30|4[35-79]|6[6-9]|77)|8(?:00|1[45]|25|[48]8)|9(?:14|4[035-9]))\\d{4}',
+    'NationalNumberPattern' => '345(?:2(?:22|3[23]|44|66)|333|444|6(?:23|38|40)|7(?:30|4[35-79]|6[6-9]|77)|8(?:00|1[45]|[48]8)|9(?:14|4[035-9]))\\d{4}',
     'ExampleNumber' => '3452221234',
     'PossibleLength' => 
     array (
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '345(?:32[1-9]|42[0-4]|5(?:1[67]|2[5-79]|4[6-9]|50|76)|649|9(?:1[679]|2[2-9]|3[06-9]|90))\\d{4}',
+    'NationalNumberPattern' => '345(?:32[1-9]|42[0-4]|5(?:1[67]|2[5-79]|4[6-9]|50|76)|649|82[56]|9(?:1[679]|2[2-9]|3[06-9]|90))\\d{4}',
     'ExampleNumber' => '3453231234',
     'PossibleLength' => 
     array (
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_LC.php b/src/data/PhoneNumberMetadata_LC.php
index c9658c1d0..8ee57a956 100644
--- a/src/data/PhoneNumberMetadata_LC.php
+++ b/src/data/PhoneNumberMetadata_LC.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_MP.php b/src/data/PhoneNumberMetadata_MP.php
index 508aa3863..2a10b1f3d 100644
--- a/src/data/PhoneNumberMetadata_MP.php
+++ b/src/data/PhoneNumberMetadata_MP.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_MS.php b/src/data/PhoneNumberMetadata_MS.php
index 4a212b2b8..be30d395c 100644
--- a/src/data/PhoneNumberMetadata_MS.php
+++ b/src/data/PhoneNumberMetadata_MS.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_PR.php b/src/data/PhoneNumberMetadata_PR.php
index f5a97a95d..9293ed755 100644
--- a/src/data/PhoneNumberMetadata_PR.php
+++ b/src/data/PhoneNumberMetadata_PR.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_SC.php b/src/data/PhoneNumberMetadata_SC.php
index f9aa09df9..6b4dab5f2 100644
--- a/src/data/PhoneNumberMetadata_SC.php
+++ b/src/data/PhoneNumberMetadata_SC.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '8000\\d{3}|(?:[249]\\d|64)\\d{5}',
+    'NationalNumberPattern' => '800\\d{4}|(?:[249]\\d|64)\\d{5}',
     'PossibleLength' => 
     array (
       0 => 7,
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '2[5-8]\\d{5}',
+    'NationalNumberPattern' => '2[125-8]\\d{5}',
     'ExampleNumber' => '2510123',
     'PossibleLength' => 
     array (
@@ -47,7 +47,7 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '8000\\d{3}',
+    'NationalNumberPattern' => '800[08]\\d{3}',
     'ExampleNumber' => '8000000',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_SX.php b/src/data/PhoneNumberMetadata_SX.php
index 493480426..e31884ccc 100644
--- a/src/data/PhoneNumberMetadata_SX.php
+++ b/src/data/PhoneNumberMetadata_SX.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_TC.php b/src/data/PhoneNumberMetadata_TC.php
index 9d0b7d708..6bf5a8642 100644
--- a/src/data/PhoneNumberMetadata_TC.php
+++ b/src/data/PhoneNumberMetadata_TC.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_TT.php b/src/data/PhoneNumberMetadata_TT.php
index c4a6d3bd1..ba259ced7 100644
--- a/src/data/PhoneNumberMetadata_TT.php
+++ b/src/data/PhoneNumberMetadata_TT.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php
index 3a417014e..6c1a4f7b4 100644
--- a/src/data/PhoneNumberMetadata_US.php
+++ b/src/data/PhoneNumberMetadata_US.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '5(?:05(?:[2-57-9]\\d\\d|6(?:[0-35-9]\\d|44))|82(?:2(?:0[0-3]|[268]2)|3(?:0[02]|33)|4(?:00|4[24]|65|82)|5(?:00|29|83)|6(?:00|66|82)|777|8(?:00|88)|9(?:00|9[89])))\\d{4}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[39]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[0179]|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[08]|3[0-289]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01579]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '5(?:05(?:[2-57-9]\\d\\d|6(?:[0-35-9]\\d|44))|82(?:2(?:0[0-3]|[268]2)|3(?:0[02]|22|33)|4(?:00|4[24]|65|82)|5(?:00|29|58|83)|6(?:00|66|82)|7(?:58|77)|8(?:00|42|88)|9(?:00|9[89])))\\d{4}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[39]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[0179]|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[08]|3[0-289]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01579]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLength' => 
     array (
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '5(?:05(?:[2-57-9]\\d\\d|6(?:[0-35-9]\\d|44))|82(?:2(?:0[0-3]|[268]2)|3(?:0[02]|33)|4(?:00|4[24]|65|82)|5(?:00|29|83)|6(?:00|66|82)|777|8(?:00|88)|9(?:00|9[89])))\\d{4}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[39]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[0179]|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[08]|3[0-289]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01579]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '5(?:05(?:[2-57-9]\\d\\d|6(?:[0-35-9]\\d|44))|82(?:2(?:0[0-3]|[268]2)|3(?:0[02]|22|33)|4(?:00|4[24]|65|82)|5(?:00|29|58|83)|6(?:00|66|82)|7(?:58|77)|8(?:00|42|88)|9(?:00|9[89])))\\d{4}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[39]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[0179]|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[08]|3[0-289]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01579]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLength' => 
     array (
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_VC.php b/src/data/PhoneNumberMetadata_VC.php
index e80b9761d..bcb23d63f 100644
--- a/src/data/PhoneNumberMetadata_VC.php
+++ b/src/data/PhoneNumberMetadata_VC.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_VG.php b/src/data/PhoneNumberMetadata_VG.php
index 71973b372..7248b2a8b 100644
--- a/src/data/PhoneNumberMetadata_VG.php
+++ b/src/data/PhoneNumberMetadata_VG.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_VI.php b/src/data/PhoneNumberMetadata_VI.php
index f3e33e48b..2039ff05e 100644
--- a/src/data/PhoneNumberMetadata_VI.php
+++ b/src/data/PhoneNumberMetadata_VI.php
@@ -82,7 +82,7 @@
   ),
   'personalNumber' => 
   array (
-    'NationalNumberPattern' => '52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[12]|33|44|66|77|88)[2-9]\\d{6}',
+    'NationalNumberPattern' => '52(?:355[0-46-9]|4(?:5(?:2[024-9]|5[0-46-9])|60[1-9]|9(?:2[0-5]|49)))\\d{4}|52(?:3(?:[2-46-9][02-9]|5[02-46-9])|4(?:[2-478][02-9]|5[034]|6[2-9]|9[05-9])|7[2-4]\\d)\\d{5}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[1256]|33|44|66|77|88)[2-9]\\d{6}',
     'ExampleNumber' => '5002345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/ShortNumberMetadata_BE.php b/src/data/ShortNumberMetadata_BE.php
index 09c0505ad..8854002ab 100644
--- a/src/data/ShortNumberMetadata_BE.php
+++ b/src/data/ShortNumberMetadata_BE.php
@@ -27,7 +27,7 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '1(?:0[0-25-8]|1[02]|7(?:12|77)|813)|(?:116|8)\\d{3}',
+    'NationalNumberPattern' => '1(?:0[0-35-8]|1[02]|7(?:12|77)|813)|(?:116|8)\\d{3}',
     'ExampleNumber' => '100',
     'PossibleLength' => 
     array (
diff --git a/src/data/ShortNumberMetadata_PT.php b/src/data/ShortNumberMetadata_PT.php
index 7376db964..18cc54650 100644
--- a/src/data/ShortNumberMetadata_PT.php
+++ b/src/data/ShortNumberMetadata_PT.php
@@ -27,7 +27,7 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '11[25]|1(?:16\\d\\d|5[1589]|8[279])\\d',
+    'NationalNumberPattern' => '11[257]|1(?:16\\d\\d|5[1589]|8[279])\\d',
     'ExampleNumber' => '112',
     'PossibleLength' => 
     array (
diff --git a/src/data/ShortNumberMetadata_SC.php b/src/data/ShortNumberMetadata_SC.php
index c9e922b95..02767a3ad 100644
--- a/src/data/ShortNumberMetadata_SC.php
+++ b/src/data/ShortNumberMetadata_SC.php
@@ -26,8 +26,8 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
+    'NationalNumberPattern' => '1(?:1[146]|60)|999',
+    'ExampleNumber' => '111',
     'PossibleLength' => 
     array (
       0 => 3,
@@ -60,7 +60,7 @@
   ),
   'shortCode' => 
   array (
-    'NationalNumberPattern' => '1(?:0\\d|1[027]|2[0-8]|3[13]|4[0-2]|[59][15]|6[1-9]|7[124-6]|8[158])|9(?:6\\d\\d|99)',
+    'NationalNumberPattern' => '1(?:[06]\\d|1[0-2467]|2[0-8]|3[13]|4[0-2]|[59][15]|7[124-6]|8[158])|9(?:6\\d\\d|99)',
     'ExampleNumber' => '100',
     'PossibleLength' => 
     array (
diff --git a/src/data/ShortNumberMetadata_SE.php b/src/data/ShortNumberMetadata_SE.php
index 298679f69..bcbac7bbc 100644
--- a/src/data/ShortNumberMetadata_SE.php
+++ b/src/data/ShortNumberMetadata_SE.php
@@ -28,13 +28,10 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '112|(?:116\\d|900)\\d\\d',
+    'NationalNumberPattern' => '11(?:2|(?:3|6\\d)\\d\\d|414|77)|900\\d\\d',
     'ExampleNumber' => '112',
     'PossibleLength' => 
     array (
-      0 => 3,
-      1 => 5,
-      2 => 6,
     ),
     'PossibleLengthLocalOnly' => 
     array (
diff --git a/src/data/ShortNumberMetadata_US.php b/src/data/ShortNumberMetadata_US.php
index 08f0ba59a..29b0cb737 100644
--- a/src/data/ShortNumberMetadata_US.php
+++ b/src/data/ShortNumberMetadata_US.php
@@ -28,7 +28,7 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '112|988|[69]11',
+    'NationalNumberPattern' => '112|611|9(?:11|33|88)',
     'ExampleNumber' => '112',
     'PossibleLength' => 
     array (
@@ -64,7 +64,7 @@
   ),
   'shortCode' => 
   array (
-    'NationalNumberPattern' => '11(?:2|5[1-47]|[68]\\d|7[0-57]|98)|[2-9]\\d{3,5}|[2-8]11|9(?:11|88)',
+    'NationalNumberPattern' => '11(?:2|5[1-47]|[68]\\d|7[0-57]|98)|[2-9]\\d{3,5}|[2-8]11|9(?:11|33|88)',
     'ExampleNumber' => '112',
     'PossibleLength' => 
     array (
diff --git a/src/geocoding/data/en/13.php b/src/geocoding/data/en/13.php
index a84278558..1c4280437 100644
--- a/src/geocoding/data/en/13.php
+++ b/src/geocoding/data/en/13.php
@@ -3117,7 +3117,6 @@
   13457 => 'Cayman Islands',
   134580 => 'Cayman Islands',
   134581 => 'Cayman Islands',
-  134582 => 'Cayman Islands',
   1345848 => 'Cayman Islands',
   134588 => 'Cayman Islands',
   1345914 => 'Cayman Islands',
diff --git a/src/geocoding/data/en/238.php b/src/geocoding/data/en/238.php
index 0be56aef2..00a1538be 100644
--- a/src/geocoding/data/en/238.php
+++ b/src/geocoding/data/en/238.php
@@ -16,8 +16,8 @@
   238223 => 'Paúl, Santo Antão',
   238224 => 'Cocoli, Santo Antão',
   238225 => 'Ponta do Sol, Santo Antão',
-  238226 => 'Chã da Igreja, Santo Antão',
-  238227 => 'Ribeira das Patas, Santo Antão',
+  238226 => 'Manta Velha/Chã de Igreja  (Santo Antão Island)',
+  238227 => 'Lajedos/Alto Mira (Santo Antão Island)',
   238230 => 'Mindelo, São Vicente',
   238231 => 'Mindelo, São Vicente',
   238232 => 'Mindelo, São Vicente',
@@ -41,7 +41,7 @@
   238267 => 'Cidade Velha, Santiago',
   238268 => 'São Domingos, Santiago',
   238269 => 'Pedra Badejo, Santiago',
-  238271 => 'São Lourenço dos Órgãos/São Jorge, Santiago',
+  238271 => 'Orgão/São Jorge (Santiago Island)',
   238272 => 'Picos, Santiago',
   238273 => 'Calheta de São Miguel, Santiago',
   238281 => 'São Filipe, Fogo',
diff --git a/src/geocoding/data/en/61.php b/src/geocoding/data/en/61.php
index 29e58a1ee..094616bee 100644
--- a/src/geocoding/data/en/61.php
+++ b/src/geocoding/data/en/61.php
@@ -4480,7 +4480,7 @@
   61255616 => 'Telegraph Point',
   61255617 => 'Toorooka',
   61255618 => 'Widden Valley',
-  61255619 => 'Baerami',
+  61255619 => 'Taree',
   61255620 => 'Bowraville',
   61255621 => 'Broke',
   61255622 => 'Bunnan',
@@ -31586,7 +31586,7 @@
   61740636 => 'Euramo',
   61740637 => 'Euramo',
   61740638 => 'Georgetown',
-  61740639 => 'Gordonvale',
+  61740639 => 'Mareeba',
   6174064 => 'South Johnstone',
   61740649 => 'Herberton',
   6174065 => 'Silkwood',
@@ -31648,7 +31648,7 @@
   61740741 => 'Mutchilba',
   61740742 => 'Peninsula',
   61740743 => 'Ravenshoe',
-  61740744 => 'Silkwood',
+  61740744 => 'Ravenshoe',
   61740745 => 'South Johnstone',
   61740746 => 'Thursday Island',
   61740747 => 'Torres',
@@ -33779,7 +33779,7 @@
   61743480 => 'Boondooma',
   61743481 => 'Booyal',
   61743482 => 'Brooklands',
-  61743483 => 'Brooweena',
+  61743483 => 'Bundaberg',
   61743484 => 'Bundaberg',
   61743485 => 'Bunker',
   61743486 => 'Burnett',
@@ -40461,7 +40461,7 @@
   61752290 => 'Imbil',
   61752291 => 'Jimna',
   61752292 => 'Kalbar',
-  61752293 => 'Kenilworth',
+  61752293 => 'Laidley',
   61752294 => 'Kia Ora',
   61752295 => 'Kilcoy',
   61752296 => 'Kilkivan',
diff --git a/src/geocoding/data/pt/238.php b/src/geocoding/data/pt/238.php
index 0be56aef2..00a1538be 100644
--- a/src/geocoding/data/pt/238.php
+++ b/src/geocoding/data/pt/238.php
@@ -16,8 +16,8 @@
   238223 => 'Paúl, Santo Antão',
   238224 => 'Cocoli, Santo Antão',
   238225 => 'Ponta do Sol, Santo Antão',
-  238226 => 'Chã da Igreja, Santo Antão',
-  238227 => 'Ribeira das Patas, Santo Antão',
+  238226 => 'Manta Velha/Chã de Igreja  (Santo Antão Island)',
+  238227 => 'Lajedos/Alto Mira (Santo Antão Island)',
   238230 => 'Mindelo, São Vicente',
   238231 => 'Mindelo, São Vicente',
   238232 => 'Mindelo, São Vicente',
@@ -41,7 +41,7 @@
   238267 => 'Cidade Velha, Santiago',
   238268 => 'São Domingos, Santiago',
   238269 => 'Pedra Badejo, Santiago',
-  238271 => 'São Lourenço dos Órgãos/São Jorge, Santiago',
+  238271 => 'Orgão/São Jorge (Santiago Island)',
   238272 => 'Picos, Santiago',
   238273 => 'Calheta de São Miguel, Santiago',
   238281 => 'São Filipe, Fogo',