From 040824fa79993f19f3a5880d253e53989091c2ce Mon Sep 17 00:00:00 2001
From: Joshua Gigg <giggsey@gmail.com>
Date: Mon, 29 Apr 2024 17:07:13 +0100
Subject: [PATCH] Smaller metadata files

 - Use symfony/var-exporter to generate better PHP
 - Skip some booleans that match their default value
 - Rename some properties to reduce string size
---
 build/BuildMetadataPHPFromXml.php             |   18 +-
 composer.json                                 |    3 +-
 src/CountryCodeToRegionCodeMap.php            | 1585 +++++++----------
 src/CountryCodeToRegionCodeMapForTesting.php  |  219 +--
 src/NumberFormat.php                          |    4 +-
 src/PhoneMetadata.php                         |   27 +-
 src/PhoneNumberDesc.php                       |   29 +-
 src/ShortNumbersRegionCodeSet.php             |  484 ++---
 src/data/PhoneNumberMetadata_800.php          |  157 +-
 src/data/PhoneNumberMetadata_808.php          |  157 +-
 src/data/PhoneNumberMetadata_870.php          |  158 +-
 src/data/PhoneNumberMetadata_878.php          |  157 +-
 src/data/PhoneNumberMetadata_881.php          |  177 +-
 src/data/PhoneNumberMetadata_882.php          |  351 ++--
 src/data/PhoneNumberMetadata_883.php          |  271 ++-
 src/data/PhoneNumberMetadata_888.php          |  154 +-
 src/data/PhoneNumberMetadata_979.php          |  169 +-
 src/data/PhoneNumberMetadata_AC.php           |  151 +-
 src/data/PhoneNumberMetadata_AD.php           |  223 +--
 src/data/PhoneNumberMetadata_AE.php           |  286 ++-
 src/data/PhoneNumberMetadata_AF.php           |  247 ++-
 src/data/PhoneNumberMetadata_AG.php           |  164 +-
 src/data/PhoneNumberMetadata_AI.php           |  160 +-
 src/data/PhoneNumberMetadata_AL.php           |  320 ++--
 src/data/PhoneNumberMetadata_AM.php           |  227 +--
 src/data/PhoneNumberMetadata_AO.php           |  155 +-
 src/data/PhoneNumberMetadata_AR.php           |  656 +++----
 src/data/PhoneNumberMetadata_AS.php           |  155 +-
 src/data/PhoneNumberMetadata_AT.php           |  583 +++---
 src/data/PhoneNumberMetadata_AU.php           |  565 +++---
 src/data/PhoneNumberMetadata_AW.php           |  152 +-
 src/data/PhoneNumberMetadata_AX.php           |  194 +-
 src/data/PhoneNumberMetadata_AZ.php           |  329 ++--
 src/data/PhoneNumberMetadata_BA.php           |  352 ++--
 src/data/PhoneNumberMetadata_BB.php           |  169 +-
 src/data/PhoneNumberMetadata_BD.php           |  241 ++-
 src/data/PhoneNumberMetadata_BE.php           |  277 ++-
 src/data/PhoneNumberMetadata_BF.php           |  155 +-
 src/data/PhoneNumberMetadata_BG.php           |  555 +++---
 src/data/PhoneNumberMetadata_BH.php           |  153 +-
 src/data/PhoneNumberMetadata_BI.php           |  155 +-
 src/data/PhoneNumberMetadata_BJ.php           |  153 +-
 src/data/PhoneNumberMetadata_BL.php           |  138 +-
 src/data/PhoneNumberMetadata_BM.php           |  156 +-
 src/data/PhoneNumberMetadata_BN.php           |  154 +-
 src/data/PhoneNumberMetadata_BO.php           |  257 ++-
 src/data/PhoneNumberMetadata_BQ.php           |  137 +-
 src/data/PhoneNumberMetadata_BR.php           |  467 +++--
 src/data/PhoneNumberMetadata_BS.php           |  160 +-
 src/data/PhoneNumberMetadata_BT.php           |  294 ++-
 src/data/PhoneNumberMetadata_BW.php           |  289 ++-
 src/data/PhoneNumberMetadata_BY.php           |  333 ++--
 src/data/PhoneNumberMetadata_BZ.php           |  192 +-
 src/data/PhoneNumberMetadata_CA.php           |  187 +-
 src/data/PhoneNumberMetadata_CC.php           |  194 +-
 src/data/PhoneNumberMetadata_CD.php           |  220 +--
 src/data/PhoneNumberMetadata_CF.php           |  154 +-
 src/data/PhoneNumberMetadata_CG.php           |  173 +-
 src/data/PhoneNumberMetadata_CH.php           |  242 ++-
 src/data/PhoneNumberMetadata_CI.php           |  174 +-
 src/data/PhoneNumberMetadata_CK.php           |  155 +-
 src/data/PhoneNumberMetadata_CL.php           |  562 +++---
 src/data/PhoneNumberMetadata_CM.php           |  186 +-
 src/data/PhoneNumberMetadata_CN.php           |  829 ++++-----
 src/data/PhoneNumberMetadata_CO.php           |  325 ++--
 src/data/PhoneNumberMetadata_CR.php           |  202 +--
 src/data/PhoneNumberMetadata_CU.php           |  281 ++-
 src/data/PhoneNumberMetadata_CV.php           |  153 +-
 src/data/PhoneNumberMetadata_CW.php           |  187 +-
 src/data/PhoneNumberMetadata_CX.php           |  194 +-
 src/data/PhoneNumberMetadata_CY.php           |  151 +-
 src/data/PhoneNumberMetadata_CZ.php           |  256 ++-
 src/data/PhoneNumberMetadata_DE.php           |  715 ++++----
 src/data/PhoneNumberMetadata_DJ.php           |  155 +-
 src/data/PhoneNumberMetadata_DK.php           |  154 +-
 src/data/PhoneNumberMetadata_DM.php           |  156 +-
 src/data/PhoneNumberMetadata_DO.php           |  154 +-
 src/data/PhoneNumberMetadata_DZ.php           |  222 +--
 src/data/PhoneNumberMetadata_EC.php           |  352 ++--
 src/data/PhoneNumberMetadata_EE.php           |  248 ++-
 src/data/PhoneNumberMetadata_EG.php           |  291 ++-
 src/data/PhoneNumberMetadata_EH.php           |  138 +-
 src/data/PhoneNumberMetadata_ER.php           |  169 +-
 src/data/PhoneNumberMetadata_ES.php           |  251 ++-
 src/data/PhoneNumberMetadata_ET.php           |  169 +-
 src/data/PhoneNumberMetadata_FI.php           |  473 +++--
 src/data/PhoneNumberMetadata_FJ.php           |  194 +-
 src/data/PhoneNumberMetadata_FK.php           |  135 +-
 src/data/PhoneNumberMetadata_FM.php           |  155 +-
 src/data/PhoneNumberMetadata_FO.php           |  154 +-
 src/data/PhoneNumberMetadata_FR.php           |  255 ++-
 src/data/PhoneNumberMetadata_GA.php           |  206 +--
 src/data/PhoneNumberMetadata_GB.php           |  419 ++---
 src/data/PhoneNumberMetadata_GD.php           |  156 +-
 src/data/PhoneNumberMetadata_GE.php           |  226 +--
 src/data/PhoneNumberMetadata_GF.php           |  177 +-
 src/data/PhoneNumberMetadata_GG.php           |  188 +-
 src/data/PhoneNumberMetadata_GH.php           |  307 ++--
 src/data/PhoneNumberMetadata_GI.php           |  156 +-
 src/data/PhoneNumberMetadata_GL.php           |  153 +-
 src/data/PhoneNumberMetadata_GM.php           |  155 +-
 src/data/PhoneNumberMetadata_GN.php           |  192 +-
 src/data/PhoneNumberMetadata_GP.php           |  178 +-
 src/data/PhoneNumberMetadata_GQ.php           |  172 +-
 src/data/PhoneNumberMetadata_GR.php           |  246 ++-
 src/data/PhoneNumberMetadata_GT.php           |  196 +-
 src/data/PhoneNumberMetadata_GU.php           |  156 +-
 src/data/PhoneNumberMetadata_GW.php           |  192 +-
 src/data/PhoneNumberMetadata_GY.php           |  152 +-
 src/data/PhoneNumberMetadata_HK.php           |  297 ++-
 src/data/PhoneNumberMetadata_HN.php           |  218 +--
 src/data/PhoneNumberMetadata_HR.php           |  367 ++--
 src/data/PhoneNumberMetadata_HT.php           |  153 +-
 src/data/PhoneNumberMetadata_HU.php           |  236 ++-
 src/data/PhoneNumberMetadata_ID.php           |  675 +++----
 src/data/PhoneNumberMetadata_IE.php           |  432 ++---
 src/data/PhoneNumberMetadata_IL.php           |  396 ++--
 src/data/PhoneNumberMetadata_IM.php           |  148 +-
 src/data/PhoneNumberMetadata_IN.php           |  692 ++++---
 src/data/PhoneNumberMetadata_IO.php           |  155 +-
 src/data/PhoneNumberMetadata_IQ.php           |  259 ++-
 src/data/PhoneNumberMetadata_IR.php           |  301 ++--
 src/data/PhoneNumberMetadata_IS.php           |  204 +--
 src/data/PhoneNumberMetadata_IT.php           |  709 ++++----
 src/data/PhoneNumberMetadata_JE.php           |  145 +-
 src/data/PhoneNumberMetadata_JM.php           |  154 +-
 src/data/PhoneNumberMetadata_JO.php           |  285 ++-
 src/data/PhoneNumberMetadata_JP.php           |  723 ++++----
 src/data/PhoneNumberMetadata_KE.php           |  232 +--
 src/data/PhoneNumberMetadata_KG.php           |  252 ++-
 src/data/PhoneNumberMetadata_KH.php           |  248 ++-
 src/data/PhoneNumberMetadata_KI.php           |  150 +-
 src/data/PhoneNumberMetadata_KM.php           |  164 +-
 src/data/PhoneNumberMetadata_KN.php           |  156 +-
 src/data/PhoneNumberMetadata_KP.php           |  250 ++-
 src/data/PhoneNumberMetadata_KR.php           |  656 +++----
 src/data/PhoneNumberMetadata_KW.php           |  193 +-
 src/data/PhoneNumberMetadata_KY.php           |  155 +-
 src/data/PhoneNumberMetadata_KZ.php           |  189 +-
 src/data/PhoneNumberMetadata_LA.php           |  259 ++-
 src/data/PhoneNumberMetadata_LB.php           |  188 +-
 src/data/PhoneNumberMetadata_LC.php           |  156 +-
 src/data/PhoneNumberMetadata_LI.php           |  238 ++-
 src/data/PhoneNumberMetadata_LK.php           |  187 +-
 src/data/PhoneNumberMetadata_LR.php           |  221 +--
 src/data/PhoneNumberMetadata_LS.php           |  154 +-
 src/data/PhoneNumberMetadata_LT.php           |  215 +--
 src/data/PhoneNumberMetadata_LU.php           |  397 ++---
 src/data/PhoneNumberMetadata_LV.php           |  153 +-
 src/data/PhoneNumberMetadata_LY.php           |  169 +-
 src/data/PhoneNumberMetadata_MA.php           |  215 +--
 src/data/PhoneNumberMetadata_MC.php           |  325 ++--
 src/data/PhoneNumberMetadata_MD.php           |  193 +-
 src/data/PhoneNumberMetadata_ME.php           |  194 +-
 src/data/PhoneNumberMetadata_MF.php           |  138 +-
 src/data/PhoneNumberMetadata_MG.php           |  170 +-
 src/data/PhoneNumberMetadata_MH.php           |  158 +-
 src/data/PhoneNumberMetadata_MK.php           |  209 +--
 src/data/PhoneNumberMetadata_ML.php           |  196 +-
 src/data/PhoneNumberMetadata_MM.php           |  403 ++---
 src/data/PhoneNumberMetadata_MN.php           |  302 ++--
 src/data/PhoneNumberMetadata_MO.php           |  192 +-
 src/data/PhoneNumberMetadata_MP.php           |  156 +-
 src/data/PhoneNumberMetadata_MQ.php           |  177 +-
 src/data/PhoneNumberMetadata_MR.php           |  154 +-
 src/data/PhoneNumberMetadata_MS.php           |  156 +-
 src/data/PhoneNumberMetadata_MT.php           |  151 +-
 src/data/PhoneNumberMetadata_MU.php           |  229 +--
 src/data/PhoneNumberMetadata_MV.php           |  202 +--
 src/data/PhoneNumberMetadata_MW.php           |  206 +--
 src/data/PhoneNumberMetadata_MX.php           |  417 ++---
 src/data/PhoneNumberMetadata_MY.php           |  341 ++--
 src/data/PhoneNumberMetadata_MZ.php           |  192 +-
 src/data/PhoneNumberMetadata_NA.php           |  232 +--
 src/data/PhoneNumberMetadata_NC.php           |  196 +-
 src/data/PhoneNumberMetadata_NE.php           |  172 +-
 src/data/PhoneNumberMetadata_NF.php           |  197 +-
 src/data/PhoneNumberMetadata_NG.php           |  401 ++---
 src/data/PhoneNumberMetadata_NI.php           |  154 +-
 src/data/PhoneNumberMetadata_NL.php           |  549 +++---
 src/data/PhoneNumberMetadata_NO.php           |  213 +--
 src/data/PhoneNumberMetadata_NP.php           |  350 ++--
 src/data/PhoneNumberMetadata_NR.php           |  155 +-
 src/data/PhoneNumberMetadata_NU.php           |  162 +-
 src/data/PhoneNumberMetadata_NZ.php           |  345 ++--
 src/data/PhoneNumberMetadata_OM.php           |  213 +--
 src/data/PhoneNumberMetadata_PA.php           |  217 +--
 src/data/PhoneNumberMetadata_PE.php           |  299 ++--
 src/data/PhoneNumberMetadata_PF.php           |  225 +--
 src/data/PhoneNumberMetadata_PG.php           |  202 +--
 src/data/PhoneNumberMetadata_PH.php           |  392 ++--
 src/data/PhoneNumberMetadata_PK.php           |  399 ++---
 src/data/PhoneNumberMetadata_PL.php           |  362 ++--
 src/data/PhoneNumberMetadata_PM.php           |  210 +--
 src/data/PhoneNumberMetadata_PR.php           |  155 +-
 src/data/PhoneNumberMetadata_PS.php           |  261 ++-
 src/data/PhoneNumberMetadata_PT.php           |  167 +-
 src/data/PhoneNumberMetadata_PW.php           |  155 +-
 src/data/PhoneNumberMetadata_PY.php           |  395 ++--
 src/data/PhoneNumberMetadata_QA.php           |  205 +--
 src/data/PhoneNumberMetadata_RE.php           |  156 +-
 src/data/PhoneNumberMetadata_RO.php           |  248 ++-
 src/data/PhoneNumberMetadata_RS.php           |  243 ++-
 src/data/PhoneNumberMetadata_RU.php           |  461 +++--
 src/data/PhoneNumberMetadata_RW.php           |  214 +--
 src/data/PhoneNumberMetadata_SA.php           |  312 ++--
 src/data/PhoneNumberMetadata_SB.php           |  170 +-
 src/data/PhoneNumberMetadata_SC.php           |  155 +-
 src/data/PhoneNumberMetadata_SD.php           |  159 +-
 src/data/PhoneNumberMetadata_SE.php           |  678 +++----
 src/data/PhoneNumberMetadata_SG.php           |  389 ++--
 src/data/PhoneNumberMetadata_SH.php           |  149 +-
 src/data/PhoneNumberMetadata_SI.php           |  283 ++-
 src/data/PhoneNumberMetadata_SJ.php           |  172 +-
 src/data/PhoneNumberMetadata_SK.php           |  442 ++---
 src/data/PhoneNumberMetadata_SL.php           |  169 +-
 src/data/PhoneNumberMetadata_SM.php           |  306 ++--
 src/data/PhoneNumberMetadata_SN.php           |  170 +-
 src/data/PhoneNumberMetadata_SO.php           |  310 ++--
 src/data/PhoneNumberMetadata_SR.php           |  206 +--
 src/data/PhoneNumberMetadata_SS.php           |  159 +-
 src/data/PhoneNumberMetadata_ST.php           |  155 +-
 src/data/PhoneNumberMetadata_SV.php           |  223 +--
 src/data/PhoneNumberMetadata_SX.php           |  156 +-
 src/data/PhoneNumberMetadata_SY.php           |  205 +--
 src/data/PhoneNumberMetadata_SZ.php           |  202 +--
 src/data/PhoneNumberMetadata_TA.php           |  138 +-
 src/data/PhoneNumberMetadata_TC.php           |  160 +-
 src/data/PhoneNumberMetadata_TD.php           |  157 +-
 src/data/PhoneNumberMetadata_TG.php           |  155 +-
 src/data/PhoneNumberMetadata_TH.php           |  232 +--
 src/data/PhoneNumberMetadata_TJ.php           |  268 ++-
 src/data/PhoneNumberMetadata_TK.php           |  141 +-
 src/data/PhoneNumberMetadata_TL.php           |  200 +--
 src/data/PhoneNumberMetadata_TM.php           |  199 +--
 src/data/PhoneNumberMetadata_TN.php           |  152 +-
 src/data/PhoneNumberMetadata_TO.php           |  217 +--
 src/data/PhoneNumberMetadata_TR.php           |  424 ++---
 src/data/PhoneNumberMetadata_TT.php           |  160 +-
 src/data/PhoneNumberMetadata_TV.php           |  213 +--
 src/data/PhoneNumberMetadata_TW.php           |  320 ++--
 src/data/PhoneNumberMetadata_TZ.php           |  209 +--
 src/data/PhoneNumberMetadata_UA.php           |  284 ++-
 src/data/PhoneNumberMetadata_UG.php           |  215 +--
 src/data/PhoneNumberMetadata_US.php           |  255 ++-
 src/data/PhoneNumberMetadata_UY.php           |  324 ++--
 src/data/PhoneNumberMetadata_UZ.php           |  161 +-
 src/data/PhoneNumberMetadata_VA.php           |  210 +--
 src/data/PhoneNumberMetadata_VC.php           |  160 +-
 src/data/PhoneNumberMetadata_VE.php           |  171 +-
 src/data/PhoneNumberMetadata_VG.php           |  156 +-
 src/data/PhoneNumberMetadata_VI.php           |  156 +-
 src/data/PhoneNumberMetadata_VN.php           |  521 +++---
 src/data/PhoneNumberMetadata_VU.php           |  174 +-
 src/data/PhoneNumberMetadata_WF.php           |  196 +-
 src/data/PhoneNumberMetadata_WS.php           |  221 +--
 src/data/PhoneNumberMetadata_XK.php           |  241 ++-
 src/data/PhoneNumberMetadata_YE.php           |  234 +--
 src/data/PhoneNumberMetadata_YT.php           |  137 +-
 src/data/PhoneNumberMetadata_ZA.php           |  320 ++--
 src/data/PhoneNumberMetadata_ZM.php           |  250 ++-
 src/data/PhoneNumberMetadata_ZW.php           |  417 ++---
 src/data/ShortNumberMetadata_AC.php           |   94 +-
 src/data/ShortNumberMetadata_AD.php           |   94 +-
 src/data/ShortNumberMetadata_AE.php           |  110 +-
 src/data/ShortNumberMetadata_AF.php           |  114 +-
 src/data/ShortNumberMetadata_AG.php           |   92 +-
 src/data/ShortNumberMetadata_AI.php           |   92 +-
 src/data/ShortNumberMetadata_AL.php           |  126 +-
 src/data/ShortNumberMetadata_AM.php           |  116 +-
 src/data/ShortNumberMetadata_AO.php           |   94 +-
 src/data/ShortNumberMetadata_AR.php           |  122 +-
 src/data/ShortNumberMetadata_AS.php           |  110 +-
 src/data/ShortNumberMetadata_AT.php           |  109 +-
 src/data/ShortNumberMetadata_AU.php           |  152 +-
 src/data/ShortNumberMetadata_AW.php           |   92 +-
 src/data/ShortNumberMetadata_AX.php           |  106 +-
 src/data/ShortNumberMetadata_AZ.php           |  114 +-
 src/data/ShortNumberMetadata_BA.php           |  112 +-
 src/data/ShortNumberMetadata_BB.php           |   93 +-
 src/data/ShortNumberMetadata_BD.php           |  118 +-
 src/data/ShortNumberMetadata_BE.php           |  111 +-
 src/data/ShortNumberMetadata_BF.php           |   94 +-
 src/data/ShortNumberMetadata_BG.php           |  101 +-
 src/data/ShortNumberMetadata_BH.php           |  113 +-
 src/data/ShortNumberMetadata_BI.php           |  114 +-
 src/data/ShortNumberMetadata_BJ.php           |  105 +-
 src/data/ShortNumberMetadata_BL.php           |   94 +-
 src/data/ShortNumberMetadata_BM.php           |   92 +-
 src/data/ShortNumberMetadata_BN.php           |   94 +-
 src/data/ShortNumberMetadata_BO.php           |  110 +-
 src/data/ShortNumberMetadata_BQ.php           |   92 +-
 src/data/ShortNumberMetadata_BR.php           |  125 +-
 src/data/ShortNumberMetadata_BS.php           |   94 +-
 src/data/ShortNumberMetadata_BT.php           |  110 +-
 src/data/ShortNumberMetadata_BW.php           |  114 +-
 src/data/ShortNumberMetadata_BY.php           |   94 +-
 src/data/ShortNumberMetadata_BZ.php           |   96 +-
 src/data/ShortNumberMetadata_CA.php           |  122 +-
 src/data/ShortNumberMetadata_CC.php           |   94 +-
 src/data/ShortNumberMetadata_CD.php           |  114 +-
 src/data/ShortNumberMetadata_CF.php           |   96 +-
 src/data/ShortNumberMetadata_CG.php           |   94 +-
 src/data/ShortNumberMetadata_CH.php           |  142 +-
 src/data/ShortNumberMetadata_CI.php           |  114 +-
 src/data/ShortNumberMetadata_CK.php           |   94 +-
 src/data/ShortNumberMetadata_CL.php           |  126 +-
 src/data/ShortNumberMetadata_CM.php           |  120 +-
 src/data/ShortNumberMetadata_CN.php           |  113 +-
 src/data/ShortNumberMetadata_CO.php           |  116 +-
 src/data/ShortNumberMetadata_CR.php           |  110 +-
 src/data/ShortNumberMetadata_CU.php           |  103 +-
 src/data/ShortNumberMetadata_CV.php           |   94 +-
 src/data/ShortNumberMetadata_CW.php           |   92 +-
 src/data/ShortNumberMetadata_CX.php           |   94 +-
 src/data/ShortNumberMetadata_CY.php           |  101 +-
 src/data/ShortNumberMetadata_CZ.php           |  112 +-
 src/data/ShortNumberMetadata_DE.php           |  110 +-
 src/data/ShortNumberMetadata_DJ.php           |   94 +-
 src/data/ShortNumberMetadata_DK.php           |  112 +-
 src/data/ShortNumberMetadata_DM.php           |   94 +-
 src/data/ShortNumberMetadata_DO.php           |   94 +-
 src/data/ShortNumberMetadata_DZ.php           |  113 +-
 src/data/ShortNumberMetadata_EC.php           |   94 +-
 src/data/ShortNumberMetadata_EE.php           |  121 +-
 src/data/ShortNumberMetadata_EG.php           |  114 +-
 src/data/ShortNumberMetadata_EH.php           |   96 +-
 src/data/ShortNumberMetadata_ER.php           |   96 +-
 src/data/ShortNumberMetadata_ES.php           |  124 +-
 src/data/ShortNumberMetadata_ET.php           |   96 +-
 src/data/ShortNumberMetadata_FI.php           |  110 +-
 src/data/ShortNumberMetadata_FJ.php           |  112 +-
 src/data/ShortNumberMetadata_FK.php           |   94 +-
 src/data/ShortNumberMetadata_FM.php           |   96 +-
 src/data/ShortNumberMetadata_FO.php           |  101 +-
 src/data/ShortNumberMetadata_FR.php           |  139 +-
 src/data/ShortNumberMetadata_GA.php           |   96 +-
 src/data/ShortNumberMetadata_GB.php           |  119 +-
 src/data/ShortNumberMetadata_GD.php           |   92 +-
 src/data/ShortNumberMetadata_GE.php           |  114 +-
 src/data/ShortNumberMetadata_GF.php           |   94 +-
 src/data/ShortNumberMetadata_GG.php           |  110 +-
 src/data/ShortNumberMetadata_GH.php           |  120 +-
 src/data/ShortNumberMetadata_GI.php           |  130 +-
 src/data/ShortNumberMetadata_GL.php           |   94 +-
 src/data/ShortNumberMetadata_GM.php           |   96 +-
 src/data/ShortNumberMetadata_GN.php           |  106 +-
 src/data/ShortNumberMetadata_GP.php           |   94 +-
 src/data/ShortNumberMetadata_GR.php           |  114 +-
 src/data/ShortNumberMetadata_GT.php           |  116 +-
 src/data/ShortNumberMetadata_GU.php           |   94 +-
 src/data/ShortNumberMetadata_GW.php           |   94 +-
 src/data/ShortNumberMetadata_GY.php           |  114 +-
 src/data/ShortNumberMetadata_HK.php           |  124 +-
 src/data/ShortNumberMetadata_HN.php           |  114 +-
 src/data/ShortNumberMetadata_HR.php           |  132 +-
 src/data/ShortNumberMetadata_HT.php           |  114 +-
 src/data/ShortNumberMetadata_HU.php           |  115 +-
 src/data/ShortNumberMetadata_ID.php           |  116 +-
 src/data/ShortNumberMetadata_IE.php           |  128 +-
 src/data/ShortNumberMetadata_IL.php           |  116 +-
 src/data/ShortNumberMetadata_IM.php           |  112 +-
 src/data/ShortNumberMetadata_IN.php           |  162 +-
 src/data/ShortNumberMetadata_IQ.php           |  120 +-
 src/data/ShortNumberMetadata_IR.php           |  124 +-
 src/data/ShortNumberMetadata_IS.php           |  118 +-
 src/data/ShortNumberMetadata_IT.php           |  128 +-
 src/data/ShortNumberMetadata_JE.php           |  108 +-
 src/data/ShortNumberMetadata_JM.php           |   92 +-
 src/data/ShortNumberMetadata_JO.php           |  118 +-
 src/data/ShortNumberMetadata_JP.php           |  110 +-
 src/data/ShortNumberMetadata_KE.php           |  105 +-
 src/data/ShortNumberMetadata_KG.php           |  114 +-
 src/data/ShortNumberMetadata_KH.php           |  114 +-
 src/data/ShortNumberMetadata_KI.php           |  110 +-
 src/data/ShortNumberMetadata_KM.php           |   94 +-
 src/data/ShortNumberMetadata_KN.php           |   94 +-
 src/data/ShortNumberMetadata_KP.php           |   94 +-
 src/data/ShortNumberMetadata_KR.php           |  116 +-
 src/data/ShortNumberMetadata_KW.php           |  110 +-
 src/data/ShortNumberMetadata_KY.php           |   94 +-
 src/data/ShortNumberMetadata_KZ.php           |  122 +-
 src/data/ShortNumberMetadata_LA.php           |   94 +-
 src/data/ShortNumberMetadata_LB.php           |   94 +-
 src/data/ShortNumberMetadata_LC.php           |   94 +-
 src/data/ShortNumberMetadata_LI.php           |  106 +-
 src/data/ShortNumberMetadata_LK.php           |  106 +-
 src/data/ShortNumberMetadata_LR.php           |  114 +-
 src/data/ShortNumberMetadata_LS.php           |   94 +-
 src/data/ShortNumberMetadata_LT.php           |  105 +-
 src/data/ShortNumberMetadata_LU.php           |  112 +-
 src/data/ShortNumberMetadata_LV.php           |  132 +-
 src/data/ShortNumberMetadata_LY.php           |   94 +-
 src/data/ShortNumberMetadata_MA.php           |   96 +-
 src/data/ShortNumberMetadata_MC.php           |   96 +-
 src/data/ShortNumberMetadata_MD.php           |  112 +-
 src/data/ShortNumberMetadata_ME.php           |  110 +-
 src/data/ShortNumberMetadata_MF.php           |   94 +-
 src/data/ShortNumberMetadata_MG.php           |   96 +-
 src/data/ShortNumberMetadata_MH.php           |   94 +-
 src/data/ShortNumberMetadata_MK.php           |  110 +-
 src/data/ShortNumberMetadata_ML.php           |  136 +-
 src/data/ShortNumberMetadata_MM.php           |   94 +-
 src/data/ShortNumberMetadata_MN.php           |   94 +-
 src/data/ShortNumberMetadata_MO.php           |   94 +-
 src/data/ShortNumberMetadata_MP.php           |   94 +-
 src/data/ShortNumberMetadata_MQ.php           |   96 +-
 src/data/ShortNumberMetadata_MR.php           |   94 +-
 src/data/ShortNumberMetadata_MS.php           |   94 +-
 src/data/ShortNumberMetadata_MT.php           |  101 +-
 src/data/ShortNumberMetadata_MU.php           |  108 +-
 src/data/ShortNumberMetadata_MV.php           |  110 +-
 src/data/ShortNumberMetadata_MW.php           |  114 +-
 src/data/ShortNumberMetadata_MX.php           |  118 +-
 src/data/ShortNumberMetadata_MY.php           |  116 +-
 src/data/ShortNumberMetadata_MZ.php           |  106 +-
 src/data/ShortNumberMetadata_NA.php           |  108 +-
 src/data/ShortNumberMetadata_NC.php           |  107 +-
 src/data/ShortNumberMetadata_NE.php           |  102 +-
 src/data/ShortNumberMetadata_NF.php           |   94 +-
 src/data/ShortNumberMetadata_NG.php           |  114 +-
 src/data/ShortNumberMetadata_NI.php           |  101 +-
 src/data/ShortNumberMetadata_NL.php           |  118 +-
 src/data/ShortNumberMetadata_NO.php           |  110 +-
 src/data/ShortNumberMetadata_NP.php           |  101 +-
 src/data/ShortNumberMetadata_NR.php           |   94 +-
 src/data/ShortNumberMetadata_NU.php           |   93 +-
 src/data/ShortNumberMetadata_NZ.php           |  109 +-
 src/data/ShortNumberMetadata_OM.php           |   94 +-
 src/data/ShortNumberMetadata_PA.php           |   94 +-
 src/data/ShortNumberMetadata_PE.php           |   94 +-
 src/data/ShortNumberMetadata_PF.php           |   94 +-
 src/data/ShortNumberMetadata_PG.php           |  122 +-
 src/data/ShortNumberMetadata_PH.php           |   94 +-
 src/data/ShortNumberMetadata_PK.php           |   98 +-
 src/data/ShortNumberMetadata_PL.php           |  110 +-
 src/data/ShortNumberMetadata_PM.php           |  110 +-
 src/data/ShortNumberMetadata_PR.php           |   94 +-
 src/data/ShortNumberMetadata_PS.php           |  110 +-
 src/data/ShortNumberMetadata_PT.php           |  103 +-
 src/data/ShortNumberMetadata_PW.php           |   94 +-
 src/data/ShortNumberMetadata_PY.php           |   94 +-
 src/data/ShortNumberMetadata_QA.php           |  112 +-
 src/data/ShortNumberMetadata_RE.php           |   96 +-
 src/data/ShortNumberMetadata_RO.php           |  122 +-
 src/data/ShortNumberMetadata_RS.php           |  116 +-
 src/data/ShortNumberMetadata_RU.php           |   96 +-
 src/data/ShortNumberMetadata_RW.php           |   94 +-
 src/data/ShortNumberMetadata_SA.php           |  122 +-
 src/data/ShortNumberMetadata_SB.php           |   94 +-
 src/data/ShortNumberMetadata_SC.php           |  106 +-
 src/data/ShortNumberMetadata_SD.php           |   94 +-
 src/data/ShortNumberMetadata_SE.php           |  121 +-
 src/data/ShortNumberMetadata_SG.php           |  112 +-
 src/data/ShortNumberMetadata_SH.php           |  108 +-
 src/data/ShortNumberMetadata_SI.php           |  105 +-
 src/data/ShortNumberMetadata_SJ.php           |   94 +-
 src/data/ShortNumberMetadata_SK.php           |  112 +-
 src/data/ShortNumberMetadata_SL.php           |  114 +-
 src/data/ShortNumberMetadata_SM.php           |   94 +-
 src/data/ShortNumberMetadata_SN.php           |  138 +-
 src/data/ShortNumberMetadata_SO.php           |   94 +-
 src/data/ShortNumberMetadata_SR.php           |  106 +-
 src/data/ShortNumberMetadata_SS.php           |   94 +-
 src/data/ShortNumberMetadata_ST.php           |   94 +-
 src/data/ShortNumberMetadata_SV.php           |  118 +-
 src/data/ShortNumberMetadata_SX.php           |   94 +-
 src/data/ShortNumberMetadata_SY.php           |   94 +-
 src/data/ShortNumberMetadata_SZ.php           |   94 +-
 src/data/ShortNumberMetadata_TC.php           |   94 +-
 src/data/ShortNumberMetadata_TD.php           |   94 +-
 src/data/ShortNumberMetadata_TG.php           |  106 +-
 src/data/ShortNumberMetadata_TH.php           |  108 +-
 src/data/ShortNumberMetadata_TJ.php           |   94 +-
 src/data/ShortNumberMetadata_TL.php           |   94 +-
 src/data/ShortNumberMetadata_TM.php           |   94 +-
 src/data/ShortNumberMetadata_TN.php           |   94 +-
 src/data/ShortNumberMetadata_TO.php           |   94 +-
 src/data/ShortNumberMetadata_TR.php           |  118 +-
 src/data/ShortNumberMetadata_TT.php           |   94 +-
 src/data/ShortNumberMetadata_TV.php           |   94 +-
 src/data/ShortNumberMetadata_TW.php           |  104 +-
 src/data/ShortNumberMetadata_TZ.php           |  114 +-
 src/data/ShortNumberMetadata_UA.php           |  118 +-
 src/data/ShortNumberMetadata_UG.php           |   94 +-
 src/data/ShortNumberMetadata_US.php           |  134 +-
 src/data/ShortNumberMetadata_UY.php           |  110 +-
 src/data/ShortNumberMetadata_UZ.php           |  120 +-
 src/data/ShortNumberMetadata_VA.php           |   94 +-
 src/data/ShortNumberMetadata_VC.php           |   94 +-
 src/data/ShortNumberMetadata_VE.php           |   94 +-
 src/data/ShortNumberMetadata_VG.php           |   94 +-
 src/data/ShortNumberMetadata_VI.php           |   94 +-
 src/data/ShortNumberMetadata_VN.php           |   94 +-
 src/data/ShortNumberMetadata_VU.php           |   94 +-
 src/data/ShortNumberMetadata_WF.php           |   94 +-
 src/data/ShortNumberMetadata_WS.php           |   93 +-
 src/data/ShortNumberMetadata_XK.php           |   94 +-
 src/data/ShortNumberMetadata_YE.php           |   94 +-
 src/data/ShortNumberMetadata_YT.php           |   96 +-
 src/data/ShortNumberMetadata_ZA.php           |  128 +-
 src/data/ShortNumberMetadata_ZM.php           |   94 +-
 src/data/ShortNumberMetadata_ZW.php           |  114 +-
 .../PhoneNumberMetadataForTesting_800.php     |  154 +-
 .../PhoneNumberMetadataForTesting_882.php     |  153 +-
 .../PhoneNumberMetadataForTesting_979.php     |  154 +-
 .../data/PhoneNumberMetadataForTesting_AD.php |  136 +-
 .../data/PhoneNumberMetadataForTesting_AE.php |  137 +-
 .../data/PhoneNumberMetadataForTesting_AM.php |  163 +-
 .../data/PhoneNumberMetadataForTesting_AO.php |  156 +-
 .../data/PhoneNumberMetadataForTesting_AR.php |  407 ++---
 .../data/PhoneNumberMetadataForTesting_AU.php |  202 +--
 .../data/PhoneNumberMetadataForTesting_BB.php |  148 +-
 .../data/PhoneNumberMetadataForTesting_BR.php |  148 +-
 .../data/PhoneNumberMetadataForTesting_BS.php |  147 +-
 .../data/PhoneNumberMetadataForTesting_BY.php |  200 +--
 .../data/PhoneNumberMetadataForTesting_CA.php |  148 +-
 .../data/PhoneNumberMetadataForTesting_CC.php |  148 +-
 .../data/PhoneNumberMetadataForTesting_CN.php |  182 +-
 .../data/PhoneNumberMetadataForTesting_CO.php |  179 +-
 .../data/PhoneNumberMetadataForTesting_CX.php |  148 +-
 .../data/PhoneNumberMetadataForTesting_DE.php |  339 ++--
 .../data/PhoneNumberMetadataForTesting_FR.php |  160 +-
 .../data/PhoneNumberMetadataForTesting_GB.php |  300 ++--
 .../data/PhoneNumberMetadataForTesting_GG.php |  148 +-
 .../data/PhoneNumberMetadataForTesting_IT.php |  274 ++-
 .../data/PhoneNumberMetadataForTesting_JP.php |  340 ++--
 .../data/PhoneNumberMetadataForTesting_KR.php |  471 +++--
 .../data/PhoneNumberMetadataForTesting_MX.php |  449 ++---
 .../data/PhoneNumberMetadataForTesting_NZ.php |  235 +--
 .../data/PhoneNumberMetadataForTesting_PL.php |  155 +-
 .../data/PhoneNumberMetadataForTesting_RE.php |  156 +-
 .../data/PhoneNumberMetadataForTesting_RU.php |  139 +-
 .../data/PhoneNumberMetadataForTesting_SE.php |  136 +-
 .../data/PhoneNumberMetadataForTesting_SG.php |  223 +--
 .../data/PhoneNumberMetadataForTesting_TA.php |  153 +-
 .../data/PhoneNumberMetadataForTesting_US.php |  212 +--
 .../data/PhoneNumberMetadataForTesting_UZ.php |  171 +-
 .../data/PhoneNumberMetadataForTesting_YT.php |  140 +-
 539 files changed, 40971 insertions(+), 56478 deletions(-)

diff --git a/build/BuildMetadataPHPFromXml.php b/build/BuildMetadataPHPFromXml.php
index 7f8ce1c1d..010ea7837 100644
--- a/build/BuildMetadataPHPFromXml.php
+++ b/build/BuildMetadataPHPFromXml.php
@@ -3,6 +3,7 @@
 namespace libphonenumber\buildtools;
 
 use libphonenumber\PhoneMetadata;
+use Symfony\Component\VarExporter\VarExporter;
 
 /**
  * Tool to convert phone number metadata from the XML format to protocol buffer format.
@@ -61,7 +62,7 @@ private function writeMetadataToFile(array $metadataCollection, string $filePref
 
             $data = '<?php' . PHP_EOL
                 . self::GENERATION_COMMENT . PHP_EOL
-                . 'return ' . \var_export($metadata->toArray(), true) . ';' . PHP_EOL;
+                . 'return ' . VarExporter::export($metadata->toArray()) . ';' . PHP_EOL;
 
             \file_put_contents($filePrefix . '_' . $regionCode . '.php', $data);
         }
@@ -94,22 +95,13 @@ private function writeCountryCallingCodeMappingToFile(array $countryCodeToRegion
 
         if ($hasRegionCodes && $hasCountryCodes) {
             $data .= self::MAP_COMMENT . PHP_EOL;
-            $data .= "   public const {$constName} = " . \var_export(
-                $countryCodeToRegionCodeMap,
-                true
-            ) . ';' . PHP_EOL;
+            $data .= "   public const {$constName} = " . VarExporter::export($countryCodeToRegionCodeMap) . ';' . PHP_EOL;
         } elseif ($hasCountryCodes) {
             $data .= self::COUNTRY_CODE_SET_COMMENT . PHP_EOL;
-            $data .= "   public const {$constName} = " . \var_export(
-                \array_keys($countryCodeToRegionCodeMap),
-                true
-            ) . ';' . PHP_EOL;
+            $data .= "   public const {$constName} = " . VarExporter::export(\array_keys($countryCodeToRegionCodeMap)) . ';' . PHP_EOL;
         } else {
             $data .= self::REGION_CODE_SET_COMMENT . PHP_EOL;
-            $data .= "   public const {$constName} = " . \var_export(
-                $countryCodeToRegionCodeMap[0],
-                true
-            ) . ';' . PHP_EOL;
+            $data .= "   public const {$constName} = " . VarExporter::export($countryCodeToRegionCodeMap[0]) . ';' . PHP_EOL;
         }
 
         $data .= PHP_EOL .
diff --git a/composer.json b/composer.json
index b020497fb..9b07ec39d 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,8 @@
     "phpstan/phpstan": "^1.8",
     "phpstan/phpstan-phpunit": "^1.2",
     "phpunit/phpunit": "^10.5",
-    "symfony/console": "^6.0"
+    "symfony/console": "^6.0",
+    "symfony/var-exporter": "^6.0"
   },
   "conflict": {
     "giggsey/libphonenumber-for-php": "*"
diff --git a/src/CountryCodeToRegionCodeMap.php b/src/CountryCodeToRegionCodeMap.php
index 92527f2f5..d32423a28 100644
--- a/src/CountryCodeToRegionCodeMap.php
+++ b/src/CountryCodeToRegionCodeMap.php
@@ -15,906 +15,691 @@ class CountryCodeToRegionCodeMap
     // countries sharing a calling code, such as the NANPA countries, the one
     // indicated with "isMainCountryForCode" in the metadata should be first.
 
-    public const COUNTRY_CODE_TO_REGION_CODE_MAP =  [
-  1 =>
-    [
-     0 => 'US',
-     1 => 'AG',
-     2 => 'AI',
-     3 => 'AS',
-     4 => 'BB',
-     5 => 'BM',
-     6 => 'BS',
-     7 => 'CA',
-     8 => 'DM',
-     9 => 'DO',
-     10 => 'GD',
-     11 => 'GU',
-     12 => 'JM',
-     13 => 'KN',
-     14 => 'KY',
-     15 => 'LC',
-     16 => 'MP',
-     17 => 'MS',
-     18 => 'PR',
-     19 => 'SX',
-     20 => 'TC',
-     21 => 'TT',
-     22 => 'VC',
-     23 => 'VG',
-     24 => 'VI',
-  ],
-  7 =>
-    [
-     0 => 'RU',
-     1 => 'KZ',
-  ],
-  20 =>
-    [
-     0 => 'EG',
-  ],
-  27 =>
-    [
-     0 => 'ZA',
-  ],
-  30 =>
-    [
-     0 => 'GR',
-  ],
-  31 =>
-    [
-     0 => 'NL',
-  ],
-  32 =>
-    [
-     0 => 'BE',
-  ],
-  33 =>
-    [
-     0 => 'FR',
-  ],
-  34 =>
-    [
-     0 => 'ES',
-  ],
-  36 =>
-    [
-     0 => 'HU',
-  ],
-  39 =>
-    [
-     0 => 'IT',
-     1 => 'VA',
-  ],
-  40 =>
-    [
-     0 => 'RO',
-  ],
-  41 =>
-    [
-     0 => 'CH',
-  ],
-  43 =>
-    [
-     0 => 'AT',
-  ],
-  44 =>
-    [
-     0 => 'GB',
-     1 => 'GG',
-     2 => 'IM',
-     3 => 'JE',
-  ],
-  45 =>
-    [
-     0 => 'DK',
-  ],
-  46 =>
-    [
-     0 => 'SE',
-  ],
-  47 =>
-    [
-     0 => 'NO',
-     1 => 'SJ',
-  ],
-  48 =>
-    [
-     0 => 'PL',
-  ],
-  49 =>
-    [
-     0 => 'DE',
-  ],
-  51 =>
-    [
-     0 => 'PE',
-  ],
-  52 =>
-    [
-     0 => 'MX',
-  ],
-  53 =>
-    [
-     0 => 'CU',
-  ],
-  54 =>
-    [
-     0 => 'AR',
-  ],
-  55 =>
-    [
-     0 => 'BR',
-  ],
-  56 =>
-    [
-     0 => 'CL',
-  ],
-  57 =>
-    [
-     0 => 'CO',
-  ],
-  58 =>
-    [
-     0 => 'VE',
-  ],
-  60 =>
-    [
-     0 => 'MY',
-  ],
-  61 =>
-    [
-     0 => 'AU',
-     1 => 'CC',
-     2 => 'CX',
-  ],
-  62 =>
-    [
-     0 => 'ID',
-  ],
-  63 =>
-    [
-     0 => 'PH',
-  ],
-  64 =>
-    [
-     0 => 'NZ',
-  ],
-  65 =>
-    [
-     0 => 'SG',
-  ],
-  66 =>
-    [
-     0 => 'TH',
-  ],
-  81 =>
-    [
-     0 => 'JP',
-  ],
-  82 =>
-    [
-     0 => 'KR',
-  ],
-  84 =>
-    [
-     0 => 'VN',
-  ],
-  86 =>
-    [
-     0 => 'CN',
-  ],
-  90 =>
-    [
-     0 => 'TR',
-  ],
-  91 =>
-    [
-     0 => 'IN',
-  ],
-  92 =>
-    [
-     0 => 'PK',
-  ],
-  93 =>
-    [
-     0 => 'AF',
-  ],
-  94 =>
-    [
-     0 => 'LK',
-  ],
-  95 =>
-    [
-     0 => 'MM',
-  ],
-  98 =>
-    [
-     0 => 'IR',
-  ],
-  211 =>
-    [
-     0 => 'SS',
-  ],
-  212 =>
-    [
-     0 => 'MA',
-     1 => 'EH',
-  ],
-  213 =>
-    [
-     0 => 'DZ',
-  ],
-  216 =>
-    [
-     0 => 'TN',
-  ],
-  218 =>
-    [
-     0 => 'LY',
-  ],
-  220 =>
-    [
-     0 => 'GM',
-  ],
-  221 =>
-    [
-     0 => 'SN',
-  ],
-  222 =>
-    [
-     0 => 'MR',
-  ],
-  223 =>
-    [
-     0 => 'ML',
-  ],
-  224 =>
-    [
-     0 => 'GN',
-  ],
-  225 =>
-    [
-     0 => 'CI',
-  ],
-  226 =>
-    [
-     0 => 'BF',
-  ],
-  227 =>
-    [
-     0 => 'NE',
-  ],
-  228 =>
-    [
-     0 => 'TG',
-  ],
-  229 =>
-    [
-     0 => 'BJ',
-  ],
-  230 =>
-    [
-     0 => 'MU',
-  ],
-  231 =>
-    [
-     0 => 'LR',
-  ],
-  232 =>
-    [
-     0 => 'SL',
-  ],
-  233 =>
-    [
-     0 => 'GH',
-  ],
-  234 =>
-    [
-     0 => 'NG',
-  ],
-  235 =>
-    [
-     0 => 'TD',
-  ],
-  236 =>
-    [
-     0 => 'CF',
-  ],
-  237 =>
-    [
-     0 => 'CM',
-  ],
-  238 =>
-    [
-     0 => 'CV',
-  ],
-  239 =>
-    [
-     0 => 'ST',
-  ],
-  240 =>
-    [
-     0 => 'GQ',
-  ],
-  241 =>
-    [
-     0 => 'GA',
-  ],
-  242 =>
-    [
-     0 => 'CG',
-  ],
-  243 =>
-    [
-     0 => 'CD',
-  ],
-  244 =>
-    [
-     0 => 'AO',
-  ],
-  245 =>
-    [
-     0 => 'GW',
-  ],
-  246 =>
-    [
-     0 => 'IO',
-  ],
-  247 =>
-    [
-     0 => 'AC',
-  ],
-  248 =>
-    [
-     0 => 'SC',
-  ],
-  249 =>
-    [
-     0 => 'SD',
-  ],
-  250 =>
-    [
-     0 => 'RW',
-  ],
-  251 =>
-    [
-     0 => 'ET',
-  ],
-  252 =>
-    [
-     0 => 'SO',
-  ],
-  253 =>
-    [
-     0 => 'DJ',
-  ],
-  254 =>
-    [
-     0 => 'KE',
-  ],
-  255 =>
-    [
-     0 => 'TZ',
-  ],
-  256 =>
-    [
-     0 => 'UG',
-  ],
-  257 =>
-    [
-     0 => 'BI',
-  ],
-  258 =>
-    [
-     0 => 'MZ',
-  ],
-  260 =>
-    [
-     0 => 'ZM',
-  ],
-  261 =>
-    [
-     0 => 'MG',
-  ],
-  262 =>
-    [
-     0 => 'RE',
-     1 => 'YT',
-  ],
-  263 =>
-    [
-     0 => 'ZW',
-  ],
-  264 =>
-    [
-     0 => 'NA',
-  ],
-  265 =>
-    [
-     0 => 'MW',
-  ],
-  266 =>
-    [
-     0 => 'LS',
-  ],
-  267 =>
-    [
-     0 => 'BW',
-  ],
-  268 =>
-    [
-     0 => 'SZ',
-  ],
-  269 =>
-    [
-     0 => 'KM',
-  ],
-  290 =>
-    [
-     0 => 'SH',
-     1 => 'TA',
-  ],
-  291 =>
-    [
-     0 => 'ER',
-  ],
-  297 =>
-    [
-     0 => 'AW',
-  ],
-  298 =>
-    [
-     0 => 'FO',
-  ],
-  299 =>
-    [
-     0 => 'GL',
-  ],
-  350 =>
-    [
-     0 => 'GI',
-  ],
-  351 =>
-    [
-     0 => 'PT',
-  ],
-  352 =>
-    [
-     0 => 'LU',
-  ],
-  353 =>
-    [
-     0 => 'IE',
-  ],
-  354 =>
-    [
-     0 => 'IS',
-  ],
-  355 =>
-    [
-     0 => 'AL',
-  ],
-  356 =>
-    [
-     0 => 'MT',
-  ],
-  357 =>
-    [
-     0 => 'CY',
-  ],
-  358 =>
-    [
-     0 => 'FI',
-     1 => 'AX',
-  ],
-  359 =>
-    [
-     0 => 'BG',
-  ],
-  370 =>
-    [
-     0 => 'LT',
-  ],
-  371 =>
-    [
-     0 => 'LV',
-  ],
-  372 =>
-    [
-     0 => 'EE',
-  ],
-  373 =>
-    [
-     0 => 'MD',
-  ],
-  374 =>
-    [
-     0 => 'AM',
-  ],
-  375 =>
-    [
-     0 => 'BY',
-  ],
-  376 =>
-    [
-     0 => 'AD',
-  ],
-  377 =>
-    [
-     0 => 'MC',
-  ],
-  378 =>
-    [
-     0 => 'SM',
-  ],
-  380 =>
-    [
-     0 => 'UA',
-  ],
-  381 =>
-    [
-     0 => 'RS',
-  ],
-  382 =>
-    [
-     0 => 'ME',
-  ],
-  383 =>
-    [
-     0 => 'XK',
-  ],
-  385 =>
-    [
-     0 => 'HR',
-  ],
-  386 =>
-    [
-     0 => 'SI',
-  ],
-  387 =>
-    [
-     0 => 'BA',
-  ],
-  389 =>
-    [
-     0 => 'MK',
-  ],
-  420 =>
-    [
-     0 => 'CZ',
-  ],
-  421 =>
-    [
-     0 => 'SK',
-  ],
-  423 =>
-    [
-     0 => 'LI',
-  ],
-  500 =>
-    [
-     0 => 'FK',
-  ],
-  501 =>
-    [
-     0 => 'BZ',
-  ],
-  502 =>
-    [
-     0 => 'GT',
-  ],
-  503 =>
-    [
-     0 => 'SV',
-  ],
-  504 =>
-    [
-     0 => 'HN',
-  ],
-  505 =>
-    [
-     0 => 'NI',
-  ],
-  506 =>
-    [
-     0 => 'CR',
-  ],
-  507 =>
-    [
-     0 => 'PA',
-  ],
-  508 =>
-    [
-     0 => 'PM',
-  ],
-  509 =>
-    [
-     0 => 'HT',
-  ],
-  590 =>
-    [
-     0 => 'GP',
-     1 => 'BL',
-     2 => 'MF',
-  ],
-  591 =>
-    [
-     0 => 'BO',
-  ],
-  592 =>
-    [
-     0 => 'GY',
-  ],
-  593 =>
-    [
-     0 => 'EC',
-  ],
-  594 =>
-    [
-     0 => 'GF',
-  ],
-  595 =>
-    [
-     0 => 'PY',
-  ],
-  596 =>
-    [
-     0 => 'MQ',
-  ],
-  597 =>
-    [
-     0 => 'SR',
-  ],
-  598 =>
-    [
-     0 => 'UY',
-  ],
-  599 =>
-    [
-     0 => 'CW',
-     1 => 'BQ',
-  ],
-  670 =>
-    [
-     0 => 'TL',
-  ],
-  672 =>
-    [
-     0 => 'NF',
-  ],
-  673 =>
-    [
-     0 => 'BN',
-  ],
-  674 =>
-    [
-     0 => 'NR',
-  ],
-  675 =>
-    [
-     0 => 'PG',
-  ],
-  676 =>
-    [
-     0 => 'TO',
-  ],
-  677 =>
-    [
-     0 => 'SB',
-  ],
-  678 =>
-    [
-     0 => 'VU',
-  ],
-  679 =>
-    [
-     0 => 'FJ',
-  ],
-  680 =>
-    [
-     0 => 'PW',
-  ],
-  681 =>
-    [
-     0 => 'WF',
-  ],
-  682 =>
-    [
-     0 => 'CK',
-  ],
-  683 =>
-    [
-     0 => 'NU',
-  ],
-  685 =>
-    [
-     0 => 'WS',
-  ],
-  686 =>
-    [
-     0 => 'KI',
-  ],
-  687 =>
-    [
-     0 => 'NC',
-  ],
-  688 =>
-    [
-     0 => 'TV',
-  ],
-  689 =>
-    [
-     0 => 'PF',
-  ],
-  690 =>
-    [
-     0 => 'TK',
-  ],
-  691 =>
-    [
-     0 => 'FM',
-  ],
-  692 =>
-    [
-     0 => 'MH',
-  ],
-  800 =>
-    [
-     0 => '001',
-  ],
-  808 =>
-    [
-     0 => '001',
-  ],
-  850 =>
-    [
-     0 => 'KP',
-  ],
-  852 =>
-    [
-     0 => 'HK',
-  ],
-  853 =>
-    [
-     0 => 'MO',
-  ],
-  855 =>
-    [
-     0 => 'KH',
-  ],
-  856 =>
-    [
-     0 => 'LA',
-  ],
-  870 =>
-    [
-     0 => '001',
-  ],
-  878 =>
-    [
-     0 => '001',
-  ],
-  880 =>
-    [
-     0 => 'BD',
-  ],
-  881 =>
-    [
-     0 => '001',
-  ],
-  882 =>
-    [
-     0 => '001',
-  ],
-  883 =>
-    [
-     0 => '001',
-  ],
-  886 =>
-    [
-     0 => 'TW',
-  ],
-  888 =>
-    [
-     0 => '001',
-  ],
-  960 =>
-    [
-     0 => 'MV',
-  ],
-  961 =>
-    [
-     0 => 'LB',
-  ],
-  962 =>
-    [
-     0 => 'JO',
-  ],
-  963 =>
-    [
-     0 => 'SY',
-  ],
-  964 =>
-    [
-     0 => 'IQ',
-  ],
-  965 =>
-    [
-     0 => 'KW',
-  ],
-  966 =>
-    [
-     0 => 'SA',
-  ],
-  967 =>
-    [
-     0 => 'YE',
-  ],
-  968 =>
-    [
-     0 => 'OM',
-  ],
-  970 =>
-    [
-     0 => 'PS',
-  ],
-  971 =>
-    [
-     0 => 'AE',
-  ],
-  972 =>
-    [
-     0 => 'IL',
-  ],
-  973 =>
-    [
-     0 => 'BH',
-  ],
-  974 =>
-    [
-     0 => 'QA',
-  ],
-  975 =>
-    [
-     0 => 'BT',
-  ],
-  976 =>
-    [
-     0 => 'MN',
-  ],
-  977 =>
-    [
-     0 => 'NP',
-  ],
-  979 =>
-    [
-     0 => '001',
-  ],
-  992 =>
-    [
-     0 => 'TJ',
-  ],
-  993 =>
-    [
-     0 => 'TM',
-  ],
-  994 =>
-    [
-     0 => 'AZ',
-  ],
-  995 =>
-    [
-     0 => 'GE',
-  ],
-  996 =>
-    [
-     0 => 'KG',
-  ],
-  998 =>
-    [
-     0 => 'UZ',
-  ],
+    public const COUNTRY_CODE_TO_REGION_CODE_MAP = [
+     1 => [
+         'US',
+         'AG',
+         'AI',
+         'AS',
+         'BB',
+         'BM',
+         'BS',
+         'CA',
+         'DM',
+         'DO',
+         'GD',
+         'GU',
+         'JM',
+         'KN',
+         'KY',
+         'LC',
+         'MP',
+         'MS',
+         'PR',
+         'SX',
+         'TC',
+         'TT',
+         'VC',
+         'VG',
+         'VI',
+     ],
+     7 => [
+         'RU',
+         'KZ',
+     ],
+     20 => [
+         'EG',
+     ],
+     27 => [
+         'ZA',
+     ],
+     30 => [
+         'GR',
+     ],
+     [
+         'NL',
+     ],
+     [
+         'BE',
+     ],
+     [
+         'FR',
+     ],
+     [
+         'ES',
+     ],
+     36 => [
+         'HU',
+     ],
+     39 => [
+         'IT',
+         'VA',
+     ],
+     [
+         'RO',
+     ],
+     [
+         'CH',
+     ],
+     43 => [
+         'AT',
+     ],
+     [
+         'GB',
+         'GG',
+         'IM',
+         'JE',
+     ],
+     [
+         'DK',
+     ],
+     [
+         'SE',
+     ],
+     [
+         'NO',
+         'SJ',
+     ],
+     [
+         'PL',
+     ],
+     [
+         'DE',
+     ],
+     51 => [
+         'PE',
+     ],
+     [
+         'MX',
+     ],
+     [
+         'CU',
+     ],
+     [
+         'AR',
+     ],
+     [
+         'BR',
+     ],
+     [
+         'CL',
+     ],
+     [
+         'CO',
+     ],
+     [
+         'VE',
+     ],
+     60 => [
+         'MY',
+     ],
+     [
+         'AU',
+         'CC',
+         'CX',
+     ],
+     [
+         'ID',
+     ],
+     [
+         'PH',
+     ],
+     [
+         'NZ',
+     ],
+     [
+         'SG',
+     ],
+     [
+         'TH',
+     ],
+     81 => [
+         'JP',
+     ],
+     [
+         'KR',
+     ],
+     84 => [
+         'VN',
+     ],
+     86 => [
+         'CN',
+     ],
+     90 => [
+         'TR',
+     ],
+     [
+         'IN',
+     ],
+     [
+         'PK',
+     ],
+     [
+         'AF',
+     ],
+     [
+         'LK',
+     ],
+     [
+         'MM',
+     ],
+     98 => [
+         'IR',
+     ],
+     211 => [
+         'SS',
+     ],
+     [
+         'MA',
+         'EH',
+     ],
+     [
+         'DZ',
+     ],
+     216 => [
+         'TN',
+     ],
+     218 => [
+         'LY',
+     ],
+     220 => [
+         'GM',
+     ],
+     [
+         'SN',
+     ],
+     [
+         'MR',
+     ],
+     [
+         'ML',
+     ],
+     [
+         'GN',
+     ],
+     [
+         'CI',
+     ],
+     [
+         'BF',
+     ],
+     [
+         'NE',
+     ],
+     [
+         'TG',
+     ],
+     [
+         'BJ',
+     ],
+     [
+         'MU',
+     ],
+     [
+         'LR',
+     ],
+     [
+         'SL',
+     ],
+     [
+         'GH',
+     ],
+     [
+         'NG',
+     ],
+     [
+         'TD',
+     ],
+     [
+         'CF',
+     ],
+     [
+         'CM',
+     ],
+     [
+         'CV',
+     ],
+     [
+         'ST',
+     ],
+     [
+         'GQ',
+     ],
+     [
+         'GA',
+     ],
+     [
+         'CG',
+     ],
+     [
+         'CD',
+     ],
+     [
+         'AO',
+     ],
+     [
+         'GW',
+     ],
+     [
+         'IO',
+     ],
+     [
+         'AC',
+     ],
+     [
+         'SC',
+     ],
+     [
+         'SD',
+     ],
+     [
+         'RW',
+     ],
+     [
+         'ET',
+     ],
+     [
+         'SO',
+     ],
+     [
+         'DJ',
+     ],
+     [
+         'KE',
+     ],
+     [
+         'TZ',
+     ],
+     [
+         'UG',
+     ],
+     [
+         'BI',
+     ],
+     [
+         'MZ',
+     ],
+     260 => [
+         'ZM',
+     ],
+     [
+         'MG',
+     ],
+     [
+         'RE',
+         'YT',
+     ],
+     [
+         'ZW',
+     ],
+     [
+         'NA',
+     ],
+     [
+         'MW',
+     ],
+     [
+         'LS',
+     ],
+     [
+         'BW',
+     ],
+     [
+         'SZ',
+     ],
+     [
+         'KM',
+     ],
+     290 => [
+         'SH',
+         'TA',
+     ],
+     [
+         'ER',
+     ],
+     297 => [
+         'AW',
+     ],
+     [
+         'FO',
+     ],
+     [
+         'GL',
+     ],
+     350 => [
+         'GI',
+     ],
+     [
+         'PT',
+     ],
+     [
+         'LU',
+     ],
+     [
+         'IE',
+     ],
+     [
+         'IS',
+     ],
+     [
+         'AL',
+     ],
+     [
+         'MT',
+     ],
+     [
+         'CY',
+     ],
+     [
+         'FI',
+         'AX',
+     ],
+     [
+         'BG',
+     ],
+     370 => [
+         'LT',
+     ],
+     [
+         'LV',
+     ],
+     [
+         'EE',
+     ],
+     [
+         'MD',
+     ],
+     [
+         'AM',
+     ],
+     [
+         'BY',
+     ],
+     [
+         'AD',
+     ],
+     [
+         'MC',
+     ],
+     [
+         'SM',
+     ],
+     380 => [
+         'UA',
+     ],
+     [
+         'RS',
+     ],
+     [
+         'ME',
+     ],
+     [
+         'XK',
+     ],
+     385 => [
+         'HR',
+     ],
+     [
+         'SI',
+     ],
+     [
+         'BA',
+     ],
+     389 => [
+         'MK',
+     ],
+     420 => [
+         'CZ',
+     ],
+     [
+         'SK',
+     ],
+     423 => [
+         'LI',
+     ],
+     500 => [
+         'FK',
+     ],
+     [
+         'BZ',
+     ],
+     [
+         'GT',
+     ],
+     [
+         'SV',
+     ],
+     [
+         'HN',
+     ],
+     [
+         'NI',
+     ],
+     [
+         'CR',
+     ],
+     [
+         'PA',
+     ],
+     [
+         'PM',
+     ],
+     [
+         'HT',
+     ],
+     590 => [
+         'GP',
+         'BL',
+         'MF',
+     ],
+     [
+         'BO',
+     ],
+     [
+         'GY',
+     ],
+     [
+         'EC',
+     ],
+     [
+         'GF',
+     ],
+     [
+         'PY',
+     ],
+     [
+         'MQ',
+     ],
+     [
+         'SR',
+     ],
+     [
+         'UY',
+     ],
+     [
+         'CW',
+         'BQ',
+     ],
+     670 => [
+         'TL',
+     ],
+     672 => [
+         'NF',
+     ],
+     [
+         'BN',
+     ],
+     [
+         'NR',
+     ],
+     [
+         'PG',
+     ],
+     [
+         'TO',
+     ],
+     [
+         'SB',
+     ],
+     [
+         'VU',
+     ],
+     [
+         'FJ',
+     ],
+     [
+         'PW',
+     ],
+     [
+         'WF',
+     ],
+     [
+         'CK',
+     ],
+     [
+         'NU',
+     ],
+     685 => [
+         'WS',
+     ],
+     [
+         'KI',
+     ],
+     [
+         'NC',
+     ],
+     [
+         'TV',
+     ],
+     [
+         'PF',
+     ],
+     [
+         'TK',
+     ],
+     [
+         'FM',
+     ],
+     [
+         'MH',
+     ],
+     800 => [
+         '001',
+     ],
+     808 => [
+         '001',
+     ],
+     850 => [
+         'KP',
+     ],
+     852 => [
+         'HK',
+     ],
+     [
+         'MO',
+     ],
+     855 => [
+         'KH',
+     ],
+     [
+         'LA',
+     ],
+     870 => [
+         '001',
+     ],
+     878 => [
+         '001',
+     ],
+     880 => [
+         'BD',
+     ],
+     [
+         '001',
+     ],
+     [
+         '001',
+     ],
+     [
+         '001',
+     ],
+     886 => [
+         'TW',
+     ],
+     888 => [
+         '001',
+     ],
+     960 => [
+         'MV',
+     ],
+     [
+         'LB',
+     ],
+     [
+         'JO',
+     ],
+     [
+         'SY',
+     ],
+     [
+         'IQ',
+     ],
+     [
+         'KW',
+     ],
+     [
+         'SA',
+     ],
+     [
+         'YE',
+     ],
+     [
+         'OM',
+     ],
+     970 => [
+         'PS',
+     ],
+     [
+         'AE',
+     ],
+     [
+         'IL',
+     ],
+     [
+         'BH',
+     ],
+     [
+         'QA',
+     ],
+     [
+         'BT',
+     ],
+     [
+         'MN',
+     ],
+     [
+         'NP',
+     ],
+     979 => [
+         '001',
+     ],
+     992 => [
+         'TJ',
+     ],
+     [
+         'TM',
+     ],
+     [
+         'AZ',
+     ],
+     [
+         'GE',
+     ],
+     [
+         'KG',
+     ],
+     998 => [
+         'UZ',
+     ],
 ];
 
 }
diff --git a/src/CountryCodeToRegionCodeMapForTesting.php b/src/CountryCodeToRegionCodeMapForTesting.php
index d7d4aed8d..d8b78e7bd 100644
--- a/src/CountryCodeToRegionCodeMapForTesting.php
+++ b/src/CountryCodeToRegionCodeMapForTesting.php
@@ -15,130 +15,101 @@ class CountryCodeToRegionCodeMapForTesting
     // countries sharing a calling code, such as the NANPA countries, the one
     // indicated with "isMainCountryForCode" in the metadata should be first.
 
-    public const COUNTRY_CODE_TO_REGION_CODE_MAP_FOR_TESTING =  [
-  1 =>
-    [
-     0 => 'US',
-     1 => 'BB',
-     2 => 'BS',
-     3 => 'CA',
-  ],
-  7 =>
-    [
-     0 => 'RU',
-  ],
-  33 =>
-    [
-     0 => 'FR',
-  ],
-  39 =>
-    [
-     0 => 'IT',
-  ],
-  44 =>
-    [
-     0 => 'GB',
-     1 => 'GG',
-  ],
-  46 =>
-    [
-     0 => 'SE',
-  ],
-  48 =>
-    [
-     0 => 'PL',
-  ],
-  49 =>
-    [
-     0 => 'DE',
-  ],
-  52 =>
-    [
-     0 => 'MX',
-  ],
-  54 =>
-    [
-     0 => 'AR',
-  ],
-  55 =>
-    [
-     0 => 'BR',
-  ],
-  57 =>
-    [
-     0 => 'CO',
-  ],
-  61 =>
-    [
-     0 => 'AU',
-     1 => 'CC',
-     2 => 'CX',
-  ],
-  64 =>
-    [
-     0 => 'NZ',
-  ],
-  65 =>
-    [
-     0 => 'SG',
-  ],
-  81 =>
-    [
-     0 => 'JP',
-  ],
-  82 =>
-    [
-     0 => 'KR',
-  ],
-  86 =>
-    [
-     0 => 'CN',
-  ],
-  244 =>
-    [
-     0 => 'AO',
-  ],
-  262 =>
-    [
-     0 => 'RE',
-     1 => 'YT',
-  ],
-  290 =>
-    [
-     0 => 'TA',
-  ],
-  374 =>
-    [
-     0 => 'AM',
-  ],
-  375 =>
-    [
-     0 => 'BY',
-  ],
-  376 =>
-    [
-     0 => 'AD',
-  ],
-  800 =>
-    [
-     0 => '001',
-  ],
-  882 =>
-    [
-     0 => '001',
-  ],
-  971 =>
-    [
-     0 => 'AE',
-  ],
-  979 =>
-    [
-     0 => '001',
-  ],
-  998 =>
-    [
-     0 => 'UZ',
-  ],
+    public const COUNTRY_CODE_TO_REGION_CODE_MAP_FOR_TESTING = [
+     1 => [
+         'US',
+         'BB',
+         'BS',
+         'CA',
+     ],
+     7 => [
+         'RU',
+     ],
+     33 => [
+         'FR',
+     ],
+     39 => [
+         'IT',
+     ],
+     44 => [
+         'GB',
+         'GG',
+     ],
+     46 => [
+         'SE',
+     ],
+     48 => [
+         'PL',
+     ],
+     [
+         'DE',
+     ],
+     52 => [
+         'MX',
+     ],
+     54 => [
+         'AR',
+     ],
+     [
+         'BR',
+     ],
+     57 => [
+         'CO',
+     ],
+     61 => [
+         'AU',
+         'CC',
+         'CX',
+     ],
+     64 => [
+         'NZ',
+     ],
+     [
+         'SG',
+     ],
+     81 => [
+         'JP',
+     ],
+     [
+         'KR',
+     ],
+     86 => [
+         'CN',
+     ],
+     244 => [
+         'AO',
+     ],
+     262 => [
+         'RE',
+         'YT',
+     ],
+     290 => [
+         'TA',
+     ],
+     374 => [
+         'AM',
+     ],
+     [
+         'BY',
+     ],
+     [
+         'AD',
+     ],
+     800 => [
+         '001',
+     ],
+     882 => [
+         '001',
+     ],
+     971 => [
+         'AE',
+     ],
+     979 => [
+         '001',
+     ],
+     998 => [
+         'UZ',
+     ],
 ];
 
 }
diff --git a/src/NumberFormat.php b/src/NumberFormat.php
index b60992c59..f13ecd0ba 100644
--- a/src/NumberFormat.php
+++ b/src/NumberFormat.php
@@ -201,6 +201,7 @@ public function mergeFrom(NumberFormat $other): NumberFormat
     }
 
     /**
+     * @internal
      * @return NumberFormatArray
      */
     public function toArray(): array
@@ -219,7 +220,7 @@ public function toArray(): array
             $output['domesticCarrierCodeFormattingRule'] = $this->getDomesticCarrierCodeFormattingRule();
         }
 
-        if ($this->hasNationalPrefixOptionalWhenFormatting()) {
+        if ($this->hasNationalPrefixOptionalWhenFormatting() && $this->getNationalPrefixOptionalWhenFormatting() !== false) {
             $output['nationalPrefixOptionalWhenFormatting'] = $this->getNationalPrefixOptionalWhenFormatting();
         }
 
@@ -227,6 +228,7 @@ public function toArray(): array
     }
 
     /**
+     * @internal
      * @param NumberFormatArray $input
      */
     public function fromArray(array $input): void
diff --git a/src/PhoneMetadata.php b/src/PhoneMetadata.php
index 0d3c955bd..33471bc82 100644
--- a/src/PhoneMetadata.php
+++ b/src/PhoneMetadata.php
@@ -10,7 +10,7 @@
  * @internal Used internally, and can change at any time
  * @phpstan-import-type PhoneNumberDescArray from PhoneNumberDesc
  * @phpstan-import-type NumberFormatArray from NumberFormat
- * @phpstan-type PhoneMetadataArray array{generalDesc?:PhoneNumberDescArray,fixedLine?:PhoneNumberDescArray,mobile?:PhoneNumberDescArray,tollFree?:PhoneNumberDescArray,premiumRate?:PhoneNumberDescArray,sharedCost?:PhoneNumberDescArray,personalNumber?:PhoneNumberDescArray,voip?:PhoneNumberDescArray,pager?:PhoneNumberDescArray,uan?:PhoneNumberDescArray,emergency?:PhoneNumberDescArray,voicemail?:PhoneNumberDescArray,shortCode?:PhoneNumberDescArray,standardRate?:PhoneNumberDescArray,carrierSpecific?:PhoneNumberDescArray,smsServices?:PhoneNumberDescArray,noInternationalDialling?:PhoneNumberDescArray,id:string|null,countryCode?:int,internationalPrefix?:string,preferredInternationalPrefix?:string,nationalPrefix?:string,preferredExtnPrefix?:string,nationalPrefixForParsing?:string,nationalPrefixTransformRule?:string,sameMobileAndFixedLinePattern?:bool,numberFormat:NumberFormatArray[],intlNumberFormat?:NumberFormatArray[],mainCountryForCode:bool,leadingDigits?:string,mobileNumberPortableRegion?:bool}
+ * @phpstan-type PhoneMetadataArray array{generalDesc?:PhoneNumberDescArray,fixedLine?:PhoneNumberDescArray,mobile?:PhoneNumberDescArray,tollFree?:PhoneNumberDescArray,premiumRate?:PhoneNumberDescArray,sharedCost?:PhoneNumberDescArray,personalNumber?:PhoneNumberDescArray,voip?:PhoneNumberDescArray,pager?:PhoneNumberDescArray,uan?:PhoneNumberDescArray,emergency?:PhoneNumberDescArray,voicemail?:PhoneNumberDescArray,shortCode?:PhoneNumberDescArray,standardRate?:PhoneNumberDescArray,carrierSpecific?:PhoneNumberDescArray,smsServices?:PhoneNumberDescArray,noInternationalDialling?:PhoneNumberDescArray,id:string|null,countryCode?:int,internationalPrefix?:string,preferredInternationalPrefix?:string,nationalPrefix?:string,preferredExtnPrefix?:string,nationalPrefixForParsing?:string,nationalPrefixTransformRule?:string,sameMobileAndFixedLinePattern?:bool,numberFormat:NumberFormatArray[],intlNumberFormat?:NumberFormatArray[],mainCountryForCode?:bool,leadingDigits?:string,mobileNumberPortableRegion?:bool}
  */
 class PhoneMetadata
 {
@@ -113,12 +113,19 @@ public function clearIntlNumberFormat(): PhoneMetadata
     }
 
     /**
+     * @internal
      * @return PhoneMetadataArray
      */
     public function toArray(): array
     {
         $output = [];
 
+        $output['id'] = $this->getId();
+
+        if ($this->hasCountryCode()) {
+            $output['countryCode'] = $this->getCountryCode();
+        }
+
         if ($this->hasGeneralDesc()) {
             $output['generalDesc'] = $this->getGeneralDesc()->toArray();
         }
@@ -187,11 +194,6 @@ public function toArray(): array
             $output['noInternationalDialling'] = $this->getNoInternationalDialling()->toArray();
         }
 
-        $output['id'] = $this->getId();
-        if ($this->hasCountryCode()) {
-            $output['countryCode'] = $this->getCountryCode();
-        }
-
         if ($this->hasInternationalPrefix()) {
             $output['internationalPrefix'] = $this->getInternationalPrefix();
         }
@@ -216,7 +218,7 @@ public function toArray(): array
             $output['nationalPrefixTransformRule'] = $this->getNationalPrefixTransformRule();
         }
 
-        if ($this->hasSameMobileAndFixedLinePattern()) {
+        if ($this->hasSameMobileAndFixedLinePattern() && $this->getSameMobileAndFixedLinePattern() !== false) {
             $output['sameMobileAndFixedLinePattern'] = $this->getSameMobileAndFixedLinePattern();
         }
 
@@ -232,13 +234,15 @@ public function toArray(): array
             }
         }
 
-        $output['mainCountryForCode'] = $this->getMainCountryForCode();
+        if ($this->getMainCountryForCode() !== false) {
+            $output['mainCountryForCode'] = $this->getMainCountryForCode();
+        }
 
         if ($this->hasLeadingDigits()) {
             $output['leadingDigits'] = $this->getLeadingDigits();
         }
 
-        if ($this->hasMobileNumberPortableRegion()) {
+        if ($this->hasMobileNumberPortableRegion() && $this->isMobileNumberPortableRegion() !== false) {
             $output['mobileNumberPortableRegion'] = $this->isMobileNumberPortableRegion();
         }
 
@@ -747,6 +751,7 @@ public function clearMobileNumberPortableRegion(): PhoneMetadata
     }
 
     /**
+     * @interal
      * @param PhoneMetadataArray $input
      */
     public function fromArray(array $input): PhoneMetadata
@@ -878,7 +883,9 @@ public function fromArray(array $input): PhoneMetadata
             $this->addIntlNumberFormat($numberFormat);
         }
 
-        $this->setMainCountryForCode($input['mainCountryForCode']);
+        if (isset($input['mainCountryForCode'])) {
+            $this->setMainCountryForCode($input['mainCountryForCode']);
+        }
 
         if (isset($input['leadingDigits'])) {
             $this->setLeadingDigits($input['leadingDigits']);
diff --git a/src/PhoneNumberDesc.php b/src/PhoneNumberDesc.php
index 9f08d1d46..8005dfb5f 100644
--- a/src/PhoneNumberDesc.php
+++ b/src/PhoneNumberDesc.php
@@ -7,7 +7,7 @@
 /**
  * Phone Number Description
  * @interal
- * @phpstan-type PhoneNumberDescArray array{NationalNumberPattern?:string,ExampleNumber?:string,PossibleLength?:int[],PossibleLengthLocalOnly?:int[]}
+ * @phpstan-type PhoneNumberDescArray array{pattern?:string,example?:string,posLength?:int[],posLengthLocal?:int[]}
  */
 class PhoneNumberDesc
 {
@@ -167,48 +167,49 @@ public function exactlySameAs(PhoneNumberDesc $other): bool
     }
 
     /**
+     * @internal
      * @return PhoneNumberDescArray
      */
     public function toArray(): array
     {
         $data = [];
         if ($this->hasNationalNumberPattern()) {
-            $data['NationalNumberPattern'] = $this->getNationalNumberPattern();
+            $data['pattern'] = $this->getNationalNumberPattern();
         }
         if ($this->hasExampleNumber()) {
-            $data['ExampleNumber'] = $this->getExampleNumber();
+            $data['example'] = $this->getExampleNumber();
         }
 
         $possibleLength = $this->getPossibleLength();
         if (!empty($possibleLength)) {
-            $data['PossibleLength'] = $possibleLength;
+            $data['posLength'] = $possibleLength;
         }
 
         $possibleLengthLocalOnly = $this->getPossibleLengthLocalOnly();
         if (!empty($possibleLengthLocalOnly)) {
-            $data['PossibleLengthLocalOnly'] = $possibleLengthLocalOnly;
+            $data['posLengthLocal'] = $possibleLengthLocalOnly;
         }
 
         return $data;
     }
 
     /**
+     * @internal
      * @param PhoneNumberDescArray $input
-     * @return $this
      */
     public function fromArray(array $input): static
     {
-        if (isset($input['NationalNumberPattern']) && $input['NationalNumberPattern'] !== '') {
-            $this->setNationalNumberPattern($input['NationalNumberPattern']);
+        if (isset($input['pattern']) && $input['pattern'] !== '') {
+            $this->setNationalNumberPattern($input['pattern']);
         }
-        if (isset($input['ExampleNumber']) && $input['ExampleNumber'] !== '') {
-            $this->setExampleNumber($input['ExampleNumber']);
+        if (isset($input['example']) && $input['example'] !== '') {
+            $this->setExampleNumber($input['example']);
         }
-        if (isset($input['PossibleLength'])) {
-            $this->setPossibleLength($input['PossibleLength']);
+        if (isset($input['posLength'])) {
+            $this->setPossibleLength($input['posLength']);
         }
-        if (isset($input['PossibleLengthLocalOnly'])) {
-            $this->setPossibleLengthLocalOnly($input['PossibleLengthLocalOnly']);
+        if (isset($input['posLengthLocal'])) {
+            $this->setPossibleLengthLocalOnly($input['posLengthLocal']);
         }
 
         return $this;
diff --git a/src/ShortNumbersRegionCodeSet.php b/src/ShortNumbersRegionCodeSet.php
index 1bf62f6d7..62623add0 100644
--- a/src/ShortNumbersRegionCodeSet.php
+++ b/src/ShortNumbersRegionCodeSet.php
@@ -12,248 +12,248 @@ class ShortNumbersRegionCodeSet
 {
     // A set of all region codes for which data is available.
 
-    public const SHORT_NUMBERS_REGION_CODE_SET =  [
-  0 => 'AC',
-  1 => 'AD',
-  2 => 'AE',
-  3 => 'AF',
-  4 => 'AG',
-  5 => 'AI',
-  6 => 'AL',
-  7 => 'AM',
-  8 => 'AO',
-  9 => 'AR',
-  10 => 'AS',
-  11 => 'AT',
-  12 => 'AU',
-  13 => 'AW',
-  14 => 'AX',
-  15 => 'AZ',
-  16 => 'BA',
-  17 => 'BB',
-  18 => 'BD',
-  19 => 'BE',
-  20 => 'BF',
-  21 => 'BG',
-  22 => 'BH',
-  23 => 'BI',
-  24 => 'BJ',
-  25 => 'BL',
-  26 => 'BM',
-  27 => 'BN',
-  28 => 'BO',
-  29 => 'BQ',
-  30 => 'BR',
-  31 => 'BS',
-  32 => 'BT',
-  33 => 'BW',
-  34 => 'BY',
-  35 => 'BZ',
-  36 => 'CA',
-  37 => 'CC',
-  38 => 'CD',
-  39 => 'CF',
-  40 => 'CG',
-  41 => 'CH',
-  42 => 'CI',
-  43 => 'CK',
-  44 => 'CL',
-  45 => 'CM',
-  46 => 'CN',
-  47 => 'CO',
-  48 => 'CR',
-  49 => 'CU',
-  50 => 'CV',
-  51 => 'CW',
-  52 => 'CX',
-  53 => 'CY',
-  54 => 'CZ',
-  55 => 'DE',
-  56 => 'DJ',
-  57 => 'DK',
-  58 => 'DM',
-  59 => 'DO',
-  60 => 'DZ',
-  61 => 'EC',
-  62 => 'EE',
-  63 => 'EG',
-  64 => 'EH',
-  65 => 'ER',
-  66 => 'ES',
-  67 => 'ET',
-  68 => 'FI',
-  69 => 'FJ',
-  70 => 'FK',
-  71 => 'FM',
-  72 => 'FO',
-  73 => 'FR',
-  74 => 'GA',
-  75 => 'GB',
-  76 => 'GD',
-  77 => 'GE',
-  78 => 'GF',
-  79 => 'GG',
-  80 => 'GH',
-  81 => 'GI',
-  82 => 'GL',
-  83 => 'GM',
-  84 => 'GN',
-  85 => 'GP',
-  86 => 'GR',
-  87 => 'GT',
-  88 => 'GU',
-  89 => 'GW',
-  90 => 'GY',
-  91 => 'HK',
-  92 => 'HN',
-  93 => 'HR',
-  94 => 'HT',
-  95 => 'HU',
-  96 => 'ID',
-  97 => 'IE',
-  98 => 'IL',
-  99 => 'IM',
-  100 => 'IN',
-  101 => 'IQ',
-  102 => 'IR',
-  103 => 'IS',
-  104 => 'IT',
-  105 => 'JE',
-  106 => 'JM',
-  107 => 'JO',
-  108 => 'JP',
-  109 => 'KE',
-  110 => 'KG',
-  111 => 'KH',
-  112 => 'KI',
-  113 => 'KM',
-  114 => 'KN',
-  115 => 'KP',
-  116 => 'KR',
-  117 => 'KW',
-  118 => 'KY',
-  119 => 'KZ',
-  120 => 'LA',
-  121 => 'LB',
-  122 => 'LC',
-  123 => 'LI',
-  124 => 'LK',
-  125 => 'LR',
-  126 => 'LS',
-  127 => 'LT',
-  128 => 'LU',
-  129 => 'LV',
-  130 => 'LY',
-  131 => 'MA',
-  132 => 'MC',
-  133 => 'MD',
-  134 => 'ME',
-  135 => 'MF',
-  136 => 'MG',
-  137 => 'MH',
-  138 => 'MK',
-  139 => 'ML',
-  140 => 'MM',
-  141 => 'MN',
-  142 => 'MO',
-  143 => 'MP',
-  144 => 'MQ',
-  145 => 'MR',
-  146 => 'MS',
-  147 => 'MT',
-  148 => 'MU',
-  149 => 'MV',
-  150 => 'MW',
-  151 => 'MX',
-  152 => 'MY',
-  153 => 'MZ',
-  154 => 'NA',
-  155 => 'NC',
-  156 => 'NE',
-  157 => 'NF',
-  158 => 'NG',
-  159 => 'NI',
-  160 => 'NL',
-  161 => 'NO',
-  162 => 'NP',
-  163 => 'NR',
-  164 => 'NU',
-  165 => 'NZ',
-  166 => 'OM',
-  167 => 'PA',
-  168 => 'PE',
-  169 => 'PF',
-  170 => 'PG',
-  171 => 'PH',
-  172 => 'PK',
-  173 => 'PL',
-  174 => 'PM',
-  175 => 'PR',
-  176 => 'PS',
-  177 => 'PT',
-  178 => 'PW',
-  179 => 'PY',
-  180 => 'QA',
-  181 => 'RE',
-  182 => 'RO',
-  183 => 'RS',
-  184 => 'RU',
-  185 => 'RW',
-  186 => 'SA',
-  187 => 'SB',
-  188 => 'SC',
-  189 => 'SD',
-  190 => 'SE',
-  191 => 'SG',
-  192 => 'SH',
-  193 => 'SI',
-  194 => 'SJ',
-  195 => 'SK',
-  196 => 'SL',
-  197 => 'SM',
-  198 => 'SN',
-  199 => 'SO',
-  200 => 'SR',
-  201 => 'SS',
-  202 => 'ST',
-  203 => 'SV',
-  204 => 'SX',
-  205 => 'SY',
-  206 => 'SZ',
-  207 => 'TC',
-  208 => 'TD',
-  209 => 'TG',
-  210 => 'TH',
-  211 => 'TJ',
-  212 => 'TL',
-  213 => 'TM',
-  214 => 'TN',
-  215 => 'TO',
-  216 => 'TR',
-  217 => 'TT',
-  218 => 'TV',
-  219 => 'TW',
-  220 => 'TZ',
-  221 => 'UA',
-  222 => 'UG',
-  223 => 'US',
-  224 => 'UY',
-  225 => 'UZ',
-  226 => 'VA',
-  227 => 'VC',
-  228 => 'VE',
-  229 => 'VG',
-  230 => 'VI',
-  231 => 'VN',
-  232 => 'VU',
-  233 => 'WF',
-  234 => 'WS',
-  235 => 'XK',
-  236 => 'YE',
-  237 => 'YT',
-  238 => 'ZA',
-  239 => 'ZM',
-  240 => 'ZW',
+    public const SHORT_NUMBERS_REGION_CODE_SET = [
+     'AC',
+     'AD',
+     'AE',
+     'AF',
+     'AG',
+     'AI',
+     'AL',
+     'AM',
+     'AO',
+     'AR',
+     'AS',
+     'AT',
+     'AU',
+     'AW',
+     'AX',
+     'AZ',
+     'BA',
+     'BB',
+     'BD',
+     'BE',
+     'BF',
+     'BG',
+     'BH',
+     'BI',
+     'BJ',
+     'BL',
+     'BM',
+     'BN',
+     'BO',
+     'BQ',
+     'BR',
+     'BS',
+     'BT',
+     'BW',
+     'BY',
+     'BZ',
+     'CA',
+     'CC',
+     'CD',
+     'CF',
+     'CG',
+     'CH',
+     'CI',
+     'CK',
+     'CL',
+     'CM',
+     'CN',
+     'CO',
+     'CR',
+     'CU',
+     'CV',
+     'CW',
+     'CX',
+     'CY',
+     'CZ',
+     'DE',
+     'DJ',
+     'DK',
+     'DM',
+     'DO',
+     'DZ',
+     'EC',
+     'EE',
+     'EG',
+     'EH',
+     'ER',
+     'ES',
+     'ET',
+     'FI',
+     'FJ',
+     'FK',
+     'FM',
+     'FO',
+     'FR',
+     'GA',
+     'GB',
+     'GD',
+     'GE',
+     'GF',
+     'GG',
+     'GH',
+     'GI',
+     'GL',
+     'GM',
+     'GN',
+     'GP',
+     'GR',
+     'GT',
+     'GU',
+     'GW',
+     'GY',
+     'HK',
+     'HN',
+     'HR',
+     'HT',
+     'HU',
+     'ID',
+     'IE',
+     'IL',
+     'IM',
+     'IN',
+     'IQ',
+     'IR',
+     'IS',
+     'IT',
+     'JE',
+     'JM',
+     'JO',
+     'JP',
+     'KE',
+     'KG',
+     'KH',
+     'KI',
+     'KM',
+     'KN',
+     'KP',
+     'KR',
+     'KW',
+     'KY',
+     'KZ',
+     'LA',
+     'LB',
+     'LC',
+     'LI',
+     'LK',
+     'LR',
+     'LS',
+     'LT',
+     'LU',
+     'LV',
+     'LY',
+     'MA',
+     'MC',
+     'MD',
+     'ME',
+     'MF',
+     'MG',
+     'MH',
+     'MK',
+     'ML',
+     'MM',
+     'MN',
+     'MO',
+     'MP',
+     'MQ',
+     'MR',
+     'MS',
+     'MT',
+     'MU',
+     'MV',
+     'MW',
+     'MX',
+     'MY',
+     'MZ',
+     'NA',
+     'NC',
+     'NE',
+     'NF',
+     'NG',
+     'NI',
+     'NL',
+     'NO',
+     'NP',
+     'NR',
+     'NU',
+     'NZ',
+     'OM',
+     'PA',
+     'PE',
+     'PF',
+     'PG',
+     'PH',
+     'PK',
+     'PL',
+     'PM',
+     'PR',
+     'PS',
+     'PT',
+     'PW',
+     'PY',
+     'QA',
+     'RE',
+     'RO',
+     'RS',
+     'RU',
+     'RW',
+     'SA',
+     'SB',
+     'SC',
+     'SD',
+     'SE',
+     'SG',
+     'SH',
+     'SI',
+     'SJ',
+     'SK',
+     'SL',
+     'SM',
+     'SN',
+     'SO',
+     'SR',
+     'SS',
+     'ST',
+     'SV',
+     'SX',
+     'SY',
+     'SZ',
+     'TC',
+     'TD',
+     'TG',
+     'TH',
+     'TJ',
+     'TL',
+     'TM',
+     'TN',
+     'TO',
+     'TR',
+     'TT',
+     'TV',
+     'TW',
+     'TZ',
+     'UA',
+     'UG',
+     'US',
+     'UY',
+     'UZ',
+     'VA',
+     'VC',
+     'VE',
+     'VG',
+     'VI',
+     'VN',
+     'VU',
+     'WF',
+     'WS',
+     'XK',
+     'YE',
+     'YT',
+     'ZA',
+     'ZM',
+     'ZW',
 ];
 
 }
diff --git a/src/data/PhoneNumberMetadata_800.php b/src/data/PhoneNumberMetadata_800.php
index b588a2bcc..8066e0176 100644
--- a/src/data/PhoneNumberMetadata_800.php
+++ b/src/data/PhoneNumberMetadata_800.php
@@ -6,109 +6,80 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:00|[1-9]\\d)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => '001',
+    'countryCode' => 800,
+    'generalDesc' => [
+        'pattern' => '(?:00|[1-9]\\d)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:00|[1-9]\\d)\\d{6}',
-    'ExampleNumber' => '12345678',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '(?:00|[1-9]\\d)\\d{6}',
+        'example' => '12345678',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 800,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '\\d',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '\\d',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_808.php b/src/data/PhoneNumberMetadata_808.php
index 4f305d519..5cc53b5fc 100644
--- a/src/data/PhoneNumberMetadata_808.php
+++ b/src/data/PhoneNumberMetadata_808.php
@@ -6,109 +6,80 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => '001',
+    'countryCode' => 808,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{7}',
-    'ExampleNumber' => '12345678',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '[1-9]\\d{7}',
+        'example' => '12345678',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 808,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_870.php b/src/data/PhoneNumberMetadata_870.php
index 5656424ca..c475dae4c 100644
--- a/src/data/PhoneNumberMetadata_870.php
+++ b/src/data/PhoneNumberMetadata_870.php
@@ -6,110 +6,80 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '7\\d{11}|[35-7]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 12,
+return [
+    'id' => '001',
+    'countryCode' => 870,
+    'generalDesc' => [
+        'pattern' => '7\\d{11}|[35-7]\\d{8}',
+        'posLength' => [
+            9,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[356]|774[45])\\d{8}|7[6-8]\\d{7}',
-    'ExampleNumber' => '301234567',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:[356]|774[45])\\d{8}|7[6-8]\\d{7}',
+        'example' => '301234567',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 870,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[35-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[35-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_878.php b/src/data/PhoneNumberMetadata_878.php
index 2efb58fd2..55adfedd7 100644
--- a/src/data/PhoneNumberMetadata_878.php
+++ b/src/data/PhoneNumberMetadata_878.php
@@ -6,109 +6,80 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '10\\d{10}',
-    'PossibleLength' =>
-     [
-      0 => 12,
+return [
+    'id' => '001',
+    'countryCode' => 878,
+    'generalDesc' => [
+        'pattern' => '10\\d{10}',
+        'posLength' => [
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '10\\d{10}',
-    'ExampleNumber' => '101234567890',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '10\\d{10}',
+        'example' => '101234567890',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 878,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{5})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_881.php b/src/data/PhoneNumberMetadata_881.php
index 479d87b54..d02151e1f 100644
--- a/src/data/PhoneNumberMetadata_881.php
+++ b/src/data/PhoneNumberMetadata_881.php
@@ -6,122 +6,89 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '6\\d{9}|[0-36-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+return [
+    'id' => '001',
+    'countryCode' => 881,
+    'generalDesc' => [
+        'pattern' => '6\\d{9}|[0-36-9]\\d{8}',
+        'posLength' => [
+            9,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6\\d{9}|[0-36-9]\\d{8}',
-    'ExampleNumber' => '612345678',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '6\\d{9}|[0-36-9]\\d{8}',
+        'example' => '612345678',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 881,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[0-37-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{5,6})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[0-37-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{5,6})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_882.php b/src/data/PhoneNumberMetadata_882.php
index 1769e992f..7bb63a945 100644
--- a/src/data/PhoneNumberMetadata_882.php
+++ b/src/data/PhoneNumberMetadata_882.php
@@ -6,206 +6,155 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[13]\\d{6}(?:\\d{2,5})?|[19]\\d{7}|(?:[25]\\d\\d|4)\\d{7}(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-      5 => 12,
+return [
+    'id' => '001',
+    'countryCode' => 882,
+    'generalDesc' => [
+        'pattern' => '[13]\\d{6}(?:\\d{2,5})?|[19]\\d{7}|(?:[25]\\d\\d|4)\\d{7}(?:\\d{2})?',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+    ],
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '342\\d{4}|(?:337|49)\\d{6}|(?:3(?:2|47|7\\d{3})|50\\d{3})\\d{7}',
+        'example' => '3421234',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            12,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '1(?:3(?:0[0347]|[13][0139]|2[035]|4[013568]|6[0459]|7[06]|8[15-8]|9[0689])\\d{4}|6\\d{5,10})|(?:345\\d|9[89])\\d{6}|(?:10|2(?:3|85\\d)|3(?:[15]|[69]\\d\\d)|4[15-8]|51)\\d{8}',
+        'example' => '390123456789',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'pattern' => '348[57]\\d{7}',
+        'example' => '34851234567',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '16|342',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '49',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1[36]|9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3[23]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '16',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '10|23|3(?:[15]|4[57])|4|51',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '34',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4,5})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-35]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '342\\d{4}|(?:337|49)\\d{6}|(?:3(?:2|47|7\\d{3})|50\\d{3})\\d{7}',
-    'ExampleNumber' => '3421234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 12,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '1(?:3(?:0[0347]|[13][0139]|2[035]|4[013568]|6[0459]|7[06]|8[15-8]|9[0689])\\d{4}|6\\d{5,10})|(?:345\\d|9[89])\\d{6}|(?:10|2(?:3|85\\d)|3(?:[15]|[69]\\d\\d)|4[15-8]|51)\\d{8}',
-    'ExampleNumber' => '390123456789',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '348[57]\\d{7}',
-    'ExampleNumber' => '34851234567',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => '001',
-  'countryCode' => 882,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16|342',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '49',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[36]|9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3[23]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '10|23|3(?:[15]|4[57])|4|51',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '34',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,5})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-35]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_883.php b/src/data/PhoneNumberMetadata_883.php
index 469a8558c..ccd7c146a 100644
--- a/src/data/PhoneNumberMetadata_883.php
+++ b/src/data/PhoneNumberMetadata_883.php
@@ -6,161 +6,120 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[1-4]\\d|51)\\d{6,10}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-      4 => 12,
+return [
+    'id' => '001',
+    'countryCode' => 883,
+    'generalDesc' => [
+        'pattern' => '(?:[1-4]\\d|51)\\d{6,10}',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+    ],
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '(?:2(?:00\\d\\d|10)|(?:370[1-9]|51\\d0)\\d)\\d{7}|51(?:00\\d{5}|[24-9]0\\d{4,7})|(?:1[0-79]|2[24-689]|3[02-689]|4[0-4])0\\d{5,9}',
+        'example' => '510012345',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2,8})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[14]|2[24-689]|3[02-689]|51[24-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '510',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '21',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '51[13]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[235]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:00\\d\\d|10)|(?:370[1-9]|51\\d0)\\d)\\d{7}|51(?:00\\d{5}|[24-9]0\\d{4,7})|(?:1[0-79]|2[24-689]|3[02-689]|4[0-4])0\\d{5,9}',
-    'ExampleNumber' => '510012345',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => '001',
-  'countryCode' => 883,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2,8})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[14]|2[24-689]|3[02-689]|51[24-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '510',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '21',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '51[13]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[235]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_888.php b/src/data/PhoneNumberMetadata_888.php
index 6d289c0e3..699fdf6e6 100644
--- a/src/data/PhoneNumberMetadata_888.php
+++ b/src/data/PhoneNumberMetadata_888.php
@@ -6,108 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{11}',
-    'PossibleLength' =>
-     [
-      0 => 11,
+return [
+    'id' => '001',
+    'countryCode' => 888,
+    'generalDesc' => [
+        'pattern' => '\\d{11}',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '\\d{11}',
-    'ExampleNumber' => '12345678901',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '\\d{11}',
+        'example' => '12345678901',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 888,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_979.php b/src/data/PhoneNumberMetadata_979.php
index 2512b1a76..2199dd0a8 100644
--- a/src/data/PhoneNumberMetadata_979.php
+++ b/src/data/PhoneNumberMetadata_979.php
@@ -6,117 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1359]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => '001',
+    'countryCode' => 979,
+    'generalDesc' => [
+        'pattern' => '[1359]\\d{8}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            8,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '[1359]\\d{8}',
+        'example' => '123456789',
+        'posLengthLocal' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '[1359]\\d{8}',
-    'ExampleNumber' => '123456789',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'internationalPrefix' => '',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1359]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 979,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1359]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_AC.php b/src/data/PhoneNumberMetadata_AC.php
index 090c1259b..f6cdc75e1 100644
--- a/src/data/PhoneNumberMetadata_AC.php
+++ b/src/data/PhoneNumberMetadata_AC.php
@@ -6,106 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[01589]\\d|[46])\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
+return [
+    'id' => 'AC',
+    'countryCode' => 247,
+    'generalDesc' => [
+        'pattern' => '(?:[01589]\\d|[46])\\d{4}',
+        'posLength' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '6[2-467]\\d{3}',
-    'ExampleNumber' => '62889',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'fixedLine' => [
+        'pattern' => '6[2-467]\\d{3}',
+        'example' => '62889',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4\\d{4}',
-    'ExampleNumber' => '40123',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'mobile' => [
+        'pattern' => '4\\d{4}',
+        'example' => '40123',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:0[1-9]|[1589]\\d)\\d{4}',
-    'ExampleNumber' => '542011',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'uan' => [
+        'pattern' => '(?:0[1-9]|[1589]\\d)\\d{4}',
+        'example' => '542011',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AC',
-  'countryCode' => 247,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_AD.php b/src/data/PhoneNumberMetadata_AD.php
index 1d8c45c0e..fa5855e32 100644
--- a/src/data/PhoneNumberMetadata_AD.php
+++ b/src/data/PhoneNumberMetadata_AD.php
@@ -6,147 +6,110 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:1|6\\d)\\d{7}|[135-9]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 9,
+return [
+    'id' => 'AD',
+    'countryCode' => 376,
+    'generalDesc' => [
+        'pattern' => '(?:1|6\\d)\\d{7}|[135-9]\\d{5}',
+        'posLength' => [
+            6,
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[78]\\d{5}',
-    'ExampleNumber' => '712345',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '[78]\\d{5}',
+        'example' => '712345',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '690\\d{6}|[356]\\d{5}',
-    'ExampleNumber' => '312345',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
+    'mobile' => [
+        'pattern' => '690\\d{6}|[356]\\d{5}',
+        'example' => '312345',
+        'posLength' => [
+            6,
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '180[02]\\d{4}',
-    'ExampleNumber' => '18001234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'tollFree' => [
+        'pattern' => '180[02]\\d{4}',
+        'example' => '18001234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{5}',
-    'ExampleNumber' => '912345',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'premiumRate' => [
+        'pattern' => '[19]\\d{5}',
+        'example' => '912345',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '1800\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'noInternationalDialling' => [
+        'pattern' => '1800\\d{4}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'id' => 'AD',
-  'countryCode' => 376,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[135-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[135-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_AE.php b/src/data/PhoneNumberMetadata_AE.php
index beb65418a..51e3a548d 100644
--- a/src/data/PhoneNumberMetadata_AE.php
+++ b/src/data/PhoneNumberMetadata_AE.php
@@ -6,168 +6,128 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[4-7]\\d|9[0-689])\\d{7}|800\\d{2,9}|[2-4679]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-      6 => 11,
-      7 => 12,
+return [
+    'id' => 'AE',
+    'countryCode' => 971,
+    'generalDesc' => [
+        'pattern' => '(?:[4-7]\\d|9[0-689])\\d{7}|800\\d{2,9}|[2-4679]\\d{7}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '[2-4679][2-8]\\d{6}',
+        'example' => '22345678',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '5[024-68]\\d{7}',
+        'example' => '501234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '400\\d{6}|800\\d{2,9}',
+        'example' => '800123456',
+    ],
+    'premiumRate' => [
+        'pattern' => '900[02]\\d{5}',
+        'example' => '900234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '700[05]\\d{5}',
+        'example' => '700012345',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '600[25]\\d{5}',
+        'example' => '600212345',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2,9})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '60|8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[236]|[479][2-8]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d)(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[479]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[2-4679][2-8]\\d{6}',
-    'ExampleNumber' => '22345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '5[024-68]\\d{7}',
-    'ExampleNumber' => '501234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '400\\d{6}|800\\d{2,9}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[02]\\d{5}',
-    'ExampleNumber' => '900234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '700[05]\\d{5}',
-    'ExampleNumber' => '700012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '600[25]\\d{5}',
-    'ExampleNumber' => '600212345',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'AE',
-  'countryCode' => 971,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2,9})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60|8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[236]|[479][2-8]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d)(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[479]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_AF.php b/src/data/PhoneNumberMetadata_AF.php
index b3b5f5a67..86be91e20 100644
--- a/src/data/PhoneNumberMetadata_AF.php
+++ b/src/data/PhoneNumberMetadata_AF.php
@@ -6,148 +6,109 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-7]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'AF',
+    'countryCode' => 93,
+    'generalDesc' => [
+        'pattern' => '[2-7]\\d{8}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:[25][0-8]|[34][0-4]|6[0-5])[2-9]\\d{6}',
+        'example' => '234567890',
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '7\\d{8}',
+        'example' => '701234567',
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:[25][0-8]|[34][0-4]|6[0-5])[2-9]\\d{6}',
-    'ExampleNumber' => '234567890',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7\\d{8}',
-    'ExampleNumber' => '701234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'AF',
-  'countryCode' => 93,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_AG.php b/src/data/PhoneNumberMetadata_AG.php
index c547321db..3590944e6 100644
--- a/src/data/PhoneNumberMetadata_AG.php
+++ b/src/data/PhoneNumberMetadata_AG.php
@@ -6,109 +6,83 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:268|[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'AG',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:268|[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '268(?:4(?:6[0-38]|84)|56[0-2])\\d{4}',
+        'example' => '2684601234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '268(?:4(?:6[0-38]|84)|56[0-2])\\d{4}',
-    'ExampleNumber' => '2684601234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '268(?:464|7(?:1[3-9]|[28]\\d|3[0246]|64|7[0-689]))\\d{4}',
+        'example' => '2684641234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '268(?:464|7(?:1[3-9]|[28]\\d|3[0246]|64|7[0-689]))\\d{4}',
-    'ExampleNumber' => '2684641234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '26848[01]\\d{4}',
-    'ExampleNumber' => '2684801234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '26840[69]\\d{4}',
-    'ExampleNumber' => '2684061234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '26848[01]\\d{4}',
+        'example' => '2684801234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'pattern' => '26840[69]\\d{4}',
+        'example' => '2684061234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AG',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([457]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '268$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '268',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([457]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '268$1',
+    'numberFormat' => [],
+    'leadingDigits' => '268',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_AI.php b/src/data/PhoneNumberMetadata_AI.php
index d6b57e382..6b8cd1cf6 100644
--- a/src/data/PhoneNumberMetadata_AI.php
+++ b/src/data/PhoneNumberMetadata_AI.php
@@ -6,107 +6,81 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:264|[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'AI',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:264|[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '264(?:292|4(?:6[12]|9[78]))\\d{4}',
+        'example' => '2644612345',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '264(?:292|4(?:6[12]|9[78]))\\d{4}',
-    'ExampleNumber' => '2644612345',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '264(?:235|4(?:69|76)|5(?:3[6-9]|8[1-4])|7(?:29|72))\\d{4}',
+        'example' => '2642351234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '264(?:235|4(?:69|76)|5(?:3[6-9]|8[1-4])|7(?:29|72))\\d{4}',
-    'ExampleNumber' => '2642351234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '264724\\d{4}',
-    'ExampleNumber' => '2647241234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'pattern' => '264724\\d{4}',
+        'example' => '2647241234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AI',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2457]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '264$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '264',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2457]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '264$1',
+    'numberFormat' => [],
+    'leadingDigits' => '264',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_AL.php b/src/data/PhoneNumberMetadata_AL.php
index 1a7327075..76fc18b38 100644
--- a/src/data/PhoneNumberMetadata_AL.php
+++ b/src/data/PhoneNumberMetadata_AL.php
@@ -6,186 +6,142 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:700\\d\\d|900)\\d{3}|8\\d{5,7}|(?:[2-5]|6\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '4505[0-2]\\d{3}|(?:[2358][16-9]\\d[2-9]|4410)\\d{4}|(?:[2358][2-5][2-9]|4(?:[2-57-9][2-9]|6\\d))\\d{5}',
-    'ExampleNumber' => '22345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6(?:[78][2-9]|9\\d)\\d{6}',
-    'ExampleNumber' => '672123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{4}',
-    'ExampleNumber' => '8001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[1-9]\\d\\d',
-    'ExampleNumber' => '900123',
-    'PossibleLength' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '808[1-9]\\d\\d',
-    'ExampleNumber' => '808123',
-    'PossibleLength' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '700[2-9]\\d{4}',
-    'ExampleNumber' => '70021234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'AL',
-  'countryCode' => 355,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80|9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '4[2-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2358][2-5]|4',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23578]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'AL',
+    'countryCode' => 355,
+    'generalDesc' => [
+        'pattern' => '(?:700\\d\\d|900)\\d{3}|8\\d{5,7}|(?:[2-5]|6\\d)\\d{7}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            5,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '4505[0-2]\\d{3}|(?:[2358][16-9]\\d[2-9]|4410)\\d{4}|(?:[2358][2-5][2-9]|4(?:[2-57-9][2-9]|6\\d))\\d{5}',
+        'example' => '22345678',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '6(?:[78][2-9]|9\\d)\\d{6}',
+        'example' => '672123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{4}',
+        'example' => '8001234',
+        'posLength' => [
+            7,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '900[1-9]\\d\\d',
+        'example' => '900123',
+        'posLength' => [
+            6,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '808[1-9]\\d\\d',
+        'example' => '808123',
+        'posLength' => [
+            6,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '700[2-9]\\d{4}',
+        'example' => '70021234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '80|9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '4[2-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2358][2-5]|4',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[23578]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_AM.php b/src/data/PhoneNumberMetadata_AM.php
index 3ae496cd1..abb37fceb 100644
--- a/src/data/PhoneNumberMetadata_AM.php
+++ b/src/data/PhoneNumberMetadata_AM.php
@@ -6,147 +6,112 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[1-489]\\d|55|60|77)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'AM',
+    'countryCode' => 374,
+    'generalDesc' => [
+        'pattern' => '(?:[1-489]\\d|55|60|77)\\d{6}',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
+    'fixedLine' => [
+        'pattern' => '(?:(?:1[0-25]|47)\\d|2(?:2[2-46]|3[1-8]|4[2-69]|5[2-7]|6[1-9]|8[1-7])|3[12]2)\\d{5}',
+        'example' => '10123456',
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:1[0-25]|47)\\d|2(?:2[2-46]|3[1-8]|4[2-69]|5[2-7]|6[1-9]|8[1-7])|3[12]2)\\d{5}',
-    'ExampleNumber' => '10123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
+    'mobile' => [
+        'pattern' => '(?:33|4[1349]|55|77|88|9[13-9])\\d{6}',
+        'example' => '77123456',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:33|4[1349]|55|77|88|9[13-9])\\d{6}',
-    'ExampleNumber' => '77123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[016]\\d{5}',
-    'ExampleNumber' => '90012345',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '80[1-4]\\d{5}',
-    'ExampleNumber' => '80112345',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80012345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '60(?:2[78]|3[5-9]|4[02-9]|5[0-46-9]|[6-8]\\d|9[0-2])\\d{4}',
-    'ExampleNumber' => '60271234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90[016]\\d{5}',
+        'example' => '90012345',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '80[1-4]\\d{5}',
+        'example' => '80112345',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '60(?:2[78]|3[5-9]|4[02-9]|5[0-46-9]|[6-8]\\d|9[0-2])\\d{4}',
+        'example' => '60271234',
     ],
-  ],
-  'id' => 'AM',
-  'countryCode' => 374,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]0',
-      ],
-      'nationalPrefixFormattingRule' => '0 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2|3[12]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1|47',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]0',
+            ],
+            'nationalPrefixFormattingRule' => '0 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2|3[12]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1|47',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[3-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_AO.php b/src/data/PhoneNumberMetadata_AO.php
index 31f4bc870..dfeb8a3c3 100644
--- a/src/data/PhoneNumberMetadata_AO.php
+++ b/src/data/PhoneNumberMetadata_AO.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[29]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'AO',
+    'countryCode' => 244,
+    'generalDesc' => [
+        'pattern' => '[29]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2\\d(?:[0134][25-9]|[25-9]\\d)\\d{5}',
-    'ExampleNumber' => '222123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9[1-59]\\d{7}',
-    'ExampleNumber' => '923123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2\\d(?:[0134][25-9]|[25-9]\\d)\\d{5}',
+        'example' => '222123456',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '9[1-59]\\d{7}',
+        'example' => '923123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AO',
-  'countryCode' => 244,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[29]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[29]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_AR.php b/src/data/PhoneNumberMetadata_AR.php
index ecdb535e9..399cdbf01 100644
--- a/src/data/PhoneNumberMetadata_AR.php
+++ b/src/data/PhoneNumberMetadata_AR.php
@@ -6,372 +6,292 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:11|[89]\\d\\d)\\d{8}|[2368]\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '3888[013-9]\\d{5}|3(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|(?:2(?:657|9(?:54|66))|3(?:7(?:55|77)|865))[2-8]\\d{5}|(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|(?:2(?:284|3(?:02|23)|920)|3(?:4(?:46|8[27]|92)|541|878))[2-7]\\d{5}|(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:(?:11[1-8]|670)\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[235][4-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|[58][3-6])))\\d{6}|2(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|5[17])))[3-6]\\d{5}|(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[145]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}',
-    'ExampleNumber' => '1123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '93(?:7(?:1[15]|81)[46]|8(?:(?:21|4[16]|69|9[12])[46]|88[013-9]))\\d{5}|9(?:2(?:657|9(?:54|66))|3(?:7(?:55|77)|865))[2-8]\\d{5}|9(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|9(?:2(?:284|3(?:02|23)|920)|3(?:4(?:46|8[27]|92)|541|878))[2-7]\\d{5}|9(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:675\\d|9(?:11[1-8]\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[235][4-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|[58][3-6]))))\\d{6}|92(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|9(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|5[17])))[3-6]\\d{5}|9(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[145]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}',
-    'ExampleNumber' => '91123456789',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7,8}',
-    'ExampleNumber' => '8001234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '60[04579]\\d{7}',
-    'ExampleNumber' => '6001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '810\\d{7}',
-    'ExampleNumber' => '8101234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '810\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'id' => 'AR',
-  'countryCode' => 54,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0?(?:(11|2(?:2(?:02?|[13]|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02?|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[67])|4(?:7[3-578]|9)|6(?:[0136]|2[24-6]|4[6-8]?|5[15-8])|80|9(?:0[1-3]|[19]|2\\d|3[1-6]|4[02568]?|5[2-4]|6[2-46]|72?|8[23]?))|3(?:3(?:2[79]|6|8[2578])|4(?:0[0-24-9]|[12]|3[5-8]?|4[24-7]|5[4-68]?|6[02-9]|7[126]|8[2379]?|9[1-36-8])|5(?:1|2[1245]|3[237]?|4[1-46-9]|6[2-4]|7[1-6]|8[2-5]?)|6[24]|7(?:[069]|1[1568]|2[15]|3[145]|4[13]|5[14-8]|7[2-57]|8[126])|8(?:[01]|2[15-7]|3[2578]?|4[13-6]|5[4-8]?|6[1-357-9]|7[36-8]?|8[5-8]?|9[124])))15)?',
-  'nationalPrefixTransformRule' => '9$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0|1(?:0[0-35-7]|1[02-5]|2[015]|3[47]|4[478])|911',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-8]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:2[024-9]|3[0-59]|47|6[245]|9[02-8])|3(?:3[28]|4[03-9]|5[2-46-8]|7[1-578]|8[2-9])',
-        1 => '2(?:[23]02|6(?:[25]|4[6-8])|9(?:[02356]|4[02568]|72|8[23]))|3(?:3[28]|4(?:[04679]|3[5-8]|5[4-68]|8[2379])|5(?:[2467]|3[237]|8[2-5])|7[1-578]|8(?:[2469]|3[2578]|5[4-8]|7[36-8]|8[5-8]))|2(?:2[24-9]|3[1-59]|47)',
-        2 => '2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3[78]|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8[23])|7[1-578]|8(?:[2469]|3[278]|5[56][46]|86[3-6]))|2(?:2[24-9]|3[1-59]|47)|38(?:[58][78]|7[378])|3(?:4[35][56]|58[45]|8(?:[38]5|54|76))[4-6]',
-        3 => '2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3(?:5(?:4[0-25689]|[56])|[78])|58|8[2379])|5(?:[2467]|3[237]|8(?:[23]|4(?:[45]|60)|5(?:4[0-39]|5|64)))|7[1-578]|8(?:[2469]|3[278]|54(?:4|5[13-7]|6[89])|86[3-6]))|2(?:2[24-9]|3[1-59]|47)|38(?:[58][78]|7[378])|3(?:454|85[56])[46]|3(?:4(?:36|5[56])|8(?:[38]5|76))[4-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[68]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$2 15-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:2[2-469]|3[3-578])',
-        1 => '9(?:2(?:2[024-9]|3[0-59]|47|6[245]|9[02-8])|3(?:3[28]|4[03-9]|5[2-46-8]|7[1-578]|8[2-9]))',
-        2 => '9(?:2(?:[23]02|6(?:[25]|4[6-8])|9(?:[02356]|4[02568]|72|8[23]))|3(?:3[28]|4(?:[04679]|3[5-8]|5[4-68]|8[2379])|5(?:[2467]|3[237]|8[2-5])|7[1-578]|8(?:[2469]|3[2578]|5[4-8]|7[36-8]|8[5-8])))|92(?:2[24-9]|3[1-59]|47)',
-        3 => '9(?:2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3[78]|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8[23])|7[1-578]|8(?:[2469]|3[278]|5(?:[56][46]|[78])|7[378]|8(?:6[3-6]|[78]))))|92(?:2[24-9]|3[1-59]|47)|93(?:4[35][56]|58[45]|8(?:[38]5|54|76))[4-6]',
-        4 => '9(?:2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3(?:5(?:4[0-25689]|[56])|[78])|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8(?:[23]|4(?:[45]|60)|5(?:4[0-39]|5|64)))|7[1-578]|8(?:[2469]|3[278]|5(?:4(?:4|5[13-7]|6[89])|[56][46]|[78])|7[378]|8(?:6[3-6]|[78]))))|92(?:2[24-9]|3[1-59]|47)|93(?:4(?:36|5[56])|8(?:[38]5|76))[4-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$2 15-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '91',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    11 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$2 15-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:2[024-9]|3[0-59]|47|6[245]|9[02-8])|3(?:3[28]|4[03-9]|5[2-46-8]|7[1-578]|8[2-9])',
-        1 => '2(?:[23]02|6(?:[25]|4[6-8])|9(?:[02356]|4[02568]|72|8[23]))|3(?:3[28]|4(?:[04679]|3[5-8]|5[4-68]|8[2379])|5(?:[2467]|3[237]|8[2-5])|7[1-578]|8(?:[2469]|3[2578]|5[4-8]|7[36-8]|8[5-8]))|2(?:2[24-9]|3[1-59]|47)',
-        2 => '2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3[78]|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8[23])|7[1-578]|8(?:[2469]|3[278]|5[56][46]|86[3-6]))|2(?:2[24-9]|3[1-59]|47)|38(?:[58][78]|7[378])|3(?:4[35][56]|58[45]|8(?:[38]5|54|76))[4-6]',
-        3 => '2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3(?:5(?:4[0-25689]|[56])|[78])|58|8[2379])|5(?:[2467]|3[237]|8(?:[23]|4(?:[45]|60)|5(?:4[0-39]|5|64)))|7[1-578]|8(?:[2469]|3[278]|54(?:4|5[13-7]|6[89])|86[3-6]))|2(?:2[24-9]|3[1-59]|47)|38(?:[58][78]|7[378])|3(?:454|85[56])[46]|3(?:4(?:36|5[56])|8(?:[38]5|76))[4-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[68]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:2[2-469]|3[3-578])',
-        1 => '9(?:2(?:2[024-9]|3[0-59]|47|6[245]|9[02-8])|3(?:3[28]|4[03-9]|5[2-46-8]|7[1-578]|8[2-9]))',
-        2 => '9(?:2(?:[23]02|6(?:[25]|4[6-8])|9(?:[02356]|4[02568]|72|8[23]))|3(?:3[28]|4(?:[04679]|3[5-8]|5[4-68]|8[2379])|5(?:[2467]|3[237]|8[2-5])|7[1-578]|8(?:[2469]|3[2578]|5[4-8]|7[36-8]|8[5-8])))|92(?:2[24-9]|3[1-59]|47)',
-        3 => '9(?:2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3[78]|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8[23])|7[1-578]|8(?:[2469]|3[278]|5(?:[56][46]|[78])|7[378]|8(?:6[3-6]|[78]))))|92(?:2[24-9]|3[1-59]|47)|93(?:4[35][56]|58[45]|8(?:[38]5|54|76))[4-6]',
-        4 => '9(?:2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3(?:5(?:4[0-25689]|[56])|[78])|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8(?:[23]|4(?:[45]|60)|5(?:4[0-39]|5|64)))|7[1-578]|8(?:[2469]|3[278]|5(?:4(?:4|5[13-7]|6[89])|[56][46]|[78])|7[378]|8(?:6[3-6]|[78]))))|92(?:2[24-9]|3[1-59]|47)|93(?:4(?:36|5[56])|8(?:[38]5|76))[4-6]',
-      ],
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '91',
-      ],
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'AR',
+    'countryCode' => 54,
+    'generalDesc' => [
+        'pattern' => '(?:11|[89]\\d\\d)\\d{8}|[2368]\\d{9}',
+        'posLength' => [
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '3888[013-9]\\d{5}|3(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|(?:2(?:657|9(?:54|66))|3(?:7(?:55|77)|865))[2-8]\\d{5}|(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|(?:2(?:284|3(?:02|23)|920)|3(?:4(?:46|8[27]|92)|541|878))[2-7]\\d{5}|(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:(?:11[1-8]|670)\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[235][4-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|[58][3-6])))\\d{6}|2(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|5[17])))[3-6]\\d{5}|(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[145]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}',
+        'example' => '1123456789',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '93(?:7(?:1[15]|81)[46]|8(?:(?:21|4[16]|69|9[12])[46]|88[013-9]))\\d{5}|9(?:2(?:657|9(?:54|66))|3(?:7(?:55|77)|865))[2-8]\\d{5}|9(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|9(?:2(?:284|3(?:02|23)|920)|3(?:4(?:46|8[27]|92)|541|878))[2-7]\\d{5}|9(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:675\\d|9(?:11[1-8]\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[235][4-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|[58][3-6]))))\\d{6}|92(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|9(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|5[17])))[3-6]\\d{5}|9(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[145]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}',
+        'example' => '91123456789',
+        'posLengthLocal' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{7,8}',
+        'example' => '8001234567',
+    ],
+    'premiumRate' => [
+        'pattern' => '60[04579]\\d{7}',
+        'example' => '6001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '810\\d{7}',
+        'example' => '8101234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '810\\d{7}',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0?(?:(11|2(?:2(?:02?|[13]|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02?|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[67])|4(?:7[3-578]|9)|6(?:[0136]|2[24-6]|4[6-8]?|5[15-8])|80|9(?:0[1-3]|[19]|2\\d|3[1-6]|4[02568]?|5[2-4]|6[2-46]|72?|8[23]?))|3(?:3(?:2[79]|6|8[2578])|4(?:0[0-24-9]|[12]|3[5-8]?|4[24-7]|5[4-68]?|6[02-9]|7[126]|8[2379]?|9[1-36-8])|5(?:1|2[1245]|3[237]?|4[1-46-9]|6[2-4]|7[1-6]|8[2-5]?)|6[24]|7(?:[069]|1[1568]|2[15]|3[145]|4[13]|5[14-8]|7[2-57]|8[126])|8(?:[01]|2[15-7]|3[2578]?|4[13-6]|5[4-8]?|6[1-357-9]|7[36-8]?|8[5-8]?|9[124])))15)?',
+    'nationalPrefixTransformRule' => '9$1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '0|1(?:0[0-35-7]|1[02-5]|2[015]|3[47]|4[478])|911',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[1-8]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '2(?:2[024-9]|3[0-59]|47|6[245]|9[02-8])|3(?:3[28]|4[03-9]|5[2-46-8]|7[1-578]|8[2-9])',
+                '2(?:[23]02|6(?:[25]|4[6-8])|9(?:[02356]|4[02568]|72|8[23]))|3(?:3[28]|4(?:[04679]|3[5-8]|5[4-68]|8[2379])|5(?:[2467]|3[237]|8[2-5])|7[1-578]|8(?:[2469]|3[2578]|5[4-8]|7[36-8]|8[5-8]))|2(?:2[24-9]|3[1-59]|47)',
+                '2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3[78]|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8[23])|7[1-578]|8(?:[2469]|3[278]|5[56][46]|86[3-6]))|2(?:2[24-9]|3[1-59]|47)|38(?:[58][78]|7[378])|3(?:4[35][56]|58[45]|8(?:[38]5|54|76))[4-6]',
+                '2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3(?:5(?:4[0-25689]|[56])|[78])|58|8[2379])|5(?:[2467]|3[237]|8(?:[23]|4(?:[45]|60)|5(?:4[0-39]|5|64)))|7[1-578]|8(?:[2469]|3[278]|54(?:4|5[13-7]|6[89])|86[3-6]))|2(?:2[24-9]|3[1-59]|47)|38(?:[58][78]|7[378])|3(?:454|85[56])[46]|3(?:4(?:36|5[56])|8(?:[38]5|76))[4-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[68]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$2 15-$3-$4',
+            'leadingDigitsPatterns' => [
+                '9(?:2[2-469]|3[3-578])',
+                '9(?:2(?:2[024-9]|3[0-59]|47|6[245]|9[02-8])|3(?:3[28]|4[03-9]|5[2-46-8]|7[1-578]|8[2-9]))',
+                '9(?:2(?:[23]02|6(?:[25]|4[6-8])|9(?:[02356]|4[02568]|72|8[23]))|3(?:3[28]|4(?:[04679]|3[5-8]|5[4-68]|8[2379])|5(?:[2467]|3[237]|8[2-5])|7[1-578]|8(?:[2469]|3[2578]|5[4-8]|7[36-8]|8[5-8])))|92(?:2[24-9]|3[1-59]|47)',
+                '9(?:2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3[78]|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8[23])|7[1-578]|8(?:[2469]|3[278]|5(?:[56][46]|[78])|7[378]|8(?:6[3-6]|[78]))))|92(?:2[24-9]|3[1-59]|47)|93(?:4[35][56]|58[45]|8(?:[38]5|54|76))[4-6]',
+                '9(?:2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3(?:5(?:4[0-25689]|[56])|[78])|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8(?:[23]|4(?:[45]|60)|5(?:4[0-39]|5|64)))|7[1-578]|8(?:[2469]|3[278]|5(?:4(?:4|5[13-7]|6[89])|[56][46]|[78])|7[378]|8(?:6[3-6]|[78]))))|92(?:2[24-9]|3[1-59]|47)|93(?:4(?:36|5[56])|8(?:[38]5|76))[4-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$2 15-$3-$4',
+            'leadingDigitsPatterns' => [
+                '91',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$2 15-$3-$4',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '2(?:2[024-9]|3[0-59]|47|6[245]|9[02-8])|3(?:3[28]|4[03-9]|5[2-46-8]|7[1-578]|8[2-9])',
+                '2(?:[23]02|6(?:[25]|4[6-8])|9(?:[02356]|4[02568]|72|8[23]))|3(?:3[28]|4(?:[04679]|3[5-8]|5[4-68]|8[2379])|5(?:[2467]|3[237]|8[2-5])|7[1-578]|8(?:[2469]|3[2578]|5[4-8]|7[36-8]|8[5-8]))|2(?:2[24-9]|3[1-59]|47)',
+                '2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3[78]|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8[23])|7[1-578]|8(?:[2469]|3[278]|5[56][46]|86[3-6]))|2(?:2[24-9]|3[1-59]|47)|38(?:[58][78]|7[378])|3(?:4[35][56]|58[45]|8(?:[38]5|54|76))[4-6]',
+                '2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3(?:5(?:4[0-25689]|[56])|[78])|58|8[2379])|5(?:[2467]|3[237]|8(?:[23]|4(?:[45]|60)|5(?:4[0-39]|5|64)))|7[1-578]|8(?:[2469]|3[278]|54(?:4|5[13-7]|6[89])|86[3-6]))|2(?:2[24-9]|3[1-59]|47)|38(?:[58][78]|7[378])|3(?:454|85[56])[46]|3(?:4(?:36|5[56])|8(?:[38]5|76))[4-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[68]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3-$4',
+            'leadingDigitsPatterns' => [
+                '9(?:2[2-469]|3[3-578])',
+                '9(?:2(?:2[024-9]|3[0-59]|47|6[245]|9[02-8])|3(?:3[28]|4[03-9]|5[2-46-8]|7[1-578]|8[2-9]))',
+                '9(?:2(?:[23]02|6(?:[25]|4[6-8])|9(?:[02356]|4[02568]|72|8[23]))|3(?:3[28]|4(?:[04679]|3[5-8]|5[4-68]|8[2379])|5(?:[2467]|3[237]|8[2-5])|7[1-578]|8(?:[2469]|3[2578]|5[4-8]|7[36-8]|8[5-8])))|92(?:2[24-9]|3[1-59]|47)',
+                '9(?:2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3[78]|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8[23])|7[1-578]|8(?:[2469]|3[278]|5(?:[56][46]|[78])|7[378]|8(?:6[3-6]|[78]))))|92(?:2[24-9]|3[1-59]|47)|93(?:4[35][56]|58[45]|8(?:[38]5|54|76))[4-6]',
+                '9(?:2(?:[23]02|6(?:[25]|4(?:64|[78]))|9(?:[02356]|4(?:[0268]|5[2-6])|72|8[23]))|3(?:3[28]|4(?:[04679]|3(?:5(?:4[0-25689]|[56])|[78])|5(?:4[46]|8)|8[2379])|5(?:[2467]|3[237]|8(?:[23]|4(?:[45]|60)|5(?:4[0-39]|5|64)))|7[1-578]|8(?:[2469]|3[278]|5(?:4(?:4|5[13-7]|6[89])|[56][46]|[78])|7[378]|8(?:6[3-6]|[78]))))|92(?:2[24-9]|3[1-59]|47)|93(?:4(?:36|5[56])|8(?:[38]5|76))[4-6]',
+            ],
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3-$4',
+            'leadingDigitsPatterns' => [
+                '91',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3-$4',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_AS.php b/src/data/PhoneNumberMetadata_AS.php
index e8a8aae16..597504a82 100644
--- a/src/data/PhoneNumberMetadata_AS.php
+++ b/src/data/PhoneNumberMetadata_AS.php
@@ -6,105 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|684|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'AS',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|684|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '6846(?:22|33|44|55|77|88|9[19])\\d{4}',
+        'example' => '6846221234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '6846(?:22|33|44|55|77|88|9[19])\\d{4}',
-    'ExampleNumber' => '6846221234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '684(?:2(?:48|5[2468]|7[26])|7(?:3[13]|70|82))\\d{4}',
+        'example' => '6847331234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '684(?:2(?:48|5[2468]|7[26])|7(?:3[13]|70|82))\\d{4}',
-    'ExampleNumber' => '6847331234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AS',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([267]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '684$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '684',
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([267]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '684$1',
+    'numberFormat' => [],
+    'leadingDigits' => '684',
 ];
diff --git a/src/data/PhoneNumberMetadata_AT.php b/src/data/PhoneNumberMetadata_AT.php
index efc685100..b968772f3 100644
--- a/src/data/PhoneNumberMetadata_AT.php
+++ b/src/data/PhoneNumberMetadata_AT.php
@@ -6,348 +6,271 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{3,12}|2\\d{6,12}|43(?:(?:0\\d|5[02-9])\\d{3,9}|2\\d{4,5}|[3467]\\d{4}|8\\d{4,6}|9\\d{4,7})|5\\d{4,12}|8\\d{7,12}|9\\d{8,12}|(?:[367]\\d|4[0-24-9])\\d{4,11}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-      5 => 9,
-      6 => 10,
-      7 => 11,
-      8 => 12,
-      9 => 13,
+return [
+    'id' => 'AT',
+    'countryCode' => 43,
+    'generalDesc' => [
+        'pattern' => '1\\d{3,12}|2\\d{6,12}|43(?:(?:0\\d|5[02-9])\\d{3,9}|2\\d{4,5}|[3467]\\d{4}|8\\d{4,6}|9\\d{4,7})|5\\d{4,12}|8\\d{7,12}|9\\d{8,12}|(?:[367]\\d|4[0-24-9])\\d{4,11}',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
+        'posLengthLocal' => [
+            3,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 3,
+    'fixedLine' => [
+        'pattern' => '1(?:11\\d|[2-9]\\d{3,11})|(?:316|463|(?:51|66|73)2)\\d{3,10}|(?:2(?:1[467]|2[13-8]|5[2357]|6[1-46-8]|7[1-8]|8[124-7]|9[1458])|3(?:1[1-578]|3[23568]|4[5-7]|5[1378]|6[1-38]|8[3-68])|4(?:2[1-8]|35|7[1368]|8[2457])|5(?:2[1-8]|3[357]|4[147]|5[12578]|6[37])|6(?:13|2[1-47]|4[135-8]|5[468])|7(?:2[1-8]|35|4[13478]|5[68]|6[16-8]|7[1-6]|9[45]))\\d{4,10}',
+        'example' => '1234567890',
+        'posLengthLocal' => [
+            3,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1(?:11\\d|[2-9]\\d{3,11})|(?:316|463|(?:51|66|73)2)\\d{3,10}|(?:2(?:1[467]|2[13-8]|5[2357]|6[1-46-8]|7[1-8]|8[124-7]|9[1458])|3(?:1[1-578]|3[23568]|4[5-7]|5[1378]|6[1-38]|8[3-68])|4(?:2[1-8]|35|7[1368]|8[2457])|5(?:2[1-8]|3[357]|4[147]|5[12578]|6[37])|6(?:13|2[1-47]|4[135-8]|5[468])|7(?:2[1-8]|35|4[13478]|5[68]|6[16-8]|7[1-6]|9[45]))\\d{4,10}',
-    'ExampleNumber' => '1234567890',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 3,
+    'mobile' => [
+        'pattern' => '6(?:5[0-3579]|6[013-9]|[7-9]\\d)\\d{4,10}',
+        'example' => '664123456',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6(?:5[0-3579]|6[013-9]|[7-9]\\d)\\d{4,10}',
-    'ExampleNumber' => '664123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-      5 => 12,
-      6 => 13,
+    'tollFree' => [
+        'pattern' => '800\\d{6,10}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6,10}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-      2 => 11,
-      3 => 12,
-      4 => 13,
+    'premiumRate' => [
+        'pattern' => '(?:8[69][2-68]|9(?:0[01]|3[019]))\\d{6,10}',
+        'example' => '900123456',
+        'posLength' => [
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:8[69][2-68]|9(?:0[01]|3[019]))\\d{6,10}',
-    'ExampleNumber' => '900123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-      2 => 11,
-      3 => 12,
-      4 => 13,
+    'sharedCost' => [
+        'pattern' => '8(?:10|2[018])\\d{6,10}|828\\d{5}',
+        'example' => '810123456',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8(?:10|2[018])\\d{6,10}|828\\d{5}',
-    'ExampleNumber' => '810123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-      4 => 12,
-      5 => 13,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '5(?:0[1-9]|17|[79]\\d)\\d{2,10}|7[28]0\\d{6,10}',
+        'example' => '780123456',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '5(?:0[1-9]|17|[79]\\d)\\d{2,10}|7[28]0\\d{6,10}',
-    'ExampleNumber' => '780123456',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-      6 => 11,
-      7 => 12,
-      8 => 13,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '14',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3,12})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1(?:11|[2-9])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '517',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '5[079]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '[18]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,10})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3,9})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-467]|5[2-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4,7})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'id' => 'AT',
-  'countryCode' => 43,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '14',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3,12})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1(?:11|[2-9])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '517',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '5[079]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,10})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3,9})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-467]|5[2-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4,7})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3,12})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:11|[2-9])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '517',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5[079]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[18]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,10})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3,9})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-467]|5[2-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4,7})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3,12})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:11|[2-9])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '517',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5[079]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,10})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3,9})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-467]|5[2-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4,7})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_AU.php b/src/data/PhoneNumberMetadata_AU.php
index 6a0502ca1..eb50bb068 100644
--- a/src/data/PhoneNumberMetadata_AU.php
+++ b/src/data/PhoneNumberMetadata_AU.php
@@ -6,323 +6,250 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1(?:[0-79]\\d{7}(?:\\d(?:\\d{2})?)?|8[0-24-9]\\d{7})|[2-478]\\d{8}|1\\d{4,7}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-      6 => 12,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:(?:2(?:[0-26-9]\\d|3[0-8]|4[02-9]|5[0135-9])|7(?:[013-57-9]\\d|2[0-8]))\\d|3(?:(?:[0-3589]\\d|6[1-9]|7[0-35-9])\\d|4(?:[0-578]\\d|90)))\\d\\d|8(?:51(?:0(?:0[03-9]|[12479]\\d|3[2-9]|5[0-8]|6[1-9]|8[0-7])|1(?:[0235689]\\d|1[0-69]|4[0-589]|7[0-47-9])|2(?:0[0-79]|[18][13579]|2[14-9]|3[0-46-9]|[4-6]\\d|7[89]|9[0-4])|3\\d\\d)|(?:6[0-8]|[78]\\d)\\d{3}|9(?:[02-9]\\d{3}|1(?:(?:[0-58]\\d|6[0135-9])\\d|7(?:0[0-24-9]|[1-9]\\d)|9(?:[0-46-9]\\d|5[0-79])))))\\d{3}',
-    'ExampleNumber' => '212345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
-    'ExampleNumber' => '412345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '180(?:0\\d{3}|2)\\d{3}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '190[0-26]\\d{6}',
-    'ExampleNumber' => '1900123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '13(?:00\\d{6}(?:\\d{2})?|45[0-4]\\d{3})|13\\d{4}',
-    'ExampleNumber' => '1300123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 10,
-      3 => 12,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '14(?:5(?:1[0458]|[23][458])|71\\d)\\d{4}',
-    'ExampleNumber' => '147101234',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '163\\d{2,6}',
-    'ExampleNumber' => '1631234',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '1(?:3(?:00\\d{5}|45[0-4])|802)\\d{3}|1[38]00\\d{6}|13\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 10,
-      4 => 12,
-    ],
-  ],
-  'id' => 'AU',
-  'countryCode' => 61,
-  'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011',
-  'preferredInternationalPrefix' => '0011',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '(183[12])|0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '13',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '19',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '180',
-        1 => '1802',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '19',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '14|4',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2378]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '$CC ($1)',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:30|[89])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '130',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '14|4',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2378]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '$CC ($1)',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:30|[89])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => true,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'AU',
+    'countryCode' => 61,
+    'generalDesc' => [
+        'pattern' => '1(?:[0-79]\\d{7}(?:\\d(?:\\d{2})?)?|8[0-24-9]\\d{7})|[2-478]\\d{8}|1\\d{4,7}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            12,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:(?:(?:2(?:[0-26-9]\\d|3[0-8]|4[02-9]|5[0135-9])|7(?:[013-57-9]\\d|2[0-8]))\\d|3(?:(?:[0-3589]\\d|6[1-9]|7[0-35-9])\\d|4(?:[0-578]\\d|90)))\\d\\d|8(?:51(?:0(?:0[03-9]|[12479]\\d|3[2-9]|5[0-8]|6[1-9]|8[0-7])|1(?:[0235689]\\d|1[0-69]|4[0-589]|7[0-47-9])|2(?:0[0-79]|[18][13579]|2[14-9]|3[0-46-9]|[4-6]\\d|7[89]|9[0-4])|3\\d\\d)|(?:6[0-8]|[78]\\d)\\d{3}|9(?:[02-9]\\d{3}|1(?:(?:[0-58]\\d|6[0135-9])\\d|7(?:0[0-24-9]|[1-9]\\d)|9(?:[0-46-9]\\d|5[0-79])))))\\d{3}',
+        'example' => '212345678',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+        'example' => '412345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '180(?:0\\d{3}|2)\\d{3}',
+        'example' => '1800123456',
+        'posLength' => [
+            7,
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '190[0-26]\\d{6}',
+        'example' => '1900123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '13(?:00\\d{6}(?:\\d{2})?|45[0-4]\\d{3})|13\\d{4}',
+        'example' => '1300123456',
+        'posLength' => [
+            6,
+            8,
+            10,
+            12,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '14(?:5(?:1[0458]|[23][458])|71\\d)\\d{4}',
+        'example' => '147101234',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '163\\d{2,6}',
+        'example' => '1631234',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '1(?:3(?:00\\d{5}|45[0-4])|802)\\d{3}|1[38]00\\d{6}|13\\d{4}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            10,
+            12,
+        ],
+    ],
+    'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011',
+    'preferredInternationalPrefix' => '0011',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '(183[12])|0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '16',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '13',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '19',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '180',
+                '1802',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '19',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '16',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '14|4',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2378]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '$CC ($1)',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:30|[89])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '130',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '16',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '16',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '14|4',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2378]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '$CC ($1)',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:30|[89])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_AW.php b/src/data/PhoneNumberMetadata_AW.php
index 530fb2cf5..5cc224568 100644
--- a/src/data/PhoneNumberMetadata_AW.php
+++ b/src/data/PhoneNumberMetadata_AW.php
@@ -6,101 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[25-79]\\d\\d|800)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'AW',
+    'countryCode' => 297,
+    'generalDesc' => [
+        'pattern' => '(?:[25-79]\\d\\d|800)\\d{4}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '5(?:2\\d|8[1-9])\\d{4}',
-    'ExampleNumber' => '5212345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:290|5[69]\\d|6(?:[03]0|22|4[0-2]|[69]\\d)|7(?:[34]\\d|7[07])|9(?:6[45]|9[4-8]))\\d{4}',
-    'ExampleNumber' => '5601234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{4}',
-    'ExampleNumber' => '8001234',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{4}',
-    'ExampleNumber' => '9001234',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '5(?:2\\d|8[1-9])\\d{4}',
+        'example' => '5212345',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:290|5[69]\\d|6(?:[03]0|22|4[0-2]|[69]\\d)|7(?:[34]\\d|7[07])|9(?:6[45]|9[4-8]))\\d{4}',
+        'example' => '5601234',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:28\\d|501)\\d{4}',
-    'ExampleNumber' => '5011234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{4}',
+        'example' => '8001234',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900\\d{4}',
+        'example' => '9001234',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AW',
-  'countryCode' => 297,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[25-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'pattern' => '(?:28\\d|501)\\d{4}',
+        'example' => '5011234',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[25-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_AX.php b/src/data/PhoneNumberMetadata_AX.php
index fcacbf7c4..6406f381f 100644
--- a/src/data/PhoneNumberMetadata_AX.php
+++ b/src/data/PhoneNumberMetadata_AX.php
@@ -6,126 +6,98 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '2\\d{4,9}|35\\d{4,5}|(?:60\\d\\d|800)\\d{4,6}|7\\d{5,11}|(?:[14]\\d|3[0-46-9]|50)\\d{4,8}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-      6 => 11,
-      7 => 12,
+return [
+    'id' => 'AX',
+    'countryCode' => 358,
+    'generalDesc' => [
+        'pattern' => '2\\d{4,9}|35\\d{4,5}|(?:60\\d\\d|800)\\d{4,6}|7\\d{5,11}|(?:[14]\\d|3[0-46-9]|50)\\d{4,8}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '18[1-8]\\d{3,6}',
-    'ExampleNumber' => '181234567',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
+    'fixedLine' => [
+        'pattern' => '18[1-8]\\d{3,6}',
+        'example' => '181234567',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4946\\d{2,6}|(?:4[0-8]|50)\\d{4,8}',
-    'ExampleNumber' => '412345678',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
+    'mobile' => [
+        'pattern' => '4946\\d{2,6}|(?:4[0-8]|50)\\d{4,8}',
+        'example' => '412345678',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{4,6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
+    'tollFree' => [
+        'pattern' => '800\\d{4,6}',
+        'example' => '800123456',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '[67]00\\d{5,6}',
-    'ExampleNumber' => '600123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+    'premiumRate' => [
+        'pattern' => '[67]00\\d{5,6}',
+        'example' => '600123456',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '20\\d{4,8}|60[12]\\d{5,6}|7(?:099\\d{4,5}|5[03-9]\\d{3,7})|20[2-59]\\d\\d|(?:606|7(?:0[78]|1|3\\d))\\d{7}|(?:10|29|3[09]|70[1-5]\\d)\\d{4,8}',
-    'ExampleNumber' => '10112345',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '20\\d{4,8}|60[12]\\d{5,6}|7(?:099\\d{4,5}|5[03-9]\\d{3,7})|20[2-59]\\d\\d|(?:606|7(?:0[78]|1|3\\d))\\d{7}|(?:10|29|3[09]|70[1-5]\\d)\\d{4,8}',
+        'example' => '10112345',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AX',
-  'countryCode' => 358,
-  'internationalPrefix' => '00|99(?:[01469]|5(?:[14]1|3[23]|5[59]|77|88|9[09]))',
-  'preferredInternationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '18',
-  'mobileNumberPortableRegion' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00|99(?:[01469]|5(?:[14]1|3[23]|5[59]|77|88|9[09]))',
+    'preferredInternationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [],
+    'leadingDigits' => '18',
 ];
diff --git a/src/data/PhoneNumberMetadata_AZ.php b/src/data/PhoneNumberMetadata_AZ.php
index 1dce3d301..d5879026f 100644
--- a/src/data/PhoneNumberMetadata_AZ.php
+++ b/src/data/PhoneNumberMetadata_AZ.php
@@ -6,192 +6,145 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '365\\d{6}|(?:[124579]\\d|60|88)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[12]428|3655[02])\\d{4}|(?:2(?:22[0-79]|63[0-28])|3654)\\d{5}|(?:(?:1[28]|46)\\d|2(?:[014-6]2|[23]3))\\d{6}',
-    'ExampleNumber' => '123123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '36554\\d{4}|(?:[16]0|4[04]|5[015]|7[07]|99)\\d{7}',
-    'ExampleNumber' => '401234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '88\\d{7}',
-    'ExampleNumber' => '881234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900200\\d{3}',
-    'ExampleNumber' => '900200123',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'AZ',
-  'countryCode' => 994,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '90',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[28]|2|365|46',
-        1 => '1[28]|2|365[45]|46',
-        2 => '1[28]|2|365(?:4|5[02])|46',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '90',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[28]|2|365|46',
-        1 => '1[28]|2|365[45]|46',
-        2 => '1[28]|2|365(?:4|5[02])|46',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'AZ',
+    'countryCode' => 994,
+    'generalDesc' => [
+        'pattern' => '365\\d{6}|(?:[124579]\\d|60|88)\\d{7}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2[12]428|3655[02])\\d{4}|(?:2(?:22[0-79]|63[0-28])|3654)\\d{5}|(?:(?:1[28]|46)\\d|2(?:[014-6]2|[23]3))\\d{6}',
+        'example' => '123123456',
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '36554\\d{4}|(?:[16]0|4[04]|5[015]|7[07]|99)\\d{7}',
+        'example' => '401234567',
+    ],
+    'tollFree' => [
+        'pattern' => '88\\d{7}',
+        'example' => '881234567',
+    ],
+    'premiumRate' => [
+        'pattern' => '900200\\d{3}',
+        'example' => '900200123',
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '90',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1[28]|2|365|46',
+                '1[28]|2|365[45]|46',
+                '1[28]|2|365(?:4|5[02])|46',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[13-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '90',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1[28]|2|365|46',
+                '1[28]|2|365[45]|46',
+                '1[28]|2|365(?:4|5[02])|46',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[13-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BA.php b/src/data/PhoneNumberMetadata_BA.php
index 2802898bc..c64f3a5ca 100644
--- a/src/data/PhoneNumberMetadata_BA.php
+++ b/src/data/PhoneNumberMetadata_BA.php
@@ -6,205 +6,155 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '6\\d{8}|(?:[35689]\\d|49|70)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:[05-79][2-9]|1[4579]|[23][24-9]|4[2-4689]|8[2457-9])|49[2-579]|5(?:0[2-49]|[13][2-9]|[268][2-4679]|4[4689]|5[2-79]|7[2-69]|9[2-4689]))\\d{5}',
-    'ExampleNumber' => '30212345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6040\\d{5}|6(?:03|[1-356]|44|7\\d)\\d{6}',
-    'ExampleNumber' => '61123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8[08]\\d{6}',
-    'ExampleNumber' => '80123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9[0246]\\d{6}',
-    'ExampleNumber' => '90123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8[12]\\d{6}',
-    'ExampleNumber' => '82123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '703[235]0\\d{3}|70(?:2[0-5]|3[0146]|[56]0)\\d{4}',
-    'ExampleNumber' => '70341234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'BA',
-  'countryCode' => 387,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6[1-3]|[7-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-5]|6[56]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6[1-3]|[7-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-5]|6[56]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'BA',
+    'countryCode' => 387,
+    'generalDesc' => [
+        'pattern' => '6\\d{8}|(?:[35689]\\d|49|70)\\d{6}',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:3(?:[05-79][2-9]|1[4579]|[23][24-9]|4[2-4689]|8[2457-9])|49[2-579]|5(?:0[2-49]|[13][2-9]|[268][2-4679]|4[4689]|5[2-79]|7[2-69]|9[2-4689]))\\d{5}',
+        'example' => '30212345',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '6040\\d{5}|6(?:03|[1-356]|44|7\\d)\\d{6}',
+        'example' => '61123456',
+    ],
+    'tollFree' => [
+        'pattern' => '8[08]\\d{6}',
+        'example' => '80123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '9[0246]\\d{6}',
+        'example' => '90123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '8[12]\\d{6}',
+        'example' => '82123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '703[235]0\\d{3}|70(?:2[0-5]|3[0146]|[56]0)\\d{4}',
+        'example' => '70341234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6[1-3]|[7-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '[3-5]|6[56]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6[1-3]|[7-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '[3-5]|6[56]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BB.php b/src/data/PhoneNumberMetadata_BB.php
index bf35c00a7..0c3003da6 100644
--- a/src/data/PhoneNumberMetadata_BB.php
+++ b/src/data/PhoneNumberMetadata_BB.php
@@ -6,113 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:246|[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'BB',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:246|[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '246521[0369]\\d{3}|246(?:2(?:2[78]|7[0-4])|4(?:1[024-6]|2\\d|3[2-9])|5(?:20|[34]\\d|54|7[1-3])|6(?:2\\d|38)|7[35]7|9(?:1[89]|63))\\d{4}',
+        'example' => '2464123456',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '246521[0369]\\d{3}|246(?:2(?:2[78]|7[0-4])|4(?:1[024-6]|2\\d|3[2-9])|5(?:20|[34]\\d|54|7[1-3])|6(?:2\\d|38)|7[35]7|9(?:1[89]|63))\\d{4}',
-    'ExampleNumber' => '2464123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '246(?:(?:2(?:[3568]\\d|4[0-57-9])|3(?:5[2-9]|6[0-6])|4(?:46|5\\d)|69[5-7]|8(?:[2-5]\\d|83))\\d|52(?:1[147]|20))\\d{3}',
+        'example' => '2462501234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '246(?:(?:2(?:[3568]\\d|4[0-57-9])|3(?:5[2-9]|6[0-6])|4(?:46|5\\d)|69[5-7]|8(?:[2-5]\\d|83))\\d|52(?:1[147]|20))\\d{3}',
-    'ExampleNumber' => '2462501234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:246976|900[2-9]\\d\\d)\\d{4}',
-    'ExampleNumber' => '9002123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'premiumRate' => [
+        'pattern' => '(?:246976|900[2-9]\\d\\d)\\d{4}',
+        'example' => '9002123456',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '24631\\d{5}',
-    'ExampleNumber' => '2463101234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '24631\\d{5}',
+        'example' => '2463101234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '246(?:292|367|4(?:1[7-9]|3[01]|4[47-9]|67)|7(?:1[2-9]|2\\d|3[016]|53))\\d{4}',
-    'ExampleNumber' => '2464301234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '246(?:292|367|4(?:1[7-9]|3[01]|4[47-9]|67)|7(?:1[2-9]|2\\d|3[016]|53))\\d{4}',
+        'example' => '2464301234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BB',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '246$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '246',
-  'mobileNumberPortableRegion' => true,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '246$1',
+    'numberFormat' => [],
+    'leadingDigits' => '246',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BD.php b/src/data/PhoneNumberMetadata_BD.php
index 9e9711ae1..ac927f047 100644
--- a/src/data/PhoneNumberMetadata_BD.php
+++ b/src/data/PhoneNumberMetadata_BD.php
@@ -6,157 +6,118 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-469]\\d{9}|8[0-79]\\d{7,8}|[2-79]\\d{8}|[2-9]\\d{7}|[3-9]\\d{6}|[57-9]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
+return [
+    'id' => 'BD',
+    'countryCode' => 880,
+    'generalDesc' => [
+        'pattern' => '[1-469]\\d{9}|8[0-79]\\d{7,8}|[2-79]\\d{8}|[2-9]\\d{7}|[3-9]\\d{6}|[57-9]\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:4(?:31\\d\\d|423)|5222)\\d{3}(?:\\d{2})?|8332[6-9]\\d\\d|(?:3(?:03[56]|224)|4(?:22[25]|653))\\d{3,4}|(?:3(?:42[47]|529|823)|4(?:027|525|65(?:28|8))|562|6257|7(?:1(?:5[3-5]|6[12]|7[156]|89)|22[589]56|32|42675|52(?:[25689](?:56|8)|[347]8)|71(?:6[1267]|75|89)|92374)|82(?:2[59]|32)56|9(?:03[23]56|23(?:256|373)|31|5(?:1|2[4589]56)))\\d{3}|(?:3(?:02[348]|22[35]|324|422)|4(?:22[67]|32[236-9]|6(?:2[46]|5[57])|953)|5526|6(?:024|6655)|81)\\d{4,5}|(?:2(?:7(?:1[0-267]|2[0-289]|3[0-29]|4[01]|5[1-3]|6[013]|7[0178]|91)|8(?:0[125]|1[1-6]|2[0157-9]|3[1-69]|41|6[1-35]|7[1-5]|8[1-8]|9[0-6])|9(?:0[0-2]|1[0-4]|2[568]|3[3-6]|5[5-7]|6[0136-9]|7[0-7]|8[014-9]))|3(?:0(?:2[025-79]|3[2-4])|181|22[12]|32[2356]|824)|4(?:02[09]|22[348]|32[045]|523|6(?:27|54))|666(?:22|53)|7(?:22[57-9]|42[56]|82[35])8|8(?:0[124-9]|2(?:181|2[02-4679]8)|4[12]|[5-7]2)|9(?:[04]2|2(?:2|328)|81))\\d{4}|(?:2(?:222|[45]\\d)\\d|3(?:1(?:2[5-7]|[5-7])|425|822)|4(?:033|1\\d|[257]1|332|4(?:2[246]|5[25])|6(?:2[35]|56|62)|8(?:23|54)|92[2-5])|5(?:02[03489]|22[457]|32[35-79]|42[46]|6(?:[18]|53)|724|826)|6(?:023|2(?:2[2-5]|5[3-5]|8)|32[3478]|42[34]|52[47]|6(?:[18]|6(?:2[34]|5[24]))|[78]2[2-5]|92[2-6])|7(?:02|21\\d|[3-589]1|6[12]|72[24])|8(?:217|3[12]|[5-7]1)|9[24]1)\\d{5}|(?:(?:3[2-8]|5[2-57-9]|6[03-589])1|4[4689][18])\\d{5}|[59]1\\d{5}',
-    'ExampleNumber' => '27111234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:1[13-9]\\d|644)\\d{7}|(?:3[78]|44|66)[02-9]\\d{7}',
-    'ExampleNumber' => '1812345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'fixedLine' => [
+        'pattern' => '(?:4(?:31\\d\\d|423)|5222)\\d{3}(?:\\d{2})?|8332[6-9]\\d\\d|(?:3(?:03[56]|224)|4(?:22[25]|653))\\d{3,4}|(?:3(?:42[47]|529|823)|4(?:027|525|65(?:28|8))|562|6257|7(?:1(?:5[3-5]|6[12]|7[156]|89)|22[589]56|32|42675|52(?:[25689](?:56|8)|[347]8)|71(?:6[1267]|75|89)|92374)|82(?:2[59]|32)56|9(?:03[23]56|23(?:256|373)|31|5(?:1|2[4589]56)))\\d{3}|(?:3(?:02[348]|22[35]|324|422)|4(?:22[67]|32[236-9]|6(?:2[46]|5[57])|953)|5526|6(?:024|6655)|81)\\d{4,5}|(?:2(?:7(?:1[0-267]|2[0-289]|3[0-29]|4[01]|5[1-3]|6[013]|7[0178]|91)|8(?:0[125]|1[1-6]|2[0157-9]|3[1-69]|41|6[1-35]|7[1-5]|8[1-8]|9[0-6])|9(?:0[0-2]|1[0-4]|2[568]|3[3-6]|5[5-7]|6[0136-9]|7[0-7]|8[014-9]))|3(?:0(?:2[025-79]|3[2-4])|181|22[12]|32[2356]|824)|4(?:02[09]|22[348]|32[045]|523|6(?:27|54))|666(?:22|53)|7(?:22[57-9]|42[56]|82[35])8|8(?:0[124-9]|2(?:181|2[02-4679]8)|4[12]|[5-7]2)|9(?:[04]2|2(?:2|328)|81))\\d{4}|(?:2(?:222|[45]\\d)\\d|3(?:1(?:2[5-7]|[5-7])|425|822)|4(?:033|1\\d|[257]1|332|4(?:2[246]|5[25])|6(?:2[35]|56|62)|8(?:23|54)|92[2-5])|5(?:02[03489]|22[457]|32[35-79]|42[46]|6(?:[18]|53)|724|826)|6(?:023|2(?:2[2-5]|5[3-5]|8)|32[3478]|42[34]|52[47]|6(?:[18]|6(?:2[34]|5[24]))|[78]2[2-5]|92[2-6])|7(?:02|21\\d|[3-589]1|6[12]|72[24])|8(?:217|3[12]|[5-7]1)|9[24]1)\\d{5}|(?:(?:3[2-8]|5[2-57-9]|6[03-589])1|4[4689][18])\\d{5}|[59]1\\d{5}',
+        'example' => '27111234',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[03]\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'mobile' => [
+        'pattern' => '(?:1[13-9]\\d|644)\\d{7}|(?:3[78]|44|66)[02-9]\\d{7}',
+        'example' => '1812345678',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[03]\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '96(?:0[469]|1[0-47]|3[389]|43|6[69]|7[78])\\d{6}',
-    'ExampleNumber' => '9604123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '96(?:0[469]|1[0-47]|3[389]|43|6[69]|7[78])\\d{6}',
+        'example' => '9604123456',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BD',
-  'countryCode' => 880,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,6})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '31[5-8]|[459]1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,7})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3(?:[67]|8[013-9])|4(?:6[168]|7|[89][18])|5(?:6[128]|9)|6(?:[15]|28|4[14])|7[2-589]|8(?:0[014-9]|[12])|9[358]|(?:3[2-5]|4[235]|5[2-578]|6[0389]|76|8[3-7]|9[24])1|(?:44|66)[01346-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4,6})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '31[5-8]|[459]1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,7})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '3(?:[67]|8[013-9])|4(?:6[168]|7|[89][18])|5(?:6[128]|9)|6(?:[15]|28|4[14])|7[2-589]|8(?:0[014-9]|[12])|9[358]|(?:3[2-5]|4[235]|5[2-578]|6[0389]|76|8[3-7]|9[24])1|(?:44|66)[01346-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3,6})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[13-9]|22',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{7,8})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3,6})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13-9]|22',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{7,8})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_BE.php b/src/data/PhoneNumberMetadata_BE.php
index 9d156b5ef..26f18de41 100644
--- a/src/data/PhoneNumberMetadata_BE.php
+++ b/src/data/PhoneNumberMetadata_BE.php
@@ -6,162 +6,123 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '4\\d{8}|[1-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '80[2-8]\\d{5}|(?:1[0-69]|[23][2-8]|4[23]|5\\d|6[013-57-9]|71|8[1-79]|9[2-4])\\d{6}',
-    'ExampleNumber' => '12345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4[5-9]\\d{7}',
-    'ExampleNumber' => '470123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800[1-9]\\d{4}',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:70(?:2[0-57]|3[04-7]|44|6[4-69]|7[0579])|90\\d\\d)\\d{4}',
-    'ExampleNumber' => '90012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '7879\\d{4}',
-    'ExampleNumber' => '78791234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '78(?:0[57]|1[014-8]|2[25]|3[15-8]|48|[56]0|7[06-8]|9\\d)\\d{4}',
-    'ExampleNumber' => '78102345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'BE',
-  'countryCode' => 32,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:80|9)0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[239]|4[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[15-8]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '4',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'BE',
+    'countryCode' => 32,
+    'generalDesc' => [
+        'pattern' => '4\\d{8}|[1-9]\\d{7}',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '80[2-8]\\d{5}|(?:1[0-69]|[23][2-8]|4[23]|5\\d|6[013-57-9]|71|8[1-79]|9[2-4])\\d{6}',
+        'example' => '12345678',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '4[5-9]\\d{7}',
+        'example' => '470123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800[1-9]\\d{4}',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '(?:70(?:2[0-57]|3[04-7]|44|6[4-69]|7[0579])|90\\d\\d)\\d{4}',
+        'example' => '90012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '7879\\d{4}',
+        'example' => '78791234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '78(?:0[57]|1[014-8]|2[25]|3[15-8]|48|[56]0|7[06-8]|9\\d)\\d{4}',
+        'example' => '78102345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '(?:80|9)0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[239]|4[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[15-8]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '4',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BF.php b/src/data/PhoneNumberMetadata_BF.php
index 64a6be59e..39e1a8834 100644
--- a/src/data/PhoneNumberMetadata_BF.php
+++ b/src/data/PhoneNumberMetadata_BF.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[025-7]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'BF',
+    'countryCode' => 226,
+    'generalDesc' => [
+        'pattern' => '[025-7]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:0(?:49|5[23]|6[5-7]|9[016-9])|4(?:4[569]|5[4-6]|6[5-7]|7[0179])|5(?:[34]\\d|50|6[5-7]))\\d{4}',
-    'ExampleNumber' => '20491234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:0[1-35-7]|5[0-8]|[67]\\d)\\d{6}',
-    'ExampleNumber' => '70123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:0(?:49|5[23]|6[5-7]|9[016-9])|4(?:4[569]|5[4-6]|6[5-7]|7[0179])|5(?:[34]\\d|50|6[5-7]))\\d{4}',
+        'example' => '20491234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:0[1-35-7]|5[0-8]|[67]\\d)\\d{6}',
+        'example' => '70123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BF',
-  'countryCode' => 226,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[025-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[025-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_BG.php b/src/data/PhoneNumberMetadata_BG.php
index 708a6da53..21012b62b 100644
--- a/src/data/PhoneNumberMetadata_BG.php
+++ b/src/data/PhoneNumberMetadata_BG.php
@@ -6,336 +6,255 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '00800\\d{7}|[2-7]\\d{6,7}|[89]\\d{6,8}|2\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 12,
+return [
+    'id' => 'BG',
+    'countryCode' => 359,
+    'generalDesc' => [
+        'pattern' => '00800\\d{7}|[2-7]\\d{6,7}|[89]\\d{6,8}|2\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            12,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
+    'fixedLine' => [
+        'pattern' => '2\\d{5,7}|(?:43[1-6]|70[1-9])\\d{4,5}|(?:[36]\\d|4[124-7]|[57][1-9]|8[1-6]|9[1-7])\\d{5,6}',
+        'example' => '2123456',
+        'posLength' => [
+            6,
+            7,
+            8,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2\\d{5,7}|(?:43[1-6]|70[1-9])\\d{4,5}|(?:[36]\\d|4[124-7]|[57][1-9]|8[1-6]|9[1-7])\\d{5,6}',
-    'ExampleNumber' => '2123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
+    'mobile' => [
+        'pattern' => '(?:43[07-9]|99[69]\\d)\\d{5}|(?:8[7-9]|98)\\d{7}',
+        'example' => '43012345',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
+    'tollFree' => [
+        'pattern' => '(?:00800\\d\\d|800)\\d{5}',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+            12,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:43[07-9]|99[69]\\d)\\d{5}|(?:8[7-9]|98)\\d{7}',
-    'ExampleNumber' => '43012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+    'premiumRate' => [
+        'pattern' => '90\\d{6}',
+        'example' => '90123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:00800\\d\\d|800)\\d{5}',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 12,
+    'sharedCost' => [
+        'pattern' => '700\\d{5}',
+        'example' => '70012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90\\d{6}',
-    'ExampleNumber' => '90123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '700\\d{5}',
-    'ExampleNumber' => '70012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d)(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '43[1-6]|70[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[356]|4[124-7]|7[1-9]|8[1-6]|9[1-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '(?:70|8)0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '43[1-7]|7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[48]|9[08]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d)(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '43[1-6]|70[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[356]|4[124-7]|7[1-9]|8[1-6]|9[1-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '(?:70|8)0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '43[1-7]|7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[48]|9[08]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'id' => 'BG',
-  'countryCode' => 359,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d)(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '43[1-6]|70[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[356]|4[124-7]|7[1-9]|8[1-6]|9[1-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:70|8)0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '43[1-7]|7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[48]|9[08]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d)(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '43[1-6]|70[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[356]|4[124-7]|7[1-9]|8[1-6]|9[1-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:70|8)0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '43[1-7]|7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[48]|9[08]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BH.php b/src/data/PhoneNumberMetadata_BH.php
index a938ef413..61f3471e4 100644
--- a/src/data/PhoneNumberMetadata_BH.php
+++ b/src/data/PhoneNumberMetadata_BH.php
@@ -6,101 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[136-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'BH',
+    'countryCode' => 973,
+    'generalDesc' => [
+        'pattern' => '[136-9]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:3[1356]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|55|7[7-9]|88)|9[69][69])|7(?:[07]\\d\\d|1(?:11|78)))\\d{4}',
-    'ExampleNumber' => '17001234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:[0-79]\\d|8[0-57-9])\\d|6(?:3(?:00|33|6[16])|441|6(?:3[03-9]|[69]\\d|7[0-689])))\\d{4}',
-    'ExampleNumber' => '36001234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8[02369]\\d{6}',
-    'ExampleNumber' => '80123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:87|9[0-8])\\d{6}',
-    'ExampleNumber' => '90123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '84\\d{6}',
-    'ExampleNumber' => '84123456',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:1(?:3[1356]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|55|7[7-9]|88)|9[69][69])|7(?:[07]\\d\\d|1(?:11|78)))\\d{4}',
+        'example' => '17001234',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:3(?:[0-79]\\d|8[0-57-9])\\d|6(?:3(?:00|33|6[16])|441|6(?:3[03-9]|[69]\\d|7[0-689])))\\d{4}',
+        'example' => '36001234',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '8[02369]\\d{6}',
+        'example' => '80123456',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '(?:87|9[0-8])\\d{6}',
+        'example' => '90123456',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '84\\d{6}',
+        'example' => '84123456',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BH',
-  'countryCode' => 973,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13679]|8[02-4679]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[13679]|8[02-4679]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BI.php b/src/data/PhoneNumberMetadata_BI.php
index 69aca8450..dadf1c9be 100644
--- a/src/data/PhoneNumberMetadata_BI.php
+++ b/src/data/PhoneNumberMetadata_BI.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[267]\\d|31)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'BI',
+    'countryCode' => 257,
+    'generalDesc' => [
+        'pattern' => '(?:[267]\\d|31)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:22|31)\\d{6}',
-    'ExampleNumber' => '22201234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:29|[67][125-9])\\d{6}',
-    'ExampleNumber' => '79561234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:22|31)\\d{6}',
+        'example' => '22201234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:29|[67][125-9])\\d{6}',
+        'example' => '79561234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BI',
-  'countryCode' => 257,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2367]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[2367]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_BJ.php b/src/data/PhoneNumberMetadata_BJ.php
index 67c583a5f..38f387848 100644
--- a/src/data/PhoneNumberMetadata_BJ.php
+++ b/src/data/PhoneNumberMetadata_BJ.php
@@ -6,103 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[24-689]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'BJ',
+    'countryCode' => 229,
+    'generalDesc' => [
+        'pattern' => '[24-689]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:02|1[037]|2[45]|3[68]|4\\d)\\d{5}',
-    'ExampleNumber' => '20211234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:4[0-7]|[56]\\d|9[013-9])\\d{6}',
-    'ExampleNumber' => '90011234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:02|1[037]|2[45]|3[68]|4\\d)\\d{5}',
+        'example' => '20211234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:4[0-7]|[56]\\d|9[013-9])\\d{6}',
+        'example' => '90011234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '857[58]\\d{4}',
-    'ExampleNumber' => '85751234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '81\\d{6}',
-    'ExampleNumber' => '81123456',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '857[58]\\d{4}',
+        'example' => '85751234',
     ],
-  ],
-  'id' => 'BJ',
-  'countryCode' => 229,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-689]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '81\\d{6}',
+        'example' => '81123456',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[24-689]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_BL.php b/src/data/PhoneNumberMetadata_BL.php
index 0e1b82314..45da054af 100644
--- a/src/data/PhoneNumberMetadata_BL.php
+++ b/src/data/PhoneNumberMetadata_BL.php
@@ -6,93 +6,69 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'BL',
+    'countryCode' => 590,
+    'generalDesc' => [
+        'pattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '590(?:2[7-9]|3[3-7]|5[12]|87)\\d{4}',
-    'ExampleNumber' => '590271234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
-    'ExampleNumber' => '690001234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '800012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '590(?:2[7-9]|3[3-7]|5[12]|87)\\d{4}',
+        'example' => '590271234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
+        'example' => '690001234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '800012345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
-    'ExampleNumber' => '976012345',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
+        'example' => '976012345',
     ],
-  ],
-  'id' => 'BL',
-  'countryCode' => 590,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BM.php b/src/data/PhoneNumberMetadata_BM.php
index 787a63dcc..8a0c727fe 100644
--- a/src/data/PhoneNumberMetadata_BM.php
+++ b/src/data/PhoneNumberMetadata_BM.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:441|[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'BM',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:441|[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '441(?:[46]\\d\\d|5(?:4\\d|60|89))\\d{4}',
+        'example' => '4414123456',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '441(?:[46]\\d\\d|5(?:4\\d|60|89))\\d{4}',
-    'ExampleNumber' => '4414123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '441(?:[2378]\\d|5[0-39]|9[02])\\d{5}',
+        'example' => '4413701234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '441(?:[2378]\\d|5[0-39]|9[02])\\d{5}',
-    'ExampleNumber' => '4413701234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BM',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '441$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '441',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '441$1',
+    'numberFormat' => [],
+    'leadingDigits' => '441',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BN.php b/src/data/PhoneNumberMetadata_BN.php
index 247db2281..034a00797 100644
--- a/src/data/PhoneNumberMetadata_BN.php
+++ b/src/data/PhoneNumberMetadata_BN.php
@@ -6,105 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-578]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'BN',
+    'countryCode' => 673,
+    'generalDesc' => [
+        'pattern' => '[2-578]\\d{6}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '22[0-7]\\d{4}|(?:2[013-9]|[34]\\d|5[0-25-9])\\d{5}',
-    'ExampleNumber' => '2345678',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:22[89]|[78]\\d\\d)\\d{4}',
-    'ExampleNumber' => '7123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '22[0-7]\\d{4}|(?:2[013-9]|[34]\\d|5[0-25-9])\\d{5}',
+        'example' => '2345678',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:22[89]|[78]\\d\\d)\\d{4}',
+        'example' => '7123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '5[34]\\d{5}',
-    'ExampleNumber' => '5345678',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '5[34]\\d{5}',
+        'example' => '5345678',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BN',
-  'countryCode' => 673,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-578]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-578]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_BO.php b/src/data/PhoneNumberMetadata_BO.php
index 51b31961c..02a96a2f7 100644
--- a/src/data/PhoneNumberMetadata_BO.php
+++ b/src/data/PhoneNumberMetadata_BO.php
@@ -6,153 +6,114 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-467]\\d\\d|8001)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'BO',
+    'countryCode' => 591,
+    'generalDesc' => [
+        'pattern' => '(?:[2-467]\\d\\d|8001)\\d{5}',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2(?:2\\d\\d|5(?:11|[258]\\d|9[67])|6(?:12|2\\d|9[34])|8(?:2[34]|39|62))|3(?:3\\d\\d|4(?:6\\d|8[24])|8(?:25|42|5[257]|86|9[25])|9(?:[27]\\d|3[2-4]|4[248]|5[24]|6[2-6]))|4(?:4\\d\\d|6(?:11|[24689]\\d|72)))\\d{4}',
+        'example' => '22123456',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '[67]\\d{7}',
+        'example' => '71234567',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '8001[07]\\d{4}',
+        'example' => '800171234',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '8001[07]\\d{4}',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'internationalPrefix' => '00(?:1\\d)?',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0(1\\d)?',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[23]|4[46]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{8})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '[67]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:2\\d\\d|5(?:11|[258]\\d|9[67])|6(?:12|2\\d|9[34])|8(?:2[34]|39|62))|3(?:3\\d\\d|4(?:6\\d|8[24])|8(?:25|42|5[257]|86|9[25])|9(?:[27]\\d|3[2-4]|4[248]|5[24]|6[2-6]))|4(?:4\\d\\d|6(?:11|[24689]\\d|72)))\\d{4}',
-    'ExampleNumber' => '22123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[67]\\d{7}',
-    'ExampleNumber' => '71234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8001[07]\\d{4}',
-    'ExampleNumber' => '800171234',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '8001[07]\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'id' => 'BO',
-  'countryCode' => 591,
-  'internationalPrefix' => '00(?:1\\d)?',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0(1\\d)?',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]|4[46]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{8})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[67]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_BQ.php b/src/data/PhoneNumberMetadata_BQ.php
index 6d6bb944d..129bf7300 100644
--- a/src/data/PhoneNumberMetadata_BQ.php
+++ b/src/data/PhoneNumberMetadata_BQ.php
@@ -6,96 +6,69 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[34]1|7\\d)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'BQ',
+    'countryCode' => 599,
+    'generalDesc' => [
+        'pattern' => '(?:[34]1|7\\d)\\d{5}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:318[023]|41(?:6[023]|70)|7(?:1[578]|2[05]|50)\\d)\\d{3}',
-    'ExampleNumber' => '7151234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:31(?:8[14-8]|9[14578])|416[14-9]|7(?:0[01]|7[07]|8\\d|9[056])\\d)\\d{3}',
-    'ExampleNumber' => '3181234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:318[023]|41(?:6[023]|70)|7(?:1[578]|2[05]|50)\\d)\\d{3}',
+        'example' => '7151234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:31(?:8[14-8]|9[14578])|416[14-9]|7(?:0[01]|7[07]|8\\d|9[056])\\d)\\d{3}',
+        'example' => '3181234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BQ',
-  'countryCode' => 599,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '[347]',
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
+    'leadingDigits' => '[347]',
 ];
diff --git a/src/data/PhoneNumberMetadata_BR.php b/src/data/PhoneNumberMetadata_BR.php
index c87e70b3d..19e582d42 100644
--- a/src/data/PhoneNumberMetadata_BR.php
+++ b/src/data/PhoneNumberMetadata_BR.php
@@ -6,269 +6,206 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[1-46-9]\\d\\d|5(?:[0-46-9]\\d|5[0-46-9]))\\d{8}|[1-9]\\d{9}|[3589]\\d{8}|[34]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-5]\\d{7}',
-    'ExampleNumber' => '1123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])(?:7|9\\d)\\d{7}',
-    'ExampleNumber' => '11961234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6,7}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '300\\d{6}|[59]00\\d{6,7}',
-    'ExampleNumber' => '300123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '(?:30[03]\\d{3}|4(?:0(?:0\\d|20)|370))\\d{4}|300\\d{5}',
-    'ExampleNumber' => '40041234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 10,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '30(?:0\\d{5,7}|3\\d{7})|40(?:0\\d|20)\\d{4}|800\\d{6,7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-    ],
-  ],
-  'id' => 'BR',
-  'countryCode' => 55,
-  'internationalPrefix' => '00(?:1[245]|2[1-35]|31|4[13]|[56]5|99)',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '(?:0|90)(?:(1[245]|2[1-35]|31|4[13]|[56]5|99)(\\d{10,11}))?',
-  'nationalPrefixTransformRule' => '$2',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3,6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:1[25-8]|2[357-9]|3[02-68]|4[12568]|5|6[0-8]|8[015]|9[0-47-9])|321|610',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '300|4(?:0[02]|37)',
-        1 => '4(?:02|37)0|[34]00',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-57]',
-        1 => '[2357]|4(?:[0-24-9]|3(?:[0-689]|7[1-9]))',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2,3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:[358]|90)0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{5})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-57]',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '0 $CC ($1)',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[16][1-9]|[2-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '0 $CC ($1)',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '300|4(?:0[02]|37)',
-        1 => '4(?:02|37)0|[34]00',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2,3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:[358]|90)0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-57]',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '0 $CC ($1)',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[16][1-9]|[2-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '0 $CC ($1)',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'BR',
+    'countryCode' => 55,
+    'generalDesc' => [
+        'pattern' => '(?:[1-46-9]\\d\\d|5(?:[0-46-9]\\d|5[0-46-9]))\\d{8}|[1-9]\\d{9}|[3589]\\d{8}|[34]\\d{7}',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-5]\\d{7}',
+        'example' => '1123456789',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])(?:7|9\\d)\\d{7}',
+        'example' => '11961234567',
+        'posLength' => [
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            8,
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{6,7}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '300\\d{6}|[59]00\\d{6,7}',
+        'example' => '300123456',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '(?:30[03]\\d{3}|4(?:0(?:0\\d|20)|370))\\d{4}|300\\d{5}',
+        'example' => '40041234',
+        'posLength' => [
+            8,
+            10,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '30(?:0\\d{5,7}|3\\d{7})|40(?:0\\d|20)\\d{4}|800\\d{6,7}',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+    ],
+    'internationalPrefix' => '00(?:1[245]|2[1-35]|31|4[13]|[56]5|99)',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '(?:0|90)(?:(1[245]|2[1-35]|31|4[13]|[56]5|99)(\\d{10,11}))?',
+    'nationalPrefixTransformRule' => '$2',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3,6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1(?:1[25-8]|2[357-9]|3[02-68]|4[12568]|5|6[0-8]|8[015]|9[0-47-9])|321|610',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '300|4(?:0[02]|37)',
+                '4(?:02|37)0|[34]00',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-57]',
+                '[2357]|4(?:[0-24-9]|3(?:[0-689]|7[1-9]))',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2,3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '(?:[358]|90)0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-57]',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '0 $CC ($1)',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '[16][1-9]|[2-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '0 $CC ($1)',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '300|4(?:0[02]|37)',
+                '4(?:02|37)0|[34]00',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2,3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '(?:[358]|90)0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-57]',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '0 $CC ($1)',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '[16][1-9]|[2-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '0 $CC ($1)',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BS.php b/src/data/PhoneNumberMetadata_BS.php
index 8cbc54b7a..7e9661c41 100644
--- a/src/data/PhoneNumberMetadata_BS.php
+++ b/src/data/PhoneNumberMetadata_BS.php
@@ -6,107 +6,81 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:242|[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'BS',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:242|[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '242(?:3(?:02|[236][1-9]|4[0-24-9]|5[0-68]|7[347]|8[0-4]|9[2-467])|461|502|6(?:0[1-5]|12|2[013]|[45]0|7[67]|8[78]|9[89])|7(?:02|88))\\d{4}',
+        'example' => '2423456789',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '242(?:3(?:02|[236][1-9]|4[0-24-9]|5[0-68]|7[347]|8[0-4]|9[2-467])|461|502|6(?:0[1-5]|12|2[013]|[45]0|7[67]|8[78]|9[89])|7(?:02|88))\\d{4}',
-    'ExampleNumber' => '2423456789',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '242(?:3(?:5[79]|7[56]|95)|4(?:[23][1-9]|4[1-35-9]|5[1-8]|6[2-8]|7\\d|81)|5(?:2[45]|3[35]|44|5[1-46-9]|65|77)|6[34]6|7(?:27|38)|8(?:0[1-9]|1[02-9]|2\\d|3[0-4]|[89]9))\\d{4}',
+        'example' => '2423591234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '242(?:3(?:5[79]|7[56]|95)|4(?:[23][1-9]|4[1-35-9]|5[1-8]|6[2-8]|7\\d|81)|5(?:2[45]|3[35]|44|5[1-46-9]|65|77)|6[34]6|7(?:27|38)|8(?:0[1-9]|1[02-9]|2\\d|3[0-4]|[89]9))\\d{4}',
-    'ExampleNumber' => '2423591234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '242300\\d{4}|8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '242300\\d{4}|8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '242225\\d{4}',
-    'ExampleNumber' => '2422250123',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '242225\\d{4}',
+        'example' => '2422250123',
     ],
-  ],
-  'id' => 'BS',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([3-8]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '242$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '242',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([3-8]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '242$1',
+    'numberFormat' => [],
+    'leadingDigits' => '242',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BT.php b/src/data/PhoneNumberMetadata_BT.php
index 6f00650bf..0fa5af5e5 100644
--- a/src/data/PhoneNumberMetadata_BT.php
+++ b/src/data/PhoneNumberMetadata_BT.php
@@ -6,175 +6,129 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[17]\\d{7}|[2-8]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+return [
+    'id' => 'BT',
+    'countryCode' => 975,
+    'generalDesc' => [
+        'pattern' => '[17]\\d{7}|[2-8]\\d{6}',
+        'posLength' => [
+            7,
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2[3-6]|[34][5-7]|5[236]|6[2-46]|7[246]|8[2-4])\\d{5}',
+        'example' => '2345678',
+        'posLength' => [
+            7,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:1[67]|77)\\d{6}',
+        'example' => '17123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-68]|7[246]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1[67]|7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-68]|7[246]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1[67]|7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[3-6]|[34][5-7]|5[236]|6[2-46]|7[246]|8[2-4])\\d{5}',
-    'ExampleNumber' => '2345678',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:1[67]|77)\\d{6}',
-    'ExampleNumber' => '17123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'BT',
-  'countryCode' => 975,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-68]|7[246]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[67]|7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-68]|7[246]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[67]|7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_BW.php b/src/data/PhoneNumberMetadata_BW.php
index d4770bc26..dd9a66a7d 100644
--- a/src/data/PhoneNumberMetadata_BW.php
+++ b/src/data/PhoneNumberMetadata_BW.php
@@ -6,171 +6,128 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:0800|(?:[37]|800)\\d)\\d{6}|(?:[2-6]\\d|90)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 10,
+return [
+    'id' => 'BW',
+    'countryCode' => 267,
+    'generalDesc' => [
+        'pattern' => '(?:0800|(?:[37]|800)\\d)\\d{6}|(?:[2-6]\\d|90)\\d{5}',
+        'posLength' => [
+            7,
+            8,
+            10,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2(?:4[0-48]|6[0-24]|9[0578])|3(?:1[0-35-9]|55|[69]\\d|7[013]|81)|4(?:6[03]|7[1267]|9[0-5])|5(?:3[03489]|4[0489]|7[1-47]|88|9[0-49])|6(?:2[1-35]|5[149]|8[067]))\\d{4}',
+        'example' => '2401234',
+        'posLength' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:321|7[1-8]\\d)\\d{5}',
+        'example' => '71123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '(?:0800|800\\d)\\d{6}',
+        'example' => '0800012345',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '90\\d{5}',
+        'example' => '9012345',
+        'posLength' => [
+            7,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '79(?:1(?:[01]\\d|2[0-8])|2[0-7]\\d)\\d{3}',
+        'example' => '79101234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '90',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[24-6]|3[15-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[37]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:4[0-48]|6[0-24]|9[0578])|3(?:1[0-35-9]|55|[69]\\d|7[013]|81)|4(?:6[03]|7[1267]|9[0-5])|5(?:3[03489]|4[0489]|7[1-47]|88|9[0-49])|6(?:2[1-35]|5[149]|8[067]))\\d{4}',
-    'ExampleNumber' => '2401234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:321|7[1-8]\\d)\\d{5}',
-    'ExampleNumber' => '71123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:0800|800\\d)\\d{6}',
-    'ExampleNumber' => '0800012345',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90\\d{5}',
-    'ExampleNumber' => '9012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '79(?:1(?:[01]\\d|2[0-8])|2[0-7]\\d)\\d{3}',
-    'ExampleNumber' => '79101234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'BW',
-  'countryCode' => 267,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '90',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-6]|3[15-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[37]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_BY.php b/src/data/PhoneNumberMetadata_BY.php
index 2c1a4c16e..e85113d2e 100644
--- a/src/data/PhoneNumberMetadata_BY.php
+++ b/src/data/PhoneNumberMetadata_BY.php
@@ -6,193 +6,148 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[12]\\d|33|44|902)\\d{7}|8(?:0[0-79]\\d{5,7}|[1-7]\\d{9})|8(?:1[0-489]|[5-79]\\d)\\d{7}|8[1-79]\\d{6,7}|8[0-79]\\d{5}|8\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:5(?:1[1-5]|[24]\\d|6[2-4]|9[1-7])|6(?:[235]\\d|4[1-7])|7\\d\\d)|2(?:1(?:[246]\\d|3[0-35-9]|5[1-9])|2(?:[235]\\d|4[0-8])|3(?:[26]\\d|3[02-79]|4[024-7]|5[03-7])))\\d{5}',
-    'ExampleNumber' => '152450911',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:5[5-79]|9[1-9])|(?:33|44)\\d)\\d{6}',
-    'ExampleNumber' => '294911911',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{3,7}|8(?:0[13]|20\\d)\\d{7}',
-    'ExampleNumber' => '8011234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:810|902)\\d{7}',
-    'ExampleNumber' => '9021234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '249\\d{6}',
-    'ExampleNumber' => '249123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '800\\d{3,7}|(?:8(?:0[13]|10|20\\d)|902)\\d{7}',
-  ],
-  'id' => 'BY',
-  'countryCode' => 375,
-  'internationalPrefix' => '810',
-  'preferredInternationalPrefix' => '8~10',
-  'nationalPrefix' => '8',
-  'nationalPrefixForParsing' => '0|80?',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '8 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '8 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{3})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:5[169]|6[3-5]|7[179])|2(?:1[35]|2[34]|3[3-5])',
-        1 => '1(?:5[169]|6(?:3[1-3]|4|5[125])|7(?:1[3-9]|7[0-24-6]|9[2-7]))|2(?:1[35]|2[34]|3[3-5])',
-      ],
-      'nationalPrefixFormattingRule' => '8 0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[56]|7[467])|2[1-3]',
-      ],
-      'nationalPrefixFormattingRule' => '8 0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-4]',
-      ],
-      'nationalPrefixFormattingRule' => '8 0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '8 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'BY',
+    'countryCode' => 375,
+    'generalDesc' => [
+        'pattern' => '(?:[12]\\d|33|44|902)\\d{7}|8(?:0[0-79]\\d{5,7}|[1-7]\\d{9})|8(?:1[0-489]|[5-79]\\d)\\d{7}|8[1-79]\\d{6,7}|8[0-79]\\d{5}|8\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            5,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1(?:5(?:1[1-5]|[24]\\d|6[2-4]|9[1-7])|6(?:[235]\\d|4[1-7])|7\\d\\d)|2(?:1(?:[246]\\d|3[0-35-9]|5[1-9])|2(?:[235]\\d|4[0-8])|3(?:[26]\\d|3[02-79]|4[024-7]|5[03-7])))\\d{5}',
+        'example' => '152450911',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:2(?:5[5-79]|9[1-9])|(?:33|44)\\d)\\d{6}',
+        'example' => '294911911',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{3,7}|8(?:0[13]|20\\d)\\d{7}',
+        'example' => '8011234567',
+    ],
+    'premiumRate' => [
+        'pattern' => '(?:810|902)\\d{7}',
+        'example' => '9021234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '249\\d{6}',
+        'example' => '249123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '800\\d{3,7}|(?:8(?:0[13]|10|20\\d)|902)\\d{7}',
+    ],
+    'internationalPrefix' => '810',
+    'preferredInternationalPrefix' => '8~10',
+    'nationalPrefix' => '8',
+    'nationalPrefixForParsing' => '0|80?',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '8 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '8 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{3})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '1(?:5[169]|6[3-5]|7[179])|2(?:1[35]|2[34]|3[3-5])',
+                '1(?:5[169]|6(?:3[1-3]|4|5[125])|7(?:1[3-9]|7[0-24-6]|9[2-7]))|2(?:1[35]|2[34]|3[3-5])',
+            ],
+            'nationalPrefixFormattingRule' => '8 0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '1(?:[56]|7[467])|2[1-3]',
+            ],
+            'nationalPrefixFormattingRule' => '8 0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '[1-4]',
+            ],
+            'nationalPrefixFormattingRule' => '8 0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '8 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_BZ.php b/src/data/PhoneNumberMetadata_BZ.php
index 39815fa67..263a7c44f 100644
--- a/src/data/PhoneNumberMetadata_BZ.php
+++ b/src/data/PhoneNumberMetadata_BZ.php
@@ -6,130 +6,96 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:0800\\d|[2-8])\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 11,
+return [
+    'id' => 'BZ',
+    'countryCode' => 501,
+    'generalDesc' => [
+        'pattern' => '(?:0800\\d|[2-8])\\d{6}',
+        'posLength' => [
+            7,
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:[02]\\d|36|[68]0)|[3-58](?:[02]\\d|[68]0)|7(?:[02]\\d|32|[68]0))\\d{4}',
-    'ExampleNumber' => '2221234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:2(?:[02]\\d|36|[68]0)|[3-58](?:[02]\\d|[68]0)|7(?:[02]\\d|32|[68]0))\\d{4}',
+        'example' => '2221234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6[0-35-7]\\d{5}',
-    'ExampleNumber' => '6221234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '6[0-35-7]\\d{5}',
+        'example' => '6221234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0800\\d{7}',
-    'ExampleNumber' => '08001234123',
-    'PossibleLength' =>
-     [
-      0 => 11,
+    'tollFree' => [
+        'pattern' => '0800\\d{7}',
+        'example' => '08001234123',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BZ',
-  'countryCode' => 501,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-8]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-8]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})(\\d{3})',
+            'format' => '$1-$2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})(\\d{3})',
-      'format' => '$1-$2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CA.php b/src/data/PhoneNumberMetadata_CA.php
index 475f13b5b..0f7e69ba1 100644
--- a/src/data/PhoneNumberMetadata_CA.php
+++ b/src/data/PhoneNumberMetadata_CA.php
@@ -6,124 +6,95 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-8]\\d|90)\\d{8}|3\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
+return [
+    'id' => 'CA',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[2-8]\\d|90)\\d{8}|3\\d{6}',
+        'posLength' => [
+            7,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:04|[23]6|[48]9|50|63)|3(?:06|43|54|6[578]|82)|4(?:03|1[68]|[26]8|3[178]|50|74)|5(?:06|1[49]|48|79|8[147])|6(?:04|[18]3|39|47|72)|7(?:0[59]|42|53|78|8[02])|8(?:[06]7|19|25|7[39])|90[25])[2-9]\\d{6}',
-    'ExampleNumber' => '5062345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'fixedLine' => [
+        'pattern' => '(?:2(?:04|[23]6|[48]9|50|63)|3(?:06|43|54|6[578]|82)|4(?:03|1[68]|[26]8|3[178]|50|74)|5(?:06|1[49]|48|79|8[147])|6(?:04|[18]3|39|47|72)|7(?:0[59]|42|53|78|8[02])|8(?:[06]7|19|25|7[39])|90[25])[2-9]\\d{6}',
+        'example' => '5062345678',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:2(?:04|[23]6|[48]9|50|63)|3(?:06|43|54|6[578]|82)|4(?:03|1[68]|[26]8|3[178]|50|74)|5(?:06|1[49]|48|79|8[147])|6(?:04|[18]3|39|47|72)|7(?:0[59]|42|53|78|8[02])|8(?:[06]7|19|25|7[39])|90[25])[2-9]\\d{6}',
+        'example' => '5062345678',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:04|[23]6|[48]9|50|63)|3(?:06|43|54|6[578]|82)|4(?:03|1[68]|[26]8|3[178]|50|74)|5(?:06|1[49]|48|79|8[147])|6(?:04|[18]3|39|47|72)|7(?:0[59]|42|53|78|8[02])|8(?:[06]7|19|25|7[39])|90[25])[2-9]\\d{6}',
-    'ExampleNumber' => '5062345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
+        'posLength' => [
+            10,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)|622)[2-9]\\d{6}',
+        'example' => '5002345678',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '600[2-9]\\d{6}',
+        'example' => '6002012345',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)|622)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '600[2-9]\\d{6}',
-    'ExampleNumber' => '6002012345',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'uan' => [
+        'pattern' => '310\\d{4}',
+        'example' => '3101234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '310\\d{4}',
-    'ExampleNumber' => '3101234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'CA',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '1',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '1',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_CC.php b/src/data/PhoneNumberMetadata_CC.php
index a8a877875..6516cde13 100644
--- a/src/data/PhoneNumberMetadata_CC.php
+++ b/src/data/PhoneNumberMetadata_CC.php
@@ -6,128 +6,98 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1(?:[0-79]\\d{8}(?:\\d{2})?|8[0-24-9]\\d{7})|[148]\\d{8}|1\\d{5,7}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 12,
+return [
+    'id' => 'CC',
+    'countryCode' => 61,
+    'generalDesc' => [
+        'pattern' => '1(?:[0-79]\\d{8}(?:\\d{2})?|8[0-24-9]\\d{7})|[148]\\d{8}|1\\d{5,7}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '8(?:51(?:0(?:02|31|60|89)|1(?:18|76)|223)|91(?:0(?:1[0-2]|29)|1(?:[28]2|50|79)|2(?:10|64)|3(?:[06]8|22)|4[29]8|62\\d|70[23]|959))\\d{3}',
-    'ExampleNumber' => '891621234',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '8(?:51(?:0(?:02|31|60|89)|1(?:18|76)|223)|91(?:0(?:1[0-2]|29)|1(?:[28]2|50|79)|2(?:10|64)|3(?:[06]8|22)|4[29]8|62\\d|70[23]|959))\\d{3}',
+        'example' => '891621234',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            8,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+        'example' => '412345678',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
-    'ExampleNumber' => '412345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '180(?:0\\d{3}|2)\\d{3}',
+        'example' => '1800123456',
+        'posLength' => [
+            7,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '180(?:0\\d{3}|2)\\d{3}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
+    'premiumRate' => [
+        'pattern' => '190[0-26]\\d{6}',
+        'example' => '1900123456',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '190[0-26]\\d{6}',
-    'ExampleNumber' => '1900123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'sharedCost' => [
+        'pattern' => '13(?:00\\d{6}(?:\\d{2})?|45[0-4]\\d{3})|13\\d{4}',
+        'example' => '1300123456',
+        'posLength' => [
+            6,
+            8,
+            10,
+            12,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '13(?:00\\d{6}(?:\\d{2})?|45[0-4]\\d{3})|13\\d{4}',
-    'ExampleNumber' => '1300123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 10,
-      3 => 12,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '14(?:5(?:1[0458]|[23][458])|71\\d)\\d{4}',
+        'example' => '147101234',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '14(?:5(?:1[0458]|[23][458])|71\\d)\\d{4}',
-    'ExampleNumber' => '147101234',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'CC',
-  'countryCode' => 61,
-  'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011',
-  'preferredInternationalPrefix' => '0011',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '([59]\\d{7})$|0',
-  'nationalPrefixTransformRule' => '8$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011',
+    'preferredInternationalPrefix' => '0011',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '([59]\\d{7})$|0',
+    'nationalPrefixTransformRule' => '8$1',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_CD.php b/src/data/PhoneNumberMetadata_CD.php
index 9d351eea4..86777250f 100644
--- a/src/data/PhoneNumberMetadata_CD.php
+++ b/src/data/PhoneNumberMetadata_CD.php
@@ -6,146 +6,108 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[189]\\d{8}|[1-68]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
+return [
+    'id' => 'CD',
+    'countryCode' => 243,
+    'generalDesc' => [
+        'pattern' => '[189]\\d{8}|[1-68]\\d{6}',
+        'posLength' => [
+            7,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '12\\d{7}|[1-6]\\d{6}',
-    'ExampleNumber' => '1234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '88\\d{5}|(?:8[0-69]|9[017-9])\\d{7}',
-    'ExampleNumber' => '991234567',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '12\\d{7}|[1-6]\\d{6}',
+        'example' => '1234567',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '88\\d{5}|(?:8[0-69]|9[017-9])\\d{7}',
+        'example' => '991234567',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CD',
-  'countryCode' => 243,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '88',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '88',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CF.php b/src/data/PhoneNumberMetadata_CF.php
index 6358bd675..7ae56fd60 100644
--- a/src/data/PhoneNumberMetadata_CF.php
+++ b/src/data/PhoneNumberMetadata_CF.php
@@ -6,105 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[27]\\d{3}|8776)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'CF',
+    'countryCode' => 236,
+    'generalDesc' => [
+        'pattern' => '(?:[27]\\d{3}|8776)\\d{4}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2[12]\\d{6}',
-    'ExampleNumber' => '21612345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[024-7]\\d{6}',
-    'ExampleNumber' => '70012345',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2[12]\\d{6}',
+        'example' => '21612345',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '8776\\d{4}',
-    'ExampleNumber' => '87761234',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '7[024-7]\\d{6}',
+        'example' => '70012345',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '8776\\d{4}',
+        'example' => '87761234',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CF',
-  'countryCode' => 236,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[278]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[278]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CG.php b/src/data/PhoneNumberMetadata_CG.php
index 52eae883d..b4d304b0e 100644
--- a/src/data/PhoneNumberMetadata_CG.php
+++ b/src/data/PhoneNumberMetadata_CG.php
@@ -6,117 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '222\\d{6}|(?:0\\d|80)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'CG',
+    'countryCode' => 242,
+    'generalDesc' => [
+        'pattern' => '222\\d{6}|(?:0\\d|80)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '222[1-589]\\d{5}',
-    'ExampleNumber' => '222123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '026(?:1[0-5]|6[6-9])\\d{4}|0(?:[14-6]\\d\\d|2(?:40|5[5-8]|6[07-9]))\\d{5}',
-    'ExampleNumber' => '061234567',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '222[1-589]\\d{5}',
+        'example' => '222123456',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '80[0-2]\\d{6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '026(?:1[0-5]|6[6-9])\\d{4}|0(?:[14-6]\\d\\d|2(?:40|5[5-8]|6[07-9]))\\d{5}',
+        'example' => '061234567',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '80[0-2]\\d{6}',
+        'example' => '800123456',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CG',
-  'countryCode' => 242,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[02]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[02]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CH.php b/src/data/PhoneNumberMetadata_CH.php
index 3f475f716..bf8238118 100644
--- a/src/data/PhoneNumberMetadata_CH.php
+++ b/src/data/PhoneNumberMetadata_CH.php
@@ -6,156 +6,120 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '8\\d{11}|[2-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 12,
+return [
+    'id' => 'CH',
+    'countryCode' => 41,
+    'generalDesc' => [
+        'pattern' => '8\\d{11}|[2-9]\\d{8}',
+        'posLength' => [
+            9,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[12467]|3[1-4]|4[134]|5[256]|6[12]|[7-9]1)\\d{7}',
-    'ExampleNumber' => '212345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '(?:2[12467]|3[1-4]|4[134]|5[256]|6[12]|[7-9]1)\\d{7}',
+        'example' => '212345678',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[35-9]\\d{7}',
-    'ExampleNumber' => '781234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '7[35-9]\\d{7}',
+        'example' => '781234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[016]\\d{6}',
-    'ExampleNumber' => '900123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'premiumRate' => [
+        'pattern' => '90[016]\\d{6}',
+        'example' => '900123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '84[0248]\\d{6}',
-    'ExampleNumber' => '840123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'sharedCost' => [
+        'pattern' => '84[0248]\\d{6}',
+        'example' => '840123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '878\\d{6}',
-    'ExampleNumber' => '878123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'personalNumber' => [
+        'pattern' => '878\\d{6}',
+        'example' => '878123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '74[0248]\\d{6}',
-    'ExampleNumber' => '740123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'pager' => [
+        'pattern' => '74[0248]\\d{6}',
+        'example' => '740123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '5[18]\\d{7}',
-    'ExampleNumber' => '581234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'uan' => [
+        'pattern' => '5[18]\\d{7}',
+        'example' => '581234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '860\\d{9}',
-    'ExampleNumber' => '860123456789',
-    'PossibleLength' =>
-     [
-      0 => 12,
+    'voicemail' => [
+        'pattern' => '860\\d{9}',
+        'example' => '860123456789',
+        'posLength' => [
+            12,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CH',
-  'countryCode' => 41,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[047]|90',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8[047]|90',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[2-79]|81',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-79]|81',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_CI.php b/src/data/PhoneNumberMetadata_CI.php
index dc59b1b55..649a512cc 100644
--- a/src/data/PhoneNumberMetadata_CI.php
+++ b/src/data/PhoneNumberMetadata_CI.php
@@ -6,119 +6,87 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[02]\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'CI',
+    'countryCode' => 225,
+    'generalDesc' => [
+        'pattern' => '[02]\\d{9}',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:[15]\\d{3}|7(?:2(?:0[23]|1[2357]|2[245]|3[45]|4[3-5])|3(?:06|1[69]|[2-6]7)))\\d{5}',
-    'ExampleNumber' => '2123456789',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '0[157]\\d{8}',
-    'ExampleNumber' => '0123456789',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:[15]\\d{3}|7(?:2(?:0[23]|1[2357]|2[245]|3[45]|4[3-5])|3(?:06|1[69]|[2-6]7)))\\d{5}',
+        'example' => '2123456789',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '0[157]\\d{8}',
+        'example' => '0123456789',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CI',
-  'countryCode' => 225,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d)(\\d{5})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d)(\\d{5})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CK.php b/src/data/PhoneNumberMetadata_CK.php
index a33da304e..6b21acad7 100644
--- a/src/data/PhoneNumberMetadata_CK.php
+++ b/src/data/PhoneNumberMetadata_CK.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-578]\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 5,
+return [
+    'id' => 'CK',
+    'countryCode' => 682,
+    'generalDesc' => [
+        'pattern' => '[2-578]\\d{4}',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2\\d|3[13-7]|4[1-5])\\d{3}',
-    'ExampleNumber' => '21234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[578]\\d{4}',
-    'ExampleNumber' => '71234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:2\\d|3[13-7]|4[1-5])\\d{3}',
+        'example' => '21234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '[578]\\d{4}',
+        'example' => '71234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CK',
-  'countryCode' => 682,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-578]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-578]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CL.php b/src/data/PhoneNumberMetadata_CL.php
index 800ad1d95..8879a8a85 100644
--- a/src/data/PhoneNumberMetadata_CL.php
+++ b/src/data/PhoneNumberMetadata_CL.php
@@ -6,324 +6,246 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '12300\\d{6}|6\\d{9,10}|[2-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-      2 => 11,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:1982[0-6]|3314[05-9])\\d{3}|(?:2(?:1(?:160|962)|3(?:2\\d\\d|3(?:[03467]\\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-3])|600)|646[59])|80[1-9]\\d\\d|9(?:3(?:[0-57-9]\\d\\d|6(?:0[02-9]|[1-9]\\d))|6(?:[0-8]\\d\\d|9(?:[02-79]\\d|1[05-9]))|7[1-9]\\d\\d|9(?:[03-9]\\d\\d|1(?:[0235-9]\\d|4[0-24-9])|2(?:[0-79]\\d|8[0-46-9]))))\\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\\d{7}',
-    'ExampleNumber' => '221234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '2(?:1982[0-6]|3314[05-9])\\d{3}|(?:2(?:1(?:160|962)|3(?:2\\d\\d|3(?:[03467]\\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-3])|600)|646[59])|80[1-9]\\d\\d|9(?:3(?:[0-57-9]\\d\\d|6(?:0[02-9]|[1-9]\\d))|6(?:[0-8]\\d\\d|9(?:[02-79]\\d|1[05-9]))|7[1-9]\\d\\d|9(?:[03-9]\\d\\d|1(?:[0235-9]\\d|4[0-24-9])|2(?:[0-79]\\d|8[0-46-9]))))\\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\\d{7}',
-    'ExampleNumber' => '221234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:123|8)00\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 11,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '600\\d{7,8}',
-    'ExampleNumber' => '6001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '44\\d{7}',
-    'ExampleNumber' => '441234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '600\\d{7,8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'id' => 'CL',
-  'countryCode' => 56,
-  'internationalPrefix' => '(?:0|1(?:1[0-69]|2[02-5]|5[13-58]|69|7[0167]|8[018]))0',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[03-589]|21)|[29]0|78',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{5})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '219',
-        1 => '2196',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '44',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[1-36]',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3[2-5]|[47]|5[1-3578]|6[13-57]|8(?:0[1-9]|[1-9])',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60|8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{5})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '219',
-        1 => '2196',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '44',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[1-36]',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3[2-5]|[47]|5[1-3578]|6[13-57]|8(?:0[1-9]|[1-9])',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60|8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'CL',
+    'countryCode' => 56,
+    'generalDesc' => [
+        'pattern' => '12300\\d{6}|6\\d{9,10}|[2-9]\\d{8}',
+        'posLength' => [
+            9,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '2(?:1982[0-6]|3314[05-9])\\d{3}|(?:2(?:1(?:160|962)|3(?:2\\d\\d|3(?:[03467]\\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-3])|600)|646[59])|80[1-9]\\d\\d|9(?:3(?:[0-57-9]\\d\\d|6(?:0[02-9]|[1-9]\\d))|6(?:[0-8]\\d\\d|9(?:[02-79]\\d|1[05-9]))|7[1-9]\\d\\d|9(?:[03-9]\\d\\d|1(?:[0235-9]\\d|4[0-24-9])|2(?:[0-79]\\d|8[0-46-9]))))\\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\\d{7}',
+        'example' => '221234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '2(?:1982[0-6]|3314[05-9])\\d{3}|(?:2(?:1(?:160|962)|3(?:2\\d\\d|3(?:[03467]\\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-3])|600)|646[59])|80[1-9]\\d\\d|9(?:3(?:[0-57-9]\\d\\d|6(?:0[02-9]|[1-9]\\d))|6(?:[0-8]\\d\\d|9(?:[02-79]\\d|1[05-9]))|7[1-9]\\d\\d|9(?:[03-9]\\d\\d|1(?:[0235-9]\\d|4[0-24-9])|2(?:[0-79]\\d|8[0-46-9]))))\\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\\d{7}',
+        'example' => '221234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '(?:123|8)00\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+            11,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '600\\d{7,8}',
+        'example' => '6001234567',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '44\\d{7}',
+        'example' => '441234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '600\\d{7,8}',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'internationalPrefix' => '(?:0|1(?:1[0-69]|2[02-5]|5[13-58]|69|7[0167]|8[018]))0',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1(?:[03-589]|21)|[29]0|78',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '219',
+                '2196',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '44',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2[1-36]',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3[2-5]|[47]|5[1-3578]|6[13-57]|8(?:0[1-9]|[1-9])',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '60|8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '60',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{5})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '219',
+                '2196',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '44',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2[1-36]',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3[2-5]|[47]|5[1-3578]|6[13-57]|8(?:0[1-9]|[1-9])',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '60|8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '60',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_CM.php b/src/data/PhoneNumberMetadata_CM.php
index ca5a4c66d..be42ac775 100644
--- a/src/data/PhoneNumberMetadata_CM.php
+++ b/src/data/PhoneNumberMetadata_CM.php
@@ -6,126 +6,94 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[26]\\d{8}|88\\d{6,7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'CM',
+    'countryCode' => 237,
+    'generalDesc' => [
+        'pattern' => '[26]\\d{8}|88\\d{6,7}',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:22|33)\\d{6}',
-    'ExampleNumber' => '222123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '2(?:22|33)\\d{6}',
+        'example' => '222123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:24[23]|6[25-9]\\d)\\d{6}',
-    'ExampleNumber' => '671234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '(?:24[23]|6[25-9]\\d)\\d{6}',
+        'example' => '671234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '88\\d{6,7}',
-    'ExampleNumber' => '88012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '88\\d{6,7}',
+        'example' => '88012345',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CM',
-  'countryCode' => 237,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '88',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[26]|88',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '88',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '[26]|88',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_CN.php b/src/data/PhoneNumberMetadata_CN.php
index 296a010cb..4238d0493 100644
--- a/src/data/PhoneNumberMetadata_CN.php
+++ b/src/data/PhoneNumberMetadata_CN.php
@@ -6,468 +6,371 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1[127]\\d{8,9}|2\\d{9}(?:\\d{2})?|[12]\\d{6,7}|86\\d{6}|(?:1[03-689]\\d|6)\\d{7,9}|(?:[3-579]\\d|8[0-57-9])\\d{6,9}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-      5 => 12,
+return [
+    'id' => 'CN',
+    'countryCode' => 86,
+    'generalDesc' => [
+        'pattern' => '1[127]\\d{8,9}|2\\d{9}(?:\\d{2})?|[12]\\d{6,7}|86\\d{6}|(?:1[03-689]\\d|6)\\d{7,9}|(?:[3-579]\\d|8[0-57-9])\\d{6,9}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:10(?:[02-79]\\d\\d|[18](?:0[1-9]|[1-9]\\d))|21(?:[18](?:0[1-9]|[1-9]\\d)|[2-79]\\d\\d))\\d{5}|(?:43[35]|754)\\d{7,8}|8(?:078\\d{7}|51\\d{7,8})|(?:10|(?:2|85)1|43[35]|754)(?:100\\d\\d|95\\d{3,4})|(?:2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|51|7[13-79]|9[15])|7(?:[39]1|5[57]|6[09])|8(?:71|98))(?:[02-8]\\d{7}|1(?:0(?:0\\d\\d(?:\\d{3})?|[1-9]\\d{5})|[1-9]\\d{6})|9(?:[0-46-9]\\d{6}|5\\d{3}(?:\\d(?:\\d{2})?)?))|(?:3(?:1[02-9]|35|49|5\\d|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|3[46-9]|5[2-9]|6[47-9]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[17]\\d|2[248]|3[04-9]|4[3-6]|5[0-3689]|6[2368]|9[02-9])|8(?:1[236-8]|2[5-7]|3\\d|5[2-9]|7[02-9]|8[36-8]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[02-8]\\d{6}|1(?:0(?:0\\d\\d(?:\\d{2})?|[1-9]\\d{4})|[1-9]\\d{5})|9(?:[0-46-9]\\d{5}|5\\d{3,5}))',
+        'example' => '1012345678',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '1740[0-5]\\d{6}|1(?:[38]\\d|4[57]|[59][0-35-9]|6[25-7]|7[0-35-8])\\d{8}',
+        'example' => '13123456789',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '(?:(?:10|21)8|8)00\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+            12,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '16[08]\\d{5}',
+        'example' => '16812345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '10(?:10\\d{4}|96\\d{3,4})|400\\d{7}|950\\d{7,8}|(?:2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}',
+        'example' => '4001234567',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '(?:(?:10|21)8|[48])00\\d{7}|950\\d{7,8}',
+        'posLength' => [
+            10,
+            11,
+            12,
+        ],
+    ],
+    'internationalPrefix' => '00|1(?:[12]\\d|79)\\d\\d00',
+    'preferredInternationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '(1(?:[12]\\d|79)\\d\\d)|0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{5,6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1(?:00|2[13])|95',
+                '1(?:00|2(?:11|39))|95',
+                '1(?:00|2(?:110|395))|95',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5,6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '10|96',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:10|2[0-57-9])[19]',
+                '(?:10|2[0-57-9])(?:10|9[56])',
+                '10(?:10|9[56])|2[0-57-9](?:100|9[56])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+                '1[1-9]|26|[3-9]|(?:10|2[0-57-9])(?:[0-8]|9[0-47-9])',
+                '1(?:0(?:[0-8]|9[0-47-9])|[1-9])|2(?:[0-57-9](?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])|6)|[3-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '16[08]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3(?:[157]|35|49|9[1-68])|4(?:[17]|2[179]|6[47-9]|8[23])|5(?:[1357]|2[37]|4[36]|6[1-46]|80)|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])|(?:4[35]|59|85)[1-9]',
+                '(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[1-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))[19]',
+                '85[23](?:10|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:10|9[56])',
+                '85[23](?:100|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100|9[56])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+                '1(?:0(?:[02-8]|1[1-9]|9[0-47-9])|[1-9])|2(?:[0-57-9](?:[0-8]|9[0-47-9])|6)|[3-9]',
+                '1(?:0(?:[02-8]|1[1-9]|9[0-47-9])|[1-9])|26|3(?:[0268]|4[0-8]|9[079])|4(?:[049]|2[02-68]|[35]0|6[0-356]|8[014-9])|5(?:0|2[0-24-689]|4[0-2457-9]|6[057-9]|8[1-9]|90)|6(?:[0-24578]|3[06-9]|6[14-79]|9[03-9])|7(?:0[02-9]|2[0135-79]|3[23]|4[0-27-9]|6[1457]|8)|8(?:[046]|1[01459]|2[0-489]|5(?:0|[23][0-8])|8[0-2459]|9[09])|9(?:0[0457]|1[08]|[268]|4[024-9]|5[06-9])|(?:33|85[23]9)[0-46-9]|(?:2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[0-8]|9[0-47-9])',
+                '1(?:0[02-8]|[1-9])|2(?:[0-57-9][0-8]|6)|3(?:[0268]|3[0-46-9]|4[0-8]|9[079])|4(?:[049]|2[02-68]|[35]0|6[0-356]|8[014-9])|5(?:0|2[0-24-689]|4[0-2457-9]|6[057-9]|90)|6(?:[0-24578]|3[06-9]|6[14-79]|9[03-9])|7(?:0[02-9]|2[0135-79]|3[23]|4[0-27-9]|6[1457]|8)|8(?:[046]|1[01459]|2[0-489]|5(?:0|[23](?:[02-8]|1[1-9]|9[0-46-9]))|8[0-2459]|9[09])|9(?:0[0457]|1[08]|[268]|4[024-9]|5[06-9])|(?:10|2[0-57-9])9[0-47-9]|(?:101|58|85[23]10)[1-9]|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '(?:4|80)0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '10|2(?:[02-57-9]|1[1-9])',
+                '10|2(?:[02-57-9]|1[1-9])',
+                '10[0-79]|2(?:[02-57-9]|1[1-79])|(?:10|21)8(?:0[1-9]|[1-9])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3(?:[3-59]|7[02-68])|4(?:[26-8]|3[3-9]|5[2-9])|5(?:3[03-9]|[468]|7[028]|9[2-46-9])|6|7(?:[0-247]|3[04-9]|5[0-4689]|6[2368])|8(?:[1-358]|9[1-7])|9(?:[013479]|5[1-5])|(?:[34]1|55|79|87)[02-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[3-578]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1[3-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[12]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:10|2[0-57-9])[19]',
+                '(?:10|2[0-57-9])(?:10|9[56])',
+                '10(?:10|9[56])|2[0-57-9](?:100|9[56])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3(?:[157]|35|49|9[1-68])|4(?:[17]|2[179]|6[47-9]|8[23])|5(?:[1357]|2[37]|4[36]|6[1-46]|80)|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])|(?:4[35]|59|85)[1-9]',
+                '(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[1-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))[19]',
+                '85[23](?:10|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:10|9[56])',
+                '85[23](?:100|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100|9[56])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '(?:4|80)0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '10|2(?:[02-57-9]|1[1-9])',
+                '10|2(?:[02-57-9]|1[1-9])',
+                '10[0-79]|2(?:[02-57-9]|1[1-79])|(?:10|21)8(?:0[1-9]|[1-9])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3(?:[3-59]|7[02-68])|4(?:[26-8]|3[3-9]|5[2-9])|5(?:3[03-9]|[468]|7[028]|9[2-46-9])|6|7(?:[0-247]|3[04-9]|5[0-4689]|6[2368])|8(?:[1-358]|9[1-7])|9(?:[013479]|5[1-5])|(?:[34]1|55|79|87)[02-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[3-578]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1[3-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[12]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:10(?:[02-79]\\d\\d|[18](?:0[1-9]|[1-9]\\d))|21(?:[18](?:0[1-9]|[1-9]\\d)|[2-79]\\d\\d))\\d{5}|(?:43[35]|754)\\d{7,8}|8(?:078\\d{7}|51\\d{7,8})|(?:10|(?:2|85)1|43[35]|754)(?:100\\d\\d|95\\d{3,4})|(?:2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|51|7[13-79]|9[15])|7(?:[39]1|5[57]|6[09])|8(?:71|98))(?:[02-8]\\d{7}|1(?:0(?:0\\d\\d(?:\\d{3})?|[1-9]\\d{5})|[1-9]\\d{6})|9(?:[0-46-9]\\d{6}|5\\d{3}(?:\\d(?:\\d{2})?)?))|(?:3(?:1[02-9]|35|49|5\\d|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|3[46-9]|5[2-9]|6[47-9]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[17]\\d|2[248]|3[04-9]|4[3-6]|5[0-3689]|6[2368]|9[02-9])|8(?:1[236-8]|2[5-7]|3\\d|5[2-9]|7[02-9]|8[36-8]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[02-8]\\d{6}|1(?:0(?:0\\d\\d(?:\\d{2})?|[1-9]\\d{4})|[1-9]\\d{5})|9(?:[0-46-9]\\d{5}|5\\d{3,5}))',
-    'ExampleNumber' => '1012345678',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '1740[0-5]\\d{6}|1(?:[38]\\d|4[57]|[59][0-35-9]|6[25-7]|7[0-35-8])\\d{8}',
-    'ExampleNumber' => '13123456789',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:(?:10|21)8|8)00\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 12,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '16[08]\\d{5}',
-    'ExampleNumber' => '16812345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '10(?:10\\d{4}|96\\d{3,4})|400\\d{7}|950\\d{7,8}|(?:2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}',
-    'ExampleNumber' => '4001234567',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '(?:(?:10|21)8|[48])00\\d{7}|950\\d{7,8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-      2 => 12,
-    ],
-  ],
-  'id' => 'CN',
-  'countryCode' => 86,
-  'internationalPrefix' => '00|1(?:[12]\\d|79)\\d\\d00',
-  'preferredInternationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '(1(?:[12]\\d|79)\\d\\d)|0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{5,6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:00|2[13])|95',
-        1 => '1(?:00|2(?:11|39))|95',
-        2 => '1(?:00|2(?:110|395))|95',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{5,6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '10|96',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:10|2[0-57-9])[19]',
-        1 => '(?:10|2[0-57-9])(?:10|9[56])',
-        2 => '10(?:10|9[56])|2[0-57-9](?:100|9[56])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-        1 => '1[1-9]|26|[3-9]|(?:10|2[0-57-9])(?:[0-8]|9[0-47-9])',
-        2 => '1(?:0(?:[0-8]|9[0-47-9])|[1-9])|2(?:[0-57-9](?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])|6)|[3-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16[08]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3(?:[157]|35|49|9[1-68])|4(?:[17]|2[179]|6[47-9]|8[23])|5(?:[1357]|2[37]|4[36]|6[1-46]|80)|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])|(?:4[35]|59|85)[1-9]',
-        1 => '(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[1-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))[19]',
-        2 => '85[23](?:10|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:10|9[56])',
-        3 => '85[23](?:100|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100|9[56])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-        1 => '1(?:0(?:[02-8]|1[1-9]|9[0-47-9])|[1-9])|2(?:[0-57-9](?:[0-8]|9[0-47-9])|6)|[3-9]',
-        2 => '1(?:0(?:[02-8]|1[1-9]|9[0-47-9])|[1-9])|26|3(?:[0268]|4[0-8]|9[079])|4(?:[049]|2[02-68]|[35]0|6[0-356]|8[014-9])|5(?:0|2[0-24-689]|4[0-2457-9]|6[057-9]|8[1-9]|90)|6(?:[0-24578]|3[06-9]|6[14-79]|9[03-9])|7(?:0[02-9]|2[0135-79]|3[23]|4[0-27-9]|6[1457]|8)|8(?:[046]|1[01459]|2[0-489]|5(?:0|[23][0-8])|8[0-2459]|9[09])|9(?:0[0457]|1[08]|[268]|4[024-9]|5[06-9])|(?:33|85[23]9)[0-46-9]|(?:2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[0-8]|9[0-47-9])',
-        3 => '1(?:0[02-8]|[1-9])|2(?:[0-57-9][0-8]|6)|3(?:[0268]|3[0-46-9]|4[0-8]|9[079])|4(?:[049]|2[02-68]|[35]0|6[0-356]|8[014-9])|5(?:0|2[0-24-689]|4[0-2457-9]|6[057-9]|90)|6(?:[0-24578]|3[06-9]|6[14-79]|9[03-9])|7(?:0[02-9]|2[0135-79]|3[23]|4[0-27-9]|6[1457]|8)|8(?:[046]|1[01459]|2[0-489]|5(?:0|[23](?:[02-8]|1[1-9]|9[0-46-9]))|8[0-2459]|9[09])|9(?:0[0457]|1[08]|[268]|4[024-9]|5[06-9])|(?:10|2[0-57-9])9[0-47-9]|(?:101|58|85[23]10)[1-9]|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:4|80)0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '10|2(?:[02-57-9]|1[1-9])',
-        1 => '10|2(?:[02-57-9]|1[1-9])',
-        2 => '10[0-79]|2(?:[02-57-9]|1[1-79])|(?:10|21)8(?:0[1-9]|[1-9])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3(?:[3-59]|7[02-68])|4(?:[26-8]|3[3-9]|5[2-9])|5(?:3[03-9]|[468]|7[028]|9[2-46-9])|6|7(?:[0-247]|3[04-9]|5[0-4689]|6[2368])|8(?:[1-358]|9[1-7])|9(?:[013479]|5[1-5])|(?:[34]1|55|79|87)[02-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    11 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    12 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-578]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    13 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[3-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    14 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:10|2[0-57-9])[19]',
-        1 => '(?:10|2[0-57-9])(?:10|9[56])',
-        2 => '10(?:10|9[56])|2[0-57-9](?:100|9[56])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3(?:[157]|35|49|9[1-68])|4(?:[17]|2[179]|6[47-9]|8[23])|5(?:[1357]|2[37]|4[36]|6[1-46]|80)|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])|(?:4[35]|59|85)[1-9]',
-        1 => '(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[1-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))[19]',
-        2 => '85[23](?:10|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:10|9[56])',
-        3 => '85[23](?:100|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100|9[56])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:4|80)0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '10|2(?:[02-57-9]|1[1-9])',
-        1 => '10|2(?:[02-57-9]|1[1-9])',
-        2 => '10[0-79]|2(?:[02-57-9]|1[1-79])|(?:10|21)8(?:0[1-9]|[1-9])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3(?:[3-59]|7[02-68])|4(?:[26-8]|3[3-9]|5[2-9])|5(?:3[03-9]|[468]|7[028]|9[2-46-9])|6|7(?:[0-247]|3[04-9]|5[0-4689]|6[2368])|8(?:[1-358]|9[1-7])|9(?:[013479]|5[1-5])|(?:[34]1|55|79|87)[02-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-578]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[3-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CO.php b/src/data/PhoneNumberMetadata_CO.php
index 08670f070..0fc822791 100644
--- a/src/data/PhoneNumberMetadata_CO.php
+++ b/src/data/PhoneNumberMetadata_CO.php
@@ -6,190 +6,143 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:60\\d\\d|9101)\\d{6}|(?:1\\d|3)\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '601055(?:[0-4]\\d|50)\\d\\d|6010(?:[0-4]\\d|5[0-4])\\d{4}|60(?:[124-7][2-9]|8[1-9])\\d{6}',
-    'ExampleNumber' => '6012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '333301[0-5]\\d{3}|3333(?:00|2[5-9]|[3-9]\\d)\\d{4}|(?:3(?:24[1-9]|3(?:00|3[0-24-9]))|9101)\\d{6}|3(?:0[0-5]|1\\d|2[0-3]|5[01]|70)\\d{7}',
-    'ExampleNumber' => '3211234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800\\d{7}',
-    'ExampleNumber' => '18001234567',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '19(?:0[01]|4[78])\\d{7}',
-    'ExampleNumber' => '19001234567',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'CO',
-  'countryCode' => 57,
-  'internationalPrefix' => '00(?:4(?:[14]4|56)|[579])',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0([3579]|4(?:[14]4|56))?',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3[0-357]|91',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{7})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3[0-357]|91',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{7})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'CO',
+    'countryCode' => 57,
+    'generalDesc' => [
+        'pattern' => '(?:60\\d\\d|9101)\\d{6}|(?:1\\d|3)\\d{9}',
+        'posLength' => [
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '601055(?:[0-4]\\d|50)\\d\\d|6010(?:[0-4]\\d|5[0-4])\\d{4}|60(?:[124-7][2-9]|8[1-9])\\d{6}',
+        'example' => '6012345678',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '333301[0-5]\\d{3}|3333(?:00|2[5-9]|[3-9]\\d)\\d{4}|(?:3(?:24[1-9]|3(?:00|3[0-24-9]))|9101)\\d{6}|3(?:0[0-5]|1\\d|2[0-3]|5[01]|70)\\d{7}',
+        'example' => '3211234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1800\\d{7}',
+        'example' => '18001234567',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '19(?:0[01]|4[78])\\d{7}',
+        'example' => '19001234567',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00(?:4(?:[14]4|56)|[579])',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0([3579]|4(?:[14]4|56))?',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3[0-357]|91',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{7})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3[0-357]|91',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{7})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_CR.php b/src/data/PhoneNumberMetadata_CR.php
index f885600bd..6739bc770 100644
--- a/src/data/PhoneNumberMetadata_CR.php
+++ b/src/data/PhoneNumberMetadata_CR.php
@@ -6,135 +6,101 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:8\\d|90)\\d{8}|(?:[24-8]\\d{3}|3005)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 10,
+return [
+    'id' => 'CR',
+    'countryCode' => 506,
+    'generalDesc' => [
+        'pattern' => '(?:8\\d|90)\\d{8}|(?:[24-8]\\d{3}|3005)\\d{4}',
+        'posLength' => [
+            8,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '210[7-9]\\d{4}|2(?:[024-7]\\d|1[1-9])\\d{5}',
-    'ExampleNumber' => '22123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '210[7-9]\\d{4}|2(?:[024-7]\\d|1[1-9])\\d{5}',
+        'example' => '22123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:3005\\d|6500[01])\\d{3}|(?:5[07]|6[0-4]|7[0-3]|8[3-9])\\d{6}',
-    'ExampleNumber' => '83123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '(?:3005\\d|6500[01])\\d{3}|(?:5[07]|6[0-4]|7[0-3]|8[3-9])\\d{6}',
+        'example' => '83123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'tollFree' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[059]\\d{7}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'premiumRate' => [
+        'pattern' => '90[059]\\d{7}',
+        'example' => '9001234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:210[0-6]|4\\d{3}|5100)\\d{4}',
-    'ExampleNumber' => '40001234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'voip' => [
+        'pattern' => '(?:210[0-6]|4\\d{3}|5100)\\d{4}',
+        'example' => '40001234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CR',
-  'countryCode' => 506,
-  'internationalPrefix' => '00',
-  'nationalPrefixForParsing' => '(19(?:0[0-2468]|1[09]|20|66|77|99))',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]|8[3-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefixForParsing' => '(19(?:0[0-2468]|1[09]|20|66|77|99))',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-7]|8[3-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CU.php b/src/data/PhoneNumberMetadata_CU.php
index de3019512..0ef11870d 100644
--- a/src/data/PhoneNumberMetadata_CU.php
+++ b/src/data/PhoneNumberMetadata_CU.php
@@ -6,166 +6,125 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-7]|8\\d\\d)\\d{7}|[2-47]\\d{6}|[34]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 10,
+return [
+    'id' => 'CU',
+    'countryCode' => 53,
+    'generalDesc' => [
+        'pattern' => '(?:[2-7]|8\\d\\d)\\d{7}|[2-47]\\d{6}|[34]\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            10,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:3[23]|4[89])\\d{4,6}|(?:31|4[36]|8(?:0[25]|78)\\d)\\d{6}|(?:2[1-4]|4[1257]|7\\d)\\d{5,6}',
+        'example' => '71234567',
+        'posLengthLocal' => [
+            4,
+            5,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:5\\d|6[2-4])\\d{6}',
+        'example' => '51234567',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '807\\d{7}',
+        'example' => '8071234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '119',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2[1-4]|[34]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{6,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[56]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3[23]|4[89])\\d{4,6}|(?:31|4[36]|8(?:0[25]|78)\\d)\\d{6}|(?:2[1-4]|4[1257]|7\\d)\\d{5,6}',
-    'ExampleNumber' => '71234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:5\\d|6[2-4])\\d{6}',
-    'ExampleNumber' => '51234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '807\\d{7}',
-    'ExampleNumber' => '8071234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'CU',
-  'countryCode' => 53,
-  'internationalPrefix' => '119',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[1-4]|[34]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{6,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[56]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CV.php b/src/data/PhoneNumberMetadata_CV.php
index b982ed72c..b237ba0e4 100644
--- a/src/data/PhoneNumberMetadata_CV.php
+++ b/src/data/PhoneNumberMetadata_CV.php
@@ -6,103 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-59]\\d\\d|800)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'CV',
+    'countryCode' => 238,
+    'generalDesc' => [
+        'pattern' => '(?:[2-59]\\d\\d|800)\\d{4}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:2[1-7]|3[0-8]|4[12]|5[1256]|6\\d|7[1-3]|8[1-5])\\d{4}',
-    'ExampleNumber' => '2211234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:36|5[1-389]|9\\d)\\d{5}',
-    'ExampleNumber' => '9911234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{4}',
-    'ExampleNumber' => '8001234',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:2[1-7]|3[0-8]|4[12]|5[1256]|6\\d|7[1-3]|8[1-5])\\d{4}',
+        'example' => '2211234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:36|5[1-389]|9\\d)\\d{5}',
+        'example' => '9911234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{4}',
+        'example' => '8001234',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:3[3-5]|4[356])\\d{5}',
-    'ExampleNumber' => '3401234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '(?:3[3-5]|4[356])\\d{5}',
+        'example' => '3401234',
     ],
-  ],
-  'id' => 'CV',
-  'countryCode' => 238,
-  'internationalPrefix' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-589]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-589]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_CW.php b/src/data/PhoneNumberMetadata_CW.php
index 6c31aab9a..fc297daa8 100644
--- a/src/data/PhoneNumberMetadata_CW.php
+++ b/src/data/PhoneNumberMetadata_CW.php
@@ -6,125 +6,94 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[34]1|60|(?:7|9\\d)\\d)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+return [
+    'id' => 'CW',
+    'countryCode' => 599,
+    'generalDesc' => [
+        'pattern' => '(?:[34]1|60|(?:7|9\\d)\\d)\\d{5}',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '9(?:4(?:3[0-5]|4[14]|6\\d)|50\\d|7(?:2[014]|3[02-9]|4[4-9]|6[357]|77|8[7-9])|8(?:3[39]|[46]\\d|7[01]|8[57-9]))\\d{4}',
-    'ExampleNumber' => '94351234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '953[01]\\d{4}|9(?:5[12467]|6[5-9])\\d{5}',
-    'ExampleNumber' => '95181234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '9(?:4(?:3[0-5]|4[14]|6\\d)|50\\d|7(?:2[014]|3[02-9]|4[4-9]|6[357]|77|8[7-9])|8(?:3[39]|[46]\\d|7[01]|8[57-9]))\\d{4}',
+        'example' => '94351234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '953[01]\\d{4}|9(?:5[12467]|6[5-9])\\d{5}',
+        'example' => '95181234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '60[0-2]\\d{4}',
-    'ExampleNumber' => '6001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '60[0-2]\\d{4}',
+        'example' => '6001234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '955\\d{5}',
-    'ExampleNumber' => '95581234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'pattern' => '955\\d{5}',
+        'example' => '95581234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CW',
-  'countryCode' => 599,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3467]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9[4-8]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => true,
-  'leadingDigits' => '[69]',
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[3467]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9[4-8]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'leadingDigits' => '[69]',
 ];
diff --git a/src/data/PhoneNumberMetadata_CX.php b/src/data/PhoneNumberMetadata_CX.php
index 288785808..3ae4432f2 100644
--- a/src/data/PhoneNumberMetadata_CX.php
+++ b/src/data/PhoneNumberMetadata_CX.php
@@ -6,128 +6,98 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1(?:[0-79]\\d{8}(?:\\d{2})?|8[0-24-9]\\d{7})|[148]\\d{8}|1\\d{5,7}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 12,
+return [
+    'id' => 'CX',
+    'countryCode' => 61,
+    'generalDesc' => [
+        'pattern' => '1(?:[0-79]\\d{8}(?:\\d{2})?|8[0-24-9]\\d{7})|[148]\\d{8}|1\\d{5,7}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '8(?:51(?:0(?:01|30|59|88)|1(?:17|46|75)|2(?:22|35))|91(?:00[6-9]|1(?:[28]1|49|78)|2(?:09|63)|3(?:12|26|75)|4(?:56|97)|64\\d|7(?:0[01]|1[0-2])|958))\\d{3}',
-    'ExampleNumber' => '891641234',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '8(?:51(?:0(?:01|30|59|88)|1(?:17|46|75)|2(?:22|35))|91(?:00[6-9]|1(?:[28]1|49|78)|2(?:09|63)|3(?:12|26|75)|4(?:56|97)|64\\d|7(?:0[01]|1[0-2])|958))\\d{3}',
+        'example' => '891641234',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            8,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+        'example' => '412345678',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
-    'ExampleNumber' => '412345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '180(?:0\\d{3}|2)\\d{3}',
+        'example' => '1800123456',
+        'posLength' => [
+            7,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '180(?:0\\d{3}|2)\\d{3}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
+    'premiumRate' => [
+        'pattern' => '190[0-26]\\d{6}',
+        'example' => '1900123456',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '190[0-26]\\d{6}',
-    'ExampleNumber' => '1900123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'sharedCost' => [
+        'pattern' => '13(?:00\\d{6}(?:\\d{2})?|45[0-4]\\d{3})|13\\d{4}',
+        'example' => '1300123456',
+        'posLength' => [
+            6,
+            8,
+            10,
+            12,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '13(?:00\\d{6}(?:\\d{2})?|45[0-4]\\d{3})|13\\d{4}',
-    'ExampleNumber' => '1300123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 10,
-      3 => 12,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '14(?:5(?:1[0458]|[23][458])|71\\d)\\d{4}',
+        'example' => '147101234',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '14(?:5(?:1[0458]|[23][458])|71\\d)\\d{4}',
-    'ExampleNumber' => '147101234',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'CX',
-  'countryCode' => 61,
-  'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011',
-  'preferredInternationalPrefix' => '0011',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '([59]\\d{7})$|0',
-  'nationalPrefixTransformRule' => '8$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011',
+    'preferredInternationalPrefix' => '0011',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '([59]\\d{7})$|0',
+    'nationalPrefixTransformRule' => '8$1',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_CY.php b/src/data/PhoneNumberMetadata_CY.php
index fcf08deea..a375e2b35 100644
--- a/src/data/PhoneNumberMetadata_CY.php
+++ b/src/data/PhoneNumberMetadata_CY.php
@@ -6,97 +6,74 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[279]\\d|[58]0)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'CY',
+    'countryCode' => 357,
+    'generalDesc' => [
+        'pattern' => '(?:[279]\\d|[58]0)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2[2-6]\\d{6}',
-    'ExampleNumber' => '22345678',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9(?:10|[4-79]\\d)\\d{5}',
-    'ExampleNumber' => '96123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80001234',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[09]\\d{5}',
-    'ExampleNumber' => '90012345',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '80[1-9]\\d{5}',
-    'ExampleNumber' => '80112345',
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '700\\d{5}',
-    'ExampleNumber' => '70012345',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2[2-6]\\d{6}',
+        'example' => '22345678',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '9(?:10|[4-79]\\d)\\d{5}',
+        'example' => '96123456',
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:50|77)\\d{6}',
-    'ExampleNumber' => '77123456',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80001234',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90[09]\\d{5}',
+        'example' => '90012345',
     ],
-  ],
-  'id' => 'CY',
-  'countryCode' => 357,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[257-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'sharedCost' => [
+        'pattern' => '80[1-9]\\d{5}',
+        'example' => '80112345',
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'personalNumber' => [
+        'pattern' => '700\\d{5}',
+        'example' => '70012345',
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '(?:50|77)\\d{6}',
+        'example' => '77123456',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[257-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_CZ.php b/src/data/PhoneNumberMetadata_CZ.php
index 3993f594c..3af328424 100644
--- a/src/data/PhoneNumberMetadata_CZ.php
+++ b/src/data/PhoneNumberMetadata_CZ.php
@@ -6,164 +6,126 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-578]\\d|60)\\d{7}|9\\d{8,11}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-      2 => 11,
-      3 => 12,
+return [
+    'id' => 'CZ',
+    'countryCode' => 420,
+    'generalDesc' => [
+        'pattern' => '(?:[2-578]\\d|60)\\d{7}|9\\d{8,11}',
+        'posLength' => [
+            9,
+            10,
+            11,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2\\d|3[1257-9]|4[16-9]|5[13-9])\\d{7}',
-    'ExampleNumber' => '212345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '(?:2\\d|3[1257-9]|4[16-9]|5[13-9])\\d{7}',
+        'example' => '212345678',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:60[1-8]\\d|7(?:0(?:[2-5]\\d|60)|190|[2379]\\d\\d))\\d{5}',
-    'ExampleNumber' => '601123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '(?:60[1-8]\\d|7(?:0(?:[2-5]\\d|60)|190|[2379]\\d\\d))\\d{5}',
+        'example' => '601123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9(?:0[05689]|76)\\d{6}',
-    'ExampleNumber' => '900123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'premiumRate' => [
+        'pattern' => '9(?:0[05689]|76)\\d{6}',
+        'example' => '900123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8[134]\\d{7}',
-    'ExampleNumber' => '811234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'sharedCost' => [
+        'pattern' => '8[134]\\d{7}',
+        'example' => '811234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70[01]\\d{6}',
-    'ExampleNumber' => '700123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'personalNumber' => [
+        'pattern' => '70[01]\\d{6}',
+        'example' => '700123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9[17]0\\d{6}',
-    'ExampleNumber' => '910123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'voip' => [
+        'pattern' => '9[17]0\\d{6}',
+        'example' => '910123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '9(?:5\\d|7[2-4])\\d{6}',
-    'ExampleNumber' => '972123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'uan' => [
+        'pattern' => '9(?:5\\d|7[2-4])\\d{6}',
+        'example' => '972123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '9(?:3\\d{9}|6\\d{7,10})',
-    'ExampleNumber' => '93123456789',
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'pattern' => '9(?:3\\d{9}|6\\d{7,10})',
+        'example' => '93123456789',
     ],
-  ],
-  'id' => 'CZ',
-  'countryCode' => 420,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-8]|9[015-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '96',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-8]|9[015-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '96',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_DE.php b/src/data/PhoneNumberMetadata_DE.php
index b5b2a7181..8fb8e1ac4 100644
--- a/src/data/PhoneNumberMetadata_DE.php
+++ b/src/data/PhoneNumberMetadata_DE.php
@@ -6,403 +6,320 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2579]\\d{5,14}|49(?:[34]0|69|8\\d)\\d\\d?|49(?:37|49|60|7[089]|9\\d)\\d{1,3}|49(?:2[024-9]|3[2-689]|7[1-7])\\d{1,8}|(?:1|[368]\\d|4[0-8])\\d{3,13}|49(?:[015]\\d|2[13]|31|[46][1-8])\\d{1,9}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-      5 => 9,
-      6 => 10,
-      7 => 11,
-      8 => 12,
-      9 => 13,
-      10 => 14,
-      11 => 15,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 2,
-      1 => 3,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '32\\d{9,11}|49[1-6]\\d{10}|322\\d{6}|49[0-7]\\d{3,9}|(?:[34]0|[68]9)\\d{3,13}|(?:2(?:0[1-689]|[1-3569]\\d|4[0-8]|7[1-7]|8[0-7])|3(?:[3569]\\d|4[0-79]|7[1-7]|8[1-8])|4(?:1[02-9]|[2-48]\\d|5[0-6]|6[0-8]|7[0-79])|5(?:0[2-8]|[124-6]\\d|[38][0-8]|[79][0-7])|6(?:0[02-9]|[1-358]\\d|[47][0-8]|6[1-9])|7(?:0[2-8]|1[1-9]|[27][0-7]|3\\d|[4-6][0-8]|8[0-5]|9[013-7])|8(?:0[2-9]|1[0-79]|2\\d|3[0-46-9]|4[0-6]|5[013-9]|6[1-8]|7[0-8]|8[0-24-6])|9(?:0[6-9]|[1-4]\\d|[589][0-7]|6[0-8]|7[0-467]))\\d{3,12}',
-    'ExampleNumber' => '30123456',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-      6 => 11,
-      7 => 12,
-      8 => 13,
-      9 => 14,
-      10 => 15,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '15(?:[0-25-9]\\d\\d|310)\\d{6}|1(?:6[023]|7\\d)\\d{7,8}',
-    'ExampleNumber' => '15123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7,12}',
-    'ExampleNumber' => '8001234567890',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-      2 => 12,
-      3 => 13,
-      4 => 14,
-      5 => 15,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:137[7-9]|900(?:[135]|9\\d))\\d{6}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '180\\d{5,11}|13(?:7[1-6]\\d\\d|8)\\d{4}',
-    'ExampleNumber' => '18012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-      5 => 12,
-      6 => 13,
-      7 => 14,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '700\\d{8}',
-    'ExampleNumber' => '70012345678',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '16(?:4\\d{1,10}|[89]\\d{1,11})',
-    'ExampleNumber' => '16412345',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-      5 => 9,
-      6 => 10,
-      7 => 11,
-      8 => 12,
-      9 => 13,
-      10 => 14,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '18(?:1\\d{5,11}|[2-9]\\d{8})',
-    'ExampleNumber' => '18500123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-      4 => 12,
-      5 => 13,
-      6 => 14,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '1(?:6(?:013|255|399)|7(?:(?:[015]1|[69]3)3|[2-4]55|[78]99))\\d{7,8}|15(?:(?:[03-68]00|113)\\d|2\\d55|7\\d99|9\\d33)\\d{7}',
-    'ExampleNumber' => '177991234567',
-    'PossibleLength' =>
-     [
-      0 => 12,
-      1 => 13,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'DE',
-  'countryCode' => 49,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,13})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3[02]|40|[68]9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,12})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:0[1-389]|1[124]|2[18]|3[14])|3(?:[35-9][15]|4[015])|906|(?:2[4-9]|4[2-9]|[579][1-9]|[68][1-8])1',
-        1 => '2(?:0[1-389]|12[0-8])|3(?:[35-9][15]|4[015])|906|2(?:[13][14]|2[18])|(?:2[4-9]|4[2-9]|[579][1-9]|[68][1-8])1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2,11})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-6]|3(?:[3569][02-46-9]|4[2-4679]|7[2-467]|8[2-46-8])|70[2-8]|8(?:0[2-9]|[1-8])|90[7-9]|[79][1-9]',
-        1 => '[24-6]|3(?:3(?:0[1-467]|2[127-9]|3[124578]|7[1257-9]|8[1256]|9[145])|4(?:2[135]|4[13578]|9[1346])|5(?:0[14]|2[1-3589]|6[1-4]|7[13468]|8[13568])|6(?:2[1-489]|3[124-6]|6[13]|7[12579]|8[1-356]|9[135])|7(?:2[1-7]|4[145]|6[1-5]|7[1-4])|8(?:21|3[1468]|6|7[1467]|8[136])|9(?:0[12479]|2[1358]|4[134679]|6[1-9]|7[136]|8[147]|9[1468]))|70[2-8]|8(?:0[2-9]|[1-8])|90[7-9]|[79][1-9]|3[68]4[1347]|3(?:47|60)[1356]|3(?:3[46]|46|5[49])[1246]|3[4579]3[1357]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '138',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{5})(\\d{2,10})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,11})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '181',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d)(\\d{4,10})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:3|80)|9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[67]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7,12})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{5})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '185',
-        1 => '1850',
-        2 => '18500',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    11 =>
-     [
-      'pattern' => '(\\d{4})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '18[68]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    12 =>
-     [
-      'pattern' => '(\\d{4})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '15[1279]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    13 =>
-     [
-      'pattern' => '(\\d{5})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '15[03568]',
-        1 => '15(?:[0568]|31)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    14 =>
-     [
-      'pattern' => '(\\d{3})(\\d{8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '18',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    15 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{7,8})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:6[023]|7)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    16 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{7})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '15[279]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    17 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{8})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '15',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'DE',
+    'countryCode' => 49,
+    'generalDesc' => [
+        'pattern' => '[2579]\\d{5,14}|49(?:[34]0|69|8\\d)\\d\\d?|49(?:37|49|60|7[089]|9\\d)\\d{1,3}|49(?:2[024-9]|3[2-689]|7[1-7])\\d{1,8}|(?:1|[368]\\d|4[0-8])\\d{3,13}|49(?:[015]\\d|2[13]|31|[46][1-8])\\d{1,9}',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+        ],
+        'posLengthLocal' => [
+            2,
+            3,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '32\\d{9,11}|49[1-6]\\d{10}|322\\d{6}|49[0-7]\\d{3,9}|(?:[34]0|[68]9)\\d{3,13}|(?:2(?:0[1-689]|[1-3569]\\d|4[0-8]|7[1-7]|8[0-7])|3(?:[3569]\\d|4[0-79]|7[1-7]|8[1-8])|4(?:1[02-9]|[2-48]\\d|5[0-6]|6[0-8]|7[0-79])|5(?:0[2-8]|[124-6]\\d|[38][0-8]|[79][0-7])|6(?:0[02-9]|[1-358]\\d|[47][0-8]|6[1-9])|7(?:0[2-8]|1[1-9]|[27][0-7]|3\\d|[4-6][0-8]|8[0-5]|9[013-7])|8(?:0[2-9]|1[0-79]|2\\d|3[0-46-9]|4[0-6]|5[013-9]|6[1-8]|7[0-8]|8[0-24-6])|9(?:0[6-9]|[1-4]\\d|[589][0-7]|6[0-8]|7[0-467]))\\d{3,12}',
+        'example' => '30123456',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+        ],
+        'posLengthLocal' => [
+            2,
+            3,
+            4,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '15(?:[0-25-9]\\d\\d|310)\\d{6}|1(?:6[023]|7\\d)\\d{7,8}',
+        'example' => '15123456789',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{7,12}',
+        'example' => '8001234567890',
+        'posLength' => [
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '(?:137[7-9]|900(?:[135]|9\\d))\\d{6}',
+        'example' => '9001234567',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '180\\d{5,11}|13(?:7[1-6]\\d\\d|8)\\d{4}',
+        'example' => '18012345',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '700\\d{8}',
+        'example' => '70012345678',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '16(?:4\\d{1,10}|[89]\\d{1,11})',
+        'example' => '16412345',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '18(?:1\\d{5,11}|[2-9]\\d{8})',
+        'example' => '18500123456',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+        ],
+    ],
+    'voicemail' => [
+        'pattern' => '1(?:6(?:013|255|399)|7(?:(?:[015]1|[69]3)3|[2-4]55|[78]99))\\d{7,8}|15(?:(?:[03-68]00|113)\\d|2\\d55|7\\d99|9\\d33)\\d{7}',
+        'example' => '177991234567',
+        'posLength' => [
+            12,
+            13,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3,13})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3[02]|40|[68]9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,12})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2(?:0[1-389]|1[124]|2[18]|3[14])|3(?:[35-9][15]|4[015])|906|(?:2[4-9]|4[2-9]|[579][1-9]|[68][1-8])1',
+                '2(?:0[1-389]|12[0-8])|3(?:[35-9][15]|4[015])|906|2(?:[13][14]|2[18])|(?:2[4-9]|4[2-9]|[579][1-9]|[68][1-8])1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2,11})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[24-6]|3(?:[3569][02-46-9]|4[2-4679]|7[2-467]|8[2-46-8])|70[2-8]|8(?:0[2-9]|[1-8])|90[7-9]|[79][1-9]',
+                '[24-6]|3(?:3(?:0[1-467]|2[127-9]|3[124578]|7[1257-9]|8[1256]|9[145])|4(?:2[135]|4[13578]|9[1346])|5(?:0[14]|2[1-3589]|6[1-4]|7[13468]|8[13568])|6(?:2[1-489]|3[124-6]|6[13]|7[12579]|8[1-356]|9[135])|7(?:2[1-7]|4[145]|6[1-5]|7[1-4])|8(?:21|3[1468]|6|7[1467]|8[136])|9(?:0[12479]|2[1358]|4[134679]|6[1-9]|7[136]|8[147]|9[1468]))|70[2-8]|8(?:0[2-9]|[1-8])|90[7-9]|[79][1-9]|3[68]4[1347]|3(?:47|60)[1356]|3(?:3[46]|46|5[49])[1246]|3[4579]3[1357]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '138',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{2,10})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,11})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '181',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d)(\\d{4,10})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:3|80)|9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1[67]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7,12})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '185',
+                '1850',
+                '18500',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '18[68]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '15[1279]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '15[03568]',
+                '15(?:[0568]|31)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '18',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{7,8})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:6[023]|7)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{7})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '15[279]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{8})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '15',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_DJ.php b/src/data/PhoneNumberMetadata_DJ.php
index e0259e953..4a7bffbdf 100644
--- a/src/data/PhoneNumberMetadata_DJ.php
+++ b/src/data/PhoneNumberMetadata_DJ.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:2\\d|77)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'DJ',
+    'countryCode' => 253,
+    'generalDesc' => [
+        'pattern' => '(?:2\\d|77)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:1[2-5]|7[45])\\d{5}',
-    'ExampleNumber' => '21360003',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '77\\d{6}',
-    'ExampleNumber' => '77831001',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:1[2-5]|7[45])\\d{5}',
+        'example' => '21360003',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '77\\d{6}',
+        'example' => '77831001',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'DJ',
-  'countryCode' => 253,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[27]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[27]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_DK.php b/src/data/PhoneNumberMetadata_DK.php
index 7d45c93bf..75c4d7fda 100644
--- a/src/data/PhoneNumberMetadata_DK.php
+++ b/src/data/PhoneNumberMetadata_DK.php
@@ -6,103 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'DK',
+    'countryCode' => 45,
+    'generalDesc' => [
+        'pattern' => '[2-9]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:2\\d|9[1-46-9])\\d|3(?:[0-37]\\d|4[013]|5[0-58]|6[01347-9]|8[0-8]|9[0-79])|4(?:[0-25]\\d|[34][02-9]|6[013-579]|7[013579]|8[0-47]|9[0-27])|5(?:[0-36]\\d|4[0146-9]|5[03-57-9]|7[0568]|8[0-358]|9[0-69])|6(?:[013578]\\d|2[0-68]|4[02-8]|6[01689]|9[015689])|7(?:[0-69]\\d|7[03-9]|8[0147])|8(?:[16-9]\\d|2[0-58]))\\d{5}',
-    'ExampleNumber' => '32123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[2-7]\\d|8[126-9]|9[1-46-9])\\d{6}',
-    'ExampleNumber' => '34412345',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{6}',
-    'ExampleNumber' => '80123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90\\d{6}',
-    'ExampleNumber' => '90123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:(?:2\\d|9[1-46-9])\\d|3(?:[0-37]\\d|4[013]|5[0-58]|6[01347-9]|8[0-8]|9[0-79])|4(?:[0-25]\\d|[34][02-9]|6[013-579]|7[013579]|8[0-47]|9[0-27])|5(?:[0-36]\\d|4[0146-9]|5[03-57-9]|7[0568]|8[0-358]|9[0-69])|6(?:[013578]\\d|2[0-68]|4[02-8]|6[01689]|9[015689])|7(?:[0-69]\\d|7[03-9]|8[0147])|8(?:[16-9]\\d|2[0-58]))\\d{5}',
+        'example' => '32123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:[2-7]\\d|8[126-9]|9[1-46-9])\\d{6}',
+        'example' => '34412345',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d{6}',
+        'example' => '80123456',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90\\d{6}',
+        'example' => '90123456',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'DK',
-  'countryCode' => 45,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_DM.php b/src/data/PhoneNumberMetadata_DM.php
index eec51935a..aaf467416 100644
--- a/src/data/PhoneNumberMetadata_DM.php
+++ b/src/data/PhoneNumberMetadata_DM.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|767|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'DM',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|767|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '767(?:2(?:55|66)|4(?:2[01]|4[0-25-9])|50[0-4])\\d{4}',
+        'example' => '7674201234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '767(?:2(?:55|66)|4(?:2[01]|4[0-25-9])|50[0-4])\\d{4}',
-    'ExampleNumber' => '7674201234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '767(?:2(?:[2-4689]5|7[5-7])|31[5-7]|61[1-8]|70[1-6])\\d{4}',
+        'example' => '7672251234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '767(?:2(?:[2-4689]5|7[5-7])|31[5-7]|61[1-8]|70[1-6])\\d{4}',
-    'ExampleNumber' => '7672251234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'DM',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-7]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '767$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '767',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-7]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '767$1',
+    'numberFormat' => [],
+    'leadingDigits' => '767',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_DO.php b/src/data/PhoneNumberMetadata_DO.php
index 57630041e..bbb9aa0c1 100644
--- a/src/data/PhoneNumberMetadata_DO.php
+++ b/src/data/PhoneNumberMetadata_DO.php
@@ -6,104 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'DO',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '8(?:[04]9[2-9]\\d\\d|29(?:2(?:[0-59]\\d|6[04-9]|7[0-27]|8[0237-9])|3(?:[0-35-9]\\d|4[7-9])|[45]\\d\\d|6(?:[0-27-9]\\d|[3-5][1-9]|6[0135-8])|7(?:0[013-9]|[1-37]\\d|4[1-35689]|5[1-4689]|6[1-57-9]|8[1-79]|9[1-8])|8(?:0[146-9]|1[0-48]|[248]\\d|3[1-79]|5[01589]|6[013-68]|7[124-8]|9[0-8])|9(?:[0-24]\\d|3[02-46-9]|5[0-79]|60|7[0169]|8[57-9]|9[02-9])))\\d{4}',
+        'example' => '8092345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '8(?:[04]9[2-9]\\d\\d|29(?:2(?:[0-59]\\d|6[04-9]|7[0-27]|8[0237-9])|3(?:[0-35-9]\\d|4[7-9])|[45]\\d\\d|6(?:[0-27-9]\\d|[3-5][1-9]|6[0135-8])|7(?:0[013-9]|[1-37]\\d|4[1-35689]|5[1-4689]|6[1-57-9]|8[1-79]|9[1-8])|8(?:0[146-9]|1[0-48]|[248]\\d|3[1-79]|5[01589]|6[013-68]|7[124-8]|9[0-8])|9(?:[0-24]\\d|3[02-46-9]|5[0-79]|60|7[0169]|8[57-9]|9[02-9])))\\d{4}',
-    'ExampleNumber' => '8092345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '8[024]9[2-9]\\d{6}',
+        'example' => '8092345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '8[024]9[2-9]\\d{6}',
-    'ExampleNumber' => '8092345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00(?:14|[2-9]\\d)|(?:33|44|55|66|77|88)[2-9]\\d)\\d{5}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00(?:14|[2-9]\\d)|(?:33|44|55|66|77|88)[2-9]\\d)\\d{5}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'DO',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '8001|8[024]9',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '1',
+    'numberFormat' => [],
+    'leadingDigits' => '8001|8[024]9',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_DZ.php b/src/data/PhoneNumberMetadata_DZ.php
index 3d3df1d52..5564baefe 100644
--- a/src/data/PhoneNumberMetadata_DZ.php
+++ b/src/data/PhoneNumberMetadata_DZ.php
@@ -6,146 +6,110 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[1-4]|[5-79]\\d|80)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'DZ',
+    'countryCode' => 213,
+    'generalDesc' => [
+        'pattern' => '(?:[1-4]|[5-79]\\d|80)\\d{7}',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '9619\\d{5}|(?:1\\d|2[013-79]|3[0-8]|4[013-689])\\d{6}',
-    'ExampleNumber' => '12345678',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:5(?:4[0-29]|5\\d|6[0-2])|6(?:[569]\\d|7[0-6])|7[7-9]\\d)\\d{6}',
-    'ExampleNumber' => '551234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '9619\\d{5}|(?:1\\d|2[013-79]|3[0-8]|4[013-689])\\d{6}',
+        'example' => '12345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '(?:5(?:4[0-29]|5\\d|6[0-2])|6(?:[569]\\d|7[0-6])|7[7-9]\\d)\\d{6}',
+        'example' => '551234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '80[3-689]1\\d{5}',
-    'ExampleNumber' => '808123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '80[12]1\\d{5}',
-    'ExampleNumber' => '801123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'premiumRate' => [
+        'pattern' => '80[3-689]1\\d{5}',
+        'example' => '808123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '80[12]1\\d{5}',
+        'example' => '801123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '98[23]\\d{6}',
-    'ExampleNumber' => '983123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '98[23]\\d{6}',
+        'example' => '983123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'DZ',
-  'countryCode' => 213,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-4]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[1-4]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[5-8]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[5-8]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_EC.php b/src/data/PhoneNumberMetadata_EC.php
index f58e5bda3..ec0cac324 100644
--- a/src/data/PhoneNumberMetadata_EC.php
+++ b/src/data/PhoneNumberMetadata_EC.php
@@ -6,205 +6,155 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{9,10}|(?:[2-7]|9\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[2-7][2-7]\\d{6}',
-    'ExampleNumber' => '22123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '964[0-2]\\d{5}|9(?:39|[57][89]|6[0-36-9]|[89]\\d)\\d{6}',
-    'ExampleNumber' => '991234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800\\d{7}|1[78]00\\d{6}',
-    'ExampleNumber' => '18001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '[2-7]890\\d{4}',
-    'ExampleNumber' => '28901234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'EC',
-  'countryCode' => 593,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]',
-      ],
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'EC',
+    'countryCode' => 593,
+    'generalDesc' => [
+        'pattern' => '1\\d{9,10}|(?:[2-7]|9\\d)\\d{7}',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '[2-7][2-7]\\d{6}',
+        'example' => '22123456',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '964[0-2]\\d{5}|9(?:39|[57][89]|6[0-36-9]|[89]\\d)\\d{6}',
+        'example' => '991234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1800\\d{7}|1[78]00\\d{6}',
+        'example' => '18001234567',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '[2-7]890\\d{4}',
+        'example' => '28901234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[2-7]',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_EE.php b/src/data/PhoneNumberMetadata_EE.php
index c67f00edd..1db49cafb 100644
--- a/src/data/PhoneNumberMetadata_EE.php
+++ b/src/data/PhoneNumberMetadata_EE.php
@@ -6,160 +6,122 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '8\\d{9}|[4578]\\d{7}|(?:[3-8]\\d|90)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 10,
+return [
+    'id' => 'EE',
+    'countryCode' => 372,
+    'generalDesc' => [
+        'pattern' => '8\\d{9}|[4578]\\d{7}|(?:[3-8]\\d|90)\\d{5}',
+        'posLength' => [
+            7,
+            8,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3[23589]|4[3-8]|6\\d|7[1-9]|88)\\d{5}',
-    'ExampleNumber' => '3212345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:3[23589]|4[3-8]|6\\d|7[1-9]|88)\\d{5}',
+        'example' => '3212345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[236]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:0(?:00|4\\d)|(?:19|[2-7]\\d)\\d)|(?:(?:[124-6]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}',
-    'ExampleNumber' => '51234567',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+    'mobile' => [
+        'pattern' => '(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[236]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:0(?:00|4\\d)|(?:19|[2-7]\\d)\\d)|(?:(?:[124-6]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}',
+        'example' => '51234567',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800(?:(?:0\\d\\d|1)\\d|[2-9])\\d{3}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:40\\d\\d|900)\\d{4}',
-    'ExampleNumber' => '9001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+    'tollFree' => [
+        'pattern' => '800(?:(?:0\\d\\d|1)\\d|[2-9])\\d{3}',
+        'example' => '80012345',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '(?:40\\d\\d|900)\\d{4}',
+        'example' => '9001234',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70[0-2]\\d{5}',
-    'ExampleNumber' => '70012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '70[0-2]\\d{5}',
+        'example' => '70012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '800[2-9]\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'EE',
-  'countryCode' => 372,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[369]|4[3-8]|5(?:[0-2]|5[0-478]|6[45])|7[1-9]|88',
-        1 => '[369]|4[3-8]|5(?:[02]|1(?:[0-8]|95)|5[0-478]|6(?:4[0-4]|5[1-589]))|7[1-9]|88',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'pattern' => '800[2-9]\\d{3}',
+        'posLength' => [
+            7,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[45]|8(?:00|[1-49])',
-        1 => '[45]|8(?:00[1-9]|[1-49])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[369]|4[3-8]|5(?:[0-2]|5[0-478]|6[45])|7[1-9]|88',
+                '[369]|4[3-8]|5(?:[02]|1(?:[0-8]|95)|5[0-478]|6(?:4[0-4]|5[1-589]))|7[1-9]|88',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[45]|8(?:00|[1-49])',
+                '[45]|8(?:00[1-9]|[1-49])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_EG.php b/src/data/PhoneNumberMetadata_EG.php
index e3d7d9581..6b9c331bd 100644
--- a/src/data/PhoneNumberMetadata_EG.php
+++ b/src/data/PhoneNumberMetadata_EG.php
@@ -6,170 +6,129 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[189]\\d{8,9}|[24-6]\\d{8}|[135]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '13[23]\\d{6}|(?:15|57)\\d{6,7}|(?:2[2-4]|3|4[05-8]|5[05]|6[24-689]|8[2468]|9[235-7])\\d{7}',
-    'ExampleNumber' => '234567890',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '1[0-25]\\d{8}',
-    'ExampleNumber' => '1001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{7}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'EG',
-  'countryCode' => 20,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{7,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[35]|[4-6]|8[2468]|9[235-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'EG',
+    'countryCode' => 20,
+    'generalDesc' => [
+        'pattern' => '[189]\\d{8,9}|[24-6]\\d{8}|[135]\\d{7}',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '13[23]\\d{6}|(?:15|57)\\d{6,7}|(?:2[2-4]|3|4[05-8]|5[05]|6[24-689]|8[2468]|9[235-7])\\d{7}',
+        'example' => '234567890',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '1[0-25]\\d{8}',
+        'example' => '1001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '900\\d{7}',
+        'example' => '9001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{7,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1[35]|[4-6]|8[2468]|9[235-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_EH.php b/src/data/PhoneNumberMetadata_EH.php
index f23bbec9a..796a0cf36 100644
--- a/src/data/PhoneNumberMetadata_EH.php
+++ b/src/data/PhoneNumberMetadata_EH.php
@@ -6,92 +6,68 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[5-8]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'EH',
+    'countryCode' => 212,
+    'generalDesc' => [
+        'pattern' => '[5-8]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '528[89]\\d{5}',
-    'ExampleNumber' => '528812345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
-    'ExampleNumber' => '650123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-7]\\d{6}',
-    'ExampleNumber' => '801234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '89\\d{7}',
-    'ExampleNumber' => '891234567',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '528[89]\\d{5}',
+        'example' => '528812345',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
+        'example' => '650123456',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}',
-    'ExampleNumber' => '592401234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-7]\\d{6}',
+        'example' => '801234567',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '89\\d{7}',
+        'example' => '891234567',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'EH',
-  'countryCode' => 212,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '528[89]',
-  'mobileNumberPortableRegion' => false,
+    'voip' => [
+        'pattern' => '(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}',
+        'example' => '592401234',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [],
+    'leadingDigits' => '528[89]',
 ];
diff --git a/src/data/PhoneNumberMetadata_ER.php b/src/data/PhoneNumberMetadata_ER.php
index de75744b9..34e1ea0fb 100644
--- a/src/data/PhoneNumberMetadata_ER.php
+++ b/src/data/PhoneNumberMetadata_ER.php
@@ -6,117 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[178]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'ER',
+    'countryCode' => 291,
+    'generalDesc' => [
+        'pattern' => '[178]\\d{6}',
+        'posLength' => [
+            7,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '(?:1(?:1[12568]|[24]0|55|6[146])|8\\d\\d)\\d{4}',
+        'example' => '8370362',
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:1[12568]|[24]0|55|6[146])|8\\d\\d)\\d{4}',
-    'ExampleNumber' => '8370362',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'mobile' => [
+        'pattern' => '(?:17[1-3]|7\\d\\d)\\d{4}',
+        'example' => '7123456',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:17[1-3]|7\\d\\d)\\d{4}',
-    'ExampleNumber' => '7123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'ER',
-  'countryCode' => 291,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[178]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[178]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_ES.php b/src/data/PhoneNumberMetadata_ES.php
index 77f399fbc..df9a1bfe4 100644
--- a/src/data/PhoneNumberMetadata_ES.php
+++ b/src/data/PhoneNumberMetadata_ES.php
@@ -6,160 +6,121 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[5-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'ES',
+    'countryCode' => 34,
+    'generalDesc' => [
+        'pattern' => '[5-9]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '96906(?:0[0-8]|1[1-9]|[2-9]\\d)\\d\\d|9(?:69(?:0[0-57-9]|[1-9]\\d)|73(?:[0-8]\\d|9[1-9]))\\d{4}|(?:8(?:[1356]\\d|[28][0-8]|[47][1-9])|9(?:[135]\\d|[268][0-8]|4[1-9]|7[124-9]))\\d{6}',
-    'ExampleNumber' => '810123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:590[16]00\\d|9(?:6906(?:09|10)|7390\\d\\d))\\d\\d|(?:6\\d|7[1-48])\\d{7}',
-    'ExampleNumber' => '612345678',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '[89]00\\d{6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '80[367]\\d{6}',
-    'ExampleNumber' => '803123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '90[12]\\d{6}',
-    'ExampleNumber' => '901123456',
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{7}',
-    'ExampleNumber' => '701234567',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '96906(?:0[0-8]|1[1-9]|[2-9]\\d)\\d\\d|9(?:69(?:0[0-57-9]|[1-9]\\d)|73(?:[0-8]\\d|9[1-9]))\\d{4}|(?:8(?:[1356]\\d|[28][0-8]|[47][1-9])|9(?:[135]\\d|[268][0-8]|4[1-9]|7[124-9]))\\d{6}',
+        'example' => '810123456',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:590[16]00\\d|9(?:6906(?:09|10)|7390\\d\\d))\\d\\d|(?:6\\d|7[1-48])\\d{7}',
+        'example' => '612345678',
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '51\\d{7}',
-    'ExampleNumber' => '511234567',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '[89]00\\d{6}',
+        'example' => '800123456',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '80[367]\\d{6}',
+        'example' => '803123456',
     ],
-  ],
-  'id' => 'ES',
-  'countryCode' => 34,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '905',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'sharedCost' => [
+        'pattern' => '90[12]\\d{6}',
+        'example' => '901123456',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[79]9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'personalNumber' => [
+        'pattern' => '70\\d{7}',
+        'example' => '701234567',
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]00',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[5-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]00',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'pattern' => '51\\d{7}',
+        'example' => '511234567',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[5-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '905',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '[79]9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]00',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[5-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]00',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[5-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_ET.php b/src/data/PhoneNumberMetadata_ET.php
index 17acabb27..61e128a2b 100644
--- a/src/data/PhoneNumberMetadata_ET.php
+++ b/src/data/PhoneNumberMetadata_ET.php
@@ -6,117 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:11|[2-579]\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'ET',
+    'countryCode' => 251,
+    'generalDesc' => [
+        'pattern' => '(?:11|[2-579]\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '11667[01]\\d{3}|(?:11(?:1(?:1[124]|2[2-7]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[578]|44|5[0-4])|6(?:1[578]|2[69]|39|4[5-7]|5[0-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|(?:22|55)[0-6]|33[0134689]|44[04]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:119|22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:(?:11|22)[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}',
+        'example' => '111112345',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '11667[01]\\d{3}|(?:11(?:1(?:1[124]|2[2-7]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[578]|44|5[0-4])|6(?:1[578]|2[69]|39|4[5-7]|5[0-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|(?:22|55)[0-6]|33[0134689]|44[04]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:119|22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:(?:11|22)[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}',
-    'ExampleNumber' => '111112345',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '700[1-9]\\d{5}|(?:7(?:0[1-9]|1[0-8]|22|77|86|99)|9\\d\\d)\\d{6}',
+        'example' => '911234567',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '700[1-9]\\d{5}|(?:7(?:0[1-9]|1[0-8]|22|77|86|99)|9\\d\\d)\\d{6}',
-    'ExampleNumber' => '911234567',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'ET',
-  'countryCode' => 251,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-579]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-579]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_FI.php b/src/data/PhoneNumberMetadata_FI.php
index 3dfc4dde8..395bb9431 100644
--- a/src/data/PhoneNumberMetadata_FI.php
+++ b/src/data/PhoneNumberMetadata_FI.php
@@ -6,271 +6,210 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-35689]\\d{4}|7\\d{10,11}|(?:[124-7]\\d|3[0-46-9])\\d{8}|[1-9]\\d{5,8}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-      6 => 11,
-      7 => 12,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1[3-79][1-8]|[23568][1-8]\\d|9(?:00|[1-8]\\d))\\d{2,6}',
-    'ExampleNumber' => '131234567',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4946\\d{2,6}|(?:4[0-8]|50)\\d{4,8}',
-    'ExampleNumber' => '412345678',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{4,6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '[67]00\\d{5,6}',
-    'ExampleNumber' => '600123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '20\\d{4,8}|60[12]\\d{5,6}|7(?:099\\d{4,5}|5[03-9]\\d{3,7})|20[2-59]\\d\\d|(?:606|7(?:0[78]|1|3\\d))\\d{7}|(?:10|29|3[09]|70[1-5]\\d)\\d{4,8}',
-    'ExampleNumber' => '10112345',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '20(?:2[023]|9[89])\\d{1,6}|(?:60[12]\\d|7099)\\d{4,5}|(?:606|7(?:0[78]|1|3\\d))\\d{7}|(?:[1-3]00|7(?:0[1-5]\\d\\d|5[03-9]))\\d{3,7}',
-  ],
-  'id' => 'FI',
-  'countryCode' => 358,
-  'internationalPrefix' => '00|99(?:[01469]|5(?:[14]1|3[23]|5[59]|77|88|9[09]))',
-  'preferredInternationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '75[12]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '20[2-59]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '11',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:[1-3]0|[68])0|70[07-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[14]|2[09]|50|7[135]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6,10})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d)(\\d{4,9})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '20[2-59]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:[1-3]0|[68])0|70[07-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[14]|2[09]|50|7[135]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6,10})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d)(\\d{4,9})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => true,
-  'leadingDigits' => '1[03-79]|[2-9]',
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'FI',
+    'countryCode' => 358,
+    'generalDesc' => [
+        'pattern' => '[1-35689]\\d{4}|7\\d{10,11}|(?:[124-7]\\d|3[0-46-9])\\d{8}|[1-9]\\d{5,8}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1[3-79][1-8]|[23568][1-8]\\d|9(?:00|[1-8]\\d))\\d{2,6}',
+        'example' => '131234567',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '4946\\d{2,6}|(?:4[0-8]|50)\\d{4,8}',
+        'example' => '412345678',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{4,6}',
+        'example' => '800123456',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '[67]00\\d{5,6}',
+        'example' => '600123456',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '20\\d{4,8}|60[12]\\d{5,6}|7(?:099\\d{4,5}|5[03-9]\\d{3,7})|20[2-59]\\d\\d|(?:606|7(?:0[78]|1|3\\d))\\d{7}|(?:10|29|3[09]|70[1-5]\\d)\\d{4,8}',
+        'example' => '10112345',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '20(?:2[023]|9[89])\\d{1,6}|(?:60[12]\\d|7099)\\d{4,5}|(?:606|7(?:0[78]|1|3\\d))\\d{7}|(?:[1-3]00|7(?:0[1-5]\\d\\d|5[03-9]))\\d{3,7}',
+    ],
+    'internationalPrefix' => '00|99(?:[01469]|5(?:[14]1|3[23]|5[59]|77|88|9[09]))',
+    'preferredInternationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '75[12]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '20[2-59]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '11',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:[1-3]0|[68])0|70[07-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[14]|2[09]|50|7[135]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6,10})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4,9})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '20[2-59]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:[1-3]0|[68])0|70[07-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[14]|2[09]|50|7[135]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6,10})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4,9})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'leadingDigits' => '1[03-79]|[2-9]',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_FJ.php b/src/data/PhoneNumberMetadata_FJ.php
index 076be2f99..09507853a 100644
--- a/src/data/PhoneNumberMetadata_FJ.php
+++ b/src/data/PhoneNumberMetadata_FJ.php
@@ -6,131 +6,97 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '45\\d{5}|(?:0800\\d|[235-9])\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 11,
+return [
+    'id' => 'FJ',
+    'countryCode' => 679,
+    'generalDesc' => [
+        'pattern' => '45\\d{5}|(?:0800\\d|[235-9])\\d{6}',
+        'posLength' => [
+            7,
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '603\\d{4}|(?:3[0-5]|6[25-7]|8[58])\\d{5}',
-    'ExampleNumber' => '3212345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '603\\d{4}|(?:3[0-5]|6[25-7]|8[58])\\d{5}',
+        'example' => '3212345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[279]\\d|45|5[01568]|8[034679])\\d{5}',
-    'ExampleNumber' => '7012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:[279]\\d|45|5[01568]|8[034679])\\d{5}',
+        'example' => '7012345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0800\\d{7}',
-    'ExampleNumber' => '08001234567',
-    'PossibleLength' =>
-     [
-      0 => 11,
+    'tollFree' => [
+        'pattern' => '0800\\d{7}',
+        'example' => '08001234567',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'FJ',
-  'countryCode' => 679,
-  'internationalPrefix' => '0(?:0|52)',
-  'preferredInternationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[235-9]|45',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '0(?:0|52)',
+    'preferredInternationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[235-9]|45',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_FK.php b/src/data/PhoneNumberMetadata_FK.php
index 13a4110e6..79d875f08 100644
--- a/src/data/PhoneNumberMetadata_FK.php
+++ b/src/data/PhoneNumberMetadata_FK.php
@@ -6,95 +6,68 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-7]\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 5,
+return [
+    'id' => 'FK',
+    'countryCode' => 500,
+    'generalDesc' => [
+        'pattern' => '[2-7]\\d{4}',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[2-47]\\d{4}',
-    'ExampleNumber' => '31234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[56]\\d{4}',
-    'ExampleNumber' => '51234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '[2-47]\\d{4}',
+        'example' => '31234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '[56]\\d{4}',
+        'example' => '51234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'FK',
-  'countryCode' => 500,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_FM.php b/src/data/PhoneNumberMetadata_FM.php
index 77e9b1582..911920ef1 100644
--- a/src/data/PhoneNumberMetadata_FM.php
+++ b/src/data/PhoneNumberMetadata_FM.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[39]\\d\\d|820)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'FM',
+    'countryCode' => 691,
+    'generalDesc' => [
+        'pattern' => '(?:[39]\\d\\d|820)\\d{4}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '31(?:00[67]|208|309)\\d\\d|(?:3(?:[2357]0[1-9]|602|804|905)|(?:820|9[2-6]\\d)\\d)\\d{3}',
-    'ExampleNumber' => '3201234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '31(?:00[67]|208|309)\\d\\d|(?:3(?:[2357]0[1-9]|602|804|905)|(?:820|9[2-7]\\d)\\d)\\d{3}',
-    'ExampleNumber' => '3501234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '31(?:00[67]|208|309)\\d\\d|(?:3(?:[2357]0[1-9]|602|804|905)|(?:820|9[2-6]\\d)\\d)\\d{3}',
+        'example' => '3201234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '31(?:00[67]|208|309)\\d\\d|(?:3(?:[2357]0[1-9]|602|804|905)|(?:820|9[2-7]\\d)\\d)\\d{3}',
+        'example' => '3501234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'FM',
-  'countryCode' => 691,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[389]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[389]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_FO.php b/src/data/PhoneNumberMetadata_FO.php
index 0cd3aec95..a53d37751 100644
--- a/src/data/PhoneNumberMetadata_FO.php
+++ b/src/data/PhoneNumberMetadata_FO.php
@@ -6,102 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
+return [
+    'id' => 'FO',
+    'countryCode' => 298,
+    'generalDesc' => [
+        'pattern' => '[2-9]\\d{5}',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:20|[34]\\d|8[19])\\d{4}',
-    'ExampleNumber' => '201234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[27][1-9]|5\\d|9[16])\\d{4}',
-    'ExampleNumber' => '211234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[257-9]\\d{3}',
-    'ExampleNumber' => '802123',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90(?:[13-5][15-7]|2[125-7]|9\\d)\\d\\d',
-    'ExampleNumber' => '901123',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:20|[34]\\d|8[19])\\d{4}',
+        'example' => '201234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:[27][1-9]|5\\d|9[16])\\d{4}',
+        'example' => '211234',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:6[0-36]|88)\\d{4}',
-    'ExampleNumber' => '601234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[257-9]\\d{3}',
+        'example' => '802123',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90(?:[13-5][15-7]|2[125-7]|9\\d)\\d\\d',
+        'example' => '901123',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'FO',
-  'countryCode' => 298,
-  'internationalPrefix' => '00',
-  'nationalPrefixForParsing' => '(10(?:01|[12]0|88))',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'pattern' => '(?:6[0-36]|88)\\d{4}',
+        'example' => '601234',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefixForParsing' => '(10(?:01|[12]0|88))',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_FR.php b/src/data/PhoneNumberMetadata_FR.php
index a0f76f5f1..386aea2a1 100644
--- a/src/data/PhoneNumberMetadata_FR.php
+++ b/src/data/PhoneNumberMetadata_FR.php
@@ -6,162 +6,123 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'FR',
+    'countryCode' => 33,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:26[013-9]|59[1-35-9])\\d{6}|(?:[13]\\d|2[0-57-9]|4[1-9]|5[0-8])\\d{7}',
-    'ExampleNumber' => '123456789',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6(?:[0-24-8]\\d|3[0-8]|9[589])|7[3-9]\\d)\\d{6}',
-    'ExampleNumber' => '612345678',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '801234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '836(?:0[0-36-9]|[1-9]\\d)\\d{4}|8(?:1[2-9]|2[2-47-9]|3[0-57-9]|[569]\\d|8[0-35-9])\\d{6}',
-    'ExampleNumber' => '891123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8(?:1[01]|2[0156]|4[02]|84)\\d{6}',
-    'ExampleNumber' => '884012345',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:26[013-9]|59[1-35-9])\\d{6}|(?:[13]\\d|2[0-57-9]|4[1-9]|5[0-8])\\d{7}',
+        'example' => '123456789',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9\\d{8}',
-    'ExampleNumber' => '912345678',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:6(?:[0-24-8]\\d|3[0-8]|9[589])|7[3-9]\\d)\\d{6}',
+        'example' => '612345678',
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '80[6-9]\\d{6}',
-    'ExampleNumber' => '806123456',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '801234567',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '836(?:0[0-36-9]|[1-9]\\d)\\d{4}|8(?:1[2-9]|2[2-47-9]|3[0-57-9]|[569]\\d|8[0-35-9])\\d{6}',
+        'example' => '891123456',
     ],
-  ],
-  'id' => 'FR',
-  'countryCode' => 33,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '10',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'sharedCost' => [
+        'pattern' => '8(?:1[01]|2[0156]|4[02]|84)\\d{6}',
+        'example' => '884012345',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'pattern' => '9\\d{8}',
+        'example' => '912345678',
     ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-79]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'pattern' => '80[6-9]\\d{6}',
+        'example' => '806123456',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-79]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '10',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '[1-79]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '[1-79]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GA.php b/src/data/PhoneNumberMetadata_GA.php
index acd0ef553..4089bc5e3 100644
--- a/src/data/PhoneNumberMetadata_GA.php
+++ b/src/data/PhoneNumberMetadata_GA.php
@@ -6,138 +6,102 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[067]\\d|11)\\d{6}|[2-7]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+return [
+    'id' => 'GA',
+    'countryCode' => 241,
+    'generalDesc' => [
+        'pattern' => '(?:[067]\\d|11)\\d{6}|[2-7]\\d{6}',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[01]1\\d{6}',
-    'ExampleNumber' => '01441234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '[01]1\\d{6}',
+        'example' => '01441234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:(?:0[2-7]|7[467])\\d|6(?:0[0-4]|10|[256]\\d))\\d{5}|[2-7]\\d{6}',
-    'ExampleNumber' => '06031234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:(?:0[2-7]|7[467])\\d|6(?:0[0-4]|10|[256]\\d))\\d{5}|[2-7]\\d{6}',
+        'example' => '06031234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GA',
-  'countryCode' => 241,
-  'internationalPrefix' => '00',
-  'nationalPrefixForParsing' => '0(11\\d{6}|60\\d{6}|61\\d{6}|6[256]\\d{6}|7[467]\\d{6})',
-  'nationalPrefixTransformRule' => '$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefixForParsing' => '0(11\\d{6}|60\\d{6}|61\\d{6}|6[256]\\d{6}|7[467]\\d{6})',
+    'nationalPrefixTransformRule' => '$1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '11|[67]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '11|[67]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_GB.php b/src/data/PhoneNumberMetadata_GB.php
index 2e2476f53..d880d034e 100644
--- a/src/data/PhoneNumberMetadata_GB.php
+++ b/src/data/PhoneNumberMetadata_GB.php
@@ -6,239 +6,188 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-357-9]\\d{9}|[18]\\d{8}|8\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
-      2 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 8,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:(?:[0-5]\\d|70)\\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[0-2]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
-    'ExampleNumber' => '1212345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:457[0-57-9]|700[01]|911[028])\\d{5}|7(?:[1-3]\\d\\d|4(?:[0-46-9]\\d|5[0-689])|5(?:0[0-8]|[13-9]\\d|2[0-35-9])|7(?:0[1-9]|[1-7]\\d|8[02-9]|9[0-689])|8(?:[014-9]\\d|[23][0-8])|9(?:[024-9]\\d|1[02-9]|3[0-689]))\\d{6}',
-    'ExampleNumber' => '7400123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[08]\\d{7}|800\\d{6}|8001111',
-    'ExampleNumber' => '8001234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:8(?:4[2-5]|7[0-3])|9(?:[01]\\d|8[2-49]))\\d{7}|845464\\d',
-    'ExampleNumber' => '9012345678',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{8}',
-    'ExampleNumber' => '7012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '56\\d{8}',
-    'ExampleNumber' => '5612345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '76(?:464|652)\\d{5}|76(?:0[0-28]|2[356]|34|4[01347]|5[49]|6[0-369]|77|8[14]|9[139])\\d{6}',
-    'ExampleNumber' => '7640123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:3[0347]|55)\\d{8}',
-    'ExampleNumber' => '5512345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'GB',
-  'countryCode' => 44,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'preferredExtnPrefix' => ' x',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-        1 => '8001',
-        2 => '80011',
-        3 => '800111',
-        4 => '8001111',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '845',
-        1 => '8454',
-        2 => '84546',
-        3 => '845464',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{5})(\\d{4,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:38|5[23]|69|76|94)',
-        1 => '1(?:(?:38|69)7|5(?:24|39)|768|946)',
-        2 => '1(?:3873|5(?:242|39[4-6])|(?:697|768)[347]|9467)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[2-69][02-9]|[78])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[25]|7(?:0|6[02-9])',
-        1 => '[25]|7(?:0|6(?:[03-9]|2[356]))',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1389]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => true,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'GB',
+    'countryCode' => 44,
+    'generalDesc' => [
+        'pattern' => '[1-357-9]\\d{9}|[18]\\d{8}|8\\d{6}',
+        'posLength' => [
+            7,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+            6,
+            8,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:(?:[0-5]\\d|70)\\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[0-2]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
+        'example' => '1212345678',
+        'posLength' => [
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '7(?:457[0-57-9]|700[01]|911[028])\\d{5}|7(?:[1-3]\\d\\d|4(?:[0-46-9]\\d|5[0-689])|5(?:0[0-8]|[13-9]\\d|2[0-35-9])|7(?:0[1-9]|[1-7]\\d|8[02-9]|9[0-689])|8(?:[014-9]\\d|[23][0-8])|9(?:[024-9]\\d|1[02-9]|3[0-689]))\\d{6}',
+        'example' => '7400123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80[08]\\d{7}|800\\d{6}|8001111',
+        'example' => '8001234567',
+    ],
+    'premiumRate' => [
+        'pattern' => '(?:8(?:4[2-5]|7[0-3])|9(?:[01]\\d|8[2-49]))\\d{7}|845464\\d',
+        'example' => '9012345678',
+        'posLength' => [
+            7,
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '70\\d{8}',
+        'example' => '7012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '56\\d{8}',
+        'example' => '5612345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '76(?:464|652)\\d{5}|76(?:0[0-28]|2[356]|34|4[01347]|5[49]|6[0-369]|77|8[14]|9[139])\\d{6}',
+        'example' => '7640123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '(?:3[0347]|55)\\d{8}',
+        'example' => '5512345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'preferredExtnPrefix' => ' x',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '800',
+                '8001',
+                '80011',
+                '800111',
+                '8001111',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '845',
+                '8454',
+                '84546',
+                '845464',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{4,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1(?:38|5[23]|69|76|94)',
+                '1(?:(?:38|69)7|5(?:24|39)|768|946)',
+                '1(?:3873|5(?:242|39[4-6])|(?:697|768)[347]|9467)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1(?:[2-69][02-9]|[78])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[25]|7(?:0|6[02-9])',
+                '[25]|7(?:0|6(?:[03-9]|2[356]))',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1389]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GD.php b/src/data/PhoneNumberMetadata_GD.php
index d52b5b748..f7cbca463 100644
--- a/src/data/PhoneNumberMetadata_GD.php
+++ b/src/data/PhoneNumberMetadata_GD.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:473|[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'GD',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:473|[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '473(?:2(?:3[0-2]|69)|3(?:2[89]|86)|4(?:[06]8|3[5-9]|4[0-4]|5[579]|73|90)|63[68]|7(?:58|84)|800|938)\\d{4}',
+        'example' => '4732691234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '473(?:2(?:3[0-2]|69)|3(?:2[89]|86)|4(?:[06]8|3[5-9]|4[0-4]|5[579]|73|90)|63[68]|7(?:58|84)|800|938)\\d{4}',
-    'ExampleNumber' => '4732691234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '473(?:4(?:0[2-79]|1[04-9]|2[0-5]|49|5[68])|5(?:2[01]|3[3-8])|901)\\d{4}',
+        'example' => '4734031234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '473(?:4(?:0[2-79]|1[04-9]|2[0-5]|49|5[68])|5(?:2[01]|3[3-8])|901)\\d{4}',
-    'ExampleNumber' => '4734031234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GD',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '473$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '473',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '473$1',
+    'numberFormat' => [],
+    'leadingDigits' => '473',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GE.php b/src/data/PhoneNumberMetadata_GE.php
index 661916148..39186ae11 100644
--- a/src/data/PhoneNumberMetadata_GE.php
+++ b/src/data/PhoneNumberMetadata_GE.php
@@ -6,148 +6,112 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[3-57]\\d\\d|800)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'GE',
+    'countryCode' => 995,
+    'generalDesc' => [
+        'pattern' => '(?:[3-57]\\d\\d|800)\\d{6}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:3(?:[256]\\d|4[124-9]|7[0-4])|4(?:1\\d|2[2-7]|3[1-79]|4[2-8]|7[239]|9[1-7]))\\d{6}',
+        'example' => '322123456',
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:[256]\\d|4[124-9]|7[0-4])|4(?:1\\d|2[2-7]|3[1-79]|4[2-8]|7[239]|9[1-7]))\\d{6}',
-    'ExampleNumber' => '322123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
+    'mobile' => [
+        'pattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:0(?:0(?:0\\d|11|22|33|44|5[05]|77|88|9[09])|111)|1(?:1(?:[03][01]|[124]\\d)|4\\d\\d)|(?:44|6[89])\\d\\d|5(?:[0157-9]\\d\\d|200)|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|58[89]|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}',
+        'example' => '555123456',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:0(?:0(?:0\\d|11|22|33|44|5[05]|77|88|9[09])|111)|1(?:1(?:[03][01]|[124]\\d)|4\\d\\d)|(?:44|6[89])\\d\\d|5(?:[0157-9]\\d\\d|200)|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|58[89]|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}',
-    'ExampleNumber' => '555123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '70[67]\\d{6}',
-    'ExampleNumber' => '706123456',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '70[67]\\d{6}',
+        'example' => '706123456',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '70[67]\\d{6}',
-  ],
-  'id' => 'GE',
-  'countryCode' => 995,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '70',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '32',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[57]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'pattern' => '70[67]\\d{6}',
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[348]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '70',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '32',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[57]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[348]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GF.php b/src/data/PhoneNumberMetadata_GF.php
index 87f22a9b5..50a3b31fe 100644
--- a/src/data/PhoneNumberMetadata_GF.php
+++ b/src/data/PhoneNumberMetadata_GF.php
@@ -6,117 +6,88 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[56]94\\d{6}|(?:80|9\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'GF',
+    'countryCode' => 594,
+    'generalDesc' => [
+        'pattern' => '[56]94\\d{6}|(?:80|9\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '594(?:[02-49]\\d|1[0-5]|5[6-9]|6[0-3]|80)\\d{4}',
-    'ExampleNumber' => '594101234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '694(?:[0-249]\\d|3[0-8])\\d{4}',
-    'ExampleNumber' => '694201234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '800012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '594(?:[02-49]\\d|1[0-5]|5[6-9]|6[0-3]|80)\\d{4}',
+        'example' => '594101234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '694(?:[0-249]\\d|3[0-8])\\d{4}',
+        'example' => '694201234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '800012345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:(?:396|76\\d)\\d|476[0-5])\\d{4}',
-    'ExampleNumber' => '976012345',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '9(?:(?:396|76\\d)\\d|476[0-5])\\d{4}',
+        'example' => '976012345',
     ],
-  ],
-  'id' => 'GF',
-  'countryCode' => 594,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[56]|9[47]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[56]|9[47]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GG.php b/src/data/PhoneNumberMetadata_GG.php
index 05e7ed03e..86dd0c82e 100644
--- a/src/data/PhoneNumberMetadata_GG.php
+++ b/src/data/PhoneNumberMetadata_GG.php
@@ -6,125 +6,95 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:1481|[357-9]\\d{3})\\d{6}|8\\d{6}(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
-      2 => 10,
+return [
+    'id' => 'GG',
+    'countryCode' => 44,
+    'generalDesc' => [
+        'pattern' => '(?:1481|[357-9]\\d{3})\\d{6}|8\\d{6}(?:\\d{2})?',
+        'posLength' => [
+            7,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '1481[25-9]\\d{5}',
+        'example' => '1481256789',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1481[25-9]\\d{5}',
-    'ExampleNumber' => '1481256789',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'mobile' => [
+        'pattern' => '7(?:(?:781|839)\\d|911[17])\\d{5}',
+        'example' => '7781123456',
+        'posLength' => [
+            10,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'tollFree' => [
+        'pattern' => '80[08]\\d{7}|800\\d{6}|8001111',
+        'example' => '8001234567',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:(?:781|839)\\d|911[17])\\d{5}',
-    'ExampleNumber' => '7781123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'premiumRate' => [
+        'pattern' => '(?:8(?:4[2-5]|7[0-3])|9(?:[01]\\d|8[0-3]))\\d{7}|845464\\d',
+        'example' => '9012345678',
+        'posLength' => [
+            7,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[08]\\d{7}|800\\d{6}|8001111',
-    'ExampleNumber' => '8001234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:8(?:4[2-5]|7[0-3])|9(?:[01]\\d|8[0-3]))\\d{7}|845464\\d',
-    'ExampleNumber' => '9012345678',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '70\\d{8}',
+        'example' => '7012345678',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{8}',
-    'ExampleNumber' => '7012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'voip' => [
+        'pattern' => '56\\d{8}',
+        'example' => '5612345678',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '56\\d{8}',
-    'ExampleNumber' => '5612345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'pager' => [
+        'pattern' => '76(?:464|652)\\d{5}|76(?:0[0-28]|2[356]|34|4[01347]|5[49]|6[0-369]|77|8[14]|9[139])\\d{6}',
+        'example' => '7640123456',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '76(?:464|652)\\d{5}|76(?:0[0-28]|2[356]|34|4[01347]|5[49]|6[0-369]|77|8[14]|9[139])\\d{6}',
-    'ExampleNumber' => '7640123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'uan' => [
+        'pattern' => '(?:3[0347]|55)\\d{8}',
+        'example' => '5512345678',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:3[0347]|55)\\d{8}',
-    'ExampleNumber' => '5512345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'GG',
-  'countryCode' => 44,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '([25-9]\\d{5})$|0',
-  'nationalPrefixTransformRule' => '1481$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '([25-9]\\d{5})$|0',
+    'nationalPrefixTransformRule' => '1481$1',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_GH.php b/src/data/PhoneNumberMetadata_GH.php
index 0efcee568..c8553f231 100644
--- a/src/data/PhoneNumberMetadata_GH.php
+++ b/src/data/PhoneNumberMetadata_GH.php
@@ -6,180 +6,135 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[235]\\d{3}|800)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '3082[0-5]\\d{4}|3(?:0(?:[237]\\d|8[01])|[167](?:2[0-6]|7\\d|80)|2(?:2[0-5]|7\\d|80)|3(?:2[0-3]|7\\d|80)|4(?:2[013-9]|3[01]|7\\d|80)|5(?:2[0-7]|7\\d|80)|8(?:2[0-2]|7\\d|80)|9(?:[28]0|7\\d))\\d{5}',
-    'ExampleNumber' => '302345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:[0346-9]\\d|5[67])|5(?:[03-7]\\d|9[1-9]))\\d{6}',
-    'ExampleNumber' => '231234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'id' => 'GH',
-  'countryCode' => 233,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[237]|8[0-2]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[235]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[235]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'GH',
+    'countryCode' => 233,
+    'generalDesc' => [
+        'pattern' => '(?:[235]\\d{3}|800)\\d{5}',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '3082[0-5]\\d{4}|3(?:0(?:[237]\\d|8[01])|[167](?:2[0-6]|7\\d|80)|2(?:2[0-5]|7\\d|80)|3(?:2[0-3]|7\\d|80)|4(?:2[013-9]|3[01]|7\\d|80)|5(?:2[0-7]|7\\d|80)|8(?:2[0-2]|7\\d|80)|9(?:[28]0|7\\d))\\d{5}',
+        'example' => '302345678',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:2(?:[0346-9]\\d|5[67])|5(?:[03-7]\\d|9[1-9]))\\d{6}',
+        'example' => '231234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '800\\d{5}',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[237]|8[0-2]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[235]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[235]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GI.php b/src/data/PhoneNumberMetadata_GI.php
index 0d914d4ee..dec853a96 100644
--- a/src/data/PhoneNumberMetadata_GI.php
+++ b/src/data/PhoneNumberMetadata_GI.php
@@ -6,107 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[25]\\d|60)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'GI',
+    'countryCode' => 350,
+    'generalDesc' => [
+        'pattern' => '(?:[25]\\d|60)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2190[0-2]\\d{3}|2(?:0(?:[02]\\d|3[01])|16[24-9]|2[2-5]\\d)\\d{4}',
-    'ExampleNumber' => '20012345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '5251[0-4]\\d{3}|(?:5(?:[146-8]\\d\\d|250)|60(?:1[01]|6\\d))\\d{4}',
-    'ExampleNumber' => '57123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2190[0-2]\\d{3}|2(?:0(?:[02]\\d|3[01])|16[24-9]|2[2-5]\\d)\\d{4}',
+        'example' => '20012345',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '5251[0-4]\\d{3}|(?:5(?:[146-8]\\d\\d|250)|60(?:1[01]|6\\d))\\d{4}',
+        'example' => '57123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GI',
-  'countryCode' => 350,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GL.php b/src/data/PhoneNumberMetadata_GL.php
index df0a77201..84aeba9f7 100644
--- a/src/data/PhoneNumberMetadata_GL.php
+++ b/src/data/PhoneNumberMetadata_GL.php
@@ -6,103 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:19|[2-689]\\d|70)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 6,
+return [
+    'id' => 'GL',
+    'countryCode' => 299,
+    'generalDesc' => [
+        'pattern' => '(?:19|[2-689]\\d|70)\\d{4}',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:19|3[1-7]|[68][1-9]|70|9\\d)\\d{4}',
-    'ExampleNumber' => '321000',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[245]\\d{5}',
-    'ExampleNumber' => '221234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{4}',
-    'ExampleNumber' => '801234',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:19|3[1-7]|[68][1-9]|70|9\\d)\\d{4}',
+        'example' => '321000',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '[245]\\d{5}',
+        'example' => '221234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d{4}',
+        'example' => '801234',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '3[89]\\d{4}',
-    'ExampleNumber' => '381234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '3[89]\\d{4}',
+        'example' => '381234',
     ],
-  ],
-  'id' => 'GL',
-  'countryCode' => 299,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '19|[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '19|[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_GM.php b/src/data/PhoneNumberMetadata_GM.php
index 94ee01615..2f6c859a0 100644
--- a/src/data/PhoneNumberMetadata_GM.php
+++ b/src/data/PhoneNumberMetadata_GM.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'GM',
+    'countryCode' => 220,
+    'generalDesc' => [
+        'pattern' => '[2-9]\\d{6}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:4(?:[23]\\d\\d|4(?:1[024679]|[6-9]\\d))|5(?:5(?:3\\d|4[0-7])|6[67]\\d|7(?:1[04]|2[035]|3[58]|48))|8\\d{3})\\d{3}',
-    'ExampleNumber' => '5661234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[23679]\\d|5[0-489])\\d{5}',
-    'ExampleNumber' => '3012345',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:4(?:[23]\\d\\d|4(?:1[024679]|[6-9]\\d))|5(?:5(?:3\\d|4[0-7])|6[67]\\d|7(?:1[04]|2[035]|3[58]|48))|8\\d{3})\\d{3}',
+        'example' => '5661234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:[23679]\\d|5[0-489])\\d{5}',
+        'example' => '3012345',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GM',
-  'countryCode' => 220,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_GN.php b/src/data/PhoneNumberMetadata_GN.php
index 08063df91..3a3c8d65a 100644
--- a/src/data/PhoneNumberMetadata_GN.php
+++ b/src/data/PhoneNumberMetadata_GN.php
@@ -6,130 +6,96 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '722\\d{6}|(?:3|6\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'GN',
+    'countryCode' => 224,
+    'generalDesc' => [
+        'pattern' => '722\\d{6}|(?:3|6\\d)\\d{7}',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '3(?:0(?:24|3[12]|4[1-35-7]|5[13]|6[189]|[78]1|9[1478])|1\\d\\d)\\d{4}',
-    'ExampleNumber' => '30241234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '3(?:0(?:24|3[12]|4[1-35-7]|5[13]|6[189]|[78]1|9[1478])|1\\d\\d)\\d{4}',
+        'example' => '30241234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6[0-356]\\d{7}',
-    'ExampleNumber' => '601123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '6[0-356]\\d{7}',
+        'example' => '601123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '722\\d{6}',
-    'ExampleNumber' => '722123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'voip' => [
+        'pattern' => '722\\d{6}',
+        'example' => '722123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GN',
-  'countryCode' => 224,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[67]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[67]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_GP.php b/src/data/PhoneNumberMetadata_GP.php
index 50137f4e1..88dc83e69 100644
--- a/src/data/PhoneNumberMetadata_GP.php
+++ b/src/data/PhoneNumberMetadata_GP.php
@@ -6,117 +6,89 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'GP',
+    'countryCode' => 590,
+    'generalDesc' => [
+        'pattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '590(?:0[1-68]|[14][0-24-9]|2[0-68]|3[1-9]|5[3-579]|[68][0-689]|7[08]|9\\d)\\d{4}',
-    'ExampleNumber' => '590201234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
-    'ExampleNumber' => '690001234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '800012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '590(?:0[1-68]|[14][0-24-9]|2[0-68]|3[1-9]|5[3-579]|[68][0-689]|7[08]|9\\d)\\d{4}',
+        'example' => '590201234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
+        'example' => '690001234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '800012345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
-    'ExampleNumber' => '976012345',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
+        'example' => '976012345',
     ],
-  ],
-  'id' => 'GP',
-  'countryCode' => 590,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[569]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => true,
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[569]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GQ.php b/src/data/PhoneNumberMetadata_GQ.php
index d4e885ab9..eddda44ca 100644
--- a/src/data/PhoneNumberMetadata_GQ.php
+++ b/src/data/PhoneNumberMetadata_GQ.php
@@ -6,115 +6,85 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '222\\d{6}|(?:3\\d|55|[89]0)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'GQ',
+    'countryCode' => 240,
+    'generalDesc' => [
+        'pattern' => '222\\d{6}|(?:3\\d|55|[89]0)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '33[0-24-9]\\d[46]\\d{4}|3(?:33|5\\d)\\d[7-9]\\d{4}',
-    'ExampleNumber' => '333091234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:222|55\\d)\\d{6}',
-    'ExampleNumber' => '222123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d[1-9]\\d{5}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90\\d[1-9]\\d{5}',
-    'ExampleNumber' => '900123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '33[0-24-9]\\d[46]\\d{4}|3(?:33|5\\d)\\d[7-9]\\d{4}',
+        'example' => '333091234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:222|55\\d)\\d{6}',
+        'example' => '222123456',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d[1-9]\\d{5}',
+        'example' => '800123456',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90\\d[1-9]\\d{5}',
+        'example' => '900123456',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GQ',
-  'countryCode' => 240,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[235]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[235]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_GR.php b/src/data/PhoneNumberMetadata_GR.php
index 3a5b6b2e4..723726e19 100644
--- a/src/data/PhoneNumberMetadata_GR.php
+++ b/src/data/PhoneNumberMetadata_GR.php
@@ -6,159 +6,121 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '5005000\\d{3}|8\\d{9,11}|(?:[269]\\d|70)\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-      2 => 12,
+return [
+    'id' => 'GR',
+    'countryCode' => 30,
+    'generalDesc' => [
+        'pattern' => '5005000\\d{3}|8\\d{9,11}|(?:[269]\\d|70)\\d{8}',
+        'posLength' => [
+            10,
+            11,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:1\\d\\d|2(?:2[1-46-9]|[36][1-8]|4[1-7]|5[1-4]|7[1-5]|[89][1-9])|3(?:1\\d|2[1-57]|[35][1-3]|4[13]|7[1-7]|8[124-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[29][1-4]|3[1-5]|4[124]|5[1-6])|6(?:1\\d|[269][1-6]|3[1245]|4[1-7]|5[13-9]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[135]|9[125-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-57]))\\d{6}',
-    'ExampleNumber' => '2123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'fixedLine' => [
+        'pattern' => '2(?:1\\d\\d|2(?:2[1-46-9]|[36][1-8]|4[1-7]|5[1-4]|7[1-5]|[89][1-9])|3(?:1\\d|2[1-57]|[35][1-3]|4[13]|7[1-7]|8[124-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[29][1-4]|3[1-5]|4[124]|5[1-6])|6(?:1\\d|[269][1-6]|3[1245]|4[1-7]|5[13-9]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[135]|9[125-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-57]))\\d{6}',
+        'example' => '2123456789',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '68[57-9]\\d{7}|(?:69|94)\\d{8}',
-    'ExampleNumber' => '6912345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'mobile' => [
+        'pattern' => '68[57-9]\\d{7}|(?:69|94)\\d{8}',
+        'example' => '6912345678',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7,9}',
-    'ExampleNumber' => '8001234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[19]\\d{7}',
-    'ExampleNumber' => '9091234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'tollFree' => [
+        'pattern' => '800\\d{7,9}',
+        'example' => '8001234567',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8(?:0[16]|12|[27]5|50)\\d{7}',
-    'ExampleNumber' => '8011234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'premiumRate' => [
+        'pattern' => '90[19]\\d{7}',
+        'example' => '9091234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{8}',
-    'ExampleNumber' => '7012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'sharedCost' => [
+        'pattern' => '8(?:0[16]|12|[27]5|50)\\d{7}',
+        'example' => '8011234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '70\\d{8}',
+        'example' => '7012345678',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '5005000\\d{3}',
-    'ExampleNumber' => '5005000123',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '5005000\\d{3}',
+        'example' => '5005000123',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GR',
-  'countryCode' => 30,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '21|7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:2|3[2-57-9]|4[2-469]|5[2-59]|6[2-9]|7[2-69]|8[2-49])|5',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '21|7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2(?:2|3[2-57-9]|4[2-469]|5[2-59]|6[2-9]|7[2-69]|8[2-49])|5',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2689]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2689]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_GT.php b/src/data/PhoneNumberMetadata_GT.php
index c68af8cd5..00c792f7b 100644
--- a/src/data/PhoneNumberMetadata_GT.php
+++ b/src/data/PhoneNumberMetadata_GT.php
@@ -6,132 +6,98 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '80\\d{6}|(?:1\\d{3}|[2-7])\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 11,
+return [
+    'id' => 'GT',
+    'countryCode' => 502,
+    'generalDesc' => [
+        'pattern' => '80\\d{6}|(?:1\\d{3}|[2-7])\\d{7}',
+        'posLength' => [
+            8,
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[267][2-9]\\d{6}',
-    'ExampleNumber' => '22456789',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '[267][2-9]\\d{6}',
+        'example' => '22456789',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[3-5]\\d\\d|80[0-4])\\d{5}',
-    'ExampleNumber' => '51234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '(?:[3-5]\\d\\d|80[0-4])\\d{5}',
+        'example' => '51234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '18[01]\\d{8}',
-    'ExampleNumber' => '18001112222',
-    'PossibleLength' =>
-     [
-      0 => 11,
+    'tollFree' => [
+        'pattern' => '18[01]\\d{8}',
+        'example' => '18001112222',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '19\\d{9}',
-    'ExampleNumber' => '19001112222',
-    'PossibleLength' =>
-     [
-      0 => 11,
+    'premiumRate' => [
+        'pattern' => '19\\d{9}',
+        'example' => '19001112222',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GT',
-  'countryCode' => 502,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-8]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-8]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_GU.php b/src/data/PhoneNumberMetadata_GU.php
index 3fbf178de..fd2665c5c 100644
--- a/src/data/PhoneNumberMetadata_GU.php
+++ b/src/data/PhoneNumberMetadata_GU.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|671|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'GU',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|671|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '671(?:2\\d\\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-46-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[48])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\\d{4}',
+        'example' => '6713001234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '671(?:2\\d\\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-46-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[48])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\\d{4}',
-    'ExampleNumber' => '6713001234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '671(?:2\\d\\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-46-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[48])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\\d{4}',
+        'example' => '6713001234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '671(?:2\\d\\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-46-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[48])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\\d{4}',
-    'ExampleNumber' => '6713001234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GU',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '671$1',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '671',
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '671$1',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [],
+    'leadingDigits' => '671',
 ];
diff --git a/src/data/PhoneNumberMetadata_GW.php b/src/data/PhoneNumberMetadata_GW.php
index 01b4ea381..b880f5558 100644
--- a/src/data/PhoneNumberMetadata_GW.php
+++ b/src/data/PhoneNumberMetadata_GW.php
@@ -6,130 +6,96 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[49]\\d{8}|4\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
+return [
+    'id' => 'GW',
+    'countryCode' => 245,
+    'generalDesc' => [
+        'pattern' => '[49]\\d{8}|4\\d{6}',
+        'posLength' => [
+            7,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '443\\d{6}',
-    'ExampleNumber' => '443201234',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '443\\d{6}',
+        'example' => '443201234',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9(?:5\\d|6[569]|77)\\d{6}',
-    'ExampleNumber' => '955012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '9(?:5\\d|6[569]|77)\\d{6}',
+        'example' => '955012345',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '40\\d{5}',
-    'ExampleNumber' => '4012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'voip' => [
+        'pattern' => '40\\d{5}',
+        'example' => '4012345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GW',
-  'countryCode' => 245,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '40',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '40',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[49]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[49]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_GY.php b/src/data/PhoneNumberMetadata_GY.php
index 4d07dcdc7..425c0ab65 100644
--- a/src/data/PhoneNumberMetadata_GY.php
+++ b/src/data/PhoneNumberMetadata_GY.php
@@ -6,101 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-8]\\d{3}|9008)\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'GY',
+    'countryCode' => 592,
+    'generalDesc' => [
+        'pattern' => '(?:[2-8]\\d{3}|9008)\\d{3}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:1[6-9]|2[0-35-9]|3[1-4]|5[3-9]|6\\d|7[0-79])|3(?:2[25-9]|3\\d)|4(?:4[0-24]|5[56])|50[0-6]|77[1-57])\\d{4}',
-    'ExampleNumber' => '2201234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[01]\\d|2[1256]|3[12]|49))\\d{4}',
-    'ExampleNumber' => '6091234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:289|8(?:00|6[28]|88|99))\\d{4}',
-    'ExampleNumber' => '2891234',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9008\\d{3}',
-    'ExampleNumber' => '9008123',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:2(?:1[6-9]|2[0-35-9]|3[1-4]|5[3-9]|6\\d|7[0-79])|3(?:2[25-9]|3\\d)|4(?:4[0-24]|5[56])|50[0-6]|77[1-57])\\d{4}',
+        'example' => '2201234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:510|6\\d\\d|7(?:[01]\\d|2[1256]|3[12]|49))\\d{4}',
+        'example' => '6091234',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '515\\d{4}',
-    'ExampleNumber' => '5151234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '(?:289|8(?:00|6[28]|88|99))\\d{4}',
+        'example' => '2891234',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '9008\\d{3}',
+        'example' => '9008123',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GY',
-  'countryCode' => 592,
-  'internationalPrefix' => '001',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'pattern' => '515\\d{4}',
+        'example' => '5151234',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '001',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php
index 572288417..44658c02e 100644
--- a/src/data/PhoneNumberMetadata_HK.php
+++ b/src/data/PhoneNumberMetadata_HK.php
@@ -6,172 +6,133 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '8[0-46-9]\\d{6,7}|9\\d{4,7}|(?:[2-7]|9\\d{3})\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 11,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[59]\\d|6[01]))|58(?:0[1-9]|1[2-9]))\\d{4}',
-    'ExampleNumber' => '21234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-8]|6[02357-9])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[129]|84[0-29]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
-    'ExampleNumber' => '51234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900(?:[0-24-9]\\d{7}|3\\d{1,4})',
-    'ExampleNumber' => '90012345678',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 11,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '8(?:1[0-4679]\\d|2(?:[0-36]\\d|7[0-4])|3(?:[034]\\d|2[09]|70))\\d{4}',
-    'ExampleNumber' => '81123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '7(?:1(?:0[0-38]|1[0-3679]|3[013]|69|9[0136])|2(?:[02389]\\d|1[18]|7[27-9])|3(?:[0-38]\\d|7[0-369]|9[2357-9])|47\\d|5(?:[178]\\d|5[0-5])|6(?:0[0-7]|2[236-9]|[35]\\d)|7(?:[27]\\d|8[7-9])|8(?:[23689]\\d|7[1-9])|9(?:[025]\\d|6[0-246-8]|7[0-36-9]|8[238]))\\d{4}',
-    'ExampleNumber' => '71123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '30(?:0[1-9]|[15-7]\\d|2[047]|89)\\d{4}',
-    'ExampleNumber' => '30161234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'HK',
-  'countryCode' => 852,
-  'internationalPrefix' => '00(?:30|5[09]|[126-9]?)',
-  'preferredInternationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '900',
-        1 => '9003',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]|8[1-4]|9(?:0[1-9]|[1-8])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'HK',
+    'countryCode' => 852,
+    'generalDesc' => [
+        'pattern' => '8[0-46-9]\\d{6,7}|9\\d{4,7}|(?:[2-7]|9\\d{3})\\d{7}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[59]\\d|6[01]))|58(?:0[1-9]|1[2-9]))\\d{4}',
+        'example' => '21234567',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-8]|6[02357-9])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[129]|84[0-29]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
+        'example' => '51234567',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '900(?:[0-24-9]\\d{7}|3\\d{1,4})',
+        'example' => '90012345678',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            11,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '8(?:1[0-4679]\\d|2(?:[0-36]\\d|7[0-4])|3(?:[034]\\d|2[09]|70))\\d{4}',
+        'example' => '81123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '7(?:1(?:0[0-38]|1[0-3679]|3[013]|69|9[0136])|2(?:[02389]\\d|1[18]|7[27-9])|3(?:[0-38]\\d|7[0-369]|9[2357-9])|47\\d|5(?:[178]\\d|5[0-5])|6(?:0[0-7]|2[236-9]|[35]\\d)|7(?:[27]\\d|8[7-9])|8(?:[23689]\\d|7[1-9])|9(?:[025]\\d|6[0-246-8]|7[0-36-9]|8[238]))\\d{4}',
+        'example' => '71123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '30(?:0[1-9]|[15-7]\\d|2[047]|89)\\d{4}',
+        'example' => '30161234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00(?:30|5[09]|[126-9]?)',
+    'preferredInternationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '900',
+                '9003',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-7]|8[1-4]|9(?:0[1-9]|[1-8])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_HN.php b/src/data/PhoneNumberMetadata_HN.php
index f4dd83c1d..b2b94595a 100644
--- a/src/data/PhoneNumberMetadata_HN.php
+++ b/src/data/PhoneNumberMetadata_HN.php
@@ -6,146 +6,108 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '8\\d{10}|[237-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 11,
+return [
+    'id' => 'HN',
+    'countryCode' => 504,
+    'generalDesc' => [
+        'pattern' => '8\\d{10}|[237-9]\\d{7}',
+        'posLength' => [
+            8,
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:2(?:0[0-59]|1[1-9]|[23]\\d|4[02-6]|5[57]|6[245]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[578]|2[3-59]|3[13-9]|4[0-68]|5[1-3589])|5(?:0[2357-9]|1[1-356]|4[03-5]|5\\d|6[014-69]|7[04]|80)|6(?:[056]\\d|17|2[067]|3[047]|4[0-378]|[78][0-8]|9[01])|7(?:0[5-79]|6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\\d{4}',
-    'ExampleNumber' => '22123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '2(?:2(?:0[0-59]|1[1-9]|[23]\\d|4[02-6]|5[57]|6[245]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[578]|2[3-59]|3[13-9]|4[0-68]|5[1-3589])|5(?:0[2357-9]|1[1-356]|4[03-5]|5\\d|6[014-69]|7[04]|80)|6(?:[056]\\d|17|2[067]|3[047]|4[0-378]|[78][0-8]|9[01])|7(?:0[5-79]|6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\\d{4}',
+        'example' => '22123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[37-9]\\d{7}',
-    'ExampleNumber' => '91234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '[37-9]\\d{7}',
+        'example' => '91234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8002\\d{7}',
-    'ExampleNumber' => '80021234567',
-    'PossibleLength' =>
-     [
-      0 => 11,
+    'tollFree' => [
+        'pattern' => '8002\\d{7}',
+        'example' => '80021234567',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '8002\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 11,
+    'noInternationalDialling' => [
+        'pattern' => '8002\\d{7}',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'id' => 'HN',
-  'countryCode' => 504,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[237-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[237-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[237-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[237-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_HR.php b/src/data/PhoneNumberMetadata_HR.php
index 7b61e56f9..e6461d3da 100644
--- a/src/data/PhoneNumberMetadata_HR.php
+++ b/src/data/PhoneNumberMetadata_HR.php
@@ -6,212 +6,163 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[24-69]\\d|3[0-79])\\d{7}|80\\d{5,7}|[1-79]\\d{7}|6\\d{5,6}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1\\d{7}|(?:2[0-3]|3[1-5]|4[02-47-9]|5[1-3])\\d{6,7}',
-    'ExampleNumber' => '12345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|55|77|9[5-7])))\\d{4}|98\\d{6}',
-    'ExampleNumber' => '921234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{5,7}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '6[01459]\\d{6}|6[01]\\d{4,5}',
-    'ExampleNumber' => '611234',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '7[45]\\d{6}',
-    'ExampleNumber' => '74123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '62\\d{6,7}|72\\d{6}',
-    'ExampleNumber' => '62123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'HR',
-  'countryCode' => 385,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6[01]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6|7[245]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-57]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'HR',
+    'countryCode' => 385,
+    'generalDesc' => [
+        'pattern' => '(?:[24-69]\\d|3[0-79])\\d{7}|80\\d{5,7}|[1-79]\\d{7}|6\\d{5,6}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '1\\d{7}|(?:2[0-3]|3[1-5]|4[02-47-9]|5[1-3])\\d{6,7}',
+        'example' => '12345678',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|55|77|9[5-7])))\\d{4}|98\\d{6}',
+        'example' => '921234567',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80\\d{5,7}',
+        'example' => '800123456',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '6[01459]\\d{6}|6[01]\\d{4,5}',
+        'example' => '611234',
+        'posLength' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '7[45]\\d{6}',
+        'example' => '74123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '62\\d{6,7}|72\\d{6}',
+        'example' => '62123456',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6[01]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6|7[245]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-57]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_HT.php b/src/data/PhoneNumberMetadata_HT.php
index d06ce9c54..683ccc5b3 100644
--- a/src/data/PhoneNumberMetadata_HT.php
+++ b/src/data/PhoneNumberMetadata_HT.php
@@ -6,103 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-489]\\d|55)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'HT',
+    'countryCode' => 509,
+    'generalDesc' => [
+        'pattern' => '(?:[2-489]\\d|55)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:2\\d|5[1-5]|81|9[149])\\d{5}',
-    'ExampleNumber' => '22453300',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[34]\\d|55)\\d{6}',
-    'ExampleNumber' => '34101234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8\\d{7}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:2\\d|5[1-5]|81|9[149])\\d{5}',
+        'example' => '22453300',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:[34]\\d|55)\\d{6}',
+        'example' => '34101234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '8\\d{7}',
+        'example' => '80012345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:[67][0-4]|8[0-3589]|9\\d)\\d{5}',
-    'ExampleNumber' => '98901234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '9(?:[67][0-4]|8[0-3589]|9\\d)\\d{5}',
+        'example' => '98901234',
     ],
-  ],
-  'id' => 'HT',
-  'countryCode' => 509,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-589]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-589]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_HU.php b/src/data/PhoneNumberMetadata_HU.php
index bc821606d..e0b6af29c 100644
--- a/src/data/PhoneNumberMetadata_HU.php
+++ b/src/data/PhoneNumberMetadata_HU.php
@@ -6,153 +6,117 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[235-7]\\d{8}|[1-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'HU',
+    'countryCode' => 36,
+    'generalDesc' => [
+        'pattern' => '[235-7]\\d{8}|[1-9]\\d{7}',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:1\\d|[27][2-9]|3[2-7]|4[24-9]|5[2-79]|6[23689]|8[2-57-9]|9[2-69])\\d{6}',
+        'example' => '12345678',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1\\d|[27][2-9]|3[2-7]|4[24-9]|5[2-79]|6[23689]|8[2-57-9]|9[2-69])\\d{6}',
-    'ExampleNumber' => '12345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '(?:[257]0|3[01])\\d{7}',
+        'example' => '201234567',
+        'posLength' => [
+            9,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
+    'tollFree' => [
+        'pattern' => '(?:[48]0\\d|680[29])\\d{5}',
+        'example' => '80123456',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[257]0|3[01])\\d{7}',
-    'ExampleNumber' => '201234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'premiumRate' => [
+        'pattern' => '9[01]\\d{6}',
+        'example' => '90123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:[48]0\\d|680[29])\\d{5}',
-    'ExampleNumber' => '80123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9[01]\\d{6}',
-    'ExampleNumber' => '90123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '21\\d{7}',
+        'example' => '211234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '21\\d{7}',
-    'ExampleNumber' => '211234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '38\\d{7}',
+        'example' => '381234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '38\\d{7}',
-    'ExampleNumber' => '381234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'pattern' => '(?:[48]0\\d|680[29])\\d{5}',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '(?:[48]0\\d|680[29])\\d{5}',
-  ],
-  'id' => 'HU',
-  'countryCode' => 36,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '06',
-  'nationalPrefixForParsing' => '06',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '(06 $1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '06',
+    'nationalPrefixForParsing' => '06',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '(06 $1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[27][2-9]|3[2-7]|4[24-9]|5[2-79]|6|8[2-57-9]|9[2-69]',
+            ],
+            'nationalPrefixFormattingRule' => '(06 $1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '06 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[27][2-9]|3[2-7]|4[24-9]|5[2-79]|6|8[2-57-9]|9[2-69]',
-      ],
-      'nationalPrefixFormattingRule' => '(06 $1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '06 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_ID.php b/src/data/PhoneNumberMetadata_ID.php
index 1917e07d5..2950c5614 100644
--- a/src/data/PhoneNumberMetadata_ID.php
+++ b/src/data/PhoneNumberMetadata_ID.php
@@ -6,388 +6,297 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:(?:00[1-9]|8\\d)\\d{4}|[1-36])\\d{6}|00\\d{10}|[1-9]\\d{8,10}|[2-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-      5 => 12,
-      6 => 13,
+return [
+    'id' => 'ID',
+    'countryCode' => 62,
+    'generalDesc' => [
+        'pattern' => '(?:(?:00[1-9]|8\\d)\\d{4}|[1-36])\\d{6}|00\\d{10}|[1-9]\\d{8,10}|[2-9]\\d{7}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '2[124]\\d{7,8}|619\\d{8}|2(?:1(?:14|500)|2\\d{3})\\d{3}|61\\d{5,8}|(?:2(?:[35][1-4]|6[0-8]|7[1-6]|8\\d|9[1-8])|3(?:1|[25][1-8]|3[1-68]|4[1-3]|6[1-3568]|7[0-469]|8\\d)|4(?:0[1-589]|1[01347-9]|2[0-36-8]|3[0-24-68]|43|5[1-378]|6[1-5]|7[134]|8[1245])|5(?:1[1-35-9]|2[25-8]|3[124-9]|4[1-3589]|5[1-46]|6[1-8])|6(?:[25]\\d|3[1-69]|4[1-6])|7(?:02|[125][1-9]|[36]\\d|4[1-8]|7[0-36-9])|9(?:0[12]|1[013-8]|2[0-479]|5[125-8]|6[23679]|7[159]|8[01346]))\\d{5,8}',
+        'example' => '218350123',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '8[1-35-9]\\d{7,10}',
+        'example' => '812345678',
+        'posLength' => [
+            9,
+            10,
+            11,
+            12,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '00[17]803\\d{7}|(?:177\\d|800)\\d{5,7}|001803\\d{6}',
+        'example' => '8001234567',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '809\\d{7}',
+        'example' => '8091234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '804\\d{7}',
+        'example' => '8041234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '(?:1500|8071\\d{3})\\d{3}',
+        'example' => '8071123456',
+        'posLength' => [
+            7,
+            10,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '001803\\d{6,7}|(?:007803\\d|8071)\\d{6}',
+        'posLength' => [
+            10,
+            12,
+            13,
+        ],
+    ],
+    'internationalPrefix' => '00[89]',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '15',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5,9})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2[124]|[36]1',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-79]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})(\\d{3})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '8[1-35-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '804',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '001',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '15',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5,9})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2[124]|[36]1',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-79]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})(\\d{3})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '8[1-35-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '804',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2[124]\\d{7,8}|619\\d{8}|2(?:1(?:14|500)|2\\d{3})\\d{3}|61\\d{5,8}|(?:2(?:[35][1-4]|6[0-8]|7[1-6]|8\\d|9[1-8])|3(?:1|[25][1-8]|3[1-68]|4[1-3]|6[1-3568]|7[0-469]|8\\d)|4(?:0[1-589]|1[01347-9]|2[0-36-8]|3[0-24-68]|43|5[1-378]|6[1-5]|7[134]|8[1245])|5(?:1[1-35-9]|2[25-8]|3[124-9]|4[1-3589]|5[1-46]|6[1-8])|6(?:[25]\\d|3[1-69]|4[1-6])|7(?:02|[125][1-9]|[36]\\d|4[1-8]|7[0-36-9])|9(?:0[12]|1[013-8]|2[0-479]|5[125-8]|6[23679]|7[159]|8[01346]))\\d{5,8}',
-    'ExampleNumber' => '218350123',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '8[1-35-9]\\d{7,10}',
-    'ExampleNumber' => '812345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-      2 => 11,
-      3 => 12,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '00[17]803\\d{7}|(?:177\\d|800)\\d{5,7}|001803\\d{6}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-      4 => 12,
-      5 => 13,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '809\\d{7}',
-    'ExampleNumber' => '8091234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '804\\d{7}',
-    'ExampleNumber' => '8041234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:1500|8071\\d{3})\\d{3}',
-    'ExampleNumber' => '8071123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '001803\\d{6,7}|(?:007803\\d|8071)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 12,
-      2 => 13,
-    ],
-  ],
-  'id' => 'ID',
-  'countryCode' => 62,
-  'internationalPrefix' => '00[89]',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '15',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5,9})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[124]|[36]1',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-79]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})(\\d{3})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[1-35-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '804',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '001',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '15',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5,9})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[124]|[36]1',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-79]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})(\\d{3})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[1-35-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '804',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_IE.php b/src/data/PhoneNumberMetadata_IE.php
index 60587bb4d..adee14201 100644
--- a/src/data/PhoneNumberMetadata_IE.php
+++ b/src/data/PhoneNumberMetadata_IE.php
@@ -6,249 +6,191 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:1\\d|[2569])\\d{6,8}|4\\d{6,9}|7\\d{8}|8\\d{8,9}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1\\d|21)\\d{6,7}|(?:2[24-9]|4(?:0[24]|5\\d|7)|5(?:0[45]|1\\d|8)|6(?:1\\d|[237-9])|9(?:1\\d|[35-9]))\\d{5}|(?:23|4(?:[1-469]|8\\d)|5[23679]|6[4-6]|7[14]|9[04])\\d{7}',
-    'ExampleNumber' => '2212345',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '8(?:22|[35-9]\\d)\\d{6}',
-    'ExampleNumber' => '850123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800\\d{6}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '15(?:1[2-8]|[2-8]0|9[089])\\d{6}',
-    'ExampleNumber' => '1520123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '18[59]0\\d{6}',
-    'ExampleNumber' => '1850123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '700\\d{6}',
-    'ExampleNumber' => '700123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '76\\d{7}',
-    'ExampleNumber' => '761234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '818\\d{6}',
-    'ExampleNumber' => '818123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '88210[1-9]\\d{4}|8(?:[35-79]5\\d\\d|8(?:[013-9]\\d\\d|2(?:[01][1-9]|[2-9]\\d)))\\d{5}',
-    'ExampleNumber' => '8551234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '18[59]0\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'id' => 'IE',
-  'countryCode' => 353,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[24-9]|47|58|6[237-9]|9[35-9]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[45]0',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2569]|4[1-69]|7[14]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '70',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '81',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[78]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '4',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{2})(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'IE',
+    'countryCode' => 353,
+    'generalDesc' => [
+        'pattern' => '(?:1\\d|[2569])\\d{6,8}|4\\d{6,9}|7\\d{8}|8\\d{8,9}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1\\d|21)\\d{6,7}|(?:2[24-9]|4(?:0[24]|5\\d|7)|5(?:0[45]|1\\d|8)|6(?:1\\d|[237-9])|9(?:1\\d|[35-9]))\\d{5}|(?:23|4(?:[1-469]|8\\d)|5[23679]|6[4-6]|7[14]|9[04])\\d{7}',
+        'example' => '2212345',
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '8(?:22|[35-9]\\d)\\d{6}',
+        'example' => '850123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1800\\d{6}',
+        'example' => '1800123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '15(?:1[2-8]|[2-8]0|9[089])\\d{6}',
+        'example' => '1520123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '18[59]0\\d{6}',
+        'example' => '1850123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '700\\d{6}',
+        'example' => '700123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '76\\d{7}',
+        'example' => '761234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '818\\d{6}',
+        'example' => '818123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'pattern' => '88210[1-9]\\d{4}|8(?:[35-79]5\\d\\d|8(?:[013-9]\\d\\d|2(?:[01][1-9]|[2-9]\\d)))\\d{5}',
+        'example' => '8551234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '18[59]0\\d{6}',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2[24-9]|47|58|6[237-9]|9[35-9]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[45]0',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2569]|4[1-69]|7[14]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '70',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '81',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[78]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '4',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_IL.php b/src/data/PhoneNumberMetadata_IL.php
index f9c6344b6..cf8271dab 100644
--- a/src/data/PhoneNumberMetadata_IL.php
+++ b/src/data/PhoneNumberMetadata_IL.php
@@ -6,228 +6,176 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{6}(?:\\d{3,5})?|[57]\\d{8}|[1-489]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-      5 => 12,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '153\\d{8,9}|29[1-9]\\d{5}|(?:2[0-8]|[3489]\\d)\\d{6}',
-    'ExampleNumber' => '21234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 11,
-      2 => 12,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '55410\\d{4}|5(?:(?:[02][02-9]|[149][2-9]|[36]\\d|8[3-7])\\d|5(?:01|2\\d|3[0-3]|4[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}',
-    'ExampleNumber' => '502345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:255|80[019]\\d{3})\\d{3}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1212\\d{4}|1(?:200|9(?:0[0-2]|19))\\d{6}',
-    'ExampleNumber' => '1919123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '1700\\d{6}',
-    'ExampleNumber' => '1700123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '7(?:38(?:0\\d|5[0-29]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}',
-    'ExampleNumber' => '771234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '1599\\d{6}',
-    'ExampleNumber' => '1599123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '151\\d{8,9}',
-    'ExampleNumber' => '15112340000',
-    'PossibleLength' =>
-     [
-      0 => 11,
-      1 => 12,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '1700\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'id' => 'IL',
-  'countryCode' => 972,
-  'internationalPrefix' => '0(?:0|1[2-9])',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '125',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{2})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '121',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-489]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[57]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '12',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{4})(\\d{6})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '159',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1-$2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[7-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{1,2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2 $3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '15',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'IL',
+    'countryCode' => 972,
+    'generalDesc' => [
+        'pattern' => '1\\d{6}(?:\\d{3,5})?|[57]\\d{8}|[1-489]\\d{7}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '153\\d{8,9}|29[1-9]\\d{5}|(?:2[0-8]|[3489]\\d)\\d{6}',
+        'example' => '21234567',
+        'posLength' => [
+            8,
+            11,
+            12,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '55410\\d{4}|5(?:(?:[02][02-9]|[149][2-9]|[36]\\d|8[3-7])\\d|5(?:01|2\\d|3[0-3]|4[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}',
+        'example' => '502345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1(?:255|80[019]\\d{3})\\d{3}',
+        'example' => '1800123456',
+        'posLength' => [
+            7,
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '1212\\d{4}|1(?:200|9(?:0[0-2]|19))\\d{6}',
+        'example' => '1919123456',
+        'posLength' => [
+            8,
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '1700\\d{6}',
+        'example' => '1700123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '7(?:38(?:0\\d|5[0-29]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}',
+        'example' => '771234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '1599\\d{6}',
+        'example' => '1599123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voicemail' => [
+        'pattern' => '151\\d{8,9}',
+        'example' => '15112340000',
+        'posLength' => [
+            11,
+            12,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '1700\\d{6}',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'internationalPrefix' => '0(?:0|1[2-9])',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{3})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '125',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{2})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '121',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[2-489]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[57]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '12',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{6})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '159',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1-$2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '1[7-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{1,2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2 $3-$4',
+            'leadingDigitsPatterns' => [
+                '15',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_IM.php b/src/data/PhoneNumberMetadata_IM.php
index b837f8923..818ceb9d3 100644
--- a/src/data/PhoneNumberMetadata_IM.php
+++ b/src/data/PhoneNumberMetadata_IM.php
@@ -6,97 +6,73 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1624\\d{6}|(?:[3578]\\d|90)\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'IM',
+    'countryCode' => 44,
+    'generalDesc' => [
+        'pattern' => '1624\\d{6}|(?:[3578]\\d|90)\\d{8}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '1624(?:230|[5-8]\\d\\d)\\d{3}',
+        'example' => '1624756789',
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1624(?:230|[5-8]\\d\\d)\\d{3}',
-    'ExampleNumber' => '1624756789',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'mobile' => [
+        'pattern' => '76245[06]\\d{4}|7(?:4576|[59]24\\d|624[0-4689])\\d{5}',
+        'example' => '7924123456',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '76245[06]\\d{4}|7(?:4576|[59]24\\d|624[0-4689])\\d{5}',
-    'ExampleNumber' => '7924123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '808162\\d{4}',
-    'ExampleNumber' => '8081624567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '8(?:440[49]06|72299\\d)\\d{3}|(?:8(?:45|70)|90[0167])624\\d{4}',
-    'ExampleNumber' => '9016247890',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '808162\\d{4}',
+        'example' => '8081624567',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{8}',
-    'ExampleNumber' => '7012345678',
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '56\\d{8}',
-    'ExampleNumber' => '5612345678',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '8(?:440[49]06|72299\\d)\\d{3}|(?:8(?:45|70)|90[0167])624\\d{4}',
+        'example' => '9016247890',
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '3440[49]06\\d{3}|(?:3(?:08162|3\\d{4}|45624|7(?:0624|2299))|55\\d{4})\\d{4}',
-    'ExampleNumber' => '5512345678',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '70\\d{8}',
+        'example' => '7012345678',
     ],
-  ],
-  'id' => 'IM',
-  'countryCode' => 44,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '([25-8]\\d{5})$|0',
-  'nationalPrefixTransformRule' => '1624$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '74576|(?:16|7[56])24',
-  'mobileNumberPortableRegion' => false,
+    'voip' => [
+        'pattern' => '56\\d{8}',
+        'example' => '5612345678',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '3440[49]06\\d{3}|(?:3(?:08162|3\\d{4}|45624|7(?:0624|2299))|55\\d{4})\\d{4}',
+        'example' => '5512345678',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '([25-8]\\d{5})$|0',
+    'nationalPrefixTransformRule' => '1624$1',
+    'numberFormat' => [],
+    'leadingDigits' => '74576|(?:16|7[56])24',
 ];
diff --git a/src/data/PhoneNumberMetadata_IN.php b/src/data/PhoneNumberMetadata_IN.php
index 4c075ea5e..c35e3313c 100644
--- a/src/data/PhoneNumberMetadata_IN.php
+++ b/src/data/PhoneNumberMetadata_IN.php
@@ -6,385 +6,315 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:000800|[2-9]\\d\\d)\\d{7}|1\\d{7,12}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-      4 => 12,
-      5 => 13,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2717(?:[2-7]\\d|95)\\d{4}|(?:271[0-689]|782[0-6])[2-7]\\d{5}|(?:170[24]|2(?:(?:[02][2-79]|90)\\d|80[13468])|(?:3(?:23|80)|683|79[1-7])\\d|4(?:20[24]|72[2-8])|552[1-7])\\d{6}|(?:11|33|4[04]|80)[2-7]\\d{7}|(?:342|674|788)(?:[0189][2-7]|[2-7]\\d)\\d{5}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[13]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[014-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[3-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1245]|4[5-8]|5[125689]|6[235-7]|7[157-9]|8[2-46-8])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])|7(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|8[013-7]|9[089])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d[2-7]\\d{5}',
-    'ExampleNumber' => '7410410123',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:61279|7(?:887[02-9]|9(?:313|79[07-9]))|8(?:079[04-9]|(?:84|91)7[02-8]))\\d{5}|(?:6(?:12|[2-47]1|5[17]|6[13]|80)[0189]|7(?:1(?:2[0189]|9[0-5])|2(?:[14][017-9]|8[0-59])|3(?:2[5-8]|[34][017-9]|9[016-9])|4(?:1[015-9]|[29][89]|39|8[389])|5(?:[15][017-9]|2[04-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589])|70[0289]|88[089]|97[02-8])|8(?:0(?:6[67]|7[02-8])|70[017-9]|84[01489]|91[0-289]))\\d{6}|(?:7(?:31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[0189]\\d|7[02-8])\\d{5}|(?:6(?:[09]\\d|1[04679]|2[03689]|3[05-9]|4[0489]|50|6[069]|7[07]|8[7-9])|7(?:0\\d|2[0235-79]|3[05-8]|40|5[0346-8]|6[6-9]|7[1-9]|8[0-79]|9[089])|8(?:0[01589]|1[0-57-9]|2[235-9]|3[03-57-9]|[45]\\d|6[02457-9]|7[1-69]|8[0-25-9]|9[02-9])|9\\d\\d)\\d{7}|(?:6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|8[124-6])\\d|7(?:[235689]\\d|4[0189]))|7(?:1(?:[013-8]\\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-5])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\\d|5[0-367])|70[13-7]|881))[0189]\\d{5}',
-    'ExampleNumber' => '8123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '000800\\d{7}|1(?:600\\d{6}|80(?:0\\d{4,9}|3\\d{9}))',
-    'ExampleNumber' => '1800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '186[12]\\d{9}',
-    'ExampleNumber' => '1861123456789',
-    'PossibleLength' =>
-     [
-      0 => 13,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '1860\\d{7}',
-    'ExampleNumber' => '18603451234',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '140\\d{7}',
-    'ExampleNumber' => '1409305260',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '1(?:600\\d{6}|800\\d{4,9})|(?:000800|18(?:03\\d\\d|6(?:0|[12]\\d\\d)))\\d{7}',
-  ],
-  'id' => 'IN',
-  'countryCode' => 91,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{7})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '575',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{8})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5(?:0|2[23]|3[03]|[67]1|88)',
-        1 => '5(?:0|2(?:21|3)|3(?:0|3[23])|616|717|888)',
-        2 => '5(?:0|2(?:21|3)|3(?:0|3[23])|616|717|8888)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '180',
-        1 => '1800',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '140',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '11|2[02]|33|4[04]|79[1-7]|80[2-46]',
-        1 => '11|2[02]|33|4[04]|79(?:[1-6]|7[19])|80(?:[2-4]|6[0-589])',
-        2 => '11|2[02]|33|4[04]|79(?:[124-6]|3(?:[02-9]|1[0-24-9])|7(?:1|9[1-6]))|80(?:[2-4]|6[0-589])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|4[47]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67|72)[14]',
-        1 => '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:2[14]|3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]',
-        2 => '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:(?:2[14]|5[15])[2-6]|3171|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|(?:74[47]|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|28|3[129]|4[1-35689]|5[29]|6[02-5]|70)|807',
-        1 => '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1(?:[013-8]|9[6-9])|28[6-8]|3(?:17|2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]',
-        2 => '1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|83)|73179|807(?:1|9[1-3])|(?:1552|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])\\d|7(?:1(?:[013-8]\\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\\d|5[0-367])|70[13-7]))[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{5})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[6-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:6|8[06])',
-        1 => '1(?:6|8[06]0)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '18',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{8})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5(?:0|2[23]|3[03]|[67]1|88)',
-        1 => '5(?:0|2(?:21|3)|3(?:0|3[23])|616|717|888)',
-        2 => '5(?:0|2(?:21|3)|3(?:0|3[23])|616|717|8888)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '180',
-        1 => '1800',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '140',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '11|2[02]|33|4[04]|79[1-7]|80[2-46]',
-        1 => '11|2[02]|33|4[04]|79(?:[1-6]|7[19])|80(?:[2-4]|6[0-589])',
-        2 => '11|2[02]|33|4[04]|79(?:[124-6]|3(?:[02-9]|1[0-24-9])|7(?:1|9[1-6]))|80(?:[2-4]|6[0-589])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|4[47]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67|72)[14]',
-        1 => '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:2[14]|3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]',
-        2 => '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:(?:2[14]|5[15])[2-6]|3171|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|(?:74[47]|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|28|3[129]|4[1-35689]|5[29]|6[02-5]|70)|807',
-        1 => '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1(?:[013-8]|9[6-9])|28[6-8]|3(?:17|2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]',
-        2 => '1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|83)|73179|807(?:1|9[1-3])|(?:1552|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])\\d|7(?:1(?:[013-8]\\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\\d|5[0-367])|70[13-7]))[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{5})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[6-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:6|8[06])',
-        1 => '1(?:6|8[06]0)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '18',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'IN',
+    'countryCode' => 91,
+    'generalDesc' => [
+        'pattern' => '(?:000800|[2-9]\\d\\d)\\d{7}|1\\d{7,12}',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '2717(?:[2-7]\\d|95)\\d{4}|(?:271[0-689]|782[0-6])[2-7]\\d{5}|(?:170[24]|2(?:(?:[02][2-79]|90)\\d|80[13468])|(?:3(?:23|80)|683|79[1-7])\\d|4(?:20[24]|72[2-8])|552[1-7])\\d{6}|(?:11|33|4[04]|80)[2-7]\\d{7}|(?:342|674|788)(?:[0189][2-7]|[2-7]\\d)\\d{5}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[13]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[014-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[3-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1245]|4[5-8]|5[125689]|6[235-7]|7[157-9]|8[2-46-8])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])|7(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|8[013-7]|9[089])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d[2-7]\\d{5}',
+        'example' => '7410410123',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:61279|7(?:887[02-9]|9(?:313|79[07-9]))|8(?:079[04-9]|(?:84|91)7[02-8]))\\d{5}|(?:6(?:12|[2-47]1|5[17]|6[13]|80)[0189]|7(?:1(?:2[0189]|9[0-5])|2(?:[14][017-9]|8[0-59])|3(?:2[5-8]|[34][017-9]|9[016-9])|4(?:1[015-9]|[29][89]|39|8[389])|5(?:[15][017-9]|2[04-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589])|70[0289]|88[089]|97[02-8])|8(?:0(?:6[67]|7[02-8])|70[017-9]|84[01489]|91[0-289]))\\d{6}|(?:7(?:31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[0189]\\d|7[02-8])\\d{5}|(?:6(?:[09]\\d|1[04679]|2[03689]|3[05-9]|4[0489]|50|6[069]|7[07]|8[7-9])|7(?:0\\d|2[0235-79]|3[05-8]|40|5[0346-8]|6[6-9]|7[1-9]|8[0-79]|9[089])|8(?:0[01589]|1[0-57-9]|2[235-9]|3[03-57-9]|[45]\\d|6[02457-9]|7[1-69]|8[0-25-9]|9[02-9])|9\\d\\d)\\d{7}|(?:6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|8[124-6])\\d|7(?:[235689]\\d|4[0189]))|7(?:1(?:[013-8]\\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-5])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\\d|5[0-367])|70[13-7]|881))[0189]\\d{5}',
+        'example' => '8123456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '000800\\d{7}|1(?:600\\d{6}|80(?:0\\d{4,9}|3\\d{9}))',
+        'example' => '1800123456',
+    ],
+    'premiumRate' => [
+        'pattern' => '186[12]\\d{9}',
+        'example' => '1861123456789',
+        'posLength' => [
+            13,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '1860\\d{7}',
+        'example' => '18603451234',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '140\\d{7}',
+        'example' => '1409305260',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '1(?:600\\d{6}|800\\d{4,9})|(?:000800|18(?:03\\d\\d|6(?:0|[12]\\d\\d)))\\d{7}',
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{7})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '575',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{8})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '5(?:0|2[23]|3[03]|[67]1|88)',
+                '5(?:0|2(?:21|3)|3(?:0|3[23])|616|717|888)',
+                '5(?:0|2(?:21|3)|3(?:0|3[23])|616|717|8888)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '180',
+                '1800',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '140',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '11|2[02]|33|4[04]|79[1-7]|80[2-46]',
+                '11|2[02]|33|4[04]|79(?:[1-6]|7[19])|80(?:[2-4]|6[0-589])',
+                '11|2[02]|33|4[04]|79(?:[124-6]|3(?:[02-9]|1[0-24-9])|7(?:1|9[1-6]))|80(?:[2-4]|6[0-589])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|4[47]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67|72)[14]',
+                '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:2[14]|3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]',
+                '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:(?:2[14]|5[15])[2-6]|3171|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|(?:74[47]|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|28|3[129]|4[1-35689]|5[29]|6[02-5]|70)|807',
+                '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1(?:[013-8]|9[6-9])|28[6-8]|3(?:17|2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]',
+                '1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|83)|73179|807(?:1|9[1-3])|(?:1552|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])\\d|7(?:1(?:[013-8]\\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\\d|5[0-367])|70[13-7]))[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[6-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:6|8[06])',
+                '1(?:6|8[06]0)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '18',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{8})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '5(?:0|2[23]|3[03]|[67]1|88)',
+                '5(?:0|2(?:21|3)|3(?:0|3[23])|616|717|888)',
+                '5(?:0|2(?:21|3)|3(?:0|3[23])|616|717|8888)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '180',
+                '1800',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '140',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '11|2[02]|33|4[04]|79[1-7]|80[2-46]',
+                '11|2[02]|33|4[04]|79(?:[1-6]|7[19])|80(?:[2-4]|6[0-589])',
+                '11|2[02]|33|4[04]|79(?:[124-6]|3(?:[02-9]|1[0-24-9])|7(?:1|9[1-6]))|80(?:[2-4]|6[0-589])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|4[47]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67|72)[14]',
+                '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:2[14]|3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]',
+                '1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:(?:2[14]|5[15])[2-6]|3171|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|(?:74[47]|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|28|3[129]|4[1-35689]|5[29]|6[02-5]|70)|807',
+                '1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1(?:[013-8]|9[6-9])|28[6-8]|3(?:17|2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]',
+                '1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|83)|73179|807(?:1|9[1-3])|(?:1552|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])\\d|7(?:1(?:[013-8]\\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\\d|5[0-367])|70[13-7]))[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[6-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:6|8[06])',
+                '1(?:6|8[06]0)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '18',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_IO.php b/src/data/PhoneNumberMetadata_IO.php
index ab3274a54..d2ac94358 100644
--- a/src/data/PhoneNumberMetadata_IO.php
+++ b/src/data/PhoneNumberMetadata_IO.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '3\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'IO',
+    'countryCode' => 246,
+    'generalDesc' => [
+        'pattern' => '3\\d{6}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '37\\d{5}',
-    'ExampleNumber' => '3709100',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '38\\d{5}',
-    'ExampleNumber' => '3801234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '37\\d{5}',
+        'example' => '3709100',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '38\\d{5}',
+        'example' => '3801234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'IO',
-  'countryCode' => 246,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_IQ.php b/src/data/PhoneNumberMetadata_IQ.php
index 0dd09656c..05952ed8f 100644
--- a/src/data/PhoneNumberMetadata_IQ.php
+++ b/src/data/PhoneNumberMetadata_IQ.php
@@ -6,154 +6,115 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:1|7\\d\\d)\\d{7}|[2-6]\\d{7,8}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
+return [
+    'id' => 'IQ',
+    'countryCode' => 964,
+    'generalDesc' => [
+        'pattern' => '(?:1|7\\d\\d)\\d{7}|[2-6]\\d{7,8}',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '1\\d{7}|(?:2[13-5]|3[02367]|4[023]|5[03]|6[026])\\d{6,7}',
+        'example' => '12345678',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '7[3-9]\\d{8}',
+        'example' => '7912345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1\\d{7}|(?:2[13-5]|3[02367]|4[023]|5[03]|6[026])\\d{6,7}',
-    'ExampleNumber' => '12345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[3-9]\\d{8}',
-    'ExampleNumber' => '7912345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'IQ',
-  'countryCode' => 964,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_IR.php b/src/data/PhoneNumberMetadata_IR.php
index b8ed112f2..c2568401e 100644
--- a/src/data/PhoneNumberMetadata_IR.php
+++ b/src/data/PhoneNumberMetadata_IR.php
@@ -6,175 +6,134 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{9}|(?:[1-8]\\d\\d|9)\\d{3,4}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])(?:[03-57]\\d{7}|[16]\\d{3}(?:\\d{4})?|[289]\\d{3}(?:\\d(?:\\d{3})?)?)|94(?:000[09]|(?:12\\d|30[0-2])\\d|2(?:121|[2689]0\\d)|4(?:111|40\\d))\\d{4}',
-    'ExampleNumber' => '2123456789',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9(?:(?:0(?:[0-35]\\d|4[4-6])|(?:[13]\\d|2[0-3])\\d)\\d|9(?:[0-46]\\d\\d|5[15]0|8(?:[12]\\d|88)|9(?:0[0-3]|[19]\\d|21|69|77|8[7-9])))\\d{5}',
-    'ExampleNumber' => '9123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '96(?:0[12]|2[16-8]|3(?:08|[14]5|[23]|66)|4(?:0|80)|5[01]|6[89]|86|9[19])',
-    'ExampleNumber' => '9601',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '9(?:4440\\d{5}|6(?:0[12]|2[16-8]|3(?:08|[14]5|[23]|66)|4(?:0|80)|5[01]|6[89]|86|9[19]))',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 10,
-    ],
-  ],
-  'id' => 'IR',
-  'countryCode' => 98,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4,5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '96',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])[12689]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-8]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'IR',
+    'countryCode' => 98,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{9}|(?:[1-8]\\d\\d|9)\\d{3,4}',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            10,
+        ],
+        'posLengthLocal' => [
+            8,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])(?:[03-57]\\d{7}|[16]\\d{3}(?:\\d{4})?|[289]\\d{3}(?:\\d(?:\\d{3})?)?)|94(?:000[09]|(?:12\\d|30[0-2])\\d|2(?:121|[2689]0\\d)|4(?:111|40\\d))\\d{4}',
+        'example' => '2123456789',
+        'posLength' => [
+            6,
+            7,
+            10,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '9(?:(?:0(?:[0-35]\\d|4[4-6])|(?:[13]\\d|2[0-3])\\d)\\d|9(?:[0-46]\\d\\d|5[15]0|8(?:[12]\\d|88)|9(?:0[0-3]|[19]\\d|21|69|77|8[7-9])))\\d{5}',
+        'example' => '9123456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '96(?:0[12]|2[16-8]|3(?:08|[14]5|[23]|66)|4(?:0|80)|5[01]|6[89]|86|9[19])',
+        'example' => '9601',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '9(?:4440\\d{5}|6(?:0[12]|2[16-8]|3(?:08|[14]5|[23]|66)|4(?:0|80)|5[01]|6[89]|86|9[19]))',
+        'posLength' => [
+            4,
+            5,
+            10,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4,5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '96',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])[12689]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-8]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_IS.php b/src/data/PhoneNumberMetadata_IS.php
index fe29bb654..3db339af3 100644
--- a/src/data/PhoneNumberMetadata_IS.php
+++ b/src/data/PhoneNumberMetadata_IS.php
@@ -6,135 +6,103 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:38\\d|[4-9])\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
+return [
+    'id' => 'IS',
+    'countryCode' => 354,
+    'generalDesc' => [
+        'pattern' => '(?:38\\d|[4-9])\\d{6}',
+        'posLength' => [
+            7,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:4(?:1[0-24-69]|2[0-7]|[37][0-8]|4[0-24589]|5[0-68]|6\\d|8[0-36-8])|5(?:05|[156]\\d|2[02578]|3[0-579]|4[03-7]|7[0-2578]|8[0-35-9]|9[013-689])|872)\\d{4}',
-    'ExampleNumber' => '4101234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:4(?:1[0-24-69]|2[0-7]|[37][0-8]|4[0-24589]|5[0-68]|6\\d|8[0-36-8])|5(?:05|[156]\\d|2[02578]|3[0-579]|4[03-7]|7[0-2578]|8[0-35-9]|9[013-689])|872)\\d{4}',
+        'example' => '4101234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:38[589]\\d\\d|6(?:1[1-8]|2[0-6]|3[026-9]|4[014679]|5[0159]|6[0-69]|70|8[06-8]|9\\d)|7(?:5[057]|[6-9]\\d)|8(?:2[0-59]|[3-69]\\d|8[238]))\\d{4}',
-    'ExampleNumber' => '6111234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-8]\\d{4}',
-    'ExampleNumber' => '8001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:38[589]\\d\\d|6(?:1[1-8]|2[0-6]|3[026-9]|4[014679]|5[0159]|6[0-69]|70|8[06-8]|9\\d)|7(?:5[057]|[6-9]\\d)|8(?:2[0-59]|[3-69]\\d|8[238]))\\d{4}',
+        'example' => '6111234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90(?:0\\d|1[5-79]|2[015-79]|3[135-79]|4[125-7]|5[25-79]|7[1-37]|8[0-35-7])\\d{3}',
-    'ExampleNumber' => '9001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '80[0-8]\\d{4}',
+        'example' => '8001234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90(?:0\\d|1[5-79]|2[015-79]|3[135-79]|4[125-7]|5[25-79]|7[1-37]|8[0-35-7])\\d{3}',
+        'example' => '9001234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '49[0-24-79]\\d{4}',
-    'ExampleNumber' => '4921234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '49[0-24-79]\\d{4}',
+        'example' => '4921234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '809\\d{4}',
-    'ExampleNumber' => '8091234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '(?:689|8(?:7[18]|80)|95[48])\\d{4}',
-    'ExampleNumber' => '6891234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'uan' => [
+        'pattern' => '809\\d{4}',
+        'example' => '8091234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'pattern' => '(?:689|8(?:7[18]|80)|95[48])\\d{4}',
+        'example' => '6891234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'id' => 'IS',
-  'countryCode' => 354,
-  'internationalPrefix' => '00|1(?:0(?:01|[12]0)|100)',
-  'preferredInternationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[4-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00|1(?:0(?:01|[12]0)|100)',
+    'preferredInternationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[4-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_IT.php b/src/data/PhoneNumberMetadata_IT.php
index 9c7336067..e148d5851 100644
--- a/src/data/PhoneNumberMetadata_IT.php
+++ b/src/data/PhoneNumberMetadata_IT.php
@@ -6,405 +6,312 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '0\\d{5,10}|1\\d{8,10}|3(?:[0-8]\\d{7,10}|9\\d{7,8})|(?:43|55|70)\\d{8}|8\\d{5}(?:\\d{2,4})?',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
-      6 => 12,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '0669[0-79]\\d{1,6}|0(?:1(?:[0159]\\d|[27][1-5]|31|4[1-4]|6[1356]|8[2-57])|2\\d\\d|3(?:[0159]\\d|2[1-4]|3[12]|[48][1-6]|6[2-59]|7[1-7])|4(?:[0159]\\d|[23][1-9]|4[245]|6[1-5]|7[1-4]|81)|5(?:[0159]\\d|2[1-5]|3[2-6]|4[1-79]|6[4-6]|7[1-578]|8[3-8])|6(?:[0-57-9]\\d|6[0-8])|7(?:[0159]\\d|2[12]|3[1-7]|4[2-46]|6[13569]|7[13-6]|8[1-59])|8(?:[0159]\\d|2[3-578]|3[1-356]|[6-8][1-5])|9(?:[0159]\\d|[238][1-5]|4[12]|6[1-8]|7[1-6]))\\d{2,7}',
-    'ExampleNumber' => '0212345678',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '3[2-9]\\d{7,8}|(?:31|43)\\d{8}',
-    'ExampleNumber' => '3123456789',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80(?:0\\d{3}|3)\\d{3}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:0878\\d{3}|89(?:2\\d|3[04]|4(?:[0-4]|[5-9]\\d\\d)|5[0-4]))\\d\\d|(?:1(?:44|6[346])|89(?:38|5[5-9]|9))\\d{6}',
-    'ExampleNumber' => '899123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '84(?:[08]\\d{3}|[17])\\d{3}',
-    'ExampleNumber' => '848123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '1(?:78\\d|99)\\d{6}',
-    'ExampleNumber' => '1781234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '55\\d{8}',
-    'ExampleNumber' => '5512345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '3[2-8]\\d{9,10}',
-    'ExampleNumber' => '33101234501',
-    'PossibleLength' =>
-     [
-      0 => 11,
-      1 => 12,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '848\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'id' => 'IT',
-  'countryCode' => 39,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4,5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:0|9[246])',
-        1 => '1(?:0|9(?:2[2-9]|[46]))',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:1|92)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[26]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[13-57-9][0159]|8(?:03|4[17]|9[2-5])',
-        1 => '0[13-57-9][0159]|8(?:03|4[17]|9(?:2|3[04]|[45][0-4]))',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0(?:[13-579][2-46-8]|8[236-8])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '894',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[26]|5',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:44|[679])|[378]|43',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[13-57-9][0159]|14',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[26]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    11 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[26]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[13-57-9][0159]|8(?:03|4[17]|9[2-5])',
-        1 => '0[13-57-9][0159]|8(?:03|4[17]|9(?:2|3[04]|[45][0-4]))',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0(?:[13-579][2-46-8]|8[236-8])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '894',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[26]|5',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:44|[679])|[378]|43',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[13-57-9][0159]|14',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[26]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => true,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'IT',
+    'countryCode' => 39,
+    'generalDesc' => [
+        'pattern' => '0\\d{5,10}|1\\d{8,10}|3(?:[0-8]\\d{7,10}|9\\d{7,8})|(?:43|55|70)\\d{8}|8\\d{5}(?:\\d{2,4})?',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '0669[0-79]\\d{1,6}|0(?:1(?:[0159]\\d|[27][1-5]|31|4[1-4]|6[1356]|8[2-57])|2\\d\\d|3(?:[0159]\\d|2[1-4]|3[12]|[48][1-6]|6[2-59]|7[1-7])|4(?:[0159]\\d|[23][1-9]|4[245]|6[1-5]|7[1-4]|81)|5(?:[0159]\\d|2[1-5]|3[2-6]|4[1-79]|6[4-6]|7[1-578]|8[3-8])|6(?:[0-57-9]\\d|6[0-8])|7(?:[0159]\\d|2[12]|3[1-7]|4[2-46]|6[13569]|7[13-6]|8[1-59])|8(?:[0159]\\d|2[3-578]|3[1-356]|[6-8][1-5])|9(?:[0159]\\d|[238][1-5]|4[12]|6[1-8]|7[1-6]))\\d{2,7}',
+        'example' => '0212345678',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '3[2-9]\\d{7,8}|(?:31|43)\\d{8}',
+        'example' => '3123456789',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80(?:0\\d{3}|3)\\d{3}',
+        'example' => '800123456',
+        'posLength' => [
+            6,
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '(?:0878\\d{3}|89(?:2\\d|3[04]|4(?:[0-4]|[5-9]\\d\\d)|5[0-4]))\\d\\d|(?:1(?:44|6[346])|89(?:38|5[5-9]|9))\\d{6}',
+        'example' => '899123456',
+        'posLength' => [
+            6,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '84(?:[08]\\d{3}|[17])\\d{3}',
+        'example' => '848123456',
+        'posLength' => [
+            6,
+            9,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '1(?:78\\d|99)\\d{6}',
+        'example' => '1781234567',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '55\\d{8}',
+        'example' => '5512345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'pattern' => '3[2-8]\\d{9,10}',
+        'example' => '33101234501',
+        'posLength' => [
+            11,
+            12,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '848\\d{6}',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4,5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1(?:0|9[246])',
+                '1(?:0|9(?:2[2-9]|[46]))',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1(?:1|92)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0[26]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0[13-57-9][0159]|8(?:03|4[17]|9[2-5])',
+                '0[13-57-9][0159]|8(?:03|4[17]|9(?:2|3[04]|[45][0-4]))',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0(?:[13-579][2-46-8]|8[236-8])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '894',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0[26]|5',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:44|[679])|[378]|43',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0[13-57-9][0159]|14',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0[26]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0[26]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0[13-57-9][0159]|8(?:03|4[17]|9[2-5])',
+                '0[13-57-9][0159]|8(?:03|4[17]|9(?:2|3[04]|[45][0-4]))',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0(?:[13-579][2-46-8]|8[236-8])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '894',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0[26]|5',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:44|[679])|[378]|43',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0[13-57-9][0159]|14',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0[26]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_JE.php b/src/data/PhoneNumberMetadata_JE.php
index 085996b1c..868ba2671 100644
--- a/src/data/PhoneNumberMetadata_JE.php
+++ b/src/data/PhoneNumberMetadata_JE.php
@@ -6,94 +6,71 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1534\\d{6}|(?:[3578]\\d|90)\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'JE',
+    'countryCode' => 44,
+    'generalDesc' => [
+        'pattern' => '1534\\d{6}|(?:[3578]\\d|90)\\d{8}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '1534[0-24-8]\\d{5}',
+        'example' => '1534456789',
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1534[0-24-8]\\d{5}',
-    'ExampleNumber' => '1534456789',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'mobile' => [
+        'pattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97\\d))\\d{5}',
+        'example' => '7797712345',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97\\d))\\d{5}',
-    'ExampleNumber' => '7797712345',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80(?:07(?:35|81)|8901)\\d{4}',
-    'ExampleNumber' => '8007354567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:8(?:4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|7(?:0002|1206))|90(?:066[59]|1810|71(?:07|55)))\\d{4}',
-    'ExampleNumber' => '9018105678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80(?:07(?:35|81)|8901)\\d{4}',
+        'example' => '8007354567',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '701511\\d{4}',
-    'ExampleNumber' => '7015115678',
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '56\\d{8}',
-    'ExampleNumber' => '5612345678',
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '76(?:464|652)\\d{5}|76(?:0[0-28]|2[356]|34|4[01347]|5[49]|6[0-369]|77|8[14]|9[139])\\d{6}',
-    'ExampleNumber' => '7640123456',
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:0(?:07(?:35|81)|8901)|3\\d{4}|4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|7(?:0002|1206))|55\\d{4})\\d{4}',
-    'ExampleNumber' => '5512345678',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '(?:8(?:4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|7(?:0002|1206))|90(?:066[59]|1810|71(?:07|55)))\\d{4}',
+        'example' => '9018105678',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'JE',
-  'countryCode' => 44,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '([0-24-8]\\d{5})$|0',
-  'nationalPrefixTransformRule' => '1534$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'personalNumber' => [
+        'pattern' => '701511\\d{4}',
+        'example' => '7015115678',
+    ],
+    'voip' => [
+        'pattern' => '56\\d{8}',
+        'example' => '5612345678',
+    ],
+    'pager' => [
+        'pattern' => '76(?:464|652)\\d{5}|76(?:0[0-28]|2[356]|34|4[01347]|5[49]|6[0-369]|77|8[14]|9[139])\\d{6}',
+        'example' => '7640123456',
+    ],
+    'uan' => [
+        'pattern' => '(?:3(?:0(?:07(?:35|81)|8901)|3\\d{4}|4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|7(?:0002|1206))|55\\d{4})\\d{4}',
+        'example' => '5512345678',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '([0-24-8]\\d{5})$|0',
+    'nationalPrefixTransformRule' => '1534$1',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_JM.php b/src/data/PhoneNumberMetadata_JM.php
index 024970faa..4c64e144c 100644
--- a/src/data/PhoneNumberMetadata_JM.php
+++ b/src/data/PhoneNumberMetadata_JM.php
@@ -6,104 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|658|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'JM',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|658|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '8766060\\d{3}|(?:658(?:2(?:[0-8]\\d|9[0-46-9])|[3-9]\\d\\d)|876(?:52[35]|6(?:0[1-3579]|1[0235-9]|[23]\\d|40|5[06]|6[2-589]|7[0-25-9]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468])))\\d{4}',
+        'example' => '8765230123',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '8766060\\d{3}|(?:658(?:2(?:[0-8]\\d|9[0-46-9])|[3-9]\\d\\d)|876(?:52[35]|6(?:0[1-3579]|1[0235-9]|[23]\\d|40|5[06]|6[2-589]|7[0-25-9]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468])))\\d{4}',
-    'ExampleNumber' => '8765230123',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:658295|876(?:2(?:0[1-9]|[13-9]\\d|2[013-9])|[348]\\d\\d|5(?:0[1-9]|[1-9]\\d)|6(?:4[89]|6[67])|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579])))\\d{4}',
+        'example' => '8762101234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:658295|876(?:2(?:0[1-9]|[13-9]\\d|2[013-9])|[348]\\d\\d|5(?:0[1-9]|[1-9]\\d)|6(?:4[89]|6[67])|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579])))\\d{4}',
-    'ExampleNumber' => '8762101234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'JM',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '658|876',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '1',
+    'numberFormat' => [],
+    'leadingDigits' => '658|876',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_JO.php b/src/data/PhoneNumberMetadata_JO.php
index 3c96bb3f8..43e16f4ba 100644
--- a/src/data/PhoneNumberMetadata_JO.php
+++ b/src/data/PhoneNumberMetadata_JO.php
@@ -6,166 +6,127 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:(?:[2689]|7\\d)\\d|32|53)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '87(?:000|90[01])\\d{3}|(?:2(?:6(?:2[0-35-9]|3[0-578]|4[24-7]|5[0-24-8]|[6-8][023]|9[0-3])|7(?:0[1-79]|10|2[014-7]|3[0-689]|4[019]|5[0-3578]))|32(?:0[1-69]|1[1-35-7]|2[024-7]|3\\d|4[0-3]|[5-7][023])|53(?:0[0-3]|[13][023]|2[0-59]|49|5[0-35-9]|6[15]|7[45]|8[1-6]|9[0-36-9])|6(?:2(?:[05]0|22)|3(?:00|33)|4(?:0[0-25]|1[2-7]|2[0569]|[38][07-9]|4[025689]|6[0-589]|7\\d|9[0-2])|5(?:[01][056]|2[034]|3[0-57-9]|4[178]|5[0-69]|6[0-35-9]|7[1-379]|8[0-68]|9[0239]))|87(?:20|7[078]|99))\\d{4}',
-    'ExampleNumber' => '62001234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:[78][0-25-9]|9\\d)\\d{6}',
-    'ExampleNumber' => '790123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{6}',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9\\d{7}',
-    'ExampleNumber' => '90012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '85\\d{6}',
-    'ExampleNumber' => '85012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{7}',
-    'ExampleNumber' => '700123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '74(?:66|77)\\d{5}',
-    'ExampleNumber' => '746612345',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '8(?:10|8\\d)\\d{5}',
-    'ExampleNumber' => '88101234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'JO',
-  'countryCode' => 962,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2356]|87',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '70',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'JO',
+    'countryCode' => 962,
+    'generalDesc' => [
+        'pattern' => '(?:(?:[2689]|7\\d)\\d|32|53)\\d{6}',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '87(?:000|90[01])\\d{3}|(?:2(?:6(?:2[0-35-9]|3[0-578]|4[24-7]|5[0-24-8]|[6-8][023]|9[0-3])|7(?:0[1-79]|10|2[014-7]|3[0-689]|4[019]|5[0-3578]))|32(?:0[1-69]|1[1-35-7]|2[024-7]|3\\d|4[0-3]|[5-7][023])|53(?:0[0-3]|[13][023]|2[0-59]|49|5[0-35-9]|6[15]|7[45]|8[1-6]|9[0-36-9])|6(?:2(?:[05]0|22)|3(?:00|33)|4(?:0[0-25]|1[2-7]|2[0569]|[38][07-9]|4[025689]|6[0-589]|7\\d|9[0-2])|5(?:[01][056]|2[034]|3[0-57-9]|4[178]|5[0-69]|6[0-35-9]|7[1-379]|8[0-68]|9[0239]))|87(?:20|7[078]|99))\\d{4}',
+        'example' => '62001234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '7(?:[78][0-25-9]|9\\d)\\d{6}',
+        'example' => '790123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80\\d{6}',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '9\\d{7}',
+        'example' => '90012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '85\\d{6}',
+        'example' => '85012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '70\\d{7}',
+        'example' => '700123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '74(?:66|77)\\d{5}',
+        'example' => '746612345',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '8(?:10|8\\d)\\d{5}',
+        'example' => '88101234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2356]|87',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '70',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_JP.php b/src/data/PhoneNumberMetadata_JP.php
index bead7a66d..1e453764d 100644
--- a/src/data/PhoneNumberMetadata_JP.php
+++ b/src/data/PhoneNumberMetadata_JP.php
@@ -6,413 +6,318 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '00[1-9]\\d{6,14}|[257-9]\\d{9}|(?:00|[1-9]\\d\\d)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-      4 => 12,
-      5 => 13,
-      6 => 14,
-      7 => 15,
-      8 => 16,
-      9 => 17,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:1[235-8]|2[3-6]|3[3-9]|4[2-6]|[58][2-8]|6[2-7]|7[2-9]|9[1-9])|(?:2[2-9]|[36][1-9])\\d|4(?:[2-578]\\d|6[02-8]|9[2-59])|5(?:[2-589]\\d|6[1-9]|7[2-8])|7(?:[25-9]\\d|3[4-9]|4[02-9])|8(?:[2679]\\d|3[2-9]|4[5-9]|5[1-9]|8[03-9])|9(?:[2-58]\\d|[679][1-9]))\\d{6}',
-    'ExampleNumber' => '312345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[7-9]0[1-9]\\d{7}',
-    'ExampleNumber' => '9012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '00777(?:[01]|5\\d)\\d\\d|(?:00(?:7778|882[1245])|(?:120|800\\d)\\d\\d)\\d{4}|00(?:37|66|78)\\d{6,13}',
-    'ExampleNumber' => '120123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '990\\d{6}',
-    'ExampleNumber' => '990123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '60\\d{7}',
-    'ExampleNumber' => '601234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '50[1-9]\\d{7}',
-    'ExampleNumber' => '5012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '20\\d{8}',
-    'ExampleNumber' => '2012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '570\\d{6}',
-    'ExampleNumber' => '570123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '00(?:777(?:[01]|(?:5|8\\d)\\d)|882[1245]\\d\\d)\\d\\d|00(?:37|66|78)\\d{6,13}',
-  ],
-  'id' => 'JP',
-  'countryCode' => 81,
-  'internationalPrefix' => '010',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '(000[259]\\d{6})$|(?:(?:003768)0?)|0',
-  'nationalPrefixTransformRule' => '$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '007',
-        1 => '0077',
-        2 => '00777',
-        3 => '00777[01]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:12|57|99)0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d)(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|499|5(?:76|97)|746|8(?:3[89]|47|51)|9(?:80|9[16])',
-        1 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:76|97)9|7468|8(?:3(?:8[7-9]|96)|477|51[2-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
-        2 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:769|979[2-69])|7468|8(?:3(?:8[7-9]|96[2457-9])|477|51[2-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[36]|4(?:2[09]|7[01])',
-        1 => '[36]|4(?:2(?:0|9[02-69])|7(?:0[019]|1))',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:1|5[45]|77|88|9[69])|2(?:2[1-37]|3[0-269]|4[59]|5|6[24]|7[1-358]|8[1369]|9[0-38])|4(?:[28][1-9]|3[0-57]|[45]|6[248]|7[2-579]|9[29])|5(?:2|3[0459]|4[0-369]|5[29]|8[02389]|9[0-389])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9[2-6])|8(?:2[124589]|3[26-9]|49|51|6|7[0-468]|8[68]|9[019])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9[1-489])',
-        1 => '1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2(?:[127]|3[014-9])|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9[19])|62|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|8[1-9]|9[29])|5(?:2|3(?:[045]|9[0-8])|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0-2469])|3(?:[29]|60)|49|51|6(?:[0-24]|36|5[0-3589]|7[23]|9[01459])|7[0-468]|8[68])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9(?:[1289]|3[34]|4[0178]))|(?:264|837)[016-9]|2(?:57|93)[015-9]|(?:25[0468]|422|838)[01]|(?:47[59]|59[89]|8(?:6[68]|9))[019]',
-        2 => '1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2[127]|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9(?:17|99))|6(?:2|4[016-9])|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|9[29])|5(?:2|3(?:[045]|9(?:[0-58]|6[4-9]|7[0-35689]))|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0169])|3(?:[29]|60|7(?:[017-9]|6[6-8]))|49|51|6(?:[0-24]|36[2-57-9]|5(?:[0-389]|5[23])|6(?:[01]|9[178])|7(?:2[2-468]|3[78])|9[0145])|7[0-468]|8[68])|9(?:4[15]|5[138]|7[156]|8[189]|9(?:[1289]|3(?:31|4[357])|4[0178]))|(?:8294|96)[1-3]|2(?:57|93)[015-9]|(?:223|8699)[014-9]|(?:25[0468]|422|838)[01]|(?:48|8292|9[23])[1-9]|(?:47[59]|59[89]|8(?:68|9))[019]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[14]|[289][2-9]|5[3-9]|7[2-4679]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{3,4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '007',
-        1 => '0077',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '008',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[257-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    11 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    12 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})(\\d{4,5})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    13 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5})(\\d{5,6})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    14 =>
-     [
-      'pattern' => '(\\d{4})(\\d{6})(\\d{6,7})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:12|57|99)0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d)(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|499|5(?:76|97)|746|8(?:3[89]|47|51)|9(?:80|9[16])',
-        1 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:76|97)9|7468|8(?:3(?:8[7-9]|96)|477|51[2-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
-        2 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:769|979[2-69])|7468|8(?:3(?:8[7-9]|96[2457-9])|477|51[2-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[36]|4(?:2[09]|7[01])',
-        1 => '[36]|4(?:2(?:0|9[02-69])|7(?:0[019]|1))',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:1|5[45]|77|88|9[69])|2(?:2[1-37]|3[0-269]|4[59]|5|6[24]|7[1-358]|8[1369]|9[0-38])|4(?:[28][1-9]|3[0-57]|[45]|6[248]|7[2-579]|9[29])|5(?:2|3[0459]|4[0-369]|5[29]|8[02389]|9[0-389])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9[2-6])|8(?:2[124589]|3[26-9]|49|51|6|7[0-468]|8[68]|9[019])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9[1-489])',
-        1 => '1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2(?:[127]|3[014-9])|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9[19])|62|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|8[1-9]|9[29])|5(?:2|3(?:[045]|9[0-8])|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0-2469])|3(?:[29]|60)|49|51|6(?:[0-24]|36|5[0-3589]|7[23]|9[01459])|7[0-468]|8[68])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9(?:[1289]|3[34]|4[0178]))|(?:264|837)[016-9]|2(?:57|93)[015-9]|(?:25[0468]|422|838)[01]|(?:47[59]|59[89]|8(?:6[68]|9))[019]',
-        2 => '1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2[127]|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9(?:17|99))|6(?:2|4[016-9])|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|9[29])|5(?:2|3(?:[045]|9(?:[0-58]|6[4-9]|7[0-35689]))|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0169])|3(?:[29]|60|7(?:[017-9]|6[6-8]))|49|51|6(?:[0-24]|36[2-57-9]|5(?:[0-389]|5[23])|6(?:[01]|9[178])|7(?:2[2-468]|3[78])|9[0145])|7[0-468]|8[68])|9(?:4[15]|5[138]|7[156]|8[189]|9(?:[1289]|3(?:31|4[357])|4[0178]))|(?:8294|96)[1-3]|2(?:57|93)[015-9]|(?:223|8699)[014-9]|(?:25[0468]|422|838)[01]|(?:48|8292|9[23])[1-9]|(?:47[59]|59[89]|8(?:68|9))[019]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[14]|[289][2-9]|5[3-9]|7[2-4679]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[257-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'JP',
+    'countryCode' => 81,
+    'generalDesc' => [
+        'pattern' => '00[1-9]\\d{6,14}|[257-9]\\d{9}|(?:00|[1-9]\\d\\d)\\d{6}',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1(?:1[235-8]|2[3-6]|3[3-9]|4[2-6]|[58][2-8]|6[2-7]|7[2-9]|9[1-9])|(?:2[2-9]|[36][1-9])\\d|4(?:[2-578]\\d|6[02-8]|9[2-59])|5(?:[2-589]\\d|6[1-9]|7[2-8])|7(?:[25-9]\\d|3[4-9]|4[02-9])|8(?:[2679]\\d|3[2-9]|4[5-9]|5[1-9]|8[03-9])|9(?:[2-58]\\d|[679][1-9]))\\d{6}',
+        'example' => '312345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '[7-9]0[1-9]\\d{7}',
+        'example' => '9012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '00777(?:[01]|5\\d)\\d\\d|(?:00(?:7778|882[1245])|(?:120|800\\d)\\d\\d)\\d{4}|00(?:37|66|78)\\d{6,13}',
+        'example' => '120123456',
+    ],
+    'premiumRate' => [
+        'pattern' => '990\\d{6}',
+        'example' => '990123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '60\\d{7}',
+        'example' => '601234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '50[1-9]\\d{7}',
+        'example' => '5012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '20\\d{8}',
+        'example' => '2012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '570\\d{6}',
+        'example' => '570123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '00(?:777(?:[01]|(?:5|8\\d)\\d)|882[1245]\\d\\d)\\d\\d|00(?:37|66|78)\\d{6,13}',
+    ],
+    'internationalPrefix' => '010',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '(000[259]\\d{6})$|(?:(?:003768)0?)|0',
+    'nationalPrefixTransformRule' => '$1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '007',
+                '0077',
+                '00777',
+                '00777[01]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '(?:12|57|99)0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d)(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|499|5(?:76|97)|746|8(?:3[89]|47|51)|9(?:80|9[16])',
+                '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:76|97)9|7468|8(?:3(?:8[7-9]|96)|477|51[2-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
+                '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:769|979[2-69])|7468|8(?:3(?:8[7-9]|96[2457-9])|477|51[2-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '60',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[36]|4(?:2[09]|7[01])',
+                '[36]|4(?:2(?:0|9[02-69])|7(?:0[019]|1))',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '1(?:1|5[45]|77|88|9[69])|2(?:2[1-37]|3[0-269]|4[59]|5|6[24]|7[1-358]|8[1369]|9[0-38])|4(?:[28][1-9]|3[0-57]|[45]|6[248]|7[2-579]|9[29])|5(?:2|3[0459]|4[0-369]|5[29]|8[02389]|9[0-389])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9[2-6])|8(?:2[124589]|3[26-9]|49|51|6|7[0-468]|8[68]|9[019])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9[1-489])',
+                '1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2(?:[127]|3[014-9])|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9[19])|62|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|8[1-9]|9[29])|5(?:2|3(?:[045]|9[0-8])|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0-2469])|3(?:[29]|60)|49|51|6(?:[0-24]|36|5[0-3589]|7[23]|9[01459])|7[0-468]|8[68])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9(?:[1289]|3[34]|4[0178]))|(?:264|837)[016-9]|2(?:57|93)[015-9]|(?:25[0468]|422|838)[01]|(?:47[59]|59[89]|8(?:6[68]|9))[019]',
+                '1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2[127]|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9(?:17|99))|6(?:2|4[016-9])|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|9[29])|5(?:2|3(?:[045]|9(?:[0-58]|6[4-9]|7[0-35689]))|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0169])|3(?:[29]|60|7(?:[017-9]|6[6-8]))|49|51|6(?:[0-24]|36[2-57-9]|5(?:[0-389]|5[23])|6(?:[01]|9[178])|7(?:2[2-468]|3[78])|9[0145])|7[0-468]|8[68])|9(?:4[15]|5[138]|7[156]|8[189]|9(?:[1289]|3(?:31|4[357])|4[0178]))|(?:8294|96)[1-3]|2(?:57|93)[015-9]|(?:223|8699)[014-9]|(?:25[0468]|422|838)[01]|(?:48|8292|9[23])[1-9]|(?:47[59]|59[89]|8(?:68|9))[019]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[14]|[289][2-9]|5[3-9]|7[2-4679]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{3,4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '007',
+                '0077',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '008',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[257-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})(\\d{4,5})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{5})(\\d{5,6})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{6})(\\d{6,7})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '(?:12|57|99)0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d)(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|499|5(?:76|97)|746|8(?:3[89]|47|51)|9(?:80|9[16])',
+                '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:76|97)9|7468|8(?:3(?:8[7-9]|96)|477|51[2-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
+                '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:769|979[2-69])|7468|8(?:3(?:8[7-9]|96[2457-9])|477|51[2-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '60',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[36]|4(?:2[09]|7[01])',
+                '[36]|4(?:2(?:0|9[02-69])|7(?:0[019]|1))',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '1(?:1|5[45]|77|88|9[69])|2(?:2[1-37]|3[0-269]|4[59]|5|6[24]|7[1-358]|8[1369]|9[0-38])|4(?:[28][1-9]|3[0-57]|[45]|6[248]|7[2-579]|9[29])|5(?:2|3[0459]|4[0-369]|5[29]|8[02389]|9[0-389])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9[2-6])|8(?:2[124589]|3[26-9]|49|51|6|7[0-468]|8[68]|9[019])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9[1-489])',
+                '1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2(?:[127]|3[014-9])|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9[19])|62|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|8[1-9]|9[29])|5(?:2|3(?:[045]|9[0-8])|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0-2469])|3(?:[29]|60)|49|51|6(?:[0-24]|36|5[0-3589]|7[23]|9[01459])|7[0-468]|8[68])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9(?:[1289]|3[34]|4[0178]))|(?:264|837)[016-9]|2(?:57|93)[015-9]|(?:25[0468]|422|838)[01]|(?:47[59]|59[89]|8(?:6[68]|9))[019]',
+                '1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2[127]|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9(?:17|99))|6(?:2|4[016-9])|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|9[29])|5(?:2|3(?:[045]|9(?:[0-58]|6[4-9]|7[0-35689]))|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0169])|3(?:[29]|60|7(?:[017-9]|6[6-8]))|49|51|6(?:[0-24]|36[2-57-9]|5(?:[0-389]|5[23])|6(?:[01]|9[178])|7(?:2[2-468]|3[78])|9[0145])|7[0-468]|8[68])|9(?:4[15]|5[138]|7[156]|8[189]|9(?:[1289]|3(?:31|4[357])|4[0178]))|(?:8294|96)[1-3]|2(?:57|93)[015-9]|(?:223|8699)[014-9]|(?:25[0468]|422|838)[01]|(?:48|8292|9[23])[1-9]|(?:47[59]|59[89]|8(?:68|9))[019]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[14]|[289][2-9]|5[3-9]|7[2-4679]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[257-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_KE.php b/src/data/PhoneNumberMetadata_KE.php
index 1537060e6..c08d855e3 100644
--- a/src/data/PhoneNumberMetadata_KE.php
+++ b/src/data/PhoneNumberMetadata_KE.php
@@ -6,151 +6,115 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[17]\\d\\d|900)\\d{6}|(?:2|80)0\\d{6,7}|[4-6]\\d{6,8}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
+return [
+    'id' => 'KE',
+    'countryCode' => 254,
+    'generalDesc' => [
+        'pattern' => '(?:[17]\\d\\d|900)\\d{6}|(?:2|80)0\\d{6,7}|[4-6]\\d{6,8}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:4[245]|5[1-79]|6[01457-9])\\d{5,7}|(?:4[136]|5[08]|62)\\d{7}|(?:[24]0|66)\\d{6,7}',
-    'ExampleNumber' => '202012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
+    'fixedLine' => [
+        'pattern' => '(?:4[245]|5[1-79]|6[01457-9])\\d{5,7}|(?:4[136]|5[08]|62)\\d{7}|(?:[24]0|66)\\d{6,7}',
+        'example' => '202012345',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:0[0-8]|1[0-5]|2[014]|30)|7\\d\\d)\\d{6}',
-    'ExampleNumber' => '712123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '(?:1(?:0[0-8]|1[0-5]|2[014]|30)|7\\d\\d)\\d{6}',
+        'example' => '712123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800[02-8]\\d{5,6}',
-    'ExampleNumber' => '800223456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+    'tollFree' => [
+        'pattern' => '800[02-8]\\d{5,6}',
+        'example' => '800223456',
+        'posLength' => [
+            9,
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[02-9]\\d{5}',
-    'ExampleNumber' => '900223456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'premiumRate' => [
+        'pattern' => '900[02-9]\\d{5}',
+        'example' => '900223456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'KE',
-  'countryCode' => 254,
-  'internationalPrefix' => '000',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '000',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{5,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[24-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[17]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[17]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_KG.php b/src/data/PhoneNumberMetadata_KG.php
index 0152d2a08..8c58bbd2d 100644
--- a/src/data/PhoneNumberMetadata_KG.php
+++ b/src/data/PhoneNumberMetadata_KG.php
@@ -6,150 +6,112 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '8\\d{9}|[235-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+return [
+    'id' => 'KG',
+    'countryCode' => 996,
+    'generalDesc' => [
+        'pattern' => '8\\d{9}|[235-9]\\d{8}',
+        'posLength' => [
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '312(?:5[0-79]\\d|9(?:[0-689]\\d|7[0-24-9]))\\d{3}|(?:3(?:1(?:2[0-46-8]|3[1-9]|47|[56]\\d)|2(?:22|3[0-479]|6[0-7])|4(?:22|5[6-9]|6\\d)|5(?:22|3[4-7]|59|6\\d)|6(?:22|5[35-7]|6\\d)|7(?:22|3[468]|4[1-9]|59|[67]\\d)|9(?:22|4[1-8]|6\\d))|6(?:09|12|2[2-4])\\d)\\d{5}',
+        'example' => '312123456',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '312(?:58\\d|973)\\d{3}|(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|600|7(?:[07]\\d|55)|88[08]|9(?:12|9[05-9]))\\d{6}',
+        'example' => '700123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{6,7}',
+        'example' => '800123456',
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3(?:1[346]|[24-79])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[235-79]|88',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d)(\\d{2,3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '312(?:5[0-79]\\d|9(?:[0-689]\\d|7[0-24-9]))\\d{3}|(?:3(?:1(?:2[0-46-8]|3[1-9]|47|[56]\\d)|2(?:22|3[0-479]|6[0-7])|4(?:22|5[6-9]|6\\d)|5(?:22|3[4-7]|59|6\\d)|6(?:22|5[35-7]|6\\d)|7(?:22|3[468]|4[1-9]|59|[67]\\d)|9(?:22|4[1-8]|6\\d))|6(?:09|12|2[2-4])\\d)\\d{5}',
-    'ExampleNumber' => '312123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '312(?:58\\d|973)\\d{3}|(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|600|7(?:[07]\\d|55)|88[08]|9(?:12|9[05-9]))\\d{6}',
-    'ExampleNumber' => '700123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6,7}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'KG',
-  'countryCode' => 996,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3(?:1[346]|[24-79])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[235-79]|88',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d)(\\d{2,3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_KH.php b/src/data/PhoneNumberMetadata_KH.php
index 27daba861..c1a659ea4 100644
--- a/src/data/PhoneNumberMetadata_KH.php
+++ b/src/data/PhoneNumberMetadata_KH.php
@@ -6,147 +6,111 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{9}|[1-9]\\d{7,8}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
+return [
+    'id' => 'KH',
+    'countryCode' => 855,
+    'generalDesc' => [
+        'pattern' => '1\\d{9}|[1-9]\\d{7,8}',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '23(?:4(?:[2-4]|[56]\\d)|[568]\\d\\d)\\d{4}|23[236-9]\\d{5}|(?:2[4-6]|3[2-6]|4[2-4]|[5-7][2-5])(?:(?:[237-9]|4[56]|5\\d)\\d{5}|6\\d{5,6})',
+        'example' => '23756789',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:(?:1[28]|3[18]|9[67])\\d|6[016-9]|7(?:[07-9]|[16]\\d)|8(?:[013-79]|8\\d))\\d{6}|(?:1\\d|9[0-57-9])\\d{6}|(?:2[3-6]|3[2-6]|4[2-4]|[5-7][2-5])48\\d{5}',
+        'example' => '91234567',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1800(?:1\\d|2[019])\\d{4}',
+        'example' => '1800123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '1900(?:1\\d|2[09])\\d{4}',
+        'example' => '1900123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00[14-9]',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '23(?:4(?:[2-4]|[56]\\d)|[568]\\d\\d)\\d{4}|23[236-9]\\d{5}|(?:2[4-6]|3[2-6]|4[2-4]|[5-7][2-5])(?:(?:[237-9]|4[56]|5\\d)\\d{5}|6\\d{5,6})',
-    'ExampleNumber' => '23756789',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:(?:1[28]|3[18]|9[67])\\d|6[016-9]|7(?:[07-9]|[16]\\d)|8(?:[013-79]|8\\d))\\d{6}|(?:1\\d|9[0-57-9])\\d{6}|(?:2[3-6]|3[2-6]|4[2-4]|[5-7][2-5])48\\d{5}',
-    'ExampleNumber' => '91234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800(?:1\\d|2[019])\\d{4}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1900(?:1\\d|2[09])\\d{4}',
-    'ExampleNumber' => '1900123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'KH',
-  'countryCode' => 855,
-  'internationalPrefix' => '00[14-9]',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_KI.php b/src/data/PhoneNumberMetadata_KI.php
index 0331d82b6..f00546ce7 100644
--- a/src/data/PhoneNumberMetadata_KI.php
+++ b/src/data/PhoneNumberMetadata_KI.php
@@ -6,104 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[37]\\d|6[0-79])\\d{6}|(?:[2-48]\\d|50)\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 8,
+return [
+    'id' => 'KI',
+    'countryCode' => 686,
+    'generalDesc' => [
+        'pattern' => '(?:[37]\\d|6[0-79])\\d{6}|(?:[2-48]\\d|50)\\d{3}',
+        'posLength' => [
+            5,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:[24]\\d|3[1-9]|50|65(?:02[12]|12[56]|22[89]|[3-5]00)|7(?:27\\d\\d|3100|5(?:02[12]|12[56]|22[89]|[34](?:00|81)|500))|8[0-5])\\d{3}',
-    'ExampleNumber' => '31234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6200[01]|7(?:310[1-9]|5(?:02[03-9]|12[0-47-9]|22[0-7]|[34](?:0[1-9]|8[02-9])|50[1-9])))\\d{3}|(?:63\\d\\d|7(?:(?:[0146-9]\\d|2[0-689])\\d|3(?:[02-9]\\d|1[1-9])|5(?:[0-2][013-9]|[34][1-79]|5[1-9]|[6-9]\\d)))\\d{4}',
-    'ExampleNumber' => '72001234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '(?:[24]\\d|3[1-9]|50|65(?:02[12]|12[56]|22[89]|[3-5]00)|7(?:27\\d\\d|3100|5(?:02[12]|12[56]|22[89]|[34](?:00|81)|500))|8[0-5])\\d{3}',
+        'example' => '31234',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:6200[01]|7(?:310[1-9]|5(?:02[03-9]|12[0-47-9]|22[0-7]|[34](?:0[1-9]|8[02-9])|50[1-9])))\\d{3}|(?:63\\d\\d|7(?:(?:[0146-9]\\d|2[0-689])\\d|3(?:[02-9]\\d|1[1-9])|5(?:[0-2][013-9]|[34][1-79]|5[1-9]|[6-9]\\d)))\\d{4}',
+        'example' => '72001234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '30(?:0[01]\\d\\d|12(?:11|20))\\d\\d',
-    'ExampleNumber' => '30010000',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '30(?:0[01]\\d\\d|12(?:11|20))\\d\\d',
+        'example' => '30010000',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'KI',
-  'countryCode' => 686,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_KM.php b/src/data/PhoneNumberMetadata_KM.php
index b954cc933..ce58b9de2 100644
--- a/src/data/PhoneNumberMetadata_KM.php
+++ b/src/data/PhoneNumberMetadata_KM.php
@@ -6,113 +6,83 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[3478]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'KM',
+    'countryCode' => 269,
+    'generalDesc' => [
+        'pattern' => '[3478]\\d{6}',
+        'posLength' => [
+            7,
+        ],
+        'posLengthLocal' => [
+            4,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
+    'fixedLine' => [
+        'pattern' => '7[4-7]\\d{5}',
+        'example' => '7712345',
+        'posLengthLocal' => [
+            4,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '7[4-7]\\d{5}',
-    'ExampleNumber' => '7712345',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
+    'mobile' => [
+        'pattern' => '[34]\\d{6}',
+        'example' => '3212345',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[34]\\d{6}',
-    'ExampleNumber' => '3212345',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '8\\d{6}',
-    'ExampleNumber' => '8001234',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '8\\d{6}',
+        'example' => '8001234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'KM',
-  'countryCode' => 269,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3478]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[3478]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_KN.php b/src/data/PhoneNumberMetadata_KN.php
index 9bad748d7..a132bd900 100644
--- a/src/data/PhoneNumberMetadata_KN.php
+++ b/src/data/PhoneNumberMetadata_KN.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'KN',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '869(?:2(?:29|36)|302|4(?:6[015-9]|70)|56[5-7])\\d{4}',
+        'example' => '8692361234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '869(?:2(?:29|36)|302|4(?:6[015-9]|70)|56[5-7])\\d{4}',
-    'ExampleNumber' => '8692361234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '869(?:48[89]|55[6-8]|66\\d|76[02-7])\\d{4}',
+        'example' => '8697652917',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '869(?:48[89]|55[6-8]|66\\d|76[02-7])\\d{4}',
-    'ExampleNumber' => '8697652917',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'KN',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-7]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '869$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '869',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-7]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '869$1',
+    'numberFormat' => [],
+    'leadingDigits' => '869',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_KP.php b/src/data/PhoneNumberMetadata_KP.php
index 1236f92e7..2285a87c9 100644
--- a/src/data/PhoneNumberMetadata_KP.php
+++ b/src/data/PhoneNumberMetadata_KP.php
@@ -6,149 +6,111 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '85\\d{6}|(?:19\\d|[2-7])\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 10,
+return [
+    'id' => 'KP',
+    'countryCode' => 850,
+    'generalDesc' => [
+        'pattern' => '85\\d{6}|(?:19\\d|[2-7])\\d{7}',
+        'posLength' => [
+            8,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:(?:195|2)\\d|3[19]|4[159]|5[37]|6[17]|7[39]|85)\\d{6}',
+        'example' => '21234567',
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '19[1-3]\\d{7}',
+        'example' => '1921234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '238[02-9]\\d{4}|2(?:[0-24-9]\\d|3[0-79])\\d{5}',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'internationalPrefix' => '00|99',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:195|2)\\d|3[19]|4[159]|5[37]|6[17]|7[39]|85)\\d{6}',
-    'ExampleNumber' => '21234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '19[1-3]\\d{7}',
-    'ExampleNumber' => '1921234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '238[02-9]\\d{4}|2(?:[0-24-9]\\d|3[0-79])\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'id' => 'KP',
-  'countryCode' => 850,
-  'internationalPrefix' => '00|99',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_KR.php b/src/data/PhoneNumberMetadata_KR.php
index 1b4a5b299..a6d5b3160 100644
--- a/src/data/PhoneNumberMetadata_KR.php
+++ b/src/data/PhoneNumberMetadata_KR.php
@@ -6,374 +6,290 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '00[1-9]\\d{8,11}|(?:[12]|5\\d{3})\\d{7}|[13-6]\\d{9}|(?:[1-6]\\d|80)\\d{7}|[3-6]\\d{4,5}|(?:00|7)0\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
-      6 => 12,
-      7 => 13,
-      8 => 14,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2|3[1-3]|[46][1-4]|5[1-5])[1-9]\\d{6,7}|(?:3[1-3]|[46][1-4]|5[1-5])1\\d{2,3}',
-    'ExampleNumber' => '22123456',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '1(?:05(?:[0-8]\\d|9[0-6])|22[13]\\d)\\d{4,5}|1(?:0[0-46-9]|[16-9]\\d|2[013-9])\\d{6,7}',
-    'ExampleNumber' => '1020000000',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '00(?:308\\d{6,7}|798\\d{7,9})|(?:00368|80)\\d{7}',
-    'ExampleNumber' => '801234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 11,
-      2 => 12,
-      3 => 13,
-      4 => 14,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '60[2-9]\\d{6}',
-    'ExampleNumber' => '602345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '50\\d{8,9}',
-    'ExampleNumber' => '5012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '70\\d{8}',
-    'ExampleNumber' => '7012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '15\\d{7,8}',
-    'ExampleNumber' => '1523456789',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '1(?:5(?:22|33|44|66|77|88|99)|6(?:[07]0|44|6[0168]|88)|8(?:00|33|55|77|99))\\d{4}',
-    'ExampleNumber' => '15441234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '00(?:3(?:08\\d{6,7}|68\\d{7})|798\\d{7,9})',
-    'PossibleLength' =>
-     [
-      0 => 11,
-      1 => 12,
-      2 => 13,
-      3 => 14,
-    ],
-  ],
-  'id' => 'KR',
-  'countryCode' => 82,
-  'internationalPrefix' => '00(?:[125689]|3(?:[46]5|91)|7(?:00|27|3|55|6[126]))',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0(8(?:[1-46-8]|5\\d\\d))?',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[016-9]1',
-        1 => '1[016-9]11',
-        2 => '1[016-9]114',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:3[1-3]|[46][1-4]|5[1-5])1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{3,4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60|8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1346]|5[1-5]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[57]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{5})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '003',
-        1 => '0030',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{5})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{5})(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:3[1-3]|[46][1-4]|5[1-5])1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3,4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '60|8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1346]|5[1-5]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[57]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$CC-$1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'KR',
+    'countryCode' => 82,
+    'generalDesc' => [
+        'pattern' => '00[1-9]\\d{8,11}|(?:[12]|5\\d{3})\\d{7}|[13-6]\\d{9}|(?:[1-6]\\d|80)\\d{7}|[3-6]\\d{4,5}|(?:00|7)0\\d{8}',
+        'posLength' => [
+            5,
+            6,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+        ],
+        'posLengthLocal' => [
+            3,
+            4,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2|3[1-3]|[46][1-4]|5[1-5])[1-9]\\d{6,7}|(?:3[1-3]|[46][1-4]|5[1-5])1\\d{2,3}',
+        'example' => '22123456',
+        'posLength' => [
+            5,
+            6,
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            3,
+            4,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '1(?:05(?:[0-8]\\d|9[0-6])|22[13]\\d)\\d{4,5}|1(?:0[0-46-9]|[16-9]\\d|2[013-9])\\d{6,7}',
+        'example' => '1020000000',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '00(?:308\\d{6,7}|798\\d{7,9})|(?:00368|80)\\d{7}',
+        'example' => '801234567',
+        'posLength' => [
+            9,
+            11,
+            12,
+            13,
+            14,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '60[2-9]\\d{6}',
+        'example' => '602345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '50\\d{8,9}',
+        'example' => '5012345678',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '70\\d{8}',
+        'example' => '7012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '15\\d{7,8}',
+        'example' => '1523456789',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '1(?:5(?:22|33|44|66|77|88|99)|6(?:[07]0|44|6[0168]|88)|8(?:00|33|55|77|99))\\d{4}',
+        'example' => '15441234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '00(?:3(?:08\\d{6,7}|68\\d{7})|798\\d{7,9})',
+        'posLength' => [
+            11,
+            12,
+            13,
+            14,
+        ],
+    ],
+    'internationalPrefix' => '00(?:[125689]|3(?:[46]5|91)|7(?:00|27|3|55|6[126]))',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0(8(?:[1-46-8]|5\\d\\d))?',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1[016-9]1',
+                '1[016-9]11',
+                '1[016-9]114',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '(?:3[1-3]|[46][1-4]|5[1-5])1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3,4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '60|8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[1346]|5[1-5]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[57]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '003',
+                '0030',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '(?:3[1-3]|[46][1-4]|5[1-5])1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3,4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '60|8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[1346]|5[1-5]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[57]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$CC-$1',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_KW.php b/src/data/PhoneNumberMetadata_KW.php
index 849f37ac4..cacff04be 100644
--- a/src/data/PhoneNumberMetadata_KW.php
+++ b/src/data/PhoneNumberMetadata_KW.php
@@ -6,130 +6,97 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '18\\d{5}|(?:[2569]\\d|41)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+return [
+    'id' => 'KW',
+    'countryCode' => 965,
+    'generalDesc' => [
+        'pattern' => '18\\d{5}|(?:[2569]\\d|41)\\d{6}',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:[23]\\d\\d|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7]))\\d{4}',
-    'ExampleNumber' => '22345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '2(?:[23]\\d\\d|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7]))\\d{4}',
+        'example' => '22345678',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:41\\d\\d|5(?:(?:[05]\\d|1[0-7]|6[56])\\d|2(?:22|5[25])|7(?:55|77)|88[58])|6(?:(?:0[034679]|5[015-9]|6\\d)\\d|1(?:00|11|6[16])|2[26]2|3[36]3|4[46]4|7(?:0[013-9]|[67]\\d)|8[68]8|9(?:[069]\\d|3[039]))|9(?:(?:[04679]\\d|8[057-9])\\d|1(?:1[01]|99)|2(?:00|2\\d)|3(?:00|3[03])|5(?:00|5\\d)))\\d{4}',
-    'ExampleNumber' => '50012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '(?:41\\d\\d|5(?:(?:[05]\\d|1[0-7]|6[56])\\d|2(?:22|5[25])|7(?:55|77)|88[58])|6(?:(?:0[034679]|5[015-9]|6\\d)\\d|1(?:00|11|6[16])|2[26]2|3[36]3|4[46]4|7(?:0[013-9]|[67]\\d)|8[68]8|9(?:[069]\\d|3[039]))|9(?:(?:[04679]\\d|8[057-9])\\d|1(?:1[01]|99)|2(?:00|2\\d)|3(?:00|3[03])|5(?:00|5\\d)))\\d{4}',
+        'example' => '50012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '18\\d{5}',
-    'ExampleNumber' => '1801234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '18\\d{5}',
+        'example' => '1801234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'KW',
-  'countryCode' => 965,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[169]|2(?:[235]|4[1-35-9])|52',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[169]|2(?:[235]|4[1-35-9])|52',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[245]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[245]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_KY.php b/src/data/PhoneNumberMetadata_KY.php
index 1d7ae8f7b..17d9847f9 100644
--- a/src/data/PhoneNumberMetadata_KY.php
+++ b/src/data/PhoneNumberMetadata_KY.php
@@ -6,103 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:345|[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'KY',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:345|[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '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}',
+        'example' => '3452221234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    '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',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '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}',
+        'example' => '3453231234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    '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',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002345678',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:345976|900[2-9]\\d\\d)\\d{4}',
-    'ExampleNumber' => '9002345678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '(?:345976|900[2-9]\\d\\d)\\d{4}',
+        'example' => '9002345678',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '345849\\d{4}',
-    'ExampleNumber' => '3458491234',
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'pattern' => '345849\\d{4}',
+        'example' => '3458491234',
     ],
-  ],
-  'id' => 'KY',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '345$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '345',
-  'mobileNumberPortableRegion' => true,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '345$1',
+    'numberFormat' => [],
+    'leadingDigits' => '345',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_KZ.php b/src/data/PhoneNumberMetadata_KZ.php
index d8c3c2231..f8ae5a1e5 100644
--- a/src/data/PhoneNumberMetadata_KZ.php
+++ b/src/data/PhoneNumberMetadata_KZ.php
@@ -6,125 +6,96 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:33622|8\\d{8})\\d{5}|[78]\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 14,
+return [
+    'id' => 'KZ',
+    'countryCode' => 7,
+    'generalDesc' => [
+        'pattern' => '(?:33622|8\\d{8})\\d{5}|[78]\\d{9}',
+        'posLength' => [
+            10,
+            14,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:33622|7(?:1(?:0(?:[23]\\d|4[0-3]|59|63)|1(?:[23]\\d|4[0-79]|59)|2(?:[23]\\d|59)|3(?:2\\d|3[0-79]|4[0-35-9]|59)|4(?:[24]\\d|3[013-9]|5[1-9]|97)|5(?:2\\d|3[1-9]|4[0-7]|59)|6(?:[2-4]\\d|5[19]|61)|72\\d|8(?:[27]\\d|3[1-46-9]|4[0-5]|59))|2(?:1(?:[23]\\d|4[46-9]|5[3469])|2(?:2\\d|3[0679]|46|5[12679])|3(?:[2-4]\\d|5[139])|4(?:2\\d|3[1-35-9]|59)|5(?:[23]\\d|4[0-8]|59|61)|6(?:2\\d|3[1-9]|4[0-4]|59)|7(?:[2379]\\d|40|5[279])|8(?:[23]\\d|4[0-3]|59)|9(?:2\\d|3[124578]|59))))\\d{5}',
+        'example' => '7123456789',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:33622|7(?:1(?:0(?:[23]\\d|4[0-3]|59|63)|1(?:[23]\\d|4[0-79]|59)|2(?:[23]\\d|59)|3(?:2\\d|3[0-79]|4[0-35-9]|59)|4(?:[24]\\d|3[013-9]|5[1-9]|97)|5(?:2\\d|3[1-9]|4[0-7]|59)|6(?:[2-4]\\d|5[19]|61)|72\\d|8(?:[27]\\d|3[1-46-9]|4[0-5]|59))|2(?:1(?:[23]\\d|4[46-9]|5[3469])|2(?:2\\d|3[0679]|46|5[12679])|3(?:[2-4]\\d|5[139])|4(?:2\\d|3[1-35-9]|59)|5(?:[23]\\d|4[0-8]|59|61)|6(?:2\\d|3[1-9]|4[0-4]|59)|7(?:[2379]\\d|40|5[279])|8(?:[23]\\d|4[0-3]|59)|9(?:2\\d|3[124578]|59))))\\d{5}',
-    'ExampleNumber' => '7123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'mobile' => [
+        'pattern' => '7(?:0[0-25-8]|47|6[0-4]|7[15-8]|85)\\d{7}',
+        'example' => '7710009998',
+        'posLength' => [
+            10,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|108\\d{3})\\d{7}',
+        'example' => '8001234567',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:0[0-25-8]|47|6[0-4]|7[15-8]|85)\\d{7}',
-    'ExampleNumber' => '7710009998',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'premiumRate' => [
+        'pattern' => '809\\d{7}',
+        'example' => '8091234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|108\\d{3})\\d{7}',
-    'ExampleNumber' => '8001234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '809\\d{7}',
-    'ExampleNumber' => '8091234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '808\\d{7}',
+        'example' => '8081234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '808\\d{7}',
-    'ExampleNumber' => '8081234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'voip' => [
+        'pattern' => '751\\d{7}',
+        'example' => '7511234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '751\\d{7}',
-    'ExampleNumber' => '7511234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'pattern' => '751\\d{7}',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '751\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'id' => 'KZ',
-  'countryCode' => 7,
-  'internationalPrefix' => '810',
-  'preferredInternationalPrefix' => '8~10',
-  'nationalPrefix' => '8',
-  'nationalPrefixForParsing' => '8',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '33|7',
-  'mobileNumberPortableRegion' => true,
+    'internationalPrefix' => '810',
+    'preferredInternationalPrefix' => '8~10',
+    'nationalPrefix' => '8',
+    'nationalPrefixForParsing' => '8',
+    'numberFormat' => [],
+    'leadingDigits' => '33|7',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_LA.php b/src/data/PhoneNumberMetadata_LA.php
index 0d34f8322..951044d1e 100644
--- a/src/data/PhoneNumberMetadata_LA.php
+++ b/src/data/PhoneNumberMetadata_LA.php
@@ -6,154 +6,115 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[23]\\d{9}|3\\d{8}|(?:[235-8]\\d|41)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
+return [
+    'id' => 'LA',
+    'countryCode' => 856,
+    'generalDesc' => [
+        'pattern' => '[23]\\d{9}|3\\d{8}|(?:[235-8]\\d|41)\\d{6}',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2[13]|[35-7][14]|41|8[1468])\\d{6}',
+        'example' => '21212862',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:20(?:[23579]\\d|88)|30(?:2\\d|4))\\d{6}',
+        'example' => '2023123456',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '30[0135-9]\\d{6}',
+        'example' => '301234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2[13]|3[14]|[4-8]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '30[013-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[13]|[35-7][14]|41|8[1468])\\d{6}',
-    'ExampleNumber' => '21212862',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:20(?:[23579]\\d|88)|30(?:2\\d|4))\\d{6}',
-    'ExampleNumber' => '2023123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '30[0135-9]\\d{6}',
-    'ExampleNumber' => '301234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'LA',
-  'countryCode' => 856,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[13]|3[14]|[4-8]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '30[013-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_LB.php b/src/data/PhoneNumberMetadata_LB.php
index 62857aaa4..34cf81dde 100644
--- a/src/data/PhoneNumberMetadata_LB.php
+++ b/src/data/PhoneNumberMetadata_LB.php
@@ -6,126 +6,94 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[27-9]\\d{7}|[13-9]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+return [
+    'id' => 'LB',
+    'countryCode' => 961,
+    'generalDesc' => [
+        'pattern' => '[27-9]\\d{7}|[13-9]\\d{6}',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '7(?:62|8[0-7]|9[04-9])\\d{4}|(?:[14-69]\\d|2(?:[14-69]\\d|[78][1-9])|7[2-57]|8[02-9])\\d{5}',
-    'ExampleNumber' => '1123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '793(?:[01]\\d|2[0-4])\\d{3}|(?:(?:3|81)\\d|7(?:[01]\\d|6[013-9]|8[89]|9[12]))\\d{5}',
-    'ExampleNumber' => '71123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '7(?:62|8[0-7]|9[04-9])\\d{4}|(?:[14-69]\\d|2(?:[14-69]\\d|[78][1-9])|7[2-57]|8[02-9])\\d{5}',
+        'example' => '1123456',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9[01]\\d{6}',
-    'ExampleNumber' => '90123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '793(?:[01]\\d|2[0-4])\\d{3}|(?:(?:3|81)\\d|7(?:[01]\\d|6[013-9]|8[89]|9[12]))\\d{5}',
+        'example' => '71123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '80\\d{6}',
-    'ExampleNumber' => '80123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '9[01]\\d{6}',
+        'example' => '90123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '80\\d{6}',
+        'example' => '80123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LB',
-  'countryCode' => 961,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13-69]|7(?:[2-57]|62|8[0-7]|9[04-9])|8[02-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[27-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[13-69]|7(?:[2-57]|62|8[0-7]|9[04-9])|8[02-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[27-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_LC.php b/src/data/PhoneNumberMetadata_LC.php
index 7fc21daa5..35a3a233f 100644
--- a/src/data/PhoneNumberMetadata_LC.php
+++ b/src/data/PhoneNumberMetadata_LC.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|758|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'LC',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|758|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '758(?:234|4(?:30|5\\d|6[2-9]|8[0-2])|57[0-2]|(?:63|75)8)\\d{4}',
+        'example' => '7584305678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '758(?:234|4(?:30|5\\d|6[2-9]|8[0-2])|57[0-2]|(?:63|75)8)\\d{4}',
-    'ExampleNumber' => '7584305678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '758(?:28[4-7]|384|4(?:6[01]|8[4-9])|5(?:1[89]|20|84)|7(?:1[2-9]|2\\d|3[0-3])|812)\\d{4}',
+        'example' => '7582845678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '758(?:28[4-7]|384|4(?:6[01]|8[4-9])|5(?:1[89]|20|84)|7(?:1[2-9]|2\\d|3[0-3])|812)\\d{4}',
-    'ExampleNumber' => '7582845678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LC',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-8]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '758$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '758',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-8]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '758$1',
+    'numberFormat' => [],
+    'leadingDigits' => '758',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_LI.php b/src/data/PhoneNumberMetadata_LI.php
index 4bf8d552e..7e81085ab 100644
--- a/src/data/PhoneNumberMetadata_LI.php
+++ b/src/data/PhoneNumberMetadata_LI.php
@@ -6,155 +6,117 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[68]\\d{8}|(?:[2378]\\d|90)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
+return [
+    'id' => 'LI',
+    'countryCode' => 423,
+    'generalDesc' => [
+        'pattern' => '[68]\\d{8}|(?:[2378]\\d|90)\\d{5}',
+        'posLength' => [
+            7,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:01|1[27]|2[02]|3\\d|6[02-578]|96)|3(?:[24]0|33|7[0135-7]|8[048]|9[0269]))\\d{4}',
-    'ExampleNumber' => '2345678',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:2(?:01|1[27]|2[02]|3\\d|6[02-578]|96)|3(?:[24]0|33|7[0135-7]|8[048]|9[0269]))\\d{4}',
+        'example' => '2345678',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6(?:(?:4[5-9]|5[0-469])\\d|6(?:[024-6]\\d|[17]0|3[7-9]))\\d|7(?:[37-9]\\d|42|56))\\d{4}',
-    'ExampleNumber' => '660234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8002[28]\\d\\d|80(?:05\\d|9)\\d{4}',
-    'ExampleNumber' => '8002222',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90(?:02[258]|1(?:23|3[14])|66[136])\\d\\d',
-    'ExampleNumber' => '9002222',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:6(?:(?:4[5-9]|5[0-469])\\d|6(?:[024-6]\\d|[17]0|3[7-9]))\\d|7(?:[37-9]\\d|42|56))\\d{4}',
+        'example' => '660234567',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '8002[28]\\d\\d|80(?:05\\d|9)\\d{4}',
+        'example' => '8002222',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90(?:02[258]|1(?:23|3[14])|66[136])\\d\\d',
+        'example' => '9002222',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '870(?:28|87)\\d\\d',
-    'ExampleNumber' => '8702812',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '697(?:42|56|[78]\\d)\\d{4}',
-    'ExampleNumber' => '697861234',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '870(?:28|87)\\d\\d',
+        'example' => '8702812',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'id' => 'LI',
-  'countryCode' => 423,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '(1001)|0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2379]|8(?:0[09]|7)',
-        1 => '[2379]|8(?:0(?:02|9)|7)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'pattern' => '697(?:42|56|[78]\\d)\\d{4}',
+        'example' => '697861234',
+        'posLength' => [
+            9,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '69',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '(1001)|0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2379]|8(?:0[09]|7)',
+                '[2379]|8(?:0(?:02|9)|7)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '69',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_LK.php b/src/data/PhoneNumberMetadata_LK.php
index 92112ab33..957cdb899 100644
--- a/src/data/PhoneNumberMetadata_LK.php
+++ b/src/data/PhoneNumberMetadata_LK.php
@@ -6,127 +6,94 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'LK',
+    'countryCode' => 94,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{8}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:12[2-9]|602|8[12]\\d|9(?:1\\d|22|9[245]))\\d{6}|(?:11|2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7])[2-57]\\d{6}',
+        'example' => '112345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:12[2-9]|602|8[12]\\d|9(?:1\\d|22|9[245]))\\d{6}|(?:11|2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7])[2-57]\\d{6}',
-    'ExampleNumber' => '112345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '7(?:[0-25-8]\\d|4[0-4])\\d{6}',
+        'example' => '712345678',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:[0-25-8]\\d|4[0-4])\\d{6}',
-    'ExampleNumber' => '712345678',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '1973\\d{5}',
-    'ExampleNumber' => '197312345',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '1973\\d{5}',
+        'example' => '197312345',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LK',
-  'countryCode' => 94,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-689]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-689]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_LR.php b/src/data/PhoneNumberMetadata_LR.php
index db8b55433..d05f43e51 100644
--- a/src/data/PhoneNumberMetadata_LR.php
+++ b/src/data/PhoneNumberMetadata_LR.php
@@ -6,146 +6,109 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[245]\\d|33|77|88)\\d{7}|(?:2\\d|[4-6])\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
+return [
+    'id' => 'LR',
+    'countryCode' => 231,
+    'generalDesc' => [
+        'pattern' => '(?:[245]\\d|33|77|88)\\d{7}|(?:2\\d|[4-6])\\d{6}',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2\\d{7}',
-    'ExampleNumber' => '21234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '2\\d{7}',
+        'example' => '21234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:(?:(?:22|33)0|555|(?:77|88)\\d)\\d|4(?:240|[67]))\\d{5}|[56]\\d{6}',
-    'ExampleNumber' => '770123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
+    'mobile' => [
+        'pattern' => '(?:(?:(?:22|33)0|555|(?:77|88)\\d)\\d|4(?:240|[67]))\\d{5}|[56]\\d{6}',
+        'example' => '770123456',
+        'posLength' => [
+            7,
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '332(?:02|[34]\\d)\\d{4}',
-    'ExampleNumber' => '332021234',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'premiumRate' => [
+        'pattern' => '332(?:02|[34]\\d)\\d{4}',
+        'example' => '332021234',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LR',
-  'countryCode' => 231,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '4[67]|[56]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '4[67]|[56]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-578]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-578]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_LS.php b/src/data/PhoneNumberMetadata_LS.php
index b74165eb1..0f43a6826 100644
--- a/src/data/PhoneNumberMetadata_LS.php
+++ b/src/data/PhoneNumberMetadata_LS.php
@@ -6,105 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[256]\\d\\d|800)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'LS',
+    'countryCode' => 266,
+    'generalDesc' => [
+        'pattern' => '(?:[256]\\d\\d|800)\\d{5}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2\\d{7}',
-    'ExampleNumber' => '22123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[56]\\d{7}',
-    'ExampleNumber' => '50123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800[1256]\\d{4}',
-    'ExampleNumber' => '80021234',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2\\d{7}',
+        'example' => '22123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '[56]\\d{7}',
+        'example' => '50123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800[1256]\\d{4}',
+        'example' => '80021234',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LS',
-  'countryCode' => 266,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2568]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2568]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_LT.php b/src/data/PhoneNumberMetadata_LT.php
index 764629151..1345cb811 100644
--- a/src/data/PhoneNumberMetadata_LT.php
+++ b/src/data/PhoneNumberMetadata_LT.php
@@ -6,133 +6,106 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[3469]\\d|52|[78]0)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'LT',
+    'countryCode' => 370,
+    'generalDesc' => [
+        'pattern' => '(?:[3469]\\d|52|[78]0)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3[1478]|4[124-6]|52)\\d{6}',
-    'ExampleNumber' => '31234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6\\d{7}',
-    'ExampleNumber' => '61234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[02]\\d{5}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9(?:0[0239]|10)\\d{5}',
-    'ExampleNumber' => '90012345',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '808\\d{5}',
-    'ExampleNumber' => '80812345',
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70[05]\\d{5}',
-    'ExampleNumber' => '70012345',
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '[89]01\\d{5}',
-    'ExampleNumber' => '80123456',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:3[1478]|4[124-6]|52)\\d{6}',
+        'example' => '31234567',
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '70[67]\\d{5}',
-    'ExampleNumber' => '70712345',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '6\\d{7}',
+        'example' => '61234567',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[02]\\d{5}',
+        'example' => '80012345',
     ],
-  ],
-  'id' => 'LT',
-  'countryCode' => 370,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '[08]',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '52[0-7]',
-      ],
-      'nationalPrefixFormattingRule' => '(0-$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'premiumRate' => [
+        'pattern' => '9(?:0[0239]|10)\\d{5}',
+        'example' => '90012345',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[7-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'sharedCost' => [
+        'pattern' => '808\\d{5}',
+        'example' => '80812345',
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '37|4(?:[15]|6[1-8])',
-      ],
-      'nationalPrefixFormattingRule' => '(0-$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'personalNumber' => [
+        'pattern' => '70[05]\\d{5}',
+        'example' => '70012345',
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-6]',
-      ],
-      'nationalPrefixFormattingRule' => '(0-$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'voip' => [
+        'pattern' => '[89]01\\d{5}',
+        'example' => '80123456',
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '70[67]\\d{5}',
+        'example' => '70712345',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '[08]',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '52[0-7]',
+            ],
+            'nationalPrefixFormattingRule' => '(0-$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[7-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '37|4(?:[15]|6[1-8])',
+            ],
+            'nationalPrefixFormattingRule' => '(0-$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[3-6]',
+            ],
+            'nationalPrefixFormattingRule' => '(0-$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_LU.php b/src/data/PhoneNumberMetadata_LU.php
index 907193627..d9e4377ed 100644
--- a/src/data/PhoneNumberMetadata_LU.php
+++ b/src/data/PhoneNumberMetadata_LU.php
@@ -6,229 +6,176 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '35[013-9]\\d{4,8}|6\\d{8}|35\\d{2,4}|(?:[2457-9]\\d|3[0-46-9])\\d{2,9}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-      5 => 9,
-      6 => 10,
-      7 => 11,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:35[013-9]|80[2-9]|90[89])\\d{1,8}|(?:2[2-9]|3[0-46-9]|[457]\\d|8[13-9]|9[2-579])\\d{2,9}',
-    'ExampleNumber' => '27123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6(?:[269][18]|5[1568]|7[189]|81)\\d{6}',
-    'ExampleNumber' => '628123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[015]\\d{5}',
-    'ExampleNumber' => '90012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '801\\d{5}',
-    'ExampleNumber' => '80112345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '20(?:1\\d{5}|[2-689]\\d{1,7})',
-    'ExampleNumber' => '20201234',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-      5 => 9,
-      6 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'LU',
-  'countryCode' => 352,
-  'internationalPrefix' => '00',
-  'nationalPrefixForParsing' => '(15(?:0[06]|1[12]|[35]5|4[04]|6[26]|77|88|99)\\d)',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:0[2-689]|[2-9])|[3-57]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:0[2-689]|[2-9])|[3-57]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '20[2-689]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:[0367]|4[3-8])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80[01]|90[015]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '20',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})',
-      'format' => '$1 $2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:[0367]|4[3-8])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{1,5})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-57]|8[13-9]|9(?:0[89]|[2-579])|(?:2|80)[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'LU',
+    'countryCode' => 352,
+    'generalDesc' => [
+        'pattern' => '35[013-9]\\d{4,8}|6\\d{8}|35\\d{2,4}|(?:[2457-9]\\d|3[0-46-9])\\d{2,9}',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:35[013-9]|80[2-9]|90[89])\\d{1,8}|(?:2[2-9]|3[0-46-9]|[457]\\d|8[13-9]|9[2-579])\\d{2,9}',
+        'example' => '27123456',
+    ],
+    'mobile' => [
+        'pattern' => '6(?:[269][18]|5[1568]|7[189]|81)\\d{6}',
+        'example' => '628123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '90[015]\\d{5}',
+        'example' => '90012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '801\\d{5}',
+        'example' => '80112345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '20(?:1\\d{5}|[2-689]\\d{1,7})',
+        'example' => '20201234',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefixForParsing' => '(15(?:0[06]|1[12]|[35]5|4[04]|6[26]|77|88|99)\\d)',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2(?:0[2-689]|[2-9])|[3-57]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2(?:0[2-689]|[2-9])|[3-57]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '20[2-689]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '2(?:[0367]|4[3-8])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '80[01]|90[015]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '20',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})',
+            'format' => '$1 $2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '2(?:[0367]|4[3-8])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{1,5})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[3-57]|8[13-9]|9(?:0[89]|[2-579])|(?:2|80)[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_LV.php b/src/data/PhoneNumberMetadata_LV.php
index 6aff84860..75f7ba8ac 100644
--- a/src/data/PhoneNumberMetadata_LV.php
+++ b/src/data/PhoneNumberMetadata_LV.php
@@ -6,101 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[268]\\d|90)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'LV',
+    'countryCode' => 371,
+    'generalDesc' => [
+        'pattern' => '(?:[268]\\d|90)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '6\\d{7}',
-    'ExampleNumber' => '63123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '23(?:23[0-57-9]|33[0238])\\d{3}|2(?:[0-24-9]\\d\\d|3(?:0[07]|[14-9]\\d|2[024-9]|3[0-24-9]))\\d{4}',
-    'ExampleNumber' => '21234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{6}',
-    'ExampleNumber' => '80123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90\\d{6}',
-    'ExampleNumber' => '90123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '81\\d{6}',
-    'ExampleNumber' => '81123456',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '6\\d{7}',
+        'example' => '63123456',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '23(?:23[0-57-9]|33[0238])\\d{3}|2(?:[0-24-9]\\d\\d|3(?:0[07]|[14-9]\\d|2[024-9]|3[0-24-9]))\\d{4}',
+        'example' => '21234567',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d{6}',
+        'example' => '80123456',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90\\d{6}',
+        'example' => '90123456',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '81\\d{6}',
+        'example' => '81123456',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LV',
-  'countryCode' => 371,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[269]|8[01]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[269]|8[01]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_LY.php b/src/data/PhoneNumberMetadata_LY.php
index 01e97559c..e84122efc 100644
--- a/src/data/PhoneNumberMetadata_LY.php
+++ b/src/data/PhoneNumberMetadata_LY.php
@@ -6,117 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'LY',
+    'countryCode' => 218,
+    'generalDesc' => [
+        'pattern' => '[2-9]\\d{8}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:2(?:0[56]|[1-6]\\d|7[124579]|8[124])|3(?:1\\d|2[2356])|4(?:[17]\\d|2[1-357]|5[2-4]|8[124])|5(?:[1347]\\d|2[1-469]|5[13-5]|8[1-4])|6(?:[1-479]\\d|5[2-57]|8[1-5])|7(?:[13]\\d|2[13-79])|8(?:[124]\\d|5[124]|84))\\d{6}',
+        'example' => '212345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:0[56]|[1-6]\\d|7[124579]|8[124])|3(?:1\\d|2[2356])|4(?:[17]\\d|2[1-357]|5[2-4]|8[124])|5(?:[1347]\\d|2[1-469]|5[13-5]|8[1-4])|6(?:[1-479]\\d|5[2-57]|8[1-5])|7(?:[13]\\d|2[13-79])|8(?:[124]\\d|5[124]|84))\\d{6}',
-    'ExampleNumber' => '212345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '9[1-6]\\d{7}',
+        'example' => '912345678',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9[1-6]\\d{7}',
-    'ExampleNumber' => '912345678',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LY',
-  'countryCode' => 218,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MA.php b/src/data/PhoneNumberMetadata_MA.php
index 7bedefaf3..6039bc8ae 100644
--- a/src/data/PhoneNumberMetadata_MA.php
+++ b/src/data/PhoneNumberMetadata_MA.php
@@ -6,139 +6,106 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[5-8]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'MA',
+    'countryCode' => 212,
+    'generalDesc' => [
+        'pattern' => '[5-8]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '5(?:2(?:[0-25-79]\\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[014-9]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}',
-    'ExampleNumber' => '520123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
-    'ExampleNumber' => '650123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-7]\\d{6}',
-    'ExampleNumber' => '801234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '89\\d{7}',
-    'ExampleNumber' => '891234567',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '5(?:2(?:[0-25-79]\\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[014-9]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}',
+        'example' => '520123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
+        'example' => '650123456',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}',
-    'ExampleNumber' => '592401234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-7]\\d{6}',
+        'example' => '801234567',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '89\\d{7}',
+        'example' => '891234567',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MA',
-  'countryCode' => 212,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5[45]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'pattern' => '(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}',
+        'example' => '592401234',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5(?:2[2-46-9]|3[3-9]|9)|8(?:0[89]|92)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[5-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => true,
-  'mobileNumberPortableRegion' => true,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '5[45]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{5})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '5(?:2[2-46-9]|3[3-9]|9)|8(?:0[89]|92)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[5-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_MC.php b/src/data/PhoneNumberMetadata_MC.php
index c8eea2922..1b815171c 100644
--- a/src/data/PhoneNumberMetadata_MC.php
+++ b/src/data/PhoneNumberMetadata_MC.php
@@ -6,192 +6,143 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[3489]|6\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'MC',
+    'countryCode' => 377,
+    'generalDesc' => [
+        'pattern' => '(?:[3489]|6\\d)\\d{7}',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:870|9[2-47-9]\\d)\\d{5}',
+        'example' => '99123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '4(?:[469]\\d|5[1-9])\\d{5}|(?:3|6\\d)\\d{7}',
+        'example' => '612345678',
+    ],
+    'tollFree' => [
+        'pattern' => '(?:800|90\\d)\\d{5}',
+        'example' => '90123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '8[07]0\\d{5}',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '87',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '4',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[389]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '4',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[389]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:870|9[2-47-9]\\d)\\d{5}',
-    'ExampleNumber' => '99123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4(?:[469]\\d|5[1-9])\\d{5}|(?:3|6\\d)\\d{7}',
-    'ExampleNumber' => '612345678',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:800|90\\d)\\d{5}',
-    'ExampleNumber' => '90123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '8[07]0\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'id' => 'MC',
-  'countryCode' => 377,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '87',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '4',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[389]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '4',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[389]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MD.php b/src/data/PhoneNumberMetadata_MD.php
index 3dca6e8b8..91f40bc51 100644
--- a/src/data/PhoneNumberMetadata_MD.php
+++ b/src/data/PhoneNumberMetadata_MD.php
@@ -6,123 +6,94 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[235-7]\\d|[89]0)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'MD',
+    'countryCode' => 373,
+    'generalDesc' => [
+        'pattern' => '(?:[235-7]\\d|[89]0)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:2[1-9]|3[1-79])\\d|5(?:33|5[257]))\\d{5}',
-    'ExampleNumber' => '22212345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '562\\d{5}|(?:6\\d|7[16-9])\\d{6}',
-    'ExampleNumber' => '62112345',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[056]\\d{5}',
-    'ExampleNumber' => '90012345',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '808\\d{5}',
-    'ExampleNumber' => '80812345',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:(?:2[1-9]|3[1-79])\\d|5(?:33|5[257]))\\d{5}',
+        'example' => '22212345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '3[08]\\d{6}',
-    'ExampleNumber' => '30123456',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '562\\d{5}|(?:6\\d|7[16-9])\\d{6}',
+        'example' => '62112345',
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '803\\d{5}',
-    'ExampleNumber' => '80312345',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80012345',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90[056]\\d{5}',
+        'example' => '90012345',
     ],
-  ],
-  'id' => 'MD',
-  'countryCode' => 373,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'sharedCost' => [
+        'pattern' => '808\\d{5}',
+        'example' => '80812345',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '22|3',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[25-7]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'pattern' => '3[08]\\d{6}',
+        'example' => '30123456',
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '803\\d{5}',
+        'example' => '80312345',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '22|3',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[25-7]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_ME.php b/src/data/PhoneNumberMetadata_ME.php
index 84b393d33..3db832c92 100644
--- a/src/data/PhoneNumberMetadata_ME.php
+++ b/src/data/PhoneNumberMetadata_ME.php
@@ -6,130 +6,98 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:20|[3-79]\\d)\\d{6}|80\\d{6,7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'ME',
+    'countryCode' => 382,
+    'generalDesc' => [
+        'pattern' => '(?:20|[3-79]\\d)\\d{6}|80\\d{6,7}',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '(?:20[2-8]|3(?:[0-2][2-7]|3[24-7])|4(?:0[2-467]|1[2467])|5(?:0[2467]|1[24-7]|2[2-467]))\\d{5}',
+        'example' => '30234567',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:20[2-8]|3(?:[0-2][2-7]|3[24-7])|4(?:0[2-467]|1[2467])|5(?:0[2467]|1[24-7]|2[2-467]))\\d{5}',
-    'ExampleNumber' => '30234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '6(?:[07-9]\\d|3[024]|6[0-25])\\d{5}',
+        'example' => '67622901',
+        'posLength' => [
+            8,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'tollFree' => [
+        'pattern' => '80(?:[0-2578]|9\\d)\\d{5}',
+        'example' => '80080002',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6(?:[07-9]\\d|3[024]|6[0-25])\\d{5}',
-    'ExampleNumber' => '67622901',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'premiumRate' => [
+        'pattern' => '9(?:4[1568]|5[178])\\d{5}',
+        'example' => '94515151',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80(?:[0-2578]|9\\d)\\d{5}',
-    'ExampleNumber' => '80080002',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9(?:4[1568]|5[178])\\d{5}',
-    'ExampleNumber' => '94515151',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '78[1-49]\\d{5}',
+        'example' => '78108780',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '78[1-49]\\d{5}',
-    'ExampleNumber' => '78108780',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '77[1-9]\\d{5}',
+        'example' => '77273012',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '77[1-9]\\d{5}',
-    'ExampleNumber' => '77273012',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'id' => 'ME',
-  'countryCode' => 382,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MF.php b/src/data/PhoneNumberMetadata_MF.php
index 7c3470dc8..d2b41e8a3 100644
--- a/src/data/PhoneNumberMetadata_MF.php
+++ b/src/data/PhoneNumberMetadata_MF.php
@@ -6,93 +6,69 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'MF',
+    'countryCode' => 590,
+    'generalDesc' => [
+        'pattern' => '590\\d{6}|(?:69|80|9\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '590(?:0[079]|[14]3|[27][79]|3[03-7]|5[0-268]|87)\\d{4}',
-    'ExampleNumber' => '590271234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
-    'ExampleNumber' => '690001234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '800012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '590(?:0[079]|[14]3|[27][79]|3[03-7]|5[0-268]|87)\\d{4}',
+        'example' => '590271234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
+        'example' => '690001234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '800012345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
-    'ExampleNumber' => '976012345',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
+        'example' => '976012345',
     ],
-  ],
-  'id' => 'MF',
-  'countryCode' => 590,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_MG.php b/src/data/PhoneNumberMetadata_MG.php
index 5b9bcd617..5105b3473 100644
--- a/src/data/PhoneNumberMetadata_MG.php
+++ b/src/data/PhoneNumberMetadata_MG.php
@@ -6,116 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[23]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'MG',
+    'countryCode' => 261,
+    'generalDesc' => [
+        'pattern' => '[23]\\d{8}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[35]|8[268]|9[245])\\d{5}',
+        'example' => '202123456',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[35]|8[268]|9[245])\\d{5}',
-    'ExampleNumber' => '202123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '3[2-47-9]\\d{7}',
+        'example' => '321234567',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '3[2-47-9]\\d{7}',
-    'ExampleNumber' => '321234567',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '22\\d{7}',
-    'ExampleNumber' => '221234567',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '22\\d{7}',
+        'example' => '221234567',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MG',
-  'countryCode' => 261,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '([24-9]\\d{6})$|0',
-  'nationalPrefixTransformRule' => '20$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '([24-9]\\d{6})$|0',
+    'nationalPrefixTransformRule' => '20$1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MH.php b/src/data/PhoneNumberMetadata_MH.php
index a8e7f9992..ddb8c43fd 100644
--- a/src/data/PhoneNumberMetadata_MH.php
+++ b/src/data/PhoneNumberMetadata_MH.php
@@ -6,107 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '329\\d{4}|(?:[256]\\d|45)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'MH',
+    'countryCode' => 692,
+    'generalDesc' => [
+        'pattern' => '329\\d{4}|(?:[256]\\d|45)\\d{5}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:247|528|625)\\d{4}',
-    'ExampleNumber' => '2471234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:(?:23|54)5|329|45[35-8])\\d{4}',
-    'ExampleNumber' => '2351234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:247|528|625)\\d{4}',
+        'example' => '2471234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:(?:23|54)5|329|45[35-8])\\d{4}',
+        'example' => '2351234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '635\\d{4}',
-    'ExampleNumber' => '6351234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '635\\d{4}',
+        'example' => '6351234',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MH',
-  'countryCode' => 692,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-6]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-6]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MK.php b/src/data/PhoneNumberMetadata_MK.php
index 290dd32e1..99fb3067c 100644
--- a/src/data/PhoneNumberMetadata_MK.php
+++ b/src/data/PhoneNumberMetadata_MK.php
@@ -6,137 +6,104 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-578]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'MK',
+    'countryCode' => 389,
+    'generalDesc' => [
+        'pattern' => '[2-578]\\d{7}',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:(?:2(?:62|77)0|3444)\\d|4[56]440)\\d{3}|(?:34|4[357])700\\d{3}|(?:2(?:[0-3]\\d|5[0-578]|6[01]|82)|3(?:1[3-68]|[23][2-68]|4[23568])|4(?:[23][2-68]|4[3-68]|5[2568]|6[25-8]|7[24-68]|8[4-68]))\\d{5}',
+        'example' => '22012345',
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:2(?:62|77)0|3444)\\d|4[56]440)\\d{3}|(?:34|4[357])700\\d{3}|(?:2(?:[0-3]\\d|5[0-578]|6[01]|82)|3(?:1[3-68]|[23][2-68]|4[23568])|4(?:[23][2-68]|4[3-68]|5[2568]|6[25-8]|7[24-68]|8[4-68]))\\d{5}',
-    'ExampleNumber' => '22012345',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
+    'mobile' => [
+        'pattern' => '7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|6[01]|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}',
+        'example' => '72345678',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|6[01]|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}',
-    'ExampleNumber' => '72345678',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '5\\d{7}',
-    'ExampleNumber' => '50012345',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8(?:0[1-9]|[1-9]\\d)\\d{5}',
-    'ExampleNumber' => '80123456',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80012345',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '5\\d{7}',
+        'example' => '50012345',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '8(?:0[1-9]|[1-9]\\d)\\d{5}',
+        'example' => '80123456',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MK',
-  'countryCode' => 389,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2|34[47]|4(?:[37]7|5[47]|64)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[347]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d)(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[58]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2|34[47]|4(?:[37]7|5[47]|64)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[347]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d)(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[58]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_ML.php b/src/data/PhoneNumberMetadata_ML.php
index 50e825565..4a550d729 100644
--- a/src/data/PhoneNumberMetadata_ML.php
+++ b/src/data/PhoneNumberMetadata_ML.php
@@ -6,130 +6,96 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[24-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'ML',
+    'countryCode' => 223,
+    'generalDesc' => [
+        'pattern' => '[24-9]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:07[0-8]|12[67])\\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-39]))\\d{5}',
-    'ExampleNumber' => '20212345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '2(?:0(?:01|79)|17\\d)\\d{4}|(?:5[01]|[679]\\d|8[2-49])\\d{6}',
-    'ExampleNumber' => '65012345',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{6}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:07[0-8]|12[67])\\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-39]))\\d{5}',
+        'example' => '20212345',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '2(?:0(?:01|79)|17\\d)\\d{4}|(?:5[01]|[679]\\d|8[2-49])\\d{6}',
+        'example' => '65012345',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d{6}',
+        'example' => '80012345',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '80\\d{6}',
-  ],
-  'id' => 'ML',
-  'countryCode' => 223,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '67[057-9]|74[045]',
-        1 => '67(?:0[09]|[59]9|77|8[89])|74(?:0[02]|44|55)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '80\\d{6}',
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '67[057-9]|74[045]',
+                '67(?:0[09]|[59]9|77|8[89])|74(?:0[02]|44|55)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[24-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[24-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MM.php b/src/data/PhoneNumberMetadata_MM.php
index 630f01fcf..f9eb94a3b 100644
--- a/src/data/PhoneNumberMetadata_MM.php
+++ b/src/data/PhoneNumberMetadata_MM.php
@@ -6,235 +6,178 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{5,7}|95\\d{6}|(?:[4-7]|9[0-46-9])\\d{6,8}|(?:2|8\\d)\\d{5,8}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
+return [
+    'id' => 'MM',
+    'countryCode' => 95,
+    'generalDesc' => [
+        'pattern' => '1\\d{5,7}|95\\d{6}|(?:[4-7]|9[0-46-9])\\d{6,8}|(?:2|8\\d)\\d{5,8}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            5,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1(?:(?:2\\d|3[56]|[89][0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5470)|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:(?:3\\d|8[01459])\\d|4[67]0)))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|[35]2\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}',
+        'example' => '1234567',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            5,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:17[01]|9(?:2(?:[0-4]|[56]\\d\\d)|(?:3(?:[0-36]|4\\d)|(?:6\\d|8[89]|9[4-8])\\d|7(?:3|40|[5-9]\\d))\\d|4(?:(?:[0245]\\d|[1379])\\d|88)|5[0-6])\\d)\\d{4}|9[69]1\\d{6}|9(?:[68]\\d|9[089])\\d{5}',
+        'example' => '92123456',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80080(?:0[1-9]|2\\d)\\d{3}',
+        'example' => '8008001234',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '1333\\d{4}|[12]468\\d{4}',
+        'example' => '13331234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '16|2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[45]|6(?:0[23]|[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[12]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[4-7]|8[1-35]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4,6})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9(?:2[0-4]|[35-9]|4[137-9])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '92',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{5})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:(?:2\\d|3[56]|[89][0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5470)|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:(?:3\\d|8[01459])\\d|4[67]0)))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|[35]2\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}',
-    'ExampleNumber' => '1234567',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:17[01]|9(?:2(?:[0-4]|[56]\\d\\d)|(?:3(?:[0-36]|4\\d)|(?:6\\d|8[89]|9[4-8])\\d|7(?:3|40|[5-9]\\d))\\d|4(?:(?:[0245]\\d|[1379])\\d|88)|5[0-6])\\d)\\d{4}|9[69]1\\d{6}|9(?:[68]\\d|9[089])\\d{5}',
-    'ExampleNumber' => '92123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80080(?:0[1-9]|2\\d)\\d{3}',
-    'ExampleNumber' => '8008001234',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '1333\\d{4}|[12]468\\d{4}',
-    'ExampleNumber' => '13331234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'MM',
-  'countryCode' => 95,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16|2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[45]|6(?:0[23]|[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[4-7]|8[1-35]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4,6})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:2[0-4]|[35-9]|4[137-9])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '92',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d)(\\d{5})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MN.php b/src/data/PhoneNumberMetadata_MN.php
index eefe62a0b..5a356baa8 100644
--- a/src/data/PhoneNumberMetadata_MN.php
+++ b/src/data/PhoneNumberMetadata_MN.php
@@ -6,178 +6,134 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[12]\\d{7,9}|[5-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
+return [
+    'id' => 'MN',
+    'countryCode' => 976,
+    'generalDesc' => [
+        'pattern' => '[12]\\d{7,9}|[5-9]\\d{7}',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '[12]2[1-3]\\d{5,6}|(?:(?:[12](?:1|27)|5[368])\\d\\d|7(?:0(?:[0-5]\\d|7[078]|80)|128))\\d{4}|[12](?:3[2-8]|4[2-68]|5[1-4689])\\d{6,7}',
+        'example' => '53123456',
+        'posLengthLocal' => [
+            4,
+            5,
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:83[01]|92[039])\\d{5}|(?:5[05]|6[069]|8[015689]|9[013-9])\\d{6}',
+        'example' => '88123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '712[0-79]\\d{4}|7(?:1[013-9]|[25-9]\\d)\\d{5}',
+        'example' => '75123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '001',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[12]1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[5-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[12]2[1-3]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[12](?:27|3[2-8]|4[2-68]|5[1-4689])',
+                '[12](?:27|3[2-8]|4[2-68]|5[1-4689])[0-3]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{4,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[12]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[12]2[1-3]\\d{5,6}|(?:(?:[12](?:1|27)|5[368])\\d\\d|7(?:0(?:[0-5]\\d|7[078]|80)|128))\\d{4}|[12](?:3[2-8]|4[2-68]|5[1-4689])\\d{6,7}',
-    'ExampleNumber' => '53123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:83[01]|92[039])\\d{5}|(?:5[05]|6[069]|8[015689]|9[013-9])\\d{6}',
-    'ExampleNumber' => '88123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '712[0-79]\\d{4}|7(?:1[013-9]|[25-9]\\d)\\d{5}',
-    'ExampleNumber' => '75123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'MN',
-  'countryCode' => 976,
-  'internationalPrefix' => '001',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12]1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[5-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12]2[1-3]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12](?:27|3[2-8]|4[2-68]|5[1-4689])',
-        1 => '[12](?:27|3[2-8]|4[2-68]|5[1-4689])[0-3]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{5})(\\d{4,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MO.php b/src/data/PhoneNumberMetadata_MO.php
index 7f2303ead..2978a3a64 100644
--- a/src/data/PhoneNumberMetadata_MO.php
+++ b/src/data/PhoneNumberMetadata_MO.php
@@ -6,130 +6,96 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '0800\\d{3}|(?:28|[68]\\d)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+return [
+    'id' => 'MO',
+    'countryCode' => 853,
+    'generalDesc' => [
+        'pattern' => '0800\\d{3}|(?:28|[68]\\d)\\d{6}',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:28[2-9]|8(?:11|[2-57-9]\\d))\\d{5}',
-    'ExampleNumber' => '28212345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '(?:28[2-9]|8(?:11|[2-57-9]\\d))\\d{5}',
+        'example' => '28212345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6800[0-79]\\d{3}|6(?:[235]\\d\\d|6(?:0[0-5]|[1-9]\\d)|8(?:0[1-9]|[14-8]\\d|2[5-9]|[39][0-4]))\\d{4}',
-    'ExampleNumber' => '66123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '6800[0-79]\\d{3}|6(?:[235]\\d\\d|6(?:0[0-5]|[1-9]\\d)|8(?:0[1-9]|[14-8]\\d|2[5-9]|[39][0-4]))\\d{4}',
+        'example' => '66123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0800\\d{3}',
-    'ExampleNumber' => '0800501',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '0800\\d{3}',
+        'example' => '0800501',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MO',
-  'countryCode' => 853,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[268]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[268]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MP.php b/src/data/PhoneNumberMetadata_MP.php
index d3357d3b6..9efa1e7fa 100644
--- a/src/data/PhoneNumberMetadata_MP.php
+++ b/src/data/PhoneNumberMetadata_MP.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[58]\\d{9}|(?:67|90)0\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'MP',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '[58]\\d{9}|(?:67|90)0\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '670(?:2(?:3[3-7]|56|8[4-8])|32[1-38]|4(?:33|8[348])|5(?:32|55|88)|6(?:64|70|82)|78[3589]|8[3-9]8|989)\\d{4}',
+        'example' => '6702345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '670(?:2(?:3[3-7]|56|8[4-8])|32[1-38]|4(?:33|8[348])|5(?:32|55|88)|6(?:64|70|82)|78[3589]|8[3-9]8|989)\\d{4}',
-    'ExampleNumber' => '6702345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '670(?:2(?:3[3-7]|56|8[4-8])|32[1-38]|4(?:33|8[348])|5(?:32|55|88)|6(?:64|70|82)|78[3589]|8[3-9]8|989)\\d{4}',
+        'example' => '6702345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '670(?:2(?:3[3-7]|56|8[4-8])|32[1-38]|4(?:33|8[348])|5(?:32|55|88)|6(?:64|70|82)|78[3589]|8[3-9]8|989)\\d{4}',
-    'ExampleNumber' => '6702345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MP',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '670$1',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '670',
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '670$1',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [],
+    'leadingDigits' => '670',
 ];
diff --git a/src/data/PhoneNumberMetadata_MQ.php b/src/data/PhoneNumberMetadata_MQ.php
index cff1f9b81..e5ca6e1cc 100644
--- a/src/data/PhoneNumberMetadata_MQ.php
+++ b/src/data/PhoneNumberMetadata_MQ.php
@@ -6,117 +6,88 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '596\\d{6}|(?:69|80|9\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'MQ',
+    'countryCode' => 596,
+    'generalDesc' => [
+        'pattern' => '596\\d{6}|(?:69|80|9\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '596(?:[03-7]\\d|1[05]|2[7-9]|8[0-39]|9[04-9])\\d{4}',
-    'ExampleNumber' => '596301234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '69(?:6(?:[0-46-9]\\d|5[0-6])|727)\\d{4}',
-    'ExampleNumber' => '696201234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '800012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '596(?:[03-7]\\d|1[05]|2[7-9]|8[0-39]|9[04-9])\\d{4}',
+        'example' => '596301234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '69(?:6(?:[0-46-9]\\d|5[0-6])|727)\\d{4}',
+        'example' => '696201234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '800012345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:397[0-3]|477[0-5]|76(?:6\\d|7[0-367]))\\d{4}',
-    'ExampleNumber' => '976612345',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '9(?:397[0-3]|477[0-5]|76(?:6\\d|7[0-367]))\\d{4}',
+        'example' => '976612345',
     ],
-  ],
-  'id' => 'MQ',
-  'countryCode' => 596,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[569]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[569]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_MR.php b/src/data/PhoneNumberMetadata_MR.php
index 0e7bef724..0317720ff 100644
--- a/src/data/PhoneNumberMetadata_MR.php
+++ b/src/data/PhoneNumberMetadata_MR.php
@@ -6,105 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-4]\\d\\d|800)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'MR',
+    'countryCode' => 222,
+    'generalDesc' => [
+        'pattern' => '(?:[2-4]\\d\\d|800)\\d{5}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:25[08]|35\\d|45[1-7])\\d{5}',
-    'ExampleNumber' => '35123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[2-4][0-46-9]\\d{6}',
-    'ExampleNumber' => '22123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:25[08]|35\\d|45[1-7])\\d{5}',
+        'example' => '35123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '[2-4][0-46-9]\\d{6}',
+        'example' => '22123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80012345',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MR',
-  'countryCode' => 222,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-48]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[2-48]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MS.php b/src/data/PhoneNumberMetadata_MS.php
index 0fb8bfd55..d2f26b0d2 100644
--- a/src/data/PhoneNumberMetadata_MS.php
+++ b/src/data/PhoneNumberMetadata_MS.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|664|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'MS',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|664|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '6644(?:1[0-3]|91)\\d{4}',
+        'example' => '6644912345',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '6644(?:1[0-3]|91)\\d{4}',
-    'ExampleNumber' => '6644912345',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '664(?:3(?:49|9[1-6])|49[2-6])\\d{4}',
+        'example' => '6644923456',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '664(?:3(?:49|9[1-6])|49[2-6])\\d{4}',
-    'ExampleNumber' => '6644923456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MS',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([34]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '664$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '664',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([34]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '664$1',
+    'numberFormat' => [],
+    'leadingDigits' => '664',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_MT.php b/src/data/PhoneNumberMetadata_MT.php
index 57f6f56f3..de3e989ec 100644
--- a/src/data/PhoneNumberMetadata_MT.php
+++ b/src/data/PhoneNumberMetadata_MT.php
@@ -6,97 +6,74 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '3550\\d{4}|(?:[2579]\\d\\d|800)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'MT',
+    'countryCode' => 356,
+    'generalDesc' => [
+        'pattern' => '3550\\d{4}|(?:[2579]\\d\\d|800)\\d{5}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '20(?:3[1-4]|6[059])\\d{4}|2(?:0[19]|[1-357]\\d|60)\\d{5}',
-    'ExampleNumber' => '21001234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:7(?:210|[79]\\d\\d)|9(?:[29]\\d\\d|69[67]|8(?:1[1-3]|89|97)))\\d{4}',
-    'ExampleNumber' => '96961234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800(?:02|[3467]\\d)\\d{3}',
-    'ExampleNumber' => '80071234',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '5(?:0(?:0(?:37|43)|(?:6\\d|70|9[0168])\\d)|[12]\\d0[1-5])\\d{3}',
-    'ExampleNumber' => '50037123',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '20(?:3[1-4]|6[059])\\d{4}|2(?:0[19]|[1-357]\\d|60)\\d{5}',
+        'example' => '21001234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:7(?:210|[79]\\d\\d)|9(?:[29]\\d\\d|69[67]|8(?:1[1-3]|89|97)))\\d{4}',
+        'example' => '96961234',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '3550\\d{4}',
-    'ExampleNumber' => '35501234',
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '7117\\d{4}',
-    'ExampleNumber' => '71171234',
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '501\\d{5}',
-    'ExampleNumber' => '50112345',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800(?:02|[3467]\\d)\\d{3}',
+        'example' => '80071234',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '5(?:0(?:0(?:37|43)|(?:6\\d|70|9[0168])\\d)|[12]\\d0[1-5])\\d{3}',
+        'example' => '50037123',
     ],
-  ],
-  'id' => 'MT',
-  'countryCode' => 356,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2357-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '3550\\d{4}',
+        'example' => '35501234',
+    ],
+    'pager' => [
+        'pattern' => '7117\\d{4}',
+        'example' => '71171234',
+    ],
+    'uan' => [
+        'pattern' => '501\\d{5}',
+        'example' => '50112345',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2357-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_MU.php b/src/data/PhoneNumberMetadata_MU.php
index 5ca02353b..59798f8a1 100644
--- a/src/data/PhoneNumberMetadata_MU.php
+++ b/src/data/PhoneNumberMetadata_MU.php
@@ -6,150 +6,113 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[57]|8\\d\\d)\\d{7}|[2-468]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 10,
+return [
+    'id' => 'MU',
+    'countryCode' => 230,
+    'generalDesc' => [
+        'pattern' => '(?:[57]|8\\d\\d)\\d{7}|[2-468]\\d{6}',
+        'posLength' => [
+            7,
+            8,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8])|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}',
-    'ExampleNumber' => '54480123',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+    'fixedLine' => [
+        'pattern' => '(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8])|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}',
+        'example' => '54480123',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-3]|3[013]))\\d{5}',
-    'ExampleNumber' => '52512345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-3]|3[013]))\\d{5}',
+        'example' => '52512345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '802\\d{7}|80[0-2]\\d{4}',
-    'ExampleNumber' => '8001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
+    'tollFree' => [
+        'pattern' => '802\\d{7}|80[0-2]\\d{4}',
+        'example' => '8001234',
+        'posLength' => [
+            7,
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '30\\d{5}',
-    'ExampleNumber' => '3012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'premiumRate' => [
+        'pattern' => '30\\d{5}',
+        'example' => '3012345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '3(?:20|9\\d)\\d{4}',
-    'ExampleNumber' => '3201234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'voip' => [
+        'pattern' => '3(?:20|9\\d)\\d{4}',
+        'example' => '3201234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MU',
-  'countryCode' => 230,
-  'internationalPrefix' => '0(?:0|[24-7]0|3[03])',
-  'preferredInternationalPrefix' => '020',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-46]|8[013]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '0(?:0|[24-7]0|3[03])',
+    'preferredInternationalPrefix' => '020',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-46]|8[013]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[57]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[57]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{5})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MV.php b/src/data/PhoneNumberMetadata_MV.php
index f6f91f9b9..39c416b5a 100644
--- a/src/data/PhoneNumberMetadata_MV.php
+++ b/src/data/PhoneNumberMetadata_MV.php
@@ -6,135 +6,101 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:800|9[0-57-9]\\d)\\d{7}|[34679]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
+return [
+    'id' => 'MV',
+    'countryCode' => 960,
+    'generalDesc' => [
+        'pattern' => '(?:800|9[0-57-9]\\d)\\d{7}|[34679]\\d{6}',
+        'posLength' => [
+            7,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:0[0-3]|3[0-59])|6(?:[58][024689]|6[024-68]|7[02468]))\\d{4}',
-    'ExampleNumber' => '6701234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:3(?:0[0-3]|3[0-59])|6(?:[58][024689]|6[024-68]|7[02468]))\\d{4}',
+        'example' => '6701234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:46[46]|[79]\\d\\d)\\d{4}',
-    'ExampleNumber' => '7712345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:46[46]|[79]\\d\\d)\\d{4}',
+        'example' => '7712345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'tollFree' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{7}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'premiumRate' => [
+        'pattern' => '900\\d{7}',
+        'example' => '9001234567',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '4(?:0[01]|50)\\d{4}',
-    'ExampleNumber' => '4001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'uan' => [
+        'pattern' => '4(?:0[01]|50)\\d{4}',
+        'example' => '4001234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MV',
-  'countryCode' => 960,
-  'internationalPrefix' => '0(?:0|19)',
-  'preferredInternationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[34679]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '0(?:0|19)',
+    'preferredInternationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[34679]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MW.php b/src/data/PhoneNumberMetadata_MW.php
index 1a1541310..3b41ca801 100644
--- a/src/data/PhoneNumberMetadata_MW.php
+++ b/src/data/PhoneNumberMetadata_MW.php
@@ -6,138 +6,102 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[1289]\\d|31|77)\\d{7}|1\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
+return [
+    'id' => 'MW',
+    'countryCode' => 265,
+    'generalDesc' => [
+        'pattern' => '(?:[1289]\\d|31|77)\\d{7}|1\\d{6}',
+        'posLength' => [
+            7,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1[2-9]|2[12]\\d\\d)\\d{5}',
-    'ExampleNumber' => '1234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '111\\d{6}|(?:31|77|[89][89])\\d{7}',
-    'ExampleNumber' => '991234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '(?:1[2-9]|2[12]\\d\\d)\\d{5}',
+        'example' => '1234567',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '111\\d{6}|(?:31|77|[89][89])\\d{7}',
+        'example' => '991234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MW',
-  'countryCode' => 265,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[137-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[137-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_MX.php b/src/data/PhoneNumberMetadata_MX.php
index fedef851c..2c4032195 100644
--- a/src/data/PhoneNumberMetadata_MX.php
+++ b/src/data/PhoneNumberMetadata_MX.php
@@ -6,237 +6,188 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1(?:(?:22|44|7[27]|87|9[69])[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-689]|8[1-69]|9[1-578])|[2-9]\\d)\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-      1 => 8,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
-    'ExampleNumber' => '2001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-      1 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
-    'ExampleNumber' => '12221234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-      1 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|88)\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{7}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '300\\d{7}',
-    'ExampleNumber' => '3001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '500\\d{7}',
-    'ExampleNumber' => '5001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'MX',
-  'countryCode' => 52,
-  'internationalPrefix' => '0[09]',
-  'preferredInternationalPrefix' => '00',
-  'nationalPrefix' => '01',
-  'nationalPrefixForParsing' => '0(?:[12]|4[45])|1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '53',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '33|5[56]|81',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:33|5[56]|81)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '33|5[56]|81',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:33|5[56]|81)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'MX',
+    'countryCode' => 52,
+    'generalDesc' => [
+        'pattern' => '1(?:(?:22|44|7[27]|87|9[69])[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-689]|8[1-69]|9[1-578])|[2-9]\\d)\\d{8}',
+        'posLength' => [
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            7,
+            8,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
+        'example' => '2001234567',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
+        'example' => '12221234567',
+        'posLengthLocal' => [
+            7,
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '8(?:00|88)\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '900\\d{7}',
+        'example' => '9001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '300\\d{7}',
+        'example' => '3001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '500\\d{7}',
+        'example' => '5001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '0[09]',
+    'preferredInternationalPrefix' => '00',
+    'nationalPrefix' => '01',
+    'nationalPrefixForParsing' => '0(?:[12]|4[45])|1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '53',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '33|5[56]|81',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1(?:33|5[56]|81)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '33|5[56]|81',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1(?:33|5[56]|81)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_MY.php b/src/data/PhoneNumberMetadata_MY.php
index 938e1615d..4e3ee28c3 100644
--- a/src/data/PhoneNumberMetadata_MY.php
+++ b/src/data/PhoneNumberMetadata_MY.php
@@ -6,198 +6,151 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{8,9}|(?:3\\d|[4-9])\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:2[0-36-9]|3[0-368]|4[0-278]|5[0-24-8]|6[0-467]|7[1246-9]|8\\d|9[0-57])\\d|4(?:2[0-689]|[3-79]\\d|8[1-35689])|5(?:2[0-589]|[3468]\\d|5[0-489]|7[1-9]|9[23])|6(?:2[2-9]|3[1357-9]|[46]\\d|5[0-6]|7[0-35-9]|85|9[015-8])|7(?:[2579]\\d|3[03-68]|4[0-8]|6[5-9]|8[0-35-9])|8(?:[24][2-8]|3[2-5]|5[2-7]|6[2-589]|7[2-578]|[89][2-9])|9(?:0[57]|13|[25-7]\\d|[3489][0-8]))\\d{5}',
-    'ExampleNumber' => '323856789',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '1(?:1888[689]|4400|8(?:47|8[27])[0-4])\\d{4}|1(?:0(?:[23568]\\d|4[0-6]|7[016-9]|9[0-8])|1(?:[1-5]\\d\\d|6(?:0[5-9]|[1-9]\\d)|7(?:[0-4]\\d|5[0-7]))|(?:[269]\\d|[37][1-9]|4[235-9])\\d|5(?:31|9\\d\\d)|8(?:1[23]|[236]\\d|4[06]|5(?:46|[7-9])|7[016-9]|8[01]|9[0-8]))\\d{5}',
-    'ExampleNumber' => '123456789',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[378]00\\d{6}',
-    'ExampleNumber' => '1300123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1600\\d{6}',
-    'ExampleNumber' => '1600123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '15(?:4(?:6[0-4]\\d|8(?:0[125]|[17]\\d|21|3[01]|4[01589]|5[014]|6[02]))|6(?:32[0-6]|78\\d))\\d{4}',
-    'ExampleNumber' => '1546012345',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'MY',
-  'countryCode' => 60,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[4-79]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[02469]|[378][1-9]|53)|8',
-        1 => '1(?:[02469]|[37][1-9]|53|8(?:[1-46-9]|5[7-9]))|8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{2})(\\d{4})',
-      'format' => '$1-$2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[367]|80)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '15',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'MY',
+    'countryCode' => 60,
+    'generalDesc' => [
+        'pattern' => '1\\d{8,9}|(?:3\\d|[4-9])\\d{7}',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:3(?:2[0-36-9]|3[0-368]|4[0-278]|5[0-24-8]|6[0-467]|7[1246-9]|8\\d|9[0-57])\\d|4(?:2[0-689]|[3-79]\\d|8[1-35689])|5(?:2[0-589]|[3468]\\d|5[0-489]|7[1-9]|9[23])|6(?:2[2-9]|3[1357-9]|[46]\\d|5[0-6]|7[0-35-9]|85|9[015-8])|7(?:[2579]\\d|3[03-68]|4[0-8]|6[5-9]|8[0-35-9])|8(?:[24][2-8]|3[2-5]|5[2-7]|6[2-589]|7[2-578]|[89][2-9])|9(?:0[57]|13|[25-7]\\d|[3489][0-8]))\\d{5}',
+        'example' => '323856789',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '1(?:1888[689]|4400|8(?:47|8[27])[0-4])\\d{4}|1(?:0(?:[23568]\\d|4[0-6]|7[016-9]|9[0-8])|1(?:[1-5]\\d\\d|6(?:0[5-9]|[1-9]\\d)|7(?:[0-4]\\d|5[0-7]))|(?:[269]\\d|[37][1-9]|4[235-9])\\d|5(?:31|9\\d\\d)|8(?:1[23]|[236]\\d|4[06]|5(?:46|[7-9])|7[016-9]|8[01]|9[0-8]))\\d{5}',
+        'example' => '123456789',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1[378]00\\d{6}',
+        'example' => '1300123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '1600\\d{6}',
+        'example' => '1600123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '15(?:4(?:6[0-4]\\d|8(?:0[125]|[17]\\d|21|3[01]|4[01589]|5[014]|6[02]))|6(?:32[0-6]|78\\d))\\d{4}',
+        'example' => '1546012345',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '[4-79]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '1(?:[02469]|[378][1-9]|53)|8',
+                '1(?:[02469]|[37][1-9]|53|8(?:[1-46-9]|5[7-9]))|8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{2})(\\d{4})',
+            'format' => '$1-$2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '1(?:[367]|80)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '15',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_MZ.php b/src/data/PhoneNumberMetadata_MZ.php
index 40a19d8b4..a51620f4a 100644
--- a/src/data/PhoneNumberMetadata_MZ.php
+++ b/src/data/PhoneNumberMetadata_MZ.php
@@ -6,130 +6,96 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:2|8\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'MZ',
+    'countryCode' => 258,
+    'generalDesc' => [
+        'pattern' => '(?:2|8\\d)\\d{7}',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:[1346]\\d|5[0-2]|[78][12]|93)\\d{5}',
-    'ExampleNumber' => '21123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '2(?:[1346]\\d|5[0-2]|[78][12]|93)\\d{5}',
+        'example' => '21123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '8[2-79]\\d{7}',
-    'ExampleNumber' => '821234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '8[2-79]\\d{7}',
+        'example' => '821234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MZ',
-  'countryCode' => 258,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2|8[2-79]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2|8[2-79]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NA.php b/src/data/PhoneNumberMetadata_NA.php
index 1d83be93d..65632ffa1 100644
--- a/src/data/PhoneNumberMetadata_NA.php
+++ b/src/data/PhoneNumberMetadata_NA.php
@@ -6,152 +6,114 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[68]\\d{7,8}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'NA',
+    'countryCode' => 264,
+    'generalDesc' => [
+        'pattern' => '[68]\\d{7,8}',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '64426\\d{3}|6(?:1(?:2[2-7]|3[01378]|4[0-4])|254|32[0237]|4(?:27|41|5[25])|52[236-8]|626|7(?:2[2-4]|30))\\d{4,5}|6(?:1(?:(?:0\\d|2[0189]|3[24-69]|4[5-9])\\d|17|69|7[014])|2(?:17|5[0-36-8]|69|70)|3(?:17|2[14-689]|34|6[289]|7[01]|81)|4(?:17|2[0-2]|4[06]|5[0137]|69|7[01])|5(?:17|2[0459]|69|7[01])|6(?:17|25|38|42|69|7[01])|7(?:17|2[569]|3[13]|6[89]|7[01]))\\d{4}',
-    'ExampleNumber' => '61221234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:60|8[1245])\\d{7}',
-    'ExampleNumber' => '811234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '64426\\d{3}|6(?:1(?:2[2-7]|3[01378]|4[0-4])|254|32[0237]|4(?:27|41|5[25])|52[236-8]|626|7(?:2[2-4]|30))\\d{4,5}|6(?:1(?:(?:0\\d|2[0189]|3[24-69]|4[5-9])\\d|17|69|7[014])|2(?:17|5[0-36-8]|69|70)|3(?:17|2[14-689]|34|6[289]|7[01]|81)|4(?:17|2[0-2]|4[06]|5[0137]|69|7[01])|5(?:17|2[0459]|69|7[01])|6(?:17|25|38|42|69|7[01])|7(?:17|2[569]|3[13]|6[89]|7[01]))\\d{4}',
+        'example' => '61221234',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{7}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '(?:60|8[1245])\\d{7}',
+        'example' => '811234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '8701\\d{5}',
-    'ExampleNumber' => '870123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '80\\d{7}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '8701\\d{5}',
+        'example' => '870123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '8(?:3\\d\\d|86)\\d{5}',
-    'ExampleNumber' => '88612345',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '8(?:3\\d\\d|86)\\d{5}',
+        'example' => '88612345',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NA',
-  'countryCode' => 264,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '88',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '87',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '88',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '87',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NC.php b/src/data/PhoneNumberMetadata_NC.php
index f67ad0d89..91a58ace9 100644
--- a/src/data/PhoneNumberMetadata_NC.php
+++ b/src/data/PhoneNumberMetadata_NC.php
@@ -6,130 +6,96 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:050|[2-57-9]\\d\\d)\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 6,
+return [
+    'id' => 'NC',
+    'countryCode' => 687,
+    'generalDesc' => [
+        'pattern' => '(?:050|[2-57-9]\\d\\d)\\d{3}',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[03-9]|3[0-5]|4[1-7]|88)\\d{4}',
-    'ExampleNumber' => '201234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:5[0-4]|[79]\\d|8[0-79])\\d{4}',
-    'ExampleNumber' => '751234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '050\\d{3}',
-    'ExampleNumber' => '050012',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '36\\d{4}',
-    'ExampleNumber' => '366711',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:2[03-9]|3[0-5]|4[1-7]|88)\\d{4}',
+        'example' => '201234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:5[0-4]|[79]\\d|8[0-79])\\d{4}',
+        'example' => '751234',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '050\\d{3}',
+        'example' => '050012',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '36\\d{4}',
+        'example' => '366711',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NC',
-  'countryCode' => 687,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5[6-8]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1.$2.$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[02-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1.$2.$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[02-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '5[6-8]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1.$2.$3',
+            'leadingDigitsPatterns' => [
+                '[02-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1.$2.$3',
+            'leadingDigitsPatterns' => [
+                '[02-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NE.php b/src/data/PhoneNumberMetadata_NE.php
index cf0bed3d4..dad10c984 100644
--- a/src/data/PhoneNumberMetadata_NE.php
+++ b/src/data/PhoneNumberMetadata_NE.php
@@ -6,115 +6,85 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[027-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'NE',
+    'countryCode' => 227,
+    'generalDesc' => [
+        'pattern' => '[027-9]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:0(?:20|3[1-8]|4[13-5]|5[14]|6[14578]|7[1-578])|1(?:4[145]|5[14]|6[14-68]|7[169]|88))\\d{4}',
-    'ExampleNumber' => '20201234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:23|7[047]|[89]\\d)\\d{6}',
-    'ExampleNumber' => '93123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '08\\d{6}',
-    'ExampleNumber' => '08123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '09\\d{6}',
-    'ExampleNumber' => '09123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:0(?:20|3[1-8]|4[13-5]|5[14]|6[14578]|7[1-578])|1(?:4[145]|5[14]|6[14-68]|7[169]|88))\\d{4}',
+        'example' => '20201234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:23|7[047]|[89]\\d)\\d{6}',
+        'example' => '93123456',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '08\\d{6}',
+        'example' => '08123456',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '09\\d{6}',
+        'example' => '09123456',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NE',
-  'countryCode' => 227,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '08',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[089]|2[013]|7[047]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '08',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[089]|2[013]|7[047]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NF.php b/src/data/PhoneNumberMetadata_NF.php
index 013b3220b..34c8832d8 100644
--- a/src/data/PhoneNumberMetadata_NF.php
+++ b/src/data/PhoneNumberMetadata_NF.php
@@ -6,133 +6,98 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[13]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
+return [
+    'id' => 'NF',
+    'countryCode' => 672,
+    'generalDesc' => [
+        'pattern' => '[13]\\d{5}',
+        'posLength' => [
+            6,
+        ],
+        'posLengthLocal' => [
+            5,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
+    'fixedLine' => [
+        'pattern' => '(?:1(?:06|17|28|39)|3[0-2]\\d)\\d{3}',
+        'example' => '106609',
+        'posLengthLocal' => [
+            5,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:06|17|28|39)|3[0-2]\\d)\\d{3}',
-    'ExampleNumber' => '106609',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
+    'mobile' => [
+        'pattern' => '(?:14|3[58])\\d{4}',
+        'example' => '381234',
+        'posLengthLocal' => [
+            5,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:14|3[58])\\d{4}',
-    'ExampleNumber' => '381234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'internationalPrefix' => '00',
+    'nationalPrefixForParsing' => '([0-258]\\d{4})$',
+    'nationalPrefixTransformRule' => '3$1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1[0-3]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[13]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'id' => 'NF',
-  'countryCode' => 672,
-  'internationalPrefix' => '00',
-  'nationalPrefixForParsing' => '([0-258]\\d{4})$',
-  'nationalPrefixTransformRule' => '3$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[0-3]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NG.php b/src/data/PhoneNumberMetadata_NG.php
index 907bb99e0..9295e3418 100644
--- a/src/data/PhoneNumberMetadata_NG.php
+++ b/src/data/PhoneNumberMetadata_NG.php
@@ -6,231 +6,178 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '2[0-24-9]\\d{8}|[78]\\d{10,13}|[7-9]\\d{9}|[1-9]\\d{7}|[124-7]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 10,
-      3 => 11,
-      4 => 12,
-      5 => 13,
-      6 => 14,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])\\d{6}|(?:(?:[1-356]\\d|4[02-8]|8[2-9])\\d|9(?:0[3-9]|[1-9]\\d))\\d{5}|7(?:0(?:[013-689]\\d|2[0-24-9])\\d{3,4}|[1-79]\\d{6})|(?:[12]\\d|4[147]|5[14579]|6[1578]|7[1-3578])\\d{5}',
-    'ExampleNumber' => '18040123',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    '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' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7,11}',
-    'ExampleNumber' => '80017591759',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-      2 => 12,
-      3 => 13,
-      4 => 14,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '700\\d{7,11}',
-    'ExampleNumber' => '7001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-      2 => 12,
-      3 => 13,
-      4 => 14,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'NG',
-  'countryCode' => 234,
-  'internationalPrefix' => '009',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '78',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12]|9(?:0[3-9]|[1-9])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-6]|7(?:0[0-689]|[1-79])|8[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[7-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '20[129]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[78]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})(\\d{5,6})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[78]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'NG',
+    'countryCode' => 234,
+    'generalDesc' => [
+        'pattern' => '2[0-24-9]\\d{8}|[78]\\d{10,13}|[7-9]\\d{9}|[1-9]\\d{7}|[124-7]\\d{6}',
+        'posLength' => [
+            7,
+            8,
+            10,
+            11,
+            12,
+            13,
+            14,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])\\d{6}|(?:(?:[1-356]\\d|4[02-8]|8[2-9])\\d|9(?:0[3-9]|[1-9]\\d))\\d{5}|7(?:0(?:[013-689]\\d|2[0-24-9])\\d{3,4}|[1-79]\\d{6})|(?:[12]\\d|4[147]|5[14579]|6[1578]|7[1-3578])\\d{5}',
+        'example' => '18040123',
+        'posLength' => [
+            7,
+            8,
+            10,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?: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}',
+        'example' => '8021234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{7,11}',
+        'example' => '80017591759',
+        'posLength' => [
+            10,
+            11,
+            12,
+            13,
+            14,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '700\\d{7,11}',
+        'example' => '7001234567',
+        'posLength' => [
+            10,
+            11,
+            12,
+            13,
+            14,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '009',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '78',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[12]|9(?:0[3-9]|[1-9])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[3-6]|7(?:0[0-689]|[1-79])|8[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[7-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '20[129]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[78]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5})(\\d{5,6})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[78]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_NI.php b/src/data/PhoneNumberMetadata_NI.php
index ccbf4c6bf..b29b94977 100644
--- a/src/data/PhoneNumberMetadata_NI.php
+++ b/src/data/PhoneNumberMetadata_NI.php
@@ -6,105 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:1800|[25-8]\\d{3})\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'NI',
+    'countryCode' => 505,
+    'generalDesc' => [
+        'pattern' => '(?:1800|[25-8]\\d{3})\\d{4}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2\\d{7}',
-    'ExampleNumber' => '21234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:5(?:5[0-7]|[78]\\d)|6(?:20|3[035]|4[045]|5[05]|77|8[1-9]|9[059])|(?:7[5-8]|8\\d)\\d)\\d{5}',
-    'ExampleNumber' => '81234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800\\d{4}',
-    'ExampleNumber' => '18001234',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2\\d{7}',
+        'example' => '21234567',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:5(?:5[0-7]|[78]\\d)|6(?:20|3[035]|4[045]|5[05]|77|8[1-9]|9[059])|(?:7[5-8]|8\\d)\\d)\\d{5}',
+        'example' => '81234567',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1800\\d{4}',
+        'example' => '18001234',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NI',
-  'countryCode' => 505,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[125-8]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[125-8]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NL.php b/src/data/PhoneNumberMetadata_NL.php
index 59396fa8b..49071beff 100644
--- a/src/data/PhoneNumberMetadata_NL.php
+++ b/src/data/PhoneNumberMetadata_NL.php
@@ -6,315 +6,242 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[124-7]\\d\\d|3(?:[02-9]\\d|1[0-8]))\\d{6}|8\\d{6,9}|9\\d{6,10}|1\\d{4,5}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-      6 => 11,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:[035]\\d|1[13-578]|6[124-8]|7[24]|8[0-467])|2(?:[0346]\\d|2[2-46-9]|5[125]|9[479])|3(?:[03568]\\d|1[3-8]|2[01]|4[1-8])|4(?:[0356]\\d|1[1-368]|7[58]|8[15-8]|9[23579])|5(?:[0358]\\d|[19][1-9]|2[1-57-9]|4[13-8]|6[126]|7[0-3578])|7\\d\\d)\\d{6}',
-    'ExampleNumber' => '101234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6[1-58]|970\\d)\\d{7}',
-    'ExampleNumber' => '612345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 11,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{4,7}',
-    'ExampleNumber' => '8001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[069]\\d{4,7}',
-    'ExampleNumber' => '9061234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:85|91)\\d{7}',
-    'ExampleNumber' => '851234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '66\\d{7}',
-    'ExampleNumber' => '662345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '140(?:1[035]|2[0346]|3[03568]|4[0356]|5[0358]|8[458])|(?:140(?:1[16-8]|2[259]|3[124]|4[17-9]|5[124679]|7)|8[478]\\d{6})\\d',
-    'ExampleNumber' => '14020',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '140(?:1[035]|2[0346]|3[03568]|4[0356]|5[0358]|8[458])|140(?:1[16-8]|2[259]|3[124]|4[17-9]|5[124679]|7)\\d',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'id' => 'NL',
-  'countryCode' => 31,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[238]|[34]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '14',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '66',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d)(\\d{8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[16-8]|2[259]|3[124]|4[17-9]|5[124679]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-578]|91',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '66',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[16-8]|2[259]|3[124]|4[17-9]|5[124679]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-578]|91',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'NL',
+    'countryCode' => 31,
+    'generalDesc' => [
+        'pattern' => '(?:[124-7]\\d\\d|3(?:[02-9]\\d|1[0-8]))\\d{6}|8\\d{6,9}|9\\d{6,10}|1\\d{4,5}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1(?:[035]\\d|1[13-578]|6[124-8]|7[24]|8[0-467])|2(?:[0346]\\d|2[2-46-9]|5[125]|9[479])|3(?:[03568]\\d|1[3-8]|2[01]|4[1-8])|4(?:[0356]\\d|1[1-368]|7[58]|8[15-8]|9[23579])|5(?:[0358]\\d|[19][1-9]|2[1-57-9]|4[13-8]|6[126]|7[0-3578])|7\\d\\d)\\d{6}',
+        'example' => '101234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:6[1-58]|970\\d)\\d{7}',
+        'example' => '612345678',
+        'posLength' => [
+            9,
+            11,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{4,7}',
+        'example' => '8001234',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '90[069]\\d{4,7}',
+        'example' => '9061234',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '(?:85|91)\\d{7}',
+        'example' => '851234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '66\\d{7}',
+        'example' => '662345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '140(?:1[035]|2[0346]|3[03568]|4[0356]|5[0358]|8[458])|(?:140(?:1[16-8]|2[259]|3[124]|4[17-9]|5[124679]|7)|8[478]\\d{6})\\d',
+        'example' => '14020',
+        'posLength' => [
+            5,
+            6,
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '140(?:1[035]|2[0346]|3[03568]|4[0356]|5[0358]|8[458])|140(?:1[16-8]|2[259]|3[124]|4[17-9]|5[124679]|7)\\d',
+        'posLength' => [
+            5,
+            6,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1[238]|[34]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '14',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[89]0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '66',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1[16-8]|2[259]|3[124]|4[17-9]|5[124679]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-578]|91',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[89]0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '66',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1[16-8]|2[259]|3[124]|4[17-9]|5[124679]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-578]|91',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_NO.php b/src/data/PhoneNumberMetadata_NO.php
index 541764001..31919e5e4 100644
--- a/src/data/PhoneNumberMetadata_NO.php
+++ b/src/data/PhoneNumberMetadata_NO.php
@@ -6,139 +6,108 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:0|[2-9]\\d{3})\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 8,
+return [
+    'id' => 'NO',
+    'countryCode' => 47,
+    'generalDesc' => [
+        'pattern' => '(?:0|[2-9]\\d{3})\\d{4}',
+        'posLength' => [
+            5,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[1-4]|3[1-3578]|5[1-35-7]|6[1-4679]|7[0-8])\\d{6}',
-    'ExampleNumber' => '21234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '(?:2[1-4]|3[1-3578]|5[1-35-7]|6[1-4679]|7[0-8])\\d{6}',
+        'example' => '21234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:4[015-8]|9\\d)\\d{6}',
-    'ExampleNumber' => '40612345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '(?:4[015-8]|9\\d)\\d{6}',
+        'example' => '40612345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[01]\\d{5}',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'tollFree' => [
+        'pattern' => '80[01]\\d{5}',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '82[09]\\d{5}',
-    'ExampleNumber' => '82012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'premiumRate' => [
+        'pattern' => '82[09]\\d{5}',
+        'example' => '82012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '810(?:0[0-6]|[2-8]\\d)\\d{3}',
-    'ExampleNumber' => '81021234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'sharedCost' => [
+        'pattern' => '810(?:0[0-6]|[2-8]\\d)\\d{3}',
+        'example' => '81021234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '880\\d{5}',
-    'ExampleNumber' => '88012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'personalNumber' => [
+        'pattern' => '880\\d{5}',
+        'example' => '88012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '85[0-5]\\d{5}',
-    'ExampleNumber' => '85012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'voip' => [
+        'pattern' => '85[0-5]\\d{5}',
+        'example' => '85012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}',
-    'ExampleNumber' => '02000',
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '81[23]\\d{5}',
-    'ExampleNumber' => '81212345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'uan' => [
+        'pattern' => '(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}',
+        'example' => '02000',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'pattern' => '81[23]\\d{5}',
+        'example' => '81212345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'id' => 'NO',
-  'countryCode' => 47,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-79]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[2-79]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => true,
-  'leadingDigits' => '[02-689]|7[0-8]',
-  'mobileNumberPortableRegion' => true,
+    'mainCountryForCode' => true,
+    'leadingDigits' => '[02-689]|7[0-8]',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_NP.php b/src/data/PhoneNumberMetadata_NP.php
index c74195a06..ea4e8f032 100644
--- a/src/data/PhoneNumberMetadata_NP.php
+++ b/src/data/PhoneNumberMetadata_NP.php
@@ -6,206 +6,154 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:1\\d|9)\\d{9}|[1-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 10,
-      2 => 11,
+return [
+    'id' => 'NP',
+    'countryCode' => 977,
+    'generalDesc' => [
+        'pattern' => '(?:1\\d|9)\\d{9}|[1-9]\\d{7}',
+        'posLength' => [
+            8,
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1[0-6]\\d|99[02-6])\\d{5}|(?:2[13-79]|3[135-8]|4[146-9]|5[135-7]|6[13-9]|7[15-9]|8[1-46-9]|9[1-7])[2-6]\\d{5}',
+        'example' => '14567890',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '9(?:00|6[0-3]|7[024-6]|8[0-24-68])\\d{7}',
+        'example' => '9841234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1(?:66001|800\\d\\d)\\d{5}',
+        'example' => '16600101234',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{7})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '1[2-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '1[01]|[2-8]|9(?:[1-59]|[67][2-6])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{5})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{7})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '1[2-6]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '1[01]|[2-8]|9(?:[1-59]|[67][2-6])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1[0-6]\\d|99[02-6])\\d{5}|(?:2[13-79]|3[135-8]|4[146-9]|5[135-7]|6[13-9]|7[15-9]|8[1-46-9]|9[1-7])[2-6]\\d{5}',
-    'ExampleNumber' => '14567890',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9(?:00|6[0-3]|7[024-6]|8[0-24-68])\\d{7}',
-    'ExampleNumber' => '9841234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:66001|800\\d\\d)\\d{5}',
-    'ExampleNumber' => '16600101234',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'NP',
-  'countryCode' => 977,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{7})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[2-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[01]|[2-8]|9(?:[1-59]|[67][2-6])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{5})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{7})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[2-6]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[01]|[2-8]|9(?:[1-59]|[67][2-6])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NR.php b/src/data/PhoneNumberMetadata_NR.php
index d6751662b..9cc854b13 100644
--- a/src/data/PhoneNumberMetadata_NR.php
+++ b/src/data/PhoneNumberMetadata_NR.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:444|(?:55|8\\d)\\d|666)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'NR',
+    'countryCode' => 674,
+    'generalDesc' => [
+        'pattern' => '(?:444|(?:55|8\\d)\\d|666)\\d{4}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '444\\d{4}',
-    'ExampleNumber' => '4441234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:55[3-9]|666|8\\d\\d)\\d{4}',
-    'ExampleNumber' => '5551234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '444\\d{4}',
+        'example' => '4441234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:55[3-9]|666|8\\d\\d)\\d{4}',
+        'example' => '5551234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NR',
-  'countryCode' => 674,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[4-68]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[4-68]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NU.php b/src/data/PhoneNumberMetadata_NU.php
index 1538986e5..8b13a3782 100644
--- a/src/data/PhoneNumberMetadata_NU.php
+++ b/src/data/PhoneNumberMetadata_NU.php
@@ -6,112 +6,82 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[4-7]|888\\d)\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 7,
+return [
+    'id' => 'NU',
+    'countryCode' => 683,
+    'generalDesc' => [
+        'pattern' => '(?:[4-7]|888\\d)\\d{3}',
+        'posLength' => [
+            4,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[47]\\d{3}',
-    'ExampleNumber' => '7012',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'fixedLine' => [
+        'pattern' => '[47]\\d{3}',
+        'example' => '7012',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[56]|888[1-9])\\d{3}',
-    'ExampleNumber' => '8884012',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:[56]|888[1-9])\\d{3}',
+        'example' => '8884012',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NU',
-  'countryCode' => 683,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_NZ.php b/src/data/PhoneNumberMetadata_NZ.php
index d035d645c..9a36738ec 100644
--- a/src/data/PhoneNumberMetadata_NZ.php
+++ b/src/data/PhoneNumberMetadata_NZ.php
@@ -6,199 +6,154 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1289]\\d{9}|50\\d{5}(?:\\d{2,3})?|[27-9]\\d{7,8}|(?:[34]\\d|6[0-35-9])\\d{6}|8\\d{4,6}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '24099\\d{3}|(?:3[2-79]|[49][2-9]|6[235-9]|7[2-57-9])\\d{6}',
-    'ExampleNumber' => '32345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '2(?:[0-27-9]\\d|6)\\d{6,7}|2(?:1\\d|75)\\d{5}',
-    'ExampleNumber' => '211234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '508\\d{6,7}|80\\d{6,8}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:1[13-57-9]\\d{5}|50(?:0[08]|30|66|77|88))\\d{3}|90\\d{6,8}',
-    'ExampleNumber' => '900123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{7}',
-    'ExampleNumber' => '701234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '8(?:1[16-9]|22|3\\d|4[045]|5[459]|6[235-9]|7[0-3579]|90)\\d{2,7}',
-    'ExampleNumber' => '83012378',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'NZ',
-  'countryCode' => 64,
-  'internationalPrefix' => '0(?:0|161)',
-  'preferredInternationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[1-79]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '50[036-8]|8|90',
-        1 => '50(?:[0367]|88)|8|90',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '24|[346]|7[2-57-9]|9[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:10|74)|[589]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1|2[028]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:[169]|7[0-35-9])|7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'NZ',
+    'countryCode' => 64,
+    'generalDesc' => [
+        'pattern' => '[1289]\\d{9}|50\\d{5}(?:\\d{2,3})?|[27-9]\\d{7,8}|(?:[34]\\d|6[0-35-9])\\d{6}|8\\d{4,6}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '24099\\d{3}|(?:3[2-79]|[49][2-9]|6[235-9]|7[2-57-9])\\d{6}',
+        'example' => '32345678',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '2(?:[0-27-9]\\d|6)\\d{6,7}|2(?:1\\d|75)\\d{5}',
+        'example' => '211234567',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '508\\d{6,7}|80\\d{6,8}',
+        'example' => '800123456',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '(?:1[13-57-9]\\d{5}|50(?:0[08]|30|66|77|88))\\d{3}|90\\d{6,8}',
+        'example' => '900123456',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '70\\d{7}',
+        'example' => '701234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '8(?:1[16-9]|22|3\\d|4[045]|5[459]|6[235-9]|7[0-3579]|90)\\d{2,7}',
+        'example' => '83012378',
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '0(?:0|161)',
+    'preferredInternationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8[1-79]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '50[036-8]|8|90',
+                '50(?:[0367]|88)|8|90',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '24|[346]|7[2-57-9]|9[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2(?:10|74)|[589]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1|2[028]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2(?:[169]|7[0-35-9])|7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_OM.php b/src/data/PhoneNumberMetadata_OM.php
index 4ece1a58d..780273aa4 100644
--- a/src/data/PhoneNumberMetadata_OM.php
+++ b/src/data/PhoneNumberMetadata_OM.php
@@ -6,141 +6,106 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:1505|[279]\\d{3}|500)\\d{4}|800\\d{5,6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
+return [
+    'id' => 'OM',
+    'countryCode' => 968,
+    'generalDesc' => [
+        'pattern' => '(?:1505|[279]\\d{3}|500)\\d{4}|800\\d{5,6}',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2[1-6]\\d{6}',
-    'ExampleNumber' => '23123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '2[1-6]\\d{6}',
+        'example' => '23123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:1505|90[1-9]\\d)\\d{4}|(?:7[126-9]|9[1-9])\\d{6}',
-    'ExampleNumber' => '92123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '(?:1505|90[1-9]\\d)\\d{4}|(?:7[126-9]|9[1-9])\\d{6}',
+        'example' => '92123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8007\\d{4,5}|(?:500|800[05])\\d{4}',
-    'ExampleNumber' => '80071234',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{5}',
-    'ExampleNumber' => '90012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'tollFree' => [
+        'pattern' => '8007\\d{4,5}|(?:500|800[05])\\d{4}',
+        'example' => '80071234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900\\d{5}',
+        'example' => '90012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'OM',
-  'countryCode' => 968,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[58]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[58]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[179]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[179]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_PA.php b/src/data/PhoneNumberMetadata_PA.php
index 31d6e7dca..b7f90dcb0 100644
--- a/src/data/PhoneNumberMetadata_PA.php
+++ b/src/data/PhoneNumberMetadata_PA.php
@@ -6,143 +6,108 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:00800|8\\d{3})\\d{6}|[68]\\d{7}|[1-57-9]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 10,
-      3 => 11,
+return [
+    'id' => 'PA',
+    'countryCode' => 507,
+    'generalDesc' => [
+        'pattern' => '(?:00800|8\\d{3})\\d{6}|[68]\\d{7}|[1-57-9]\\d{6}',
+        'posLength' => [
+            7,
+            8,
+            10,
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[089]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068]|7[0-8])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}',
-    'ExampleNumber' => '2001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[089]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068]|7[0-8])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}',
+        'example' => '2001234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:1[16]1|21[89]|6\\d{3}|8(?:1[01]|7[23]))\\d{4}',
-    'ExampleNumber' => '61234567',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+    'mobile' => [
+        'pattern' => '(?:1[16]1|21[89]|6\\d{3}|8(?:1[01]|7[23]))\\d{4}',
+        'example' => '61234567',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{4,5}|(?:00800|800\\d)\\d{6}',
-    'ExampleNumber' => '8001234',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:8(?:22|55|60|7[78]|86)|9(?:00|81))\\d{4}',
-    'ExampleNumber' => '8601234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '800\\d{4,5}|(?:00800|800\\d)\\d{6}',
+        'example' => '8001234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '(?:8(?:22|55|60|7[78]|86)|9(?:00|81))\\d{4}',
+        'example' => '8601234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PA',
-  'countryCode' => 507,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[68]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[1-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[68]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_PE.php b/src/data/PhoneNumberMetadata_PE.php
index 61b191c69..bb25b45f9 100644
--- a/src/data/PhoneNumberMetadata_PE.php
+++ b/src/data/PhoneNumberMetadata_PE.php
@@ -6,174 +6,133 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[14-8]|9\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:4[34]|5[14])[0-8]\\d|7(?:173|3[0-8]\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}',
-    'ExampleNumber' => '11234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9\\d{8}',
-    'ExampleNumber' => '912345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '805\\d{5}',
-    'ExampleNumber' => '80512345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '801\\d{5}',
-    'ExampleNumber' => '80112345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '80[24]\\d{5}',
-    'ExampleNumber' => '80212345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'PE',
-  'countryCode' => 51,
-  'internationalPrefix' => '00|19(?:1[124]|77|90)00',
-  'preferredInternationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'preferredExtnPrefix' => ' Anexo ',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[4-8]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'PE',
+    'countryCode' => 51,
+    'generalDesc' => [
+        'pattern' => '(?:[14-8]|9\\d)\\d{7}',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:(?:4[34]|5[14])[0-8]\\d|7(?:173|3[0-8]\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}',
+        'example' => '11234567',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '9\\d{8}',
+        'example' => '912345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '805\\d{5}',
+        'example' => '80512345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '801\\d{5}',
+        'example' => '80112345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '80[24]\\d{5}',
+        'example' => '80212345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00|19(?:1[124]|77|90)00',
+    'preferredInternationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'preferredExtnPrefix' => ' Anexo ',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[4-8]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_PF.php b/src/data/PhoneNumberMetadata_PF.php
index 81e849476..9ed313699 100644
--- a/src/data/PhoneNumberMetadata_PF.php
+++ b/src/data/PhoneNumberMetadata_PF.php
@@ -6,148 +6,111 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '4\\d{5}(?:\\d{2})?|8\\d{7,8}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 9,
+return [
+    'id' => 'PF',
+    'countryCode' => 689,
+    'generalDesc' => [
+        'pattern' => '4\\d{5}(?:\\d{2})?|8\\d{7,8}',
+        'posLength' => [
+            6,
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '4(?:0[4-689]|9[4-68])\\d{5}',
-    'ExampleNumber' => '40412345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '4(?:0[4-689]|9[4-68])\\d{5}',
+        'example' => '40412345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '8[7-9]\\d{6}',
-    'ExampleNumber' => '87123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '8[7-9]\\d{6}',
+        'example' => '87123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '800012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '800012345',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '499\\d{5}',
-    'ExampleNumber' => '49901234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'voip' => [
+        'pattern' => '499\\d{5}',
+        'example' => '49901234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '44\\d{4}',
-    'ExampleNumber' => '440123',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'uan' => [
+        'pattern' => '44\\d{4}',
+        'example' => '440123',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '44\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'noInternationalDialling' => [
+        'pattern' => '44\\d{4}',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'id' => 'PF',
-  'countryCode' => 689,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '44',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '44',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '4|8[7-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '4|8[7-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_PG.php b/src/data/PhoneNumberMetadata_PG.php
index c4a535565..3f2d80714 100644
--- a/src/data/PhoneNumberMetadata_PG.php
+++ b/src/data/PhoneNumberMetadata_PG.php
@@ -6,135 +6,101 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:180|[78]\\d{3})\\d{4}|(?:[2-589]\\d|64)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+return [
+    'id' => 'PG',
+    'countryCode' => 675,
+    'generalDesc' => [
+        'pattern' => '(?:180|[78]\\d{3})\\d{4}|(?:[2-589]\\d|64)\\d{5}',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:3[0-2]|4[257]|5[34]|9[78])\\d|64[1-9]|85[02-46-9])\\d{4}',
-    'ExampleNumber' => '3123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:(?:3[0-2]|4[257]|5[34]|9[78])\\d|64[1-9]|85[02-46-9])\\d{4}',
+        'example' => '3123456',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:7\\d|8[1-38])\\d{6}',
-    'ExampleNumber' => '70123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '(?:7\\d|8[1-38])\\d{6}',
+        'example' => '70123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '180\\d{4}',
-    'ExampleNumber' => '1801234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '180\\d{4}',
+        'example' => '1801234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '2(?:0[0-57]|7[568])\\d{4}',
-    'ExampleNumber' => '2751234',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'voip' => [
+        'pattern' => '2(?:0[0-57]|7[568])\\d{4}',
+        'example' => '2751234',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '27[01]\\d{4}',
-    'ExampleNumber' => '2700123',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'pager' => [
+        'pattern' => '27[01]\\d{4}',
+        'example' => '2700123',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PG',
-  'countryCode' => 675,
-  'internationalPrefix' => '00|140[1-3]',
-  'preferredInternationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '18|[2-69]|85',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00|140[1-3]',
+    'preferredInternationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '18|[2-69]|85',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[78]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[78]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_PH.php b/src/data/PhoneNumberMetadata_PH.php
index 98c9f918e..554c428d8 100644
--- a/src/data/PhoneNumberMetadata_PH.php
+++ b/src/data/PhoneNumberMetadata_PH.php
@@ -6,228 +6,174 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-7]|9\\d)\\d{8}|2\\d{5}|(?:1800|8)\\d{7,9}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-      5 => 12,
-      6 => 13,
+return [
+    'id' => 'PH',
+    'countryCode' => 63,
+    'generalDesc' => [
+        'pattern' => '(?:[2-7]|9\\d)\\d{8}|2\\d{5}|(?:1800|8)\\d{7,9}',
+        'posLength' => [
+            6,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:(?:2[3-8]|3[2-68]|4[2-9]|5[2-6]|6[2-58]|7[24578])\\d{3}|88(?:22\\d\\d|42))\\d{4}|(?:2|8[2-8]\\d\\d)\\d{5}',
+        'example' => '232345678',
+        'posLength' => [
+            6,
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:8(?:1[37]|9[5-8])|9(?:0[5-9]|1[0-24-9]|[235-7]\\d|4[2-9]|8[135-9]|9[1-9]))\\d{7}',
+        'example' => '9051234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1800\\d{7,9}',
+        'example' => '180012345678',
+        'posLength' => [
+            11,
+            12,
+            13,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3(?:23|39|46)|4(?:2[3-6]|[35]9|4[26]|76)|544|88[245]|(?:52|64|86)2',
+                '3(?:230|397|461)|4(?:2(?:35|[46]4|51)|396|4(?:22|63)|59[347]|76[15])|5(?:221|446)|642[23]|8(?:622|8(?:[24]2|5[13]))',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '346|4(?:27|9[35])|883',
+                '3469|4(?:279|9(?:30|56))|8834',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[3-7]|8[2-8]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{1,2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:2[3-8]|3[2-68]|4[2-9]|5[2-6]|6[2-58]|7[24578])\\d{3}|88(?:22\\d\\d|42))\\d{4}|(?:2|8[2-8]\\d\\d)\\d{5}',
-    'ExampleNumber' => '232345678',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:8(?:1[37]|9[5-8])|9(?:0[5-9]|1[0-24-9]|[235-7]\\d|4[2-9]|8[135-9]|9[1-9]))\\d{7}',
-    'ExampleNumber' => '9051234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800\\d{7,9}',
-    'ExampleNumber' => '180012345678',
-    'PossibleLength' =>
-     [
-      0 => 11,
-      1 => 12,
-      2 => 13,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'PH',
-  'countryCode' => 63,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3(?:23|39|46)|4(?:2[3-6]|[35]9|4[26]|76)|544|88[245]|(?:52|64|86)2',
-        1 => '3(?:230|397|461)|4(?:2(?:35|[46]4|51)|396|4(?:22|63)|59[347]|76[15])|5(?:221|446)|642[23]|8(?:622|8(?:[24]2|5[13]))',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{5})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '346|4(?:27|9[35])|883',
-        1 => '3469|4(?:279|9(?:30|56))|8834',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-7]|8[2-8]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{4})(\\d{1,2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_PK.php b/src/data/PhoneNumberMetadata_PK.php
index 7abb646bb..fbbd61bca 100644
--- a/src/data/PhoneNumberMetadata_PK.php
+++ b/src/data/PhoneNumberMetadata_PK.php
@@ -6,230 +6,177 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '122\\d{6}|[24-8]\\d{10,11}|9(?:[013-9]\\d{8,10}|2(?:[01]\\d\\d|2(?:[06-8]\\d|1[01]))\\d{7})|(?:[2-8]\\d{3}|92(?:[0-7]\\d|8[1-9]))\\d{6}|[24-9]\\d{8}|[89]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-      4 => 12,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:21|42)[2-9]|58[126])\\d{7}|(?:2[25]|4[0146-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]\\d{6,7}|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8]))[2-9]\\d{5,6}',
-    'ExampleNumber' => '2123456789',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '3(?:[0-247]\\d|3[0-79]|55|64)\\d{7}',
-    'ExampleNumber' => '3012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}(?:\\d{3})?',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 11,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{5}',
-    'ExampleNumber' => '90012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '122\\d{6}',
-    'ExampleNumber' => '122044444',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:[125]|3[2358]|4[2-4]|9[2-8])|4(?:[0-246-9]|5[3479])|5(?:[1-35-7]|4[2-467])|6(?:0[468]|[1-8])|7(?:[14]|2[236])|8(?:[16]|2[2-689]|3[23578]|4[3478]|5[2356])|9(?:1|22|3[27-9]|4[2-6]|6[3569]|9[2-7]))111\\d{6}',
-    'ExampleNumber' => '21111825888',
-    'PossibleLength' =>
-     [
-      0 => 11,
-      1 => 12,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'PK',
-  'countryCode' => 92,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2,7})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8])',
-        1 => '9(?:2[3-8]|98)|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:22|3[27-9]|4[2-6]|6[3569]|9[25-7]))[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{5})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '58',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-9]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'PK',
+    'countryCode' => 92,
+    'generalDesc' => [
+        'pattern' => '122\\d{6}|[24-8]\\d{10,11}|9(?:[013-9]\\d{8,10}|2(?:[01]\\d\\d|2(?:[06-8]\\d|1[01]))\\d{7})|(?:[2-8]\\d{3}|92(?:[0-7]\\d|8[1-9]))\\d{6}|[24-9]\\d{8}|[89]\\d{7}',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:(?:21|42)[2-9]|58[126])\\d{7}|(?:2[25]|4[0146-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]\\d{6,7}|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8]))[2-9]\\d{5,6}',
+        'example' => '2123456789',
+        'posLength' => [
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '3(?:[0-247]\\d|3[0-79]|55|64)\\d{7}',
+        'example' => '3012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{5}(?:\\d{3})?',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+            11,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '900\\d{5}',
+        'example' => '90012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '122\\d{6}',
+        'example' => '122044444',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '(?:2(?:[125]|3[2358]|4[2-4]|9[2-8])|4(?:[0-246-9]|5[3479])|5(?:[1-35-7]|4[2-467])|6(?:0[468]|[1-8])|7(?:[14]|2[236])|8(?:[16]|2[2-689]|3[23578]|4[3478]|5[2356])|9(?:1|22|3[27-9]|4[2-6]|6[3569]|9[2-7]))111\\d{6}',
+        'example' => '21111825888',
+        'posLength' => [
+            11,
+            12,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2,7})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8])',
+                '9(?:2[3-8]|98)|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:22|3[27-9]|4[2-6]|6[3569]|9[25-7]))[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '58',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[24-9]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_PL.php b/src/data/PhoneNumberMetadata_PL.php
index ef3e76a6d..658fd2517 100644
--- a/src/data/PhoneNumberMetadata_PL.php
+++ b/src/data/PhoneNumberMetadata_PL.php
@@ -6,209 +6,161 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:6|8\\d\\d)\\d{7}|[1-9]\\d{6}(?:\\d{2})?|[26]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '47\\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\\d{6}|1(?:[0-8]\\d{5}|9\\d{3}(?:\\d{2})?))',
-    'ExampleNumber' => '123456789',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '21(?:1[013-5]|2\\d)\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}',
-    'ExampleNumber' => '512345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6,7}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '70[01346-8]\\d{6}',
-    'ExampleNumber' => '701234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '801\\d{6}',
-    'ExampleNumber' => '801234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '39\\d{7}',
-    'ExampleNumber' => '391234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '64\\d{4,7}',
-    'ExampleNumber' => '641234567',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '804\\d{6}',
-    'ExampleNumber' => '804123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'PL',
-  'countryCode' => 48,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '19',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '11|20|64',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])1',
-        1 => '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])19',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '64',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '21|39|45|5[0137]|6[0469]|7[02389]|8(?:0[14]|8)',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[2-8]|[2-7]|8[1-79]|9[145]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'PL',
+    'countryCode' => 48,
+    'generalDesc' => [
+        'pattern' => '(?:6|8\\d\\d)\\d{7}|[1-9]\\d{6}(?:\\d{2})?|[26]\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '47\\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\\d{6}|1(?:[0-8]\\d{5}|9\\d{3}(?:\\d{2})?))',
+        'example' => '123456789',
+        'posLength' => [
+            7,
+            9,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '21(?:1[013-5]|2\\d)\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}',
+        'example' => '512345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{6,7}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '70[01346-8]\\d{6}',
+        'example' => '701234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '801\\d{6}',
+        'example' => '801234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '39\\d{7}',
+        'example' => '391234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '64\\d{4,7}',
+        'example' => '641234567',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '804\\d{6}',
+        'example' => '804123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '19',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '11|20|64',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])1',
+                '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])19',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '64',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '21|39|45|5[0137]|6[0469]|7[02389]|8(?:0[14]|8)',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1[2-8]|[2-7]|8[1-79]|9[145]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_PM.php b/src/data/PhoneNumberMetadata_PM.php
index 347777b1b..95833d282 100644
--- a/src/data/PhoneNumberMetadata_PM.php
+++ b/src/data/PhoneNumberMetadata_PM.php
@@ -6,140 +6,104 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[45]\\d{5}|(?:708|80\\d)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
+return [
+    'id' => 'PM',
+    'countryCode' => 508,
+    'generalDesc' => [
+        'pattern' => '[45]\\d{5}|(?:708|80\\d)\\d{6}',
+        'posLength' => [
+            6,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:4[1-35-7]|5[01])\\d{4}',
-    'ExampleNumber' => '430123',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '(?:4[1-35-7]|5[01])\\d{4}',
+        'example' => '430123',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:4[02-4]|5[056]|708[45][0-5])\\d{4}',
-    'ExampleNumber' => '551234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '800012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '(?:4[02-4]|5[056]|708[45][0-5])\\d{4}',
+        'example' => '551234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '800012345',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PM',
-  'countryCode' => 508,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[45]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[45]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_PR.php b/src/data/PhoneNumberMetadata_PR.php
index 9168399b7..f55b6203f 100644
--- a/src/data/PhoneNumberMetadata_PR.php
+++ b/src/data/PhoneNumberMetadata_PR.php
@@ -6,104 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[589]\\d\\d|787)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'PR',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[589]\\d\\d|787)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:787|939)[2-9]\\d{6}',
+        'example' => '7872345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:787|939)[2-9]\\d{6}',
-    'ExampleNumber' => '7872345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:787|939)[2-9]\\d{6}',
+        'example' => '7872345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:787|939)[2-9]\\d{6}',
-    'ExampleNumber' => '7872345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002345678',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002345678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002345678',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PR',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '1',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '787|939',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '1',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [],
+    'leadingDigits' => '787|939',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_PS.php b/src/data/PhoneNumberMetadata_PS.php
index 0a3f797df..e523feaa8 100644
--- a/src/data/PhoneNumberMetadata_PS.php
+++ b/src/data/PhoneNumberMetadata_PS.php
@@ -6,155 +6,116 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2489]2\\d{6}|(?:1\\d|5)\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
+return [
+    'id' => 'PS',
+    'countryCode' => 970,
+    'generalDesc' => [
+        'pattern' => '[2489]2\\d{6}|(?:1\\d|5)\\d{8}',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:22[2-47-9]|42[45]|82[014-68]|92[3569])\\d{5}',
+        'example' => '22234567',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '5[69]\\d{7}',
+        'example' => '599123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1800\\d{6}',
+        'example' => '1800123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '1700\\d{6}',
+        'example' => '1700123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2489]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:22[2-47-9]|42[45]|82[014-68]|92[3569])\\d{5}',
-    'ExampleNumber' => '22234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '5[69]\\d{7}',
-    'ExampleNumber' => '599123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800\\d{6}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '1700\\d{6}',
-    'ExampleNumber' => '1700123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'PS',
-  'countryCode' => 970,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2489]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_PT.php b/src/data/PhoneNumberMetadata_PT.php
index 937b9c45a..536bead9e 100644
--- a/src/data/PhoneNumberMetadata_PT.php
+++ b/src/data/PhoneNumberMetadata_PT.php
@@ -6,103 +6,80 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1693\\d{5}|(?:[26-9]\\d|30)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'PT',
+    'countryCode' => 351,
+    'generalDesc' => [
+        'pattern' => '1693\\d{5}|(?:[26-9]\\d|30)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:[12]\\d|3[1-689]|4[1-59]|[57][1-9]|6[1-35689]|8[1-69]|9[1256])\\d{6}',
-    'ExampleNumber' => '212345678',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6(?:[06]92(?:30|9\\d)|[35]92(?:[049]\\d|3[034]))\\d{3}|(?:(?:16|6[0356])93|9(?:[1-36]\\d\\d|480))\\d{5}',
-    'ExampleNumber' => '912345678',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[02]\\d{6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:6(?:0[178]|4[68])\\d|76(?:0[1-57]|1[2-47]|2[237]))\\d{5}',
-    'ExampleNumber' => '760123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '80(?:8\\d|9[1579])\\d{5}',
-    'ExampleNumber' => '808123456',
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '884[0-4689]\\d{5}',
-    'ExampleNumber' => '884123456',
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '30\\d{7}',
-    'ExampleNumber' => '301234567',
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '6(?:222\\d|8988)\\d{4}',
-    'ExampleNumber' => '622212345',
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '70(?:38[01]|596|(?:7\\d|8[17])\\d)\\d{4}',
-    'ExampleNumber' => '707123456',
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '600\\d{6}|6[06]92(?:0\\d|3[349]|49)\\d{3}',
-    'ExampleNumber' => '600110000',
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:[12]\\d|3[1-689]|4[1-59]|[57][1-9]|6[1-35689]|8[1-69]|9[1256])\\d{6}',
+        'example' => '212345678',
     ],
-  ],
-  'id' => 'PT',
-  'countryCode' => 351,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[12]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'mobile' => [
+        'pattern' => '6(?:[06]92(?:30|9\\d)|[35]92(?:[049]\\d|3[034]))\\d{3}|(?:(?:16|6[0356])93|9(?:[1-36]\\d\\d|480))\\d{5}',
+        'example' => '912345678',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '16|[236-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'tollFree' => [
+        'pattern' => '80[02]\\d{6}',
+        'example' => '800123456',
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'premiumRate' => [
+        'pattern' => '(?:6(?:0[178]|4[68])\\d|76(?:0[1-57]|1[2-47]|2[237]))\\d{5}',
+        'example' => '760123456',
+    ],
+    'sharedCost' => [
+        'pattern' => '80(?:8\\d|9[1579])\\d{5}',
+        'example' => '808123456',
+    ],
+    'personalNumber' => [
+        'pattern' => '884[0-4689]\\d{5}',
+        'example' => '884123456',
+    ],
+    'voip' => [
+        'pattern' => '30\\d{7}',
+        'example' => '301234567',
+    ],
+    'pager' => [
+        'pattern' => '6(?:222\\d|8988)\\d{4}',
+        'example' => '622212345',
+    ],
+    'uan' => [
+        'pattern' => '70(?:38[01]|596|(?:7\\d|8[17])\\d)\\d{4}',
+        'example' => '707123456',
+    ],
+    'voicemail' => [
+        'pattern' => '600\\d{6}|6[06]92(?:0\\d|3[349]|49)\\d{3}',
+        'example' => '600110000',
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2[12]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '16|[236-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_PW.php b/src/data/PhoneNumberMetadata_PW.php
index fa555169f..547652d29 100644
--- a/src/data/PhoneNumberMetadata_PW.php
+++ b/src/data/PhoneNumberMetadata_PW.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[24-8]\\d\\d|345|900)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'PW',
+    'countryCode' => 680,
+    'generalDesc' => [
+        'pattern' => '(?:[24-8]\\d\\d|345|900)\\d{4}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:55|77)|345|488|5(?:35|44|87)|6(?:22|54|79)|7(?:33|47)|8(?:24|55|76)|900)\\d{4}',
-    'ExampleNumber' => '2771234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:(?:46|83)[0-5]|6[2-4689]0)\\d{4}|(?:45|77|88)\\d{5}',
-    'ExampleNumber' => '6201234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:2(?:55|77)|345|488|5(?:35|44|87)|6(?:22|54|79)|7(?:33|47)|8(?:24|55|76)|900)\\d{4}',
+        'example' => '2771234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:(?:46|83)[0-5]|6[2-4689]0)\\d{4}|(?:45|77|88)\\d{5}',
+        'example' => '6201234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PW',
-  'countryCode' => 680,
-  'internationalPrefix' => '01[12]',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '01[12]',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_PY.php b/src/data/PhoneNumberMetadata_PY.php
index 58a607591..5c5ad5861 100644
--- a/src/data/PhoneNumberMetadata_PY.php
+++ b/src/data/PhoneNumberMetadata_PY.php
@@ -6,228 +6,175 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '59\\d{4,6}|9\\d{5,10}|(?:[2-46-8]\\d|5[0-8])\\d{4,7}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36])\\d{5,7}|(?:2(?:2[4-68]|[4-68]\\d|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51|[67]\\d)|4(?:3[12]|5[13]|9[1-47])|5(?:[1-4]\\d|5[02-4])|6(?:3[1-3]|44|7[1-8])|7(?:4[0-4]|5\\d|6[1-578]|75|8[0-8])|858)\\d{5,6}',
-    'ExampleNumber' => '212345678',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9(?:51|6[129]|7[1-6]|8[1-7]|9[1-5])\\d{6}',
-    'ExampleNumber' => '961456789',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9800\\d{5,7}',
-    'ExampleNumber' => '98000123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-      2 => 11,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '8700[0-4]\\d{4}',
-    'ExampleNumber' => '870012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '[2-9]0\\d{4,7}',
-    'ExampleNumber' => '201234567',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'PY',
-  'countryCode' => 595,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[279]|3[13-5]|4[359]|5|6(?:[34]|7[1-46-8])|7[46-8]|85',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[14-68]|3[26-9]|4[1246-8]|6(?:1|75)|7[1-35]|8[1-36]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '87',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:[5-79]|8[1-7])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-8]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'PY',
+    'countryCode' => 595,
+    'generalDesc' => [
+        'pattern' => '59\\d{4,6}|9\\d{5,10}|(?:[2-46-8]\\d|5[0-8])\\d{4,7}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            5,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36])\\d{5,7}|(?:2(?:2[4-68]|[4-68]\\d|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51|[67]\\d)|4(?:3[12]|5[13]|9[1-47])|5(?:[1-4]\\d|5[02-4])|6(?:3[1-3]|44|7[1-8])|7(?:4[0-4]|5\\d|6[1-578]|75|8[0-8])|858)\\d{5,6}',
+        'example' => '212345678',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '9(?:51|6[129]|7[1-6]|8[1-7]|9[1-5])\\d{6}',
+        'example' => '961456789',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '9800\\d{5,7}',
+        'example' => '98000123456',
+        'posLength' => [
+            9,
+            10,
+            11,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '8700[0-4]\\d{4}',
+        'example' => '870012345',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '[2-9]0\\d{4,7}',
+        'example' => '201234567',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-9]0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2[279]|3[13-5]|4[359]|5|6(?:[34]|7[1-46-8])|7[46-8]|85',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2[14-68]|3[26-9]|4[1246-8]|6(?:1|75)|7[1-35]|8[1-36]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '87',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '9(?:[5-79]|8[1-7])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-8]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_QA.php b/src/data/PhoneNumberMetadata_QA.php
index 43d0afd48..6db8b717a 100644
--- a/src/data/PhoneNumberMetadata_QA.php
+++ b/src/data/PhoneNumberMetadata_QA.php
@@ -6,136 +6,103 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '800\\d{4}|(?:2|800)\\d{6}|(?:0080|[3-7])\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 11,
+return [
+    'id' => 'QA',
+    'countryCode' => 974,
+    'generalDesc' => [
+        'pattern' => '800\\d{4}|(?:2|800)\\d{6}|(?:0080|[3-7])\\d{7}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '4(?:1111|2022)\\d{3}|4(?:[04]\\d\\d|14[0-6]|999)\\d{4}',
-    'ExampleNumber' => '44123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '4(?:1111|2022)\\d{3}|4(?:[04]\\d\\d|14[0-6]|999)\\d{4}',
+        'example' => '44123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[35-7]\\d{7}',
-    'ExampleNumber' => '33123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '[35-7]\\d{7}',
+        'example' => '33123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{4}|(?:0080[01]|800)\\d{6}',
-    'ExampleNumber' => '8001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
-      2 => 11,
+    'tollFree' => [
+        'pattern' => '800\\d{4}|(?:0080[01]|800)\\d{6}',
+        'example' => '8001234',
+        'posLength' => [
+            7,
+            9,
+            11,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '2[16]\\d{5}',
-    'ExampleNumber' => '2123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'pager' => [
+        'pattern' => '2[16]\\d{5}',
+        'example' => '2123456',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'QA',
-  'countryCode' => 974,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[16]|8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2[16]|8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[3-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_RE.php b/src/data/PhoneNumberMetadata_RE.php
index a02482a41..1c3d26037 100644
--- a/src/data/PhoneNumberMetadata_RE.php
+++ b/src/data/PhoneNumberMetadata_RE.php
@@ -6,101 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:26|[689]\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'RE',
+    'countryCode' => 262,
+    'generalDesc' => [
+        'pattern' => '(?:26|[689]\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '26(?:2\\d\\d|3(?:0\\d|1[0-6]))\\d{4}',
-    'ExampleNumber' => '262161234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '69(?:2\\d\\d|3(?:[06][0-6]|1[013]|2[0-2]|3[0-39]|4\\d|5[0-5]|7[0-37]|8[0-8]|9[0-479]))\\d{4}',
-    'ExampleNumber' => '692123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{7}',
-    'ExampleNumber' => '801234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '89[1-37-9]\\d{6}',
-    'ExampleNumber' => '891123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8(?:1[019]|2[0156]|84|90)\\d{6}',
-    'ExampleNumber' => '810123456',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '26(?:2\\d\\d|3(?:0\\d|1[0-6]))\\d{4}',
+        'example' => '262161234',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:399[0-3]|479[0-5]|76(?:2[27]|3[0-37]))\\d{4}',
-    'ExampleNumber' => '939901234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '69(?:2\\d\\d|3(?:[06][0-6]|1[013]|2[0-2]|3[0-39]|4\\d|5[0-5]|7[0-37]|8[0-8]|9[0-479]))\\d{4}',
+        'example' => '692123456',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d{7}',
+        'example' => '801234567',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '89[1-37-9]\\d{6}',
+        'example' => '891123456',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '8(?:1[019]|2[0156]|84|90)\\d{6}',
+        'example' => '810123456',
     ],
-  ],
-  'id' => 'RE',
-  'countryCode' => 262,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2689]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => true,
-  'mobileNumberPortableRegion' => false,
+    'voip' => [
+        'pattern' => '9(?:399[0-3]|479[0-5]|76(?:2[27]|3[0-37]))\\d{4}',
+        'example' => '939901234',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[2689]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_RO.php b/src/data/PhoneNumberMetadata_RO.php
index 4608ed2bf..514ce67fb 100644
--- a/src/data/PhoneNumberMetadata_RO.php
+++ b/src/data/PhoneNumberMetadata_RO.php
@@ -6,160 +6,122 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[236-8]\\d|90)\\d{7}|[23]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
+return [
+    'id' => 'RO',
+    'countryCode' => 40,
+    'generalDesc' => [
+        'pattern' => '(?:[236-8]\\d|90)\\d{7}|[23]\\d{5}',
+        'posLength' => [
+            6,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[23][13-6]\\d{7}|(?:2(?:19\\d|[3-6]\\d9)|31\\d\\d)\\d\\d',
-    'ExampleNumber' => '211234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7020\\d{5}|(?:6(?:[04]0|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}',
-    'ExampleNumber' => '712034567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '[23][13-6]\\d{7}|(?:2(?:19\\d|[3-6]\\d9)|31\\d\\d)\\d\\d',
+        'example' => '211234567',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '7020\\d{5}|(?:6(?:[04]0|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}',
+        'example' => '712034567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[0136]\\d{6}',
-    'ExampleNumber' => '900123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '801\\d{6}',
-    'ExampleNumber' => '801123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'premiumRate' => [
+        'pattern' => '90[0136]\\d{6}',
+        'example' => '900123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '801\\d{6}',
+        'example' => '801123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:37\\d|80[578])\\d{6}',
-    'ExampleNumber' => '372123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '(?:37\\d|80[578])\\d{6}',
+        'example' => '372123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'RO',
-  'countryCode' => 40,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'preferredExtnPrefix' => ' int ',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[3-6]',
-        1 => '2[3-6]\\d9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '219|31',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'preferredExtnPrefix' => ' int ',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2[3-6]',
+                '2[3-6]\\d9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '219|31',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[23]1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[236-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[236-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_RS.php b/src/data/PhoneNumberMetadata_RS.php
index 700f47e20..8adb0e1b7 100644
--- a/src/data/PhoneNumberMetadata_RS.php
+++ b/src/data/PhoneNumberMetadata_RS.php
@@ -6,155 +6,122 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '38[02-9]\\d{6,9}|6\\d{7,9}|90\\d{4,8}|38\\d{5,6}|(?:7\\d\\d|800)\\d{3,9}|(?:[12]\\d|3[0-79])\\d{5,10}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
-      6 => 12,
+return [
+    'id' => 'RS',
+    'countryCode' => 381,
+    'generalDesc' => [
+        'pattern' => '38[02-9]\\d{6,9}|6\\d{7,9}|90\\d{4,8}|38\\d{5,6}|(?:7\\d\\d|800)\\d{3,9}|(?:[12]\\d|3[0-79])\\d{5,10}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
+    'fixedLine' => [
+        'pattern' => '(?:11[1-9]\\d|(?:2[389]|39)(?:0[2-9]|[2-9]\\d))\\d{3,8}|(?:1[02-9]|2[0-24-7]|3[0-8])[2-9]\\d{4,9}',
+        'example' => '10234567',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
+        'posLengthLocal' => [
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:11[1-9]\\d|(?:2[389]|39)(?:0[2-9]|[2-9]\\d))\\d{3,8}|(?:1[02-9]|2[0-24-7]|3[0-8])[2-9]\\d{4,9}',
-    'ExampleNumber' => '10234567',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-      5 => 12,
+    'mobile' => [
+        'pattern' => '6(?:[0-689]|7\\d)\\d{6,7}',
+        'example' => '601234567',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
+    'tollFree' => [
+        'pattern' => '800\\d{3,9}',
+        'example' => '80012345',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6(?:[0-689]|7\\d)\\d{6,7}',
-    'ExampleNumber' => '601234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
+    'premiumRate' => [
+        'pattern' => '(?:78\\d|90[0169])\\d{3,7}',
+        'example' => '90012345',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{3,9}',
-    'ExampleNumber' => '80012345',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:78\\d|90[0169])\\d{3,7}',
-    'ExampleNumber' => '90012345',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '7[06]\\d{4,10}',
+        'example' => '700123456',
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '7[06]\\d{4,10}',
-    'ExampleNumber' => '700123456',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'RS',
-  'countryCode' => 381,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,9})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:2[389]|39)0|[7-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3,9})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:2[389]|39)0|[7-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5,10})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-36]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5,10})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-36]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_RU.php b/src/data/PhoneNumberMetadata_RU.php
index 2adaf3268..4dbf47aa0 100644
--- a/src/data/PhoneNumberMetadata_RU.php
+++ b/src/data/PhoneNumberMetadata_RU.php
@@ -6,261 +6,208 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '8\\d{13}|[347-9]\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 14,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:0[12]|4[1-35-79]|5[1-3]|65|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15]|6[1-35-79]|7[1-37-9]))\\d{7}',
-    'ExampleNumber' => '3011234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9\\d{9}',
-    'ExampleNumber' => '9123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:0[04]|108\\d{3})\\d{7}',
-    'ExampleNumber' => '8001234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '80[39]\\d{7}',
-    'ExampleNumber' => '8091234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '808\\d{7}',
-    'ExampleNumber' => '8081234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'RU',
-  'countryCode' => 7,
-  'internationalPrefix' => '810',
-  'preferredInternationalPrefix' => '8~10',
-  'nationalPrefix' => '8',
-  'nationalPrefixForParsing' => '8',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[0-79]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7(?:1[0-8]|2[1-9])',
-        1 => '7(?:1(?:[0-356]2|4[29]|7|8[27])|2(?:1[23]|[2-9]2))',
-        2 => '7(?:1(?:[0-356]2|4[29]|7|8[27])|2(?:13[03-69]|62[013-9]))|72[1-57-9]2',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{5})(\\d)(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7(?:1[0-68]|2[1-9])',
-        1 => '7(?:1(?:[06][3-6]|[18]|2[35]|[3-5][3-5])|2(?:[13][3-5]|[24-689]|7[457]))',
-        2 => '7(?:1(?:0(?:[356]|4[023])|[18]|2(?:3[013-9]|5)|3[45]|43[013-79]|5(?:3[1-8]|4[1-7]|5)|6(?:3[0-35-9]|[4-6]))|2(?:1(?:3[178]|[45])|[24-689]|3[35]|7[457]))|7(?:14|23)4[0-8]|71(?:33|45)[1-79]',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[349]|8(?:[02-7]|1[1-8])',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7(?:1[0-8]|2[1-9])',
-        1 => '7(?:1(?:[0-356]2|4[29]|7|8[27])|2(?:1[23]|[2-9]2))',
-        2 => '7(?:1(?:[0-356]2|4[29]|7|8[27])|2(?:13[03-69]|62[013-9]))|72[1-57-9]2',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{5})(\\d)(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7(?:1[0-68]|2[1-9])',
-        1 => '7(?:1(?:[06][3-6]|[18]|2[35]|[3-5][3-5])|2(?:[13][3-5]|[24-689]|7[457]))',
-        2 => '7(?:1(?:0(?:[356]|4[023])|[18]|2(?:3[013-9]|5)|3[45]|43[013-79]|5(?:3[1-8]|4[1-7]|5)|6(?:3[0-35-9]|[4-6]))|2(?:1(?:3[178]|[45])|[24-689]|3[35]|7[457]))|7(?:14|23)4[0-8]|71(?:33|45)[1-79]',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[349]|8(?:[02-7]|1[1-8])',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '8 ($1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => true,
-  'leadingDigits' => '3[04-689]|[489]',
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'RU',
+    'countryCode' => 7,
+    'generalDesc' => [
+        'pattern' => '8\\d{13}|[347-9]\\d{9}',
+        'posLength' => [
+            10,
+            14,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:3(?:0[12]|4[1-35-79]|5[1-3]|65|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15]|6[1-35-79]|7[1-37-9]))\\d{7}',
+        'example' => '3011234567',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '9\\d{9}',
+        'example' => '9123456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '8(?:0[04]|108\\d{3})\\d{7}',
+        'example' => '8001234567',
+    ],
+    'premiumRate' => [
+        'pattern' => '80[39]\\d{7}',
+        'example' => '8091234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '808\\d{7}',
+        'example' => '8081234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '810',
+    'preferredInternationalPrefix' => '8~10',
+    'nationalPrefix' => '8',
+    'nationalPrefixForParsing' => '8',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[0-79]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '7(?:1[0-8]|2[1-9])',
+                '7(?:1(?:[0-356]2|4[29]|7|8[27])|2(?:1[23]|[2-9]2))',
+                '7(?:1(?:[0-356]2|4[29]|7|8[27])|2(?:13[03-69]|62[013-9]))|72[1-57-9]2',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d)(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '7(?:1[0-68]|2[1-9])',
+                '7(?:1(?:[06][3-6]|[18]|2[35]|[3-5][3-5])|2(?:[13][3-5]|[24-689]|7[457]))',
+                '7(?:1(?:0(?:[356]|4[023])|[18]|2(?:3[013-9]|5)|3[45]|43[013-79]|5(?:3[1-8]|4[1-7]|5)|6(?:3[0-35-9]|[4-6]))|2(?:1(?:3[178]|[45])|[24-689]|3[35]|7[457]))|7(?:14|23)4[0-8]|71(?:33|45)[1-79]',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '[349]|8(?:[02-7]|1[1-8])',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '7(?:1[0-8]|2[1-9])',
+                '7(?:1(?:[0-356]2|4[29]|7|8[27])|2(?:1[23]|[2-9]2))',
+                '7(?:1(?:[0-356]2|4[29]|7|8[27])|2(?:13[03-69]|62[013-9]))|72[1-57-9]2',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d)(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '7(?:1[0-68]|2[1-9])',
+                '7(?:1(?:[06][3-6]|[18]|2[35]|[3-5][3-5])|2(?:[13][3-5]|[24-689]|7[457]))',
+                '7(?:1(?:0(?:[356]|4[023])|[18]|2(?:3[013-9]|5)|3[45]|43[013-79]|5(?:3[1-8]|4[1-7]|5)|6(?:3[0-35-9]|[4-6]))|2(?:1(?:3[178]|[45])|[24-689]|3[35]|7[457]))|7(?:14|23)4[0-8]|71(?:33|45)[1-79]',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '[349]|8(?:[02-7]|1[1-8])',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '8 ($1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'leadingDigits' => '3[04-689]|[489]',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_RW.php b/src/data/PhoneNumberMetadata_RW.php
index 327dd683f..07e570d0a 100644
--- a/src/data/PhoneNumberMetadata_RW.php
+++ b/src/data/PhoneNumberMetadata_RW.php
@@ -6,142 +6,106 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:06|[27]\\d\\d|[89]00)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'RW',
+    'countryCode' => 250,
+    'generalDesc' => [
+        'pattern' => '(?:06|[27]\\d\\d|[89]00)\\d{6}',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:06|2[23568]\\d)\\d{6}',
-    'ExampleNumber' => '250123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[237-9]\\d{7}',
-    'ExampleNumber' => '720123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '(?:06|2[23568]\\d)\\d{6}',
+        'example' => '250123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '7[237-9]\\d{7}',
+        'example' => '720123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{6}',
-    'ExampleNumber' => '900123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900\\d{6}',
+        'example' => '900123456',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'RW',
-  'countryCode' => 250,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[7-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[7-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SA.php b/src/data/PhoneNumberMetadata_SA.php
index 16c661117..875a5855d 100644
--- a/src/data/PhoneNumberMetadata_SA.php
+++ b/src/data/PhoneNumberMetadata_SA.php
@@ -6,182 +6,138 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '92\\d{7}|(?:[15]|8\\d)\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1(?:1\\d|2[24-8]|3[35-8]|4[3-68]|6[2-5]|7[235-7])\\d{6}',
-    'ExampleNumber' => '112345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '579[01]\\d{5}|5(?:[013-689]\\d|7[0-8])\\d{6}',
-    'ExampleNumber' => '512345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '925\\d{6}',
-    'ExampleNumber' => '925012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '920\\d{6}',
-    'ExampleNumber' => '920012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '811\\d{7}',
-    'ExampleNumber' => '8110123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'SA',
-  'countryCode' => 966,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '81',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'SA',
+    'countryCode' => 966,
+    'generalDesc' => [
+        'pattern' => '92\\d{7}|(?:[15]|8\\d)\\d{8}',
+        'posLength' => [
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '1(?:1\\d|2[24-8]|3[35-8]|4[3-68]|6[2-5]|7[235-7])\\d{6}',
+        'example' => '112345678',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '579[01]\\d{5}|5(?:[013-689]\\d|7[0-8])\\d{6}',
+        'example' => '512345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '925\\d{6}',
+        'example' => '925012345',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '920\\d{6}',
+        'example' => '920012345',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '811\\d{7}',
+        'example' => '8110123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '81',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_SB.php b/src/data/PhoneNumberMetadata_SB.php
index 6923070f9..51f3e851b 100644
--- a/src/data/PhoneNumberMetadata_SB.php
+++ b/src/data/PhoneNumberMetadata_SB.php
@@ -6,116 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[1-6]|[7-9]\\d\\d)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 7,
+return [
+    'id' => 'SB',
+    'countryCode' => 677,
+    'generalDesc' => [
+        'pattern' => '(?:[1-6]|[7-9]\\d\\d)\\d{4}',
+        'posLength' => [
+            5,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1[4-79]|[23]\\d|4[0-2]|5[03]|6[0-37])\\d{3}',
-    'ExampleNumber' => '40123',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'fixedLine' => [
+        'pattern' => '(?:1[4-79]|[23]\\d|4[0-2]|5[03]|6[0-37])\\d{3}',
+        'example' => '40123',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '48\\d{3}|(?:(?:7[1-9]|8[4-9])\\d|9(?:1[2-9]|2[013-9]|3[0-2]|[46]\\d|5[0-46-9]|7[0-689]|8[0-79]|9[0-8]))\\d{4}',
-    'ExampleNumber' => '7421234',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[38]\\d{3}',
-    'ExampleNumber' => '18123',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'mobile' => [
+        'pattern' => '48\\d{3}|(?:(?:7[1-9]|8[4-9])\\d|9(?:1[2-9]|2[013-9]|3[0-2]|[46]\\d|5[0-46-9]|7[0-689]|8[0-79]|9[0-8]))\\d{4}',
+        'example' => '7421234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[38]\\d{3}',
+        'example' => '18123',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '5[12]\\d{3}',
-    'ExampleNumber' => '51123',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '5[12]\\d{3}',
+        'example' => '51123',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SB',
-  'countryCode' => 677,
-  'internationalPrefix' => '0[01]',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7|8[4-9]|9(?:[1-8]|9[0-8])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '0[01]',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '7|8[4-9]|9(?:[1-8]|9[0-8])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SC.php b/src/data/PhoneNumberMetadata_SC.php
index 5c38ccb73..4bb3f8494 100644
--- a/src/data/PhoneNumberMetadata_SC.php
+++ b/src/data/PhoneNumberMetadata_SC.php
@@ -6,104 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '800\\d{4}|(?:[249]\\d|64)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'SC',
+    'countryCode' => 248,
+    'generalDesc' => [
+        'pattern' => '800\\d{4}|(?:[249]\\d|64)\\d{5}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '4[2-46]\\d{5}',
-    'ExampleNumber' => '4217123',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '2[125-8]\\d{5}',
-    'ExampleNumber' => '2510123',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800[08]\\d{3}',
-    'ExampleNumber' => '8000000',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '4[2-46]\\d{5}',
+        'example' => '4217123',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '2[125-8]\\d{5}',
+        'example' => '2510123',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800[08]\\d{3}',
+        'example' => '8000000',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '971\\d{4}|(?:64|95)\\d{5}',
-    'ExampleNumber' => '6412345',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '971\\d{4}|(?:64|95)\\d{5}',
+        'example' => '6412345',
     ],
-  ],
-  'id' => 'SC',
-  'countryCode' => 248,
-  'internationalPrefix' => '010|0[0-2]',
-  'preferredInternationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[246]|9[57]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '010|0[0-2]',
+    'preferredInternationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[246]|9[57]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SD.php b/src/data/PhoneNumberMetadata_SD.php
index 5518b9991..f4848bf13 100644
--- a/src/data/PhoneNumberMetadata_SD.php
+++ b/src/data/PhoneNumberMetadata_SD.php
@@ -6,109 +6,80 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'SD',
+    'countryCode' => 249,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1(?:5\\d|8[35-7])\\d{6}',
-    'ExampleNumber' => '153123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:1[0-2]|9[0-3569])\\d{7}',
-    'ExampleNumber' => '911231234',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '1(?:5\\d|8[35-7])\\d{6}',
+        'example' => '153123456',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:1[0-2]|9[0-3569])\\d{7}',
+        'example' => '911231234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SD',
-  'countryCode' => 249,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[19]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[19]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SE.php b/src/data/PhoneNumberMetadata_SE.php
index 5a78c3cb4..c6d39af69 100644
--- a/src/data/PhoneNumberMetadata_SE.php
+++ b/src/data/PhoneNumberMetadata_SE.php
@@ -6,387 +6,299 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[26]\\d\\d|9)\\d{9}|[1-9]\\d{8}|[1-689]\\d{7}|[1-4689]\\d{6}|2\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 12,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:(?:[12][136]|3[356]|4[0246]|6[03]|8\\d)\\d|90[1-9])\\d{4,6}|(?:1(?:2[0-35]|4[0-4]|5[0-25-9]|7[13-6]|[89]\\d)|2(?:2[0-7]|4[0136-8]|5[0138]|7[018]|8[01]|9[0-57])|3(?:0[0-4]|1\\d|2[0-25]|4[056]|7[0-2]|8[0-3]|9[023])|4(?:1[013-8]|3[0135]|5[14-79]|7[0-246-9]|8[0156]|9[0-689])|5(?:0[0-6]|[15][0-5]|2[0-68]|3[0-4]|4\\d|6[03-5]|7[013]|8[0-79]|9[01])|6(?:1[1-3]|2[0-4]|4[02-57]|5[0-37]|6[0-3]|7[0-2]|8[0247]|9[0-356])|9(?:1[0-68]|2\\d|3[02-5]|4[0-3]|5[0-4]|[68][01]|7[0135-8]))\\d{5,6}',
-    'ExampleNumber' => '8123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[02369]\\d{7}',
-    'ExampleNumber' => '701234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '20\\d{4,7}',
-    'ExampleNumber' => '20123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '649\\d{6}|99[1-59]\\d{4}(?:\\d{3})?|9(?:00|39|44)[1-8]\\d{3,6}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '77[0-7]\\d{6}',
-    'ExampleNumber' => '771234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '75[1-8]\\d{6}',
-    'ExampleNumber' => '751234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '74[02-9]\\d{6}',
-    'ExampleNumber' => '740123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '10[1-8]\\d{6}',
-    'ExampleNumber' => '102345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '(?:25[245]|67[3-68])\\d{9}',
-    'ExampleNumber' => '254123456789',
-    'PossibleLength' =>
-     [
-      0 => 12,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'SE',
-  'countryCode' => 46,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2,3})(\\d{2})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '20',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:00|39|44|9)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12][136]|3[356]|4[0246]|6[03]|90[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{2,3})(\\d{2})(\\d{2})',
-      'format' => '$1-$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2,3})(\\d{2})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[125689]|4[02-57]|7[0-2])|9(?:[125-8]|3[02-5]|4[0-3])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2,3})(\\d{3})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:00|39|44)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2,3})(\\d{2})(\\d{2})',
-      'format' => '$1-$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[13689]|2[0136]|3[1356]|4[0246]|54|6[03]|90[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1-$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '10|7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{2})',
-      'format' => '$1-$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1-$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13-5]|2(?:[247-9]|5[0138])|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[02-5]|4[0-3])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1-$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    11 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1-$2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[26]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2,3})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '20',
-      ],
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:00|39|44|9)',
-      ],
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[12][136]|3[356]|4[0246]|6[03]|90[1-9]',
-      ],
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{2,3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2,3})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[125689]|4[02-57]|7[0-2])|9(?:[125-8]|3[02-5]|4[0-3])',
-      ],
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2,3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:00|39|44)',
-      ],
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2,3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[13689]|2[0136]|3[1356]|4[0246]|54|6[03]|90[1-9]',
-      ],
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '10|7',
-      ],
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13-5]|2(?:[247-9]|5[0138])|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[02-5]|4[0-3])',
-      ],
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-    ],
-    11 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4 $5',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[26]',
-      ],
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'SE',
+    'countryCode' => 46,
+    'generalDesc' => [
+        'pattern' => '(?:[26]\\d\\d|9)\\d{9}|[1-9]\\d{8}|[1-689]\\d{7}|[1-4689]\\d{6}|2\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            12,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:(?:[12][136]|3[356]|4[0246]|6[03]|8\\d)\\d|90[1-9])\\d{4,6}|(?:1(?:2[0-35]|4[0-4]|5[0-25-9]|7[13-6]|[89]\\d)|2(?:2[0-7]|4[0136-8]|5[0138]|7[018]|8[01]|9[0-57])|3(?:0[0-4]|1\\d|2[0-25]|4[056]|7[0-2]|8[0-3]|9[023])|4(?:1[013-8]|3[0135]|5[14-79]|7[0-246-9]|8[0156]|9[0-689])|5(?:0[0-6]|[15][0-5]|2[0-68]|3[0-4]|4\\d|6[03-5]|7[013]|8[0-79]|9[01])|6(?:1[1-3]|2[0-4]|4[02-57]|5[0-37]|6[0-3]|7[0-2]|8[0247]|9[0-356])|9(?:1[0-68]|2\\d|3[02-5]|4[0-3]|5[0-4]|[68][01]|7[0135-8]))\\d{5,6}',
+        'example' => '8123456',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '7[02369]\\d{7}',
+        'example' => '701234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '20\\d{4,7}',
+        'example' => '20123456',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '649\\d{6}|99[1-59]\\d{4}(?:\\d{3})?|9(?:00|39|44)[1-8]\\d{3,6}',
+        'example' => '9001234567',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '77[0-7]\\d{6}',
+        'example' => '771234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '75[1-8]\\d{6}',
+        'example' => '751234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '74[02-9]\\d{6}',
+        'example' => '740123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '10[1-8]\\d{6}',
+        'example' => '102345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'pattern' => '(?:25[245]|67[3-68])\\d{9}',
+        'example' => '254123456789',
+        'posLength' => [
+            12,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2,3})(\\d{2})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '20',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '9(?:00|39|44|9)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '[12][136]|3[356]|4[0246]|6[03]|90[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2,3})(\\d{2})(\\d{2})',
+            'format' => '$1-$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2,3})(\\d{2})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[125689]|4[02-57]|7[0-2])|9(?:[125-8]|3[02-5]|4[0-3])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2,3})(\\d{3})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '9(?:00|39|44)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2,3})(\\d{2})(\\d{2})',
+            'format' => '$1-$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1[13689]|2[0136]|3[1356]|4[0246]|54|6[03]|90[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1-$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '10|7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{2})',
+            'format' => '$1-$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1-$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[13-5]|2(?:[247-9]|5[0138])|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[02-5]|4[0-3])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1-$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1-$2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '[26]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2,3})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '20',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '9(?:00|39|44|9)',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[12][136]|3[356]|4[0246]|6[03]|90[1-9]',
+            ],
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2,3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2,3})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[125689]|4[02-57]|7[0-2])|9(?:[125-8]|3[02-5]|4[0-3])',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2,3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9(?:00|39|44)',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2,3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1[13689]|2[0136]|3[1356]|4[0246]|54|6[03]|90[1-9]',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '10|7',
+            ],
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[13-5]|2(?:[247-9]|5[0138])|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[02-5]|4[0-3])',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4 $5',
+            'leadingDigitsPatterns' => [
+                '[26]',
+            ],
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php
index 75f6f820b..9739987e0 100644
--- a/src/data/PhoneNumberMetadata_SG.php
+++ b/src/data/PhoneNumberMetadata_SG.php
@@ -6,226 +6,171 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:(?:1\\d|8)\\d\\d|7000)\\d{7}|[3689]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 10,
-      2 => 11,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '662[0-24-9]\\d{4}|6(?:[0-578]\\d|6[013-57-9]|9[0-35-9])\\d{5}',
-    'ExampleNumber' => '61234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '8(?:09[0-24]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
-    'ExampleNumber' => '81234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:18|8)00\\d{7}',
-    'ExampleNumber' => '18001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1900\\d{7}',
-    'ExampleNumber' => '19001234567',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:3[12]\\d|666)\\d{5}',
-    'ExampleNumber' => '31234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '7000\\d{7}',
-    'ExampleNumber' => '70001234567',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'SG',
-  'countryCode' => 65,
-  'internationalPrefix' => '0[0-3]\\d',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4,5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[013-9]|77',
-        1 => '1(?:[013-8]|9(?:0[1-9]|[1-9]))|77',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[369]|8(?:0[1-9]|[1-9])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[369]|8(?:0[1-9]|[1-9])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'SG',
+    'countryCode' => 65,
+    'generalDesc' => [
+        'pattern' => '(?:(?:1\\d|8)\\d\\d|7000)\\d{7}|[3689]\\d{7}',
+        'posLength' => [
+            8,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '662[0-24-9]\\d{4}|6(?:[0-578]\\d|6[013-57-9]|9[0-35-9])\\d{5}',
+        'example' => '61234567',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '8(?:09[0-24]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
+        'example' => '81234567',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '(?:18|8)00\\d{7}',
+        'example' => '18001234567',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '1900\\d{7}',
+        'example' => '19001234567',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '(?:3[12]\\d|666)\\d{5}',
+        'example' => '31234567',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '7000\\d{7}',
+        'example' => '70001234567',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '0[0-3]\\d',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4,5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '1[013-9]|77',
+                '1(?:[013-8]|9(?:0[1-9]|[1-9]))|77',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[369]|8(?:0[1-9]|[1-9])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[369]|8(?:0[1-9]|[1-9])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_SH.php b/src/data/PhoneNumberMetadata_SH.php
index e4a78acf5..fd5b5252e 100644
--- a/src/data/PhoneNumberMetadata_SH.php
+++ b/src/data/PhoneNumberMetadata_SH.php
@@ -6,103 +6,76 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[256]\\d|8)\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+return [
+    'id' => 'SH',
+    'countryCode' => 290,
+    'generalDesc' => [
+        'pattern' => '(?:[256]\\d|8)\\d{3}',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:[0-57-9]\\d|6[4-9])\\d\\d',
-    'ExampleNumber' => '22158',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[56]\\d{4}',
-    'ExampleNumber' => '51234',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'fixedLine' => [
+        'pattern' => '2(?:[0-57-9]\\d|6[4-9])\\d\\d',
+        'example' => '22158',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '[56]\\d{4}',
+        'example' => '51234',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '262\\d\\d',
-    'ExampleNumber' => '26212',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '262\\d\\d',
+        'example' => '26212',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SH',
-  'countryCode' => 290,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => true,
-  'leadingDigits' => '[256]',
-  'mobileNumberPortableRegion' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
+    'mainCountryForCode' => true,
+    'leadingDigits' => '[256]',
 ];
diff --git a/src/data/PhoneNumberMetadata_SI.php b/src/data/PhoneNumberMetadata_SI.php
index 533749990..0637b2cb3 100644
--- a/src/data/PhoneNumberMetadata_SI.php
+++ b/src/data/PhoneNumberMetadata_SI.php
@@ -6,165 +6,126 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-7]\\d{7}|8\\d{4,7}|90\\d{4,6}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:[1-357][2-8]|4[24-8])\\d{6}',
-    'ExampleNumber' => '12345678',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '65(?:[178]\\d|5[56]|6[01])\\d{4}|(?:[37][01]|4[0139]|51|6[489])\\d{6}',
-    'ExampleNumber' => '31234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{4,6}',
-    'ExampleNumber' => '80123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '89[1-3]\\d{2,5}|90\\d{4,6}',
-    'ExampleNumber' => '90123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:59\\d\\d|8(?:1(?:[67]\\d|8[0-589])|2(?:0\\d|2[0-37-9]|8[0-2489])|3[389]\\d))\\d{4}',
-    'ExampleNumber' => '59012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'SI',
-  'countryCode' => 386,
-  'internationalPrefix' => '00|10(?:22|66|88|99)',
-  'preferredInternationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[09]|9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '59|8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[37][01]|4[0139]|51|6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-57]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'SI',
+    'countryCode' => 386,
+    'generalDesc' => [
+        'pattern' => '[1-7]\\d{7}|8\\d{4,7}|90\\d{4,6}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:[1-357][2-8]|4[24-8])\\d{6}',
+        'example' => '12345678',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '65(?:[178]\\d|5[56]|6[01])\\d{4}|(?:[37][01]|4[0139]|51|6[489])\\d{6}',
+        'example' => '31234567',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80\\d{4,6}',
+        'example' => '80123456',
+        'posLength' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '89[1-3]\\d{2,5}|90\\d{4,6}',
+        'example' => '90123456',
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '(?:59\\d\\d|8(?:1(?:[67]\\d|8[0-589])|2(?:0\\d|2[0-37-9]|8[0-2489])|3[389]\\d))\\d{4}',
+        'example' => '59012345',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00|10(?:22|66|88|99)',
+    'preferredInternationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8[09]|9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '59|8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[37][01]|4[0139]|51|6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[1-57]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_SJ.php b/src/data/PhoneNumberMetadata_SJ.php
index 11152bd46..aa75e2bfe 100644
--- a/src/data/PhoneNumberMetadata_SJ.php
+++ b/src/data/PhoneNumberMetadata_SJ.php
@@ -6,115 +6,87 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '0\\d{4}|(?:[489]\\d|79)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 8,
+return [
+    'id' => 'SJ',
+    'countryCode' => 47,
+    'generalDesc' => [
+        'pattern' => '0\\d{4}|(?:[489]\\d|79)\\d{6}',
+        'posLength' => [
+            5,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '79\\d{6}',
-    'ExampleNumber' => '79123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '79\\d{6}',
+        'example' => '79123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:4[015-8]|9\\d)\\d{6}',
-    'ExampleNumber' => '41234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '(?:4[015-8]|9\\d)\\d{6}',
+        'example' => '41234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[01]\\d{5}',
-    'ExampleNumber' => '80012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'tollFree' => [
+        'pattern' => '80[01]\\d{5}',
+        'example' => '80012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '82[09]\\d{5}',
-    'ExampleNumber' => '82012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'premiumRate' => [
+        'pattern' => '82[09]\\d{5}',
+        'example' => '82012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '810(?:0[0-6]|[2-8]\\d)\\d{3}',
-    'ExampleNumber' => '81021234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'sharedCost' => [
+        'pattern' => '810(?:0[0-6]|[2-8]\\d)\\d{3}',
+        'example' => '81021234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '880\\d{5}',
-    'ExampleNumber' => '88012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'personalNumber' => [
+        'pattern' => '880\\d{5}',
+        'example' => '88012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '85[0-5]\\d{5}',
-    'ExampleNumber' => '85012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'voip' => [
+        'pattern' => '85[0-5]\\d{5}',
+        'example' => '85012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}',
-    'ExampleNumber' => '02000',
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '81[23]\\d{5}',
-    'ExampleNumber' => '81212345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'uan' => [
+        'pattern' => '(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}',
+        'example' => '02000',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'pattern' => '81[23]\\d{5}',
+        'example' => '81212345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'id' => 'SJ',
-  'countryCode' => 47,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '79',
-  'mobileNumberPortableRegion' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
+    'leadingDigits' => '79',
 ];
diff --git a/src/data/PhoneNumberMetadata_SK.php b/src/data/PhoneNumberMetadata_SK.php
index 711a76bec..752f9dc01 100644
--- a/src/data/PhoneNumberMetadata_SK.php
+++ b/src/data/PhoneNumberMetadata_SK.php
@@ -6,255 +6,195 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-689]\\d{8}|[2-59]\\d{6}|[2-5]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 9,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:16|[2-9]\\d{3})|(?:(?:[3-5][1-8]\\d|819)\\d|601[1-5])\\d)\\d{4}|(?:2|[3-5][1-8])1[67]\\d{3}|[3-5][1-8]16\\d\\d',
-    'ExampleNumber' => '221234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '909[1-9]\\d{5}|9(?:0[1-8]|1[0-24-9]|4[03-57-9]|5\\d)\\d{6}',
-    'ExampleNumber' => '912123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9(?:00|[78]\\d)\\d{6}',
-    'ExampleNumber' => '900123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8[5-9]\\d{7}',
-    'ExampleNumber' => '850123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '6(?:02|5[0-4]|9[0-6])\\d{6}',
-    'ExampleNumber' => '690123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '9090\\d{3}',
-    'ExampleNumber' => '9090123',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '96\\d{7}',
-    'ExampleNumber' => '961234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '9090\\d{3}|(?:602|8(?:00|[5-9]\\d)|9(?:00|[78]\\d))\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
-    ],
-  ],
-  'id' => 'SK',
-  'countryCode' => 421,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '21',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-5][1-8]1',
-        1 => '[3-5][1-8]1[67]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '909',
-        1 => '9090',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{2})',
-      'format' => '$1/$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[689]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1/$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-5]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '21',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-5][1-8]1',
-        1 => '[3-5][1-8]1[67]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{2})',
-      'format' => '$1/$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[689]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1/$2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-5]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'SK',
+    'countryCode' => 421,
+    'generalDesc' => [
+        'pattern' => '[2-689]\\d{8}|[2-59]\\d{6}|[2-5]\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            9,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2(?:16|[2-9]\\d{3})|(?:(?:[3-5][1-8]\\d|819)\\d|601[1-5])\\d)\\d{4}|(?:2|[3-5][1-8])1[67]\\d{3}|[3-5][1-8]16\\d\\d',
+        'example' => '221234567',
+    ],
+    'mobile' => [
+        'pattern' => '909[1-9]\\d{5}|9(?:0[1-8]|1[0-24-9]|4[03-57-9]|5\\d)\\d{6}',
+        'example' => '912123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '9(?:00|[78]\\d)\\d{6}',
+        'example' => '900123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '8[5-9]\\d{7}',
+        'example' => '850123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '6(?:02|5[0-4]|9[0-6])\\d{6}',
+        'example' => '690123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '9090\\d{3}',
+        'example' => '9090123',
+        'posLength' => [
+            7,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '96\\d{7}',
+        'example' => '961234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '9090\\d{3}|(?:602|8(?:00|[5-9]\\d)|9(?:00|[78]\\d))\\d{6}',
+        'posLength' => [
+            7,
+            9,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '21',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[3-5][1-8]1',
+                '[3-5][1-8]1[67]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '909',
+                '9090',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{2})',
+            'format' => '$1/$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[689]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1/$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[3-5]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '21',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[3-5][1-8]1',
+                '[3-5][1-8]1[67]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{2})',
+            'format' => '$1/$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[689]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1/$2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[3-5]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_SL.php b/src/data/PhoneNumberMetadata_SL.php
index f2918b09e..716230096 100644
--- a/src/data/PhoneNumberMetadata_SL.php
+++ b/src/data/PhoneNumberMetadata_SL.php
@@ -6,117 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[237-9]\\d|66)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'SL',
+    'countryCode' => 232,
+    'generalDesc' => [
+        'pattern' => '(?:[237-9]\\d|66)\\d{6}',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '22[2-4][2-9]\\d{4}',
+        'example' => '22221234',
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '22[2-4][2-9]\\d{4}',
-    'ExampleNumber' => '22221234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'mobile' => [
+        'pattern' => '(?:25|3[0-5]|66|7[2-9]|8[08]|9[09])\\d{6}',
+        'example' => '25123456',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:25|3[0-5]|66|7[2-9]|8[08]|9[09])\\d{6}',
-    'ExampleNumber' => '25123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SL',
-  'countryCode' => 232,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[236-9]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[236-9]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SM.php b/src/data/PhoneNumberMetadata_SM.php
index 990f758da..ca4473b93 100644
--- a/src/data/PhoneNumberMetadata_SM.php
+++ b/src/data/PhoneNumberMetadata_SM.php
@@ -6,181 +6,135 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:0549|[5-7]\\d)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 10,
+return [
+    'id' => 'SM',
+    'countryCode' => 378,
+    'generalDesc' => [
+        'pattern' => '(?:0549|[5-7]\\d)\\d{6}',
+        'posLength' => [
+            8,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '0549(?:8[0157-9]|9\\d)\\d{4}',
+        'example' => '0549886377',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '6[16]\\d{6}',
+        'example' => '66661212',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '7[178]\\d{6}',
+        'example' => '71123456',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '5[158]\\d{6}',
+        'example' => '58001110',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefixForParsing' => '([89]\\d{5})$',
+    'nationalPrefixTransformRule' => '0549$1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[5-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[5-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '0549(?:8[0157-9]|9\\d)\\d{4}',
-    'ExampleNumber' => '0549886377',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6[16]\\d{6}',
-    'ExampleNumber' => '66661212',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '7[178]\\d{6}',
-    'ExampleNumber' => '71123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '5[158]\\d{6}',
-    'ExampleNumber' => '58001110',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'SM',
-  'countryCode' => 378,
-  'internationalPrefix' => '00',
-  'nationalPrefixForParsing' => '([89]\\d{5})$',
-  'nationalPrefixTransformRule' => '0549$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[5-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[5-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SN.php b/src/data/PhoneNumberMetadata_SN.php
index 8492337e1..076bad149 100644
--- a/src/data/PhoneNumberMetadata_SN.php
+++ b/src/data/PhoneNumberMetadata_SN.php
@@ -6,111 +6,83 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[378]\\d|93)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'SN',
+    'countryCode' => 221,
+    'generalDesc' => [
+        'pattern' => '(?:[378]\\d|93)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '3(?:0(?:1[0-2]|80)|282|3(?:8[1-9]|9[3-9])|611)\\d{5}',
-    'ExampleNumber' => '301012345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:(?:[06-8]\\d|21|90)\\d|5(?:01|[19]0|25|[38]3|[4-7]\\d))\\d{5}',
-    'ExampleNumber' => '701234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '88[4689]\\d{6}',
-    'ExampleNumber' => '884123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '81[02468]\\d{6}',
-    'ExampleNumber' => '810123456',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '3(?:0(?:1[0-2]|80)|282|3(?:8[1-9]|9[3-9])|611)\\d{5}',
+        'example' => '301012345',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:392|9[01]\\d)\\d|93(?:3[13]0|929))\\d{4}',
-    'ExampleNumber' => '933301234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '7(?:(?:[06-8]\\d|21|90)\\d|5(?:01|[19]0|25|[38]3|[4-7]\\d))\\d{5}',
+        'example' => '701234567',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '88[4689]\\d{6}',
+        'example' => '884123456',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '81[02468]\\d{6}',
+        'example' => '810123456',
     ],
-  ],
-  'id' => 'SN',
-  'countryCode' => 221,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[379]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'pattern' => '(?:3(?:392|9[01]\\d)\\d|93(?:3[13]0|929))\\d{4}',
+        'example' => '933301234',
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[379]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SO.php b/src/data/PhoneNumberMetadata_SO.php
index 9889a70b6..3bc832cca 100644
--- a/src/data/PhoneNumberMetadata_SO.php
+++ b/src/data/PhoneNumberMetadata_SO.php
@@ -6,183 +6,137 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[346-9]\\d{8}|[12679]\\d{7}|[1-5]\\d{6}|[1348]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
+return [
+    'id' => 'SO',
+    'countryCode' => 252,
+    'generalDesc' => [
+        'pattern' => '[346-9]\\d{8}|[12679]\\d{7}|[1-5]\\d{6}|[1348]\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1\\d|2[0-79]|3[0-46-8]|4[0-7]|5[57-9])\\d{5}|(?:[134]\\d|8[125])\\d{4}',
+        'example' => '4012345',
+        'posLength' => [
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:(?:15|(?:3[59]|4[89]|6\\d|7[79]|8[08])\\d|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:[67]\\d\\d|904)\\d{5}',
+        'example' => '71123456',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8[125]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{6})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '[134]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[15]|2[0-79]|3[0-46-8]|4[0-7]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:2|90)4|[67]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[348]|64|79|90',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1|28|6[0-35-9]|77|9[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1\\d|2[0-79]|3[0-46-8]|4[0-7]|5[57-9])\\d{5}|(?:[134]\\d|8[125])\\d{4}',
-    'ExampleNumber' => '4012345',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:(?:15|(?:3[59]|4[89]|6\\d|7[79]|8[08])\\d|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:[67]\\d\\d|904)\\d{5}',
-    'ExampleNumber' => '71123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'SO',
-  'countryCode' => 252,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[125]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{6})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[134]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[15]|2[0-79]|3[0-46-8]|4[0-7]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:2|90)4|[67]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[348]|64|79|90',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1|28|6[0-35-9]|77|9[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SR.php b/src/data/PhoneNumberMetadata_SR.php
index 9180ca6cc..f057f6ba3 100644
--- a/src/data/PhoneNumberMetadata_SR.php
+++ b/src/data/PhoneNumberMetadata_SR.php
@@ -6,138 +6,102 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-5]|68|[78]\\d)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
+return [
+    'id' => 'SR',
+    'countryCode' => 597,
+    'generalDesc' => [
+        'pattern' => '(?:[2-5]|68|[78]\\d)\\d{5}',
+        'posLength' => [
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[1-3]|3[0-7]|(?:4|68)\\d|5[2-58])\\d{4}',
-    'ExampleNumber' => '211234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:7[124-7]|8[124-9])\\d{5}',
-    'ExampleNumber' => '7412345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:2[1-3]|3[0-7]|(?:4|68)\\d|5[2-58])\\d{4}',
+        'example' => '211234',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:7[124-7]|8[124-9])\\d{5}',
+        'example' => '7412345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '56\\d{4}',
-    'ExampleNumber' => '561234',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '56\\d{4}',
+        'example' => '561234',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SR',
-  'countryCode' => 597,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '56',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-5]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '56',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-5]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[6-8]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[6-8]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SS.php b/src/data/PhoneNumberMetadata_SS.php
index 933a94917..fa8faf220 100644
--- a/src/data/PhoneNumberMetadata_SS.php
+++ b/src/data/PhoneNumberMetadata_SS.php
@@ -6,109 +6,80 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'SS',
+    'countryCode' => 211,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '1[89]\\d{7}',
-    'ExampleNumber' => '181234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:12|9[1257-9])\\d{7}',
-    'ExampleNumber' => '977123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '1[89]\\d{7}',
+        'example' => '181234567',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:12|9[1257-9])\\d{7}',
+        'example' => '977123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SS',
-  'countryCode' => 211,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[19]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[19]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_ST.php b/src/data/PhoneNumberMetadata_ST.php
index 8a6771f25..bc1a5177d 100644
--- a/src/data/PhoneNumberMetadata_ST.php
+++ b/src/data/PhoneNumberMetadata_ST.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:22|9\\d)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'ST',
+    'countryCode' => 239,
+    'generalDesc' => [
+        'pattern' => '(?:22|9\\d)\\d{5}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '22\\d{5}',
-    'ExampleNumber' => '2221234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '900[5-9]\\d{3}|9(?:0[1-9]|[89]\\d)\\d{4}',
-    'ExampleNumber' => '9812345',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '22\\d{5}',
+        'example' => '2221234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '900[5-9]\\d{3}|9(?:0[1-9]|[89]\\d)\\d{4}',
+        'example' => '9812345',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'ST',
-  'countryCode' => 239,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[29]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[29]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SV.php b/src/data/PhoneNumberMetadata_SV.php
index 1274ec9df..956c2777e 100644
--- a/src/data/PhoneNumberMetadata_SV.php
+++ b/src/data/PhoneNumberMetadata_SV.php
@@ -6,147 +6,110 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[267]\\d{7}|(?:80\\d|900)\\d{4}(?:\\d{4})?',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 11,
+return [
+    'id' => 'SV',
+    'countryCode' => 503,
+    'generalDesc' => [
+        'pattern' => '[267]\\d{7}|(?:80\\d|900)\\d{4}(?:\\d{4})?',
+        'posLength' => [
+            7,
+            8,
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:79(?:0[0347-9]|[1-9]\\d)|89(?:0[024589]|[1-9]\\d))\\d{3}|2(?:[1-69]\\d|[78][0-8])\\d{5}',
-    'ExampleNumber' => '21234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '2(?:79(?:0[0347-9]|[1-9]\\d)|89(?:0[024589]|[1-9]\\d))\\d{3}|2(?:[1-69]\\d|[78][0-8])\\d{5}',
+        'example' => '21234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[67]\\d{7}',
-    'ExampleNumber' => '70123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '[67]\\d{7}',
+        'example' => '70123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{8}|80[01]\\d{4}',
-    'ExampleNumber' => '8001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 11,
+    'tollFree' => [
+        'pattern' => '800\\d{8}|80[01]\\d{4}',
+        'example' => '8001234',
+        'posLength' => [
+            7,
+            11,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{4}(?:\\d{4})?',
-    'ExampleNumber' => '9001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 11,
+    'premiumRate' => [
+        'pattern' => '900\\d{4}(?:\\d{4})?',
+        'example' => '9001234',
+        'posLength' => [
+            7,
+            11,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SV',
-  'countryCode' => 503,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[267]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[267]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SX.php b/src/data/PhoneNumberMetadata_SX.php
index e6077ce20..dfd08630c 100644
--- a/src/data/PhoneNumberMetadata_SX.php
+++ b/src/data/PhoneNumberMetadata_SX.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '7215\\d{6}|(?:[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'SX',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '7215\\d{6}|(?:[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '7215(?:4[2-8]|8[239]|9[056])\\d{4}',
+        'example' => '7215425678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '7215(?:4[2-8]|8[239]|9[056])\\d{4}',
-    'ExampleNumber' => '7215425678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '7215(?:1[02]|2\\d|5[034679]|8[014-8])\\d{4}',
+        'example' => '7215205678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7215(?:1[02]|2\\d|5[034679]|8[014-8])\\d{4}',
-    'ExampleNumber' => '7215205678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SX',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '(5\\d{6})$|1',
-  'nationalPrefixTransformRule' => '721$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '721',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '(5\\d{6})$|1',
+    'nationalPrefixTransformRule' => '721$1',
+    'numberFormat' => [],
+    'leadingDigits' => '721',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_SY.php b/src/data/PhoneNumberMetadata_SY.php
index e19d84ed1..a19642d23 100644
--- a/src/data/PhoneNumberMetadata_SY.php
+++ b/src/data/PhoneNumberMetadata_SY.php
@@ -6,136 +6,103 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-39]\\d{8}|[1-5]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'SY',
+    'countryCode' => 963,
+    'generalDesc' => [
+        'pattern' => '[1-39]\\d{8}|[1-5]\\d{7}',
+        'posLength' => [
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
+    'fixedLine' => [
+        'pattern' => '21\\d{6,7}|(?:1(?:[14]\\d|[2356])|2[235]|3(?:[13]\\d|4)|4[134]|5[1-3])\\d{6}',
+        'example' => '112345678',
+        'posLengthLocal' => [
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '21\\d{6,7}|(?:1(?:[14]\\d|[2356])|2[235]|3(?:[13]\\d|4)|4[134]|5[1-3])\\d{6}',
-    'ExampleNumber' => '112345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
+    'mobile' => [
+        'pattern' => '9[1-689]\\d{7}',
+        'example' => '944567890',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9[1-689]\\d{7}',
-    'ExampleNumber' => '944567890',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-5]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
     ],
-  ],
-  'id' => 'SY',
-  'countryCode' => 963,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-5]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_SZ.php b/src/data/PhoneNumberMetadata_SZ.php
index d72650063..77b36d81d 100644
--- a/src/data/PhoneNumberMetadata_SZ.php
+++ b/src/data/PhoneNumberMetadata_SZ.php
@@ -6,135 +6,101 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '0800\\d{4}|(?:[237]\\d|900)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
+return [
+    'id' => 'SZ',
+    'countryCode' => 268,
+    'generalDesc' => [
+        'pattern' => '0800\\d{4}|(?:[237]\\d|900)\\d{6}',
+        'posLength' => [
+            8,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[23][2-5]\\d{6}',
-    'ExampleNumber' => '22171234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '[23][2-5]\\d{6}',
+        'example' => '22171234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[6-9]\\d{6}',
-    'ExampleNumber' => '76123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '7[6-9]\\d{6}',
+        'example' => '76123456',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0800\\d{4}',
-    'ExampleNumber' => '08001234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'tollFree' => [
+        'pattern' => '0800\\d{4}',
+        'example' => '08001234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{6}',
-    'ExampleNumber' => '900012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'premiumRate' => [
+        'pattern' => '900\\d{6}',
+        'example' => '900012345',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '70\\d{6}',
-    'ExampleNumber' => '70012345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'voip' => [
+        'pattern' => '70\\d{6}',
+        'example' => '70012345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '0800\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'noInternationalDialling' => [
+        'pattern' => '0800\\d{4}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'id' => 'SZ',
-  'countryCode' => 268,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[0237]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[0237]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{5})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{5})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TA.php b/src/data/PhoneNumberMetadata_TA.php
index 7c63f6833..7425bda0f 100644
--- a/src/data/PhoneNumberMetadata_TA.php
+++ b/src/data/PhoneNumberMetadata_TA.php
@@ -6,98 +6,70 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '8\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 4,
+return [
+    'id' => 'TA',
+    'countryCode' => 290,
+    'generalDesc' => [
+        'pattern' => '8\\d{3}',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '8\\d{3}',
-    'ExampleNumber' => '8999',
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '8\\d{3}',
+        'example' => '8999',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TA',
-  'countryCode' => 290,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '8',
-  'mobileNumberPortableRegion' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
+    'leadingDigits' => '8',
 ];
diff --git a/src/data/PhoneNumberMetadata_TC.php b/src/data/PhoneNumberMetadata_TC.php
index a1cfc5a08..fca7fc676 100644
--- a/src/data/PhoneNumberMetadata_TC.php
+++ b/src/data/PhoneNumberMetadata_TC.php
@@ -6,107 +6,81 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|649|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'TC',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|649|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '649(?:266|712|9(?:4\\d|50))\\d{4}',
+        'example' => '6497121234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '649(?:266|712|9(?:4\\d|50))\\d{4}',
-    'ExampleNumber' => '6497121234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '649(?:2(?:3[129]|4[1-79])|3\\d\\d|4[34][1-3])\\d{4}',
+        'example' => '6492311234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '649(?:2(?:3[129]|4[1-79])|3\\d\\d|4[34][1-3])\\d{4}',
-    'ExampleNumber' => '6492311234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002345678',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002345678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002345678',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '649(?:71[01]|966)\\d{4}',
-    'ExampleNumber' => '6497101234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '649(?:71[01]|966)\\d{4}',
+        'example' => '6497101234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TC',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-479]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '649$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '649',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-479]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '649$1',
+    'numberFormat' => [],
+    'leadingDigits' => '649',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_TD.php b/src/data/PhoneNumberMetadata_TD.php
index 8e51d08d9..58f3332d6 100644
--- a/src/data/PhoneNumberMetadata_TD.php
+++ b/src/data/PhoneNumberMetadata_TD.php
@@ -6,108 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:22|[69]\\d|77)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'TD',
+    'countryCode' => 235,
+    'generalDesc' => [
+        'pattern' => '(?:22|[69]\\d|77)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '22(?:[37-9]0|5[0-5]|6[89])\\d{4}',
-    'ExampleNumber' => '22501234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6[0-689]|77|9\\d)\\d{6}',
-    'ExampleNumber' => '63012345',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '22(?:[37-9]0|5[0-5]|6[89])\\d{4}',
+        'example' => '22501234',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:6[0-689]|77|9\\d)\\d{6}',
+        'example' => '63012345',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TD',
-  'countryCode' => 235,
-  'internationalPrefix' => '00|16',
-  'preferredInternationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2679]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00|16',
+    'preferredInternationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[2679]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TG.php b/src/data/PhoneNumberMetadata_TG.php
index 8d316a81f..007f94831 100644
--- a/src/data/PhoneNumberMetadata_TG.php
+++ b/src/data/PhoneNumberMetadata_TG.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[279]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'TG',
+    'countryCode' => 228,
+    'generalDesc' => [
+        'pattern' => '[279]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:2[2-7]|3[23]|4[45]|55|6[67]|77)\\d{5}',
-    'ExampleNumber' => '22212345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:7[019]|9[0-36-9])\\d{6}',
-    'ExampleNumber' => '90112345',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2(?:2[2-7]|3[23]|4[45]|55|6[67]|77)\\d{5}',
+        'example' => '22212345',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:7[019]|9[0-36-9])\\d{6}',
+        'example' => '90112345',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TG',
-  'countryCode' => 228,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[279]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[279]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TH.php b/src/data/PhoneNumberMetadata_TH.php
index 710c93708..a2346ecff 100644
--- a/src/data/PhoneNumberMetadata_TH.php
+++ b/src/data/PhoneNumberMetadata_TH.php
@@ -6,151 +6,115 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:001800|[2-57]|[689]\\d)\\d{7}|1\\d{7,9}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 13,
+return [
+    'id' => 'TH',
+    'countryCode' => 66,
+    'generalDesc' => [
+        'pattern' => '(?:001800|[2-57]|[689]\\d)\\d{7}|1\\d{7,9}',
+        'posLength' => [
+            8,
+            9,
+            10,
+            13,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1[0689]|2\\d|3[2-9]|4[2-5]|5[2-6]|7[3-7])\\d{6}',
-    'ExampleNumber' => '21234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '(?:1[0689]|2\\d|3[2-9]|4[2-5]|5[2-6]|7[3-7])\\d{6}',
+        'example' => '21234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '67(?:1[0-8]|2[4-7])\\d{5}|(?:14|6[1-6]|[89]\\d)\\d{7}',
-    'ExampleNumber' => '812345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '67(?:1[0-8]|2[4-7])\\d{5}|(?:14|6[1-6]|[89]\\d)\\d{7}',
+        'example' => '812345678',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:001800\\d|1800)\\d{6}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 13,
+    'tollFree' => [
+        'pattern' => '(?:001800\\d|1800)\\d{6}',
+        'example' => '1800123456',
+        'posLength' => [
+            10,
+            13,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1900\\d{6}',
-    'ExampleNumber' => '1900123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'premiumRate' => [
+        'pattern' => '1900\\d{6}',
+        'example' => '1900123456',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '6[08]\\d{7}',
-    'ExampleNumber' => '601234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'voip' => [
+        'pattern' => '6[08]\\d{7}',
+        'example' => '601234567',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TH',
-  'countryCode' => 66,
-  'internationalPrefix' => '00[1-9]',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00[1-9]',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[13-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[13-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php
index 089d0adbf..8ac5caf8c 100644
--- a/src/data/PhoneNumberMetadata_TJ.php
+++ b/src/data/PhoneNumberMetadata_TJ.php
@@ -6,159 +6,119 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[0-57-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'TJ',
+    'countryCode' => 992,
+    'generalDesc' => [
+        'pattern' => '[0-57-9]\\d{8}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            3,
+            5,
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:3(?:1[3-5]|2[245]|3[12]|4[24-7]|5[25]|72)|4(?:46|74|87))\\d{6}',
+        'example' => '372123456',
+        'posLengthLocal' => [
+            3,
+            5,
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:0[0-57-9]|1[017]|2[02]|[34]0|5[05]|7[0178]|8[078]|9\\d)\\d{7}',
+        'example' => '917123456',
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '810',
+    'preferredInternationalPrefix' => '8~10',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{6})(\\d)(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '331',
+                '3317',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '44[02-479]|[34]7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d)(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3[1-5]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[0-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3(?:1[3-5]|2[245]|3[12]|4[24-7]|5[25]|72)|4(?:46|74|87))\\d{6}',
-    'ExampleNumber' => '372123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:0[0-57-9]|1[017]|2[02]|[34]0|5[05]|7[0178]|8[078]|9\\d)\\d{7}',
-    'ExampleNumber' => '917123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'TJ',
-  'countryCode' => 992,
-  'internationalPrefix' => '810',
-  'preferredInternationalPrefix' => '8~10',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{6})(\\d)(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '331',
-        1 => '3317',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '44[02-479]|[34]7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d)(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3[1-5]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[0-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TK.php b/src/data/PhoneNumberMetadata_TK.php
index 5426045a0..2907634db 100644
--- a/src/data/PhoneNumberMetadata_TK.php
+++ b/src/data/PhoneNumberMetadata_TK.php
@@ -6,98 +6,71 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-47]\\d{3,6}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
+return [
+    'id' => 'TK',
+    'countryCode' => 690,
+    'generalDesc' => [
+        'pattern' => '[2-47]\\d{3,6}',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[2-4]|[34]\\d)\\d{2,5}',
-    'ExampleNumber' => '3101',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[2-4]\\d{2,5}',
-    'ExampleNumber' => '7290',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:2[2-4]|[34]\\d)\\d{2,5}',
+        'example' => '3101',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '7[2-4]\\d{2,5}',
+        'example' => '7290',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TK',
-  'countryCode' => 690,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_TL.php b/src/data/PhoneNumberMetadata_TL.php
index 2d03480e2..d35bfab07 100644
--- a/src/data/PhoneNumberMetadata_TL.php
+++ b/src/data/PhoneNumberMetadata_TL.php
@@ -6,134 +6,100 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '7\\d{7}|(?:[2-47]\\d|[89]0)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+return [
+    'id' => 'TL',
+    'countryCode' => 670,
+    'generalDesc' => [
+        'pattern' => '7\\d{7}|(?:[2-47]\\d|[89]0)\\d{5}',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[1-5]|3[1-9]|4[1-4])\\d{5}',
-    'ExampleNumber' => '2112345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:2[1-5]|3[1-9]|4[1-4])\\d{5}',
+        'example' => '2112345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[2-8]\\d{6}',
-    'ExampleNumber' => '77212345',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '7[2-8]\\d{6}',
+        'example' => '77212345',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{5}',
-    'ExampleNumber' => '8012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '80\\d{5}',
+        'example' => '8012345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90\\d{5}',
-    'ExampleNumber' => '9012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'premiumRate' => [
+        'pattern' => '90\\d{5}',
+        'example' => '9012345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{5}',
-    'ExampleNumber' => '7012345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'personalNumber' => [
+        'pattern' => '70\\d{5}',
+        'example' => '7012345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TL',
-  'countryCode' => 670,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-489]|70',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[2-489]|70',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TM.php b/src/data/PhoneNumberMetadata_TM.php
index fbe4bec9a..885f3431e 100644
--- a/src/data/PhoneNumberMetadata_TM.php
+++ b/src/data/PhoneNumberMetadata_TM.php
@@ -6,134 +6,99 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[1-6]\\d|71)\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'TM',
+    'countryCode' => 993,
+    'generalDesc' => [
+        'pattern' => '(?:[1-6]\\d|71)\\d{6}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:2\\d|3[1-9])|2(?:22|4[0-35-8])|3(?:22|4[03-9])|4(?:22|3[128]|4\\d|6[15])|5(?:22|5[7-9]|6[014-689]))\\d{5}',
-    'ExampleNumber' => '12345678',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6\\d|71)\\d{6}',
-    'ExampleNumber' => '66123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:1(?:2\\d|3[1-9])|2(?:22|4[0-35-8])|3(?:22|4[03-9])|4(?:22|3[128]|4\\d|6[15])|5(?:22|5[7-9]|6[014-689]))\\d{5}',
+        'example' => '12345678',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:6\\d|71)\\d{6}',
+        'example' => '66123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TM',
-  'countryCode' => 993,
-  'internationalPrefix' => '810',
-  'preferredInternationalPrefix' => '8~10',
-  'nationalPrefix' => '8',
-  'nationalPrefixForParsing' => '8',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '12',
-      ],
-      'nationalPrefixFormattingRule' => '(8 $1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d)(\\d{2})(\\d{2})',
-      'format' => '$1 $2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-5]',
-      ],
-      'nationalPrefixFormattingRule' => '(8 $1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[67]',
-      ],
-      'nationalPrefixFormattingRule' => '8 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '810',
+    'preferredInternationalPrefix' => '8~10',
+    'nationalPrefix' => '8',
+    'nationalPrefixForParsing' => '8',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '12',
+            ],
+            'nationalPrefixFormattingRule' => '(8 $1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d)(\\d{2})(\\d{2})',
+            'format' => '$1 $2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '[1-5]',
+            ],
+            'nationalPrefixFormattingRule' => '(8 $1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[67]',
+            ],
+            'nationalPrefixFormattingRule' => '8 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TN.php b/src/data/PhoneNumberMetadata_TN.php
index e8e8c3ab2..1097c962e 100644
--- a/src/data/PhoneNumberMetadata_TN.php
+++ b/src/data/PhoneNumberMetadata_TN.php
@@ -6,101 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-57-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'TN',
+    'countryCode' => 216,
+    'generalDesc' => [
+        'pattern' => '[2-57-9]\\d{7}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '81200\\d{3}|(?:3[0-2]|7\\d)\\d{6}',
-    'ExampleNumber' => '30010123',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '3(?:001|[12]40)\\d{4}|(?:(?:[259]\\d|4[0-8])\\d|3(?:1[1-35]|6[0-4]|91))\\d{5}',
-    'ExampleNumber' => '20123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8010\\d{4}',
-    'ExampleNumber' => '80101234',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '88\\d{6}',
-    'ExampleNumber' => '88123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8[12]10\\d{4}',
-    'ExampleNumber' => '81101234',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '81200\\d{3}|(?:3[0-2]|7\\d)\\d{6}',
+        'example' => '30010123',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '3(?:001|[12]40)\\d{4}|(?:(?:[259]\\d|4[0-8])\\d|3(?:1[1-35]|6[0-4]|91))\\d{5}',
+        'example' => '20123456',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '8010\\d{4}',
+        'example' => '80101234',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '88\\d{6}',
+        'example' => '88123456',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'pattern' => '8[12]10\\d{4}',
+        'example' => '81101234',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TN',
-  'countryCode' => 216,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TO.php b/src/data/PhoneNumberMetadata_TO.php
index 7691e8ffb..b192a55a2 100644
--- a/src/data/PhoneNumberMetadata_TO.php
+++ b/src/data/PhoneNumberMetadata_TO.php
@@ -6,144 +6,107 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:0800|(?:[5-8]\\d\\d|999)\\d)\\d{3}|[2-8]\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 7,
+return [
+    'id' => 'TO',
+    'countryCode' => 676,
+    'generalDesc' => [
+        'pattern' => '(?:0800|(?:[5-8]\\d\\d|999)\\d)\\d{3}|[2-8]\\d{4}',
+        'posLength' => [
+            5,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2\\d|3[0-8]|4[0-4]|50|6[09]|7[0-24-69]|8[05])\\d{3}',
-    'ExampleNumber' => '20123',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'fixedLine' => [
+        'pattern' => '(?:2\\d|3[0-8]|4[0-4]|50|6[09]|7[0-24-69]|8[05])\\d{3}',
+        'example' => '20123',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    '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' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:5(?:4[0-5]|5[4-6])|6(?:[09]\\d|3[02]|8[15-9])|(?:7\\d|8[46-9])\\d|999)\\d{4}',
+        'example' => '7715123',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0800\\d{3}',
-    'ExampleNumber' => '0800222',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '0800\\d{3}',
+        'example' => '0800222',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '55[0-37-9]\\d{4}',
-    'ExampleNumber' => '5510123',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'voip' => [
+        'pattern' => '55[0-37-9]\\d{4}',
+        'example' => '5510123',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TO',
-  'countryCode' => 676,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-4]|50|6[09]|7[0-24-69]|8[05]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[2-4]|50|6[09]|7[0-24-69]|8[05]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[5-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[5-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TR.php b/src/data/PhoneNumberMetadata_TR.php
index bb4872f9d..afa0e6187 100644
--- a/src/data/PhoneNumberMetadata_TR.php
+++ b/src/data/PhoneNumberMetadata_TR.php
@@ -6,239 +6,193 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '4\\d{6}|8\\d{11,12}|(?:[2-58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
-      2 => 12,
-      3 => 13,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:[13][26]|[28][2468]|[45][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\\d{7}',
-    'ExampleNumber' => '2123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '561(?:011|61\\d)\\d{4}|5(?:0[15-7]|1[06]|24|[34]\\d|5[1-59]|9[46])\\d{7}',
-    'ExampleNumber' => '5012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00\\d{7}(?:\\d{2,3})?|11\\d{7})',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 12,
-      2 => 13,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:8[89]8|900)\\d{7}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '592(?:21[12]|461)\\d{4}',
-    'ExampleNumber' => '5922121234',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '850\\d{7}',
-    'ExampleNumber' => '8500123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '512\\d{7}',
-    'ExampleNumber' => '5123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '444\\d{4}',
-    'ExampleNumber' => '4441444',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '(?:444|811\\d{3})\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
-    ],
-  ],
-  'id' => 'TR',
-  'countryCode' => 90,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d)(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '444',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '512|8[01589]|90',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5(?:[0-59]|61)',
-        1 => '5(?:[0-59]|61[06])',
-        2 => '5(?:[0-59]|61[06]1)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24][1-8]|3[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{6,7})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '512|8[01589]|90',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5(?:[0-59]|61)',
-        1 => '5(?:[0-59]|61[06])',
-        2 => '5(?:[0-59]|61[06]1)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24][1-8]|3[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{6,7})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'TR',
+    'countryCode' => 90,
+    'generalDesc' => [
+        'pattern' => '4\\d{6}|8\\d{11,12}|(?:[2-58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            7,
+            10,
+            12,
+            13,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2(?:[13][26]|[28][2468]|[45][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\\d{7}',
+        'example' => '2123456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '561(?:011|61\\d)\\d{4}|5(?:0[15-7]|1[06]|24|[34]\\d|5[1-59]|9[46])\\d{7}',
+        'example' => '5012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '8(?:00\\d{7}(?:\\d{2,3})?|11\\d{7})',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+            12,
+            13,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '(?:8[89]8|900)\\d{7}',
+        'example' => '9001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '592(?:21[12]|461)\\d{4}',
+        'example' => '5922121234',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '850\\d{7}',
+        'example' => '8500123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '512\\d{7}',
+        'example' => '5123456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '444\\d{4}',
+        'example' => '4441444',
+        'posLength' => [
+            7,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '(?:444|811\\d{3})\\d{4}',
+        'posLength' => [
+            7,
+            10,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d)(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '444',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '512|8[01589]|90',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '5(?:[0-59]|61)',
+                '5(?:[0-59]|61[06])',
+                '5(?:[0-59]|61[06]1)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[24][1-8]|3[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{6,7})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '512|8[01589]|90',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '5(?:[0-59]|61)',
+                '5(?:[0-59]|61[06])',
+                '5(?:[0-59]|61[06]1)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[24][1-8]|3[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{6,7})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_TT.php b/src/data/PhoneNumberMetadata_TT.php
index ade32d613..6139158d1 100644
--- a/src/data/PhoneNumberMetadata_TT.php
+++ b/src/data/PhoneNumberMetadata_TT.php
@@ -6,107 +6,81 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'TT',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '868(?:2(?:01|1[5-9]|[23]\\d|4[0-2])|6(?:0[7-9]|1[02-8]|2[1-9]|[3-69]\\d|7[0-79])|82[124])\\d{4}',
+        'example' => '8682211234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '868(?:2(?:01|1[5-9]|[23]\\d|4[0-2])|6(?:0[7-9]|1[02-8]|2[1-9]|[3-69]\\d|7[0-79])|82[124])\\d{4}',
-    'ExampleNumber' => '8682211234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '868(?:(?:2[5-9]|3\\d)\\d|4(?:3[0-6]|[6-9]\\d)|6(?:20|78|8\\d)|7(?:0[1-9]|1[02-9]|[2-9]\\d))\\d{4}',
+        'example' => '8682911234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '868(?:(?:2[5-9]|3\\d)\\d|4(?:3[0-6]|[6-9]\\d)|6(?:20|78|8\\d)|7(?:0[1-9]|1[02-9]|[2-9]\\d))\\d{4}',
-    'ExampleNumber' => '8682911234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002345678',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002345678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002345678',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '868619\\d{4}',
-    'ExampleNumber' => '8686191234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TT',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-46-8]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '868$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '868',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'pattern' => '868619\\d{4}',
+        'example' => '8686191234',
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-46-8]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '868$1',
+    'numberFormat' => [],
+    'leadingDigits' => '868',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_TV.php b/src/data/PhoneNumberMetadata_TV.php
index b6725e436..08fdcd953 100644
--- a/src/data/PhoneNumberMetadata_TV.php
+++ b/src/data/PhoneNumberMetadata_TV.php
@@ -6,142 +6,105 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:2|7\\d\\d|90)\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
+return [
+    'id' => 'TV',
+    'countryCode' => 688,
+    'generalDesc' => [
+        'pattern' => '(?:2|7\\d\\d|90)\\d{4}',
+        'posLength' => [
+            5,
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2[02-9]\\d{3}',
-    'ExampleNumber' => '20123',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'fixedLine' => [
+        'pattern' => '2[02-9]\\d{3}',
+        'example' => '20123',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:7[01]\\d|90)\\d{4}',
-    'ExampleNumber' => '901234',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
+    'mobile' => [
+        'pattern' => '(?:7[01]\\d|90)\\d{4}',
+        'example' => '901234',
+        'posLength' => [
+            6,
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TV',
-  'countryCode' => 688,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '90',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '90',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_TW.php b/src/data/PhoneNumberMetadata_TW.php
index 6e0193da1..30cbe936c 100644
--- a/src/data/PhoneNumberMetadata_TW.php
+++ b/src/data/PhoneNumberMetadata_TW.php
@@ -6,185 +6,143 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-689]\\d{8}|7\\d{9,10}|[2-8]\\d{7}|2\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
-      4 => 11,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2[2-8]\\d|370|55[01]|7[1-9])\\d{6}|4(?:(?:0(?:0[1-9]|[2-48]\\d)|1[023]\\d)\\d{4,5}|(?:[239]\\d\\d|4(?:0[56]|12|49))\\d{5})|6(?:[01]\\d{7}|4(?:0[56]|12|24|4[09])\\d{4,5})|8(?:(?:2(?:3\\d|4[0-269]|[578]0|66)|36[24-9]|90\\d\\d)\\d{4}|4(?:0[56]|12|24|4[09])\\d{4,5})|(?:2(?:2(?:0\\d\\d|4(?:0[68]|[249]0|3[0-467]|5[0-25-9]|6[0235689]))|(?:3(?:[09]\\d|1[0-4])|(?:4\\d|5[0-49]|6[0-29]|7[0-5])\\d)\\d)|(?:(?:3[2-9]|5[2-8]|6[0-35-79]|8[7-9])\\d\\d|4(?:2(?:[089]\\d|7[1-9])|(?:3[0-4]|[78]\\d|9[01])\\d))\\d)\\d{3}',
-    'ExampleNumber' => '221234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:40001[0-2]|9[0-8]\\d{4})\\d{3}',
-    'ExampleNumber' => '912345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-79]\\d{6}|800\\d{5}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '20(?:[013-9]\\d\\d|2)\\d{4}',
-    'ExampleNumber' => '203123456',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '99\\d{7}',
-    'ExampleNumber' => '990123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '7010(?:[0-2679]\\d|3[0-7]|8[0-5])\\d{5}|70\\d{8}',
-    'ExampleNumber' => '7012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '50[0-46-9]\\d{6}',
-    'ExampleNumber' => '500123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'TW',
-  'countryCode' => 886,
-  'internationalPrefix' => '0(?:0[25-79]|19)',
-  'nationalPrefix' => '0',
-  'preferredExtnPrefix' => '#',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d)(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '202',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[258]0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23568]|4(?:0[02-48]|[1-47-9])|7[1-9]',
-        1 => '[23568]|4(?:0[2-48]|[1-47-9])|(?:400|7)[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[49]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4,5})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'TW',
+    'countryCode' => 886,
+    'generalDesc' => [
+        'pattern' => '[2-689]\\d{8}|7\\d{9,10}|[2-8]\\d{7}|2\\d{6}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2[2-8]\\d|370|55[01]|7[1-9])\\d{6}|4(?:(?:0(?:0[1-9]|[2-48]\\d)|1[023]\\d)\\d{4,5}|(?:[239]\\d\\d|4(?:0[56]|12|49))\\d{5})|6(?:[01]\\d{7}|4(?:0[56]|12|24|4[09])\\d{4,5})|8(?:(?:2(?:3\\d|4[0-269]|[578]0|66)|36[24-9]|90\\d\\d)\\d{4}|4(?:0[56]|12|24|4[09])\\d{4,5})|(?:2(?:2(?:0\\d\\d|4(?:0[68]|[249]0|3[0-467]|5[0-25-9]|6[0235689]))|(?:3(?:[09]\\d|1[0-4])|(?:4\\d|5[0-49]|6[0-29]|7[0-5])\\d)\\d)|(?:(?:3[2-9]|5[2-8]|6[0-35-79]|8[7-9])\\d\\d|4(?:2(?:[089]\\d|7[1-9])|(?:3[0-4]|[78]\\d|9[01])\\d))\\d)\\d{3}',
+        'example' => '221234567',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:40001[0-2]|9[0-8]\\d{4})\\d{3}',
+        'example' => '912345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80[0-79]\\d{6}|800\\d{5}',
+        'example' => '800123456',
+        'posLength' => [
+            8,
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '20(?:[013-9]\\d\\d|2)\\d{4}',
+        'example' => '203123456',
+        'posLength' => [
+            7,
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '99\\d{7}',
+        'example' => '990123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '7010(?:[0-2679]\\d|3[0-7]|8[0-5])\\d{5}|70\\d{8}',
+        'example' => '7012345678',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '50[0-46-9]\\d{6}',
+        'example' => '500123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '0(?:0[25-79]|19)',
+    'nationalPrefix' => '0',
+    'preferredExtnPrefix' => '#',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d)(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '202',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[258]0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[23568]|4(?:0[02-48]|[1-47-9])|7[1-9]',
+                '[23568]|4(?:0[2-48]|[1-47-9])|(?:400|7)[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[49]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4,5})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_TZ.php b/src/data/PhoneNumberMetadata_TZ.php
index 416809b14..e334a0f7e 100644
--- a/src/data/PhoneNumberMetadata_TZ.php
+++ b/src/data/PhoneNumberMetadata_TZ.php
@@ -6,134 +6,101 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[25-8]\\d|41|90)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'TZ',
+    'countryCode' => 255,
+    'generalDesc' => [
+        'pattern' => '(?:[25-8]\\d|41|90)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2[2-8]\\d{7}',
-    'ExampleNumber' => '222345678',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:6[125-9]|7[13-9])\\d{7}',
-    'ExampleNumber' => '621234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[08]\\d{6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90\\d{7}',
-    'ExampleNumber' => '900123456',
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8(?:40|6[01])\\d{6}',
-    'ExampleNumber' => '840123456',
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2[2-8]\\d{7}',
+        'example' => '222345678',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '41\\d{7}',
-    'ExampleNumber' => '412345678',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:6[125-9]|7[13-9])\\d{7}',
+        'example' => '621234567',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80[08]\\d{6}',
+        'example' => '800123456',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90\\d{7}',
+        'example' => '900123456',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '(?:8(?:[04]0|6[01])|90\\d)\\d{6}',
-  ],
-  'id' => 'TZ',
-  'countryCode' => 255,
-  'internationalPrefix' => '00[056]',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'sharedCost' => [
+        'pattern' => '8(?:40|6[01])\\d{6}',
+        'example' => '840123456',
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '5',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voip' => [
+        'pattern' => '41\\d{7}',
+        'example' => '412345678',
     ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[67]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '(?:8(?:[04]0|6[01])|90\\d)\\d{6}',
+    ],
+    'internationalPrefix' => '00[056]',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[24]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '5',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[67]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_UA.php b/src/data/PhoneNumberMetadata_UA.php
index 111cebcdf..ff0a6875b 100644
--- a/src/data/PhoneNumberMetadata_UA.php
+++ b/src/data/PhoneNumberMetadata_UA.php
@@ -6,167 +6,127 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[89]\\d{9}|[3-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+return [
+    'id' => 'UA',
+    'countryCode' => 380,
+    'generalDesc' => [
+        'pattern' => '[89]\\d{9}|[3-9]\\d{8}',
+        'posLength' => [
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:3[1-8]|4[13-8]|5[1-7]|6[12459])\\d{7}',
+        'example' => '311234567',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}',
+        'example' => '501234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800[1-8]\\d{5,6}',
+        'example' => '800123456',
+    ],
+    'premiumRate' => [
+        'pattern' => '900[239]\\d{5,6}',
+        'example' => '900212345',
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '89[1-579]\\d{6}',
+        'example' => '891234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'preferredInternationalPrefix' => '0~0',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '6[12][29]|(?:3[1-8]|4[136-8]|5[12457]|6[49])2|(?:56|65)[24]',
+                '6[12][29]|(?:35|4[1378]|5[12457]|6[49])2|(?:56|65)[24]|(?:3[1-46-8]|46)2[013-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6[0135689]|7[4-6])|6(?:[12][3-7]|[459])',
+                '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6(?:[015689]|3[02389])|7[4-6])|6(?:[12][3-7]|[459])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[3-7]|89|9[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:3[1-8]|4[13-8]|5[1-7]|6[12459])\\d{7}',
-    'ExampleNumber' => '311234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}',
-    'ExampleNumber' => '501234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800[1-8]\\d{5,6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[239]\\d{5,6}',
-    'ExampleNumber' => '900212345',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '89[1-579]\\d{6}',
-    'ExampleNumber' => '891234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'UA',
-  'countryCode' => 380,
-  'internationalPrefix' => '00',
-  'preferredInternationalPrefix' => '0~0',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6[12][29]|(?:3[1-8]|4[136-8]|5[12457]|6[49])2|(?:56|65)[24]',
-        1 => '6[12][29]|(?:35|4[1378]|5[12457]|6[49])2|(?:56|65)[24]|(?:3[1-46-8]|46)2[013-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6[0135689]|7[4-6])|6(?:[12][3-7]|[459])',
-        1 => '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6(?:[015689]|3[02389])|7[4-6])|6(?:[12][3-7]|[459])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-7]|89|9[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_UG.php b/src/data/PhoneNumberMetadata_UG.php
index 10d6b829e..f685187bb 100644
--- a/src/data/PhoneNumberMetadata_UG.php
+++ b/src/data/PhoneNumberMetadata_UG.php
@@ -6,142 +6,107 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}|(?:[29]0|[347]\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'UG',
+    'countryCode' => 256,
+    'generalDesc' => [
+        'pattern' => '800\\d{6}|(?:[29]0|[347]\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
+    'fixedLine' => [
+        'pattern' => '20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|3[1-4]|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}',
+        'example' => '312345678',
+        'posLengthLocal' => [
+            5,
+            6,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|3[1-4]|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}',
-    'ExampleNumber' => '312345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
+    'mobile' => [
+        'pattern' => '72(?:[48]0|6[01])\\d{5}|7(?:[015-8]\\d|20|36|4[0-5]|9[89])\\d{6}',
+        'example' => '712345678',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '72(?:[48]0|6[01])\\d{5}|7(?:[015-8]\\d|20|36|4[0-5]|9[89])\\d{6}',
-    'ExampleNumber' => '712345678',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800[1-3]\\d{5}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[1-3]\\d{6}',
-    'ExampleNumber' => '901123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800[1-3]\\d{5}',
+        'example' => '800123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90[1-3]\\d{6}',
+        'example' => '901123456',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'UG',
-  'countryCode' => 256,
-  'internationalPrefix' => '00[057]',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '202',
-        1 => '2024',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[27-9]|4(?:6[45]|[7-9])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[34]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00[057]',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '202',
+                '2024',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[27-9]|4(?:6[45]|[7-9])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[34]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php
index f85f57657..b123ddd5c 100644
--- a/src/data/PhoneNumberMetadata_US.php
+++ b/src/data/PhoneNumberMetadata_US.php
@@ -6,163 +6,128 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{9}|3\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'US',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '[2-9]\\d{9}|3\\d{6}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|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}',
+        'example' => '2015550123',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|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',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|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}',
+        'example' => '2015550123',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|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',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002345678',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002345678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002345678',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'US',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '1',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '310',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-9]|3(?:[02-9]|1[1-9])',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '($1) $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '1',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '310',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[24-9]|3(?:[02-9]|1[1-9])',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '($1) $2-$3',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
     ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '310',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '310',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[2-9]',
+            ],
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-9]',
-      ],
-    ],
-  ],
-  'mainCountryForCode' => true,
-  'mobileNumberPortableRegion' => true,
+    'mainCountryForCode' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_UY.php b/src/data/PhoneNumberMetadata_UY.php
index da4e4b21e..3cac60989 100644
--- a/src/data/PhoneNumberMetadata_UY.php
+++ b/src/data/PhoneNumberMetadata_UY.php
@@ -6,190 +6,144 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '0004\\d{2,9}|[1249]\\d{7}|(?:[49]\\d|80)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
-      6 => 12,
-      7 => 13,
+return [
+    'id' => 'UY',
+    'countryCode' => 598,
+    'generalDesc' => [
+        'pattern' => '0004\\d{2,9}|[1249]\\d{7}|(?:[49]\\d|80)\\d{5}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1(?:770|9(?:20|87))|(?:2\\d|4[2-7])\\d\\d)\\d{4}',
+        'example' => '21231234',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '9[1-9]\\d{6}',
+        'example' => '94231234',
+        'posLength' => [
+            8,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '0004\\d{2,9}|(?:405|80[05])\\d{4}',
+        'example' => '8001234',
+    ],
+    'premiumRate' => [
+        'pattern' => '90[0-8]\\d{4}',
+        'example' => '9001234',
+        'posLength' => [
+            7,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '0(?:0|1[3-9]\\d)',
+    'preferredInternationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'preferredExtnPrefix' => ' int. ',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[49]0|8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[124]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{2,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{2,4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '0',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:770|9(?:20|87))|(?:2\\d|4[2-7])\\d\\d)\\d{4}',
-    'ExampleNumber' => '21231234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9[1-9]\\d{6}',
-    'ExampleNumber' => '94231234',
-    'PossibleLength' =>
-     [
-      0 => 8,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0004\\d{2,9}|(?:405|80[05])\\d{4}',
-    'ExampleNumber' => '8001234',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[0-8]\\d{4}',
-    'ExampleNumber' => '9001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'UY',
-  'countryCode' => 598,
-  'internationalPrefix' => '0(?:0|1[3-9]\\d)',
-  'preferredInternationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'preferredExtnPrefix' => ' int. ',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[49]0|8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[124]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{2,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{2,4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_UZ.php b/src/data/PhoneNumberMetadata_UZ.php
index 7a3141d9b..adecbb7c9 100644
--- a/src/data/PhoneNumberMetadata_UZ.php
+++ b/src/data/PhoneNumberMetadata_UZ.php
@@ -6,110 +6,81 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:20|33|[5-79]\\d|88)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'UZ',
+    'countryCode' => 998,
+    'generalDesc' => [
+        'pattern' => '(?:20|33|[5-79]\\d|88)\\d{7}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|6\\d\\d|7(?:[23]\\d|7[69])|9(?:22|4[1-8]|6[135]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}',
-    'ExampleNumber' => '669050123',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}',
-    'ExampleNumber' => '912345678',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|6\\d\\d|7(?:[23]\\d|7[69])|9(?:22|4[1-8]|6[135]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}',
+        'example' => '669050123',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}',
+        'example' => '912345678',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'UZ',
-  'countryCode' => 998,
-  'internationalPrefix' => '810',
-  'preferredInternationalPrefix' => '8~10',
-  'nationalPrefix' => '8',
-  'nationalPrefixForParsing' => '8',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[235-9]',
-      ],
-      'nationalPrefixFormattingRule' => '8 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '810',
+    'preferredInternationalPrefix' => '8~10',
+    'nationalPrefix' => '8',
+    'nationalPrefixForParsing' => '8',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[235-9]',
+            ],
+            'nationalPrefixFormattingRule' => '8 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_VA.php b/src/data/PhoneNumberMetadata_VA.php
index 6165b64d5..251dfd39a 100644
--- a/src/data/PhoneNumberMetadata_VA.php
+++ b/src/data/PhoneNumberMetadata_VA.php
@@ -6,135 +6,107 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '0\\d{5,10}|3[0-8]\\d{7,10}|55\\d{8}|8\\d{5}(?:\\d{2,4})?|(?:1\\d|39)\\d{7,8}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
-      6 => 12,
+return [
+    'id' => 'VA',
+    'countryCode' => 39,
+    'generalDesc' => [
+        'pattern' => '0\\d{5,10}|3[0-8]\\d{7,10}|55\\d{8}|8\\d{5}(?:\\d{2,4})?|(?:1\\d|39)\\d{7,8}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '06698\\d{1,6}',
-    'ExampleNumber' => '0669812345',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
+    'fixedLine' => [
+        'pattern' => '06698\\d{1,6}',
+        'example' => '0669812345',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '3[1-9]\\d{8}|3[2-9]\\d{7}',
-    'ExampleNumber' => '3123456789',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+    'mobile' => [
+        'pattern' => '3[1-9]\\d{8}|3[2-9]\\d{7}',
+        'example' => '3123456789',
+        'posLength' => [
+            9,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80(?:0\\d{3}|3)\\d{3}',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
+    'tollFree' => [
+        'pattern' => '80(?:0\\d{3}|3)\\d{3}',
+        'example' => '800123456',
+        'posLength' => [
+            6,
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:0878\\d{3}|89(?:2\\d|3[04]|4(?:[0-4]|[5-9]\\d\\d)|5[0-4]))\\d\\d|(?:1(?:44|6[346])|89(?:38|5[5-9]|9))\\d{6}',
-    'ExampleNumber' => '899123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 8,
-      2 => 9,
-      3 => 10,
+    'premiumRate' => [
+        'pattern' => '(?:0878\\d{3}|89(?:2\\d|3[04]|4(?:[0-4]|[5-9]\\d\\d)|5[0-4]))\\d\\d|(?:1(?:44|6[346])|89(?:38|5[5-9]|9))\\d{6}',
+        'example' => '899123456',
+        'posLength' => [
+            6,
+            8,
+            9,
+            10,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '84(?:[08]\\d{3}|[17])\\d{3}',
-    'ExampleNumber' => '848123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
+    'sharedCost' => [
+        'pattern' => '84(?:[08]\\d{3}|[17])\\d{3}',
+        'example' => '848123456',
+        'posLength' => [
+            6,
+            9,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '1(?:78\\d|99)\\d{6}',
-    'ExampleNumber' => '1781234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+    'personalNumber' => [
+        'pattern' => '1(?:78\\d|99)\\d{6}',
+        'example' => '1781234567',
+        'posLength' => [
+            9,
+            10,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '55\\d{8}',
-    'ExampleNumber' => '5512345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'voip' => [
+        'pattern' => '55\\d{8}',
+        'example' => '5512345678',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '3[2-8]\\d{9,10}',
-    'ExampleNumber' => '33101234501',
-    'PossibleLength' =>
-     [
-      0 => 11,
-      1 => 12,
+    'voicemail' => [
+        'pattern' => '3[2-8]\\d{9,10}',
+        'example' => '33101234501',
+        'posLength' => [
+            11,
+            12,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'VA',
-  'countryCode' => 39,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '06698',
-  'mobileNumberPortableRegion' => true,
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
+    'leadingDigits' => '06698',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_VC.php b/src/data/PhoneNumberMetadata_VC.php
index 93056ef2f..c869f3c0e 100644
--- a/src/data/PhoneNumberMetadata_VC.php
+++ b/src/data/PhoneNumberMetadata_VC.php
@@ -6,107 +6,81 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d\\d|784|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'VC',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:[58]\\d\\d|784|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '784(?:266|3(?:6[6-9]|7\\d|8[0-6])|4(?:38|5[0-36-8]|8[0-8])|5(?:55|7[0-2]|93)|638|784)\\d{4}',
+        'example' => '7842661234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '784(?:266|3(?:6[6-9]|7\\d|8[0-6])|4(?:38|5[0-36-8]|8[0-8])|5(?:55|7[0-2]|93)|638|784)\\d{4}',
-    'ExampleNumber' => '7842661234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '784(?:4(?:3[0-5]|5[45]|89|9[0-8])|5(?:2[6-9]|3[0-4])|720)\\d{4}',
+        'example' => '7844301234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '784(?:4(?:3[0-5]|5[45]|89|9[0-8])|5(?:2[6-9]|3[0-4])|720)\\d{4}',
-    'ExampleNumber' => '7844301234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002345678',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002345678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002345678',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '78451[0-2]\\d{4}',
-    'ExampleNumber' => '7845101234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '78451[0-2]\\d{4}',
+        'example' => '7845101234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'VC',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-7]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '784$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '784',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-7]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '784$1',
+    'numberFormat' => [],
+    'leadingDigits' => '784',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_VE.php b/src/data/PhoneNumberMetadata_VE.php
index 5c58e29ec..e804f7088 100644
--- a/src/data/PhoneNumberMetadata_VE.php
+++ b/src/data/PhoneNumberMetadata_VE.php
@@ -6,115 +6,86 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[68]00\\d{7}|(?:[24]\\d|[59]0)\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'VE',
+    'countryCode' => 58,
+    'generalDesc' => [
+        'pattern' => '[68]00\\d{7}|(?:[24]\\d|[59]0)\\d{8}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '(?:2(?:12|3[457-9]|[467]\\d|[58][1-9]|9[1-6])|[4-6]00)\\d{7}',
+        'example' => '2121234567',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:12|3[457-9]|[467]\\d|[58][1-9]|9[1-6])|[4-6]00)\\d{7}',
-    'ExampleNumber' => '2121234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '4(?:1[24-8]|2[46])\\d{7}',
+        'example' => '4121234567',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4(?:1[24-8]|2[46])\\d{7}',
-    'ExampleNumber' => '4121234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8001234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '90[01]\\d{7}',
-    'ExampleNumber' => '9001234567',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8001234567',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '90[01]\\d{7}',
+        'example' => '9001234567',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '501\\d{7}',
-    'ExampleNumber' => '5010123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '501\\d{7}',
+        'example' => '5010123456',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'id' => 'VE',
-  'countryCode' => 58,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[24-689]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[24-689]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_VG.php b/src/data/PhoneNumberMetadata_VG.php
index 59188f69e..a05af1e48 100644
--- a/src/data/PhoneNumberMetadata_VG.php
+++ b/src/data/PhoneNumberMetadata_VG.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:284|[58]\\d\\d|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'VG',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(?:284|[58]\\d\\d|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '284(?:229|4(?:22|9[45])|774|8(?:52|6[459]))\\d{4}',
+        'example' => '2842291234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '284(?:229|4(?:22|9[45])|774|8(?:52|6[459]))\\d{4}',
-    'ExampleNumber' => '2842291234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '284(?:245|3(?:0[0-3]|4[0-7]|68|9[34])|4(?:4[0-6]|68|9[69])|5(?:4[0-7]|68|9[69]))\\d{4}',
+        'example' => '2843001234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '284(?:245|3(?:0[0-3]|4[0-7]|68|9[34])|4(?:4[0-6]|68|9[69])|5(?:4[0-7]|68|9[69]))\\d{4}',
-    'ExampleNumber' => '2843001234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002345678',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002345678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002345678',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'VG',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-578]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '284$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '284',
-  'mobileNumberPortableRegion' => true,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-578]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '284$1',
+    'numberFormat' => [],
+    'leadingDigits' => '284',
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_VI.php b/src/data/PhoneNumberMetadata_VI.php
index aa5c9d130..af1a4c61b 100644
--- a/src/data/PhoneNumberMetadata_VI.php
+++ b/src/data/PhoneNumberMetadata_VI.php
@@ -6,105 +6,79 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[58]\\d{9}|(?:34|90)0\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'VI',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '[58]\\d{9}|(?:34|90)0\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '340(?:2(?:0[0-368]|2[06-8]|4[49]|77)|3(?:32|44)|4(?:2[23]|44|7[34]|89)|5(?:1[34]|55)|6(?:2[56]|4[23]|77|9[023])|7(?:1[2-57-9]|2[57]|7\\d)|884|998)\\d{4}',
+        'example' => '3406421234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '340(?:2(?:0[0-368]|2[06-8]|4[49]|77)|3(?:32|44)|4(?:2[23]|44|7[34]|89)|5(?:1[34]|55)|6(?:2[56]|4[23]|77|9[023])|7(?:1[2-57-9]|2[57]|7\\d)|884|998)\\d{4}',
-    'ExampleNumber' => '3406421234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '340(?:2(?:0[0-368]|2[06-8]|4[49]|77)|3(?:32|44)|4(?:2[23]|44|7[34]|89)|5(?:1[34]|55)|6(?:2[56]|4[23]|77|9[023])|7(?:1[2-57-9]|2[57]|7\\d)|884|998)\\d{4}',
+        'example' => '3406421234',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '340(?:2(?:0[0-368]|2[06-8]|4[49]|77)|3(?:32|44)|4(?:2[23]|44|7[34]|89)|5(?:1[34]|55)|6(?:2[56]|4[23]|77|9[023])|7(?:1[2-57-9]|2[57]|7\\d)|884|998)\\d{4}',
-    'ExampleNumber' => '3406421234',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
+        'example' => '8002345678',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|33|44|55|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '8002345678',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900[2-9]\\d{6}',
-    'ExampleNumber' => '9002345678',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900[2-9]\\d{6}',
+        'example' => '9002345678',
     ],
-  ],
-  'personalNumber' =>
-   [
-    '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
-    'ExampleNumber' => '5002345678',
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'pattern' => '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[125-9]|33|44|66|77|88)[2-9]\\d{6}',
+        'example' => '5002345678',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'VI',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
-  'nationalPrefixTransformRule' => '340$1',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '340',
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
+    'nationalPrefixTransformRule' => '340$1',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [],
+    'leadingDigits' => '340',
 ];
diff --git a/src/data/PhoneNumberMetadata_VN.php b/src/data/PhoneNumberMetadata_VN.php
index fffeb663b..7dc488abb 100644
--- a/src/data/PhoneNumberMetadata_VN.php
+++ b/src/data/PhoneNumberMetadata_VN.php
@@ -6,294 +6,237 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[12]\\d{9}|[135-9]\\d{8}|[16]\\d{7}|[16-8]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
+return [
+    'id' => 'VN',
+    'countryCode' => 84,
+    'generalDesc' => [
+        'pattern' => '[12]\\d{9}|[135-9]\\d{8}|[16]\\d{7}|[16-8]\\d{6}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '2(?:0[3-9]|1[0-689]|2[0-25-9]|[38][2-9]|4[2-8]|5[124-9]|6[0-39]|7[0-7]|9[0-4679])\\d{7}',
+        'example' => '2101234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:5(?:2[238]|59)|89[6-9]|99[013-9])\\d{6}|(?:3\\d|5[1689]|7[06-9]|8[1-8]|9[0-8])\\d{7}',
+        'example' => '912345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '1800\\d{4,6}|12(?:0[13]|28)\\d{4}',
+        'example' => '1800123456',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '1900\\d{4,6}',
+        'example' => '1900123456',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '672\\d{6}',
+        'example' => '672012345',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '(?:[17]99|80\\d)\\d{4}|69\\d{5,6}',
+        'example' => '1992000',
+        'posLength' => [
+            7,
+            8,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '[17]99\\d{4}|69\\d{5,6}',
+        'posLength' => [
+            7,
+            8,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[17]99',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '69',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[357-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2[48]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{4,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[357-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2[48]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2(?:0[3-9]|1[0-689]|2[0-25-9]|[38][2-9]|4[2-8]|5[124-9]|6[0-39]|7[0-7]|9[0-4679])\\d{7}',
-    'ExampleNumber' => '2101234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:5(?:2[238]|59)|89[6-9]|99[013-9])\\d{6}|(?:3\\d|5[1689]|7[06-9]|8[1-8]|9[0-8])\\d{7}',
-    'ExampleNumber' => '912345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800\\d{4,6}|12(?:0[13]|28)\\d{4}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1900\\d{4,6}',
-    'ExampleNumber' => '1900123456',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '672\\d{6}',
-    'ExampleNumber' => '672012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:[17]99|80\\d)\\d{4}|69\\d{5,6}',
-    'ExampleNumber' => '1992000',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '[17]99\\d{4}|69\\d{5,6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-    ],
-  ],
-  'id' => 'VN',
-  'countryCode' => 84,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[17]99',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '69',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[357-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[48]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[357-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[48]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_VU.php b/src/data/PhoneNumberMetadata_VU.php
index 6328d4fd8..1ec3f2293 100644
--- a/src/data/PhoneNumberMetadata_VU.php
+++ b/src/data/PhoneNumberMetadata_VU.php
@@ -6,118 +6,88 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[57-9]\\d{6}|(?:[238]\\d|48)\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 7,
+return [
+    'id' => 'VU',
+    'countryCode' => 678,
+    'generalDesc' => [
+        'pattern' => '[57-9]\\d{6}|(?:[238]\\d|48)\\d{3}',
+        'posLength' => [
+            5,
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:38[0-8]|48[4-9])\\d\\d|(?:2[02-9]|3[4-7]|88)\\d{3}',
-    'ExampleNumber' => '22123',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'fixedLine' => [
+        'pattern' => '(?:38[0-8]|48[4-9])\\d\\d|(?:2[02-9]|3[4-7]|88)\\d{3}',
+        'example' => '22123',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:[58]\\d|7[013-7])\\d{5}',
-    'ExampleNumber' => '5912345',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '(?:[58]\\d|7[013-7])\\d{5}',
+        'example' => '5912345',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '81[18]\\d\\d',
-    'ExampleNumber' => '81123',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'tollFree' => [
+        'pattern' => '81[18]\\d\\d',
+        'example' => '81123',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:0[1-9]|1[01])\\d{4}',
-    'ExampleNumber' => '9010123',
-    'PossibleLength' =>
-     [
-      0 => 7,
+    'voip' => [
+        'pattern' => '9(?:0[1-9]|1[01])\\d{4}',
+        'example' => '9010123',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '(?:3[03]|900\\d)\\d{3}',
-    'ExampleNumber' => '30123',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '(?:3[03]|900\\d)\\d{3}',
+        'example' => '30123',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'VU',
-  'countryCode' => 678,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_WF.php b/src/data/PhoneNumberMetadata_WF.php
index 6a0ab7cc4..48be484fa 100644
--- a/src/data/PhoneNumberMetadata_WF.php
+++ b/src/data/PhoneNumberMetadata_WF.php
@@ -6,132 +6,98 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:40|72)\\d{4}|8\\d{5}(?:\\d{3})?',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
+return [
+    'id' => 'WF',
+    'countryCode' => 681,
+    'generalDesc' => [
+        'pattern' => '(?:40|72)\\d{4}|8\\d{5}(?:\\d{3})?',
+        'posLength' => [
+            6,
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '72\\d{4}',
-    'ExampleNumber' => '721234',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '72\\d{4}',
+        'example' => '721234',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:72|8[23])\\d{4}',
-    'ExampleNumber' => '821234',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'mobile' => [
+        'pattern' => '(?:72|8[23])\\d{4}',
+        'example' => '821234',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80[0-5]\\d{6}',
-    'ExampleNumber' => '800012345',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'tollFree' => [
+        'pattern' => '80[0-5]\\d{6}',
+        'example' => '800012345',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'NationalNumberPattern' => '[48]0\\d{4}',
-    'ExampleNumber' => '401234',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'voicemail' => [
+        'pattern' => '[48]0\\d{4}',
+        'example' => '401234',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'WF',
-  'countryCode' => 681,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[478]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[478]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_WS.php b/src/data/PhoneNumberMetadata_WS.php
index 231906a9b..b74aef98b 100644
--- a/src/data/PhoneNumberMetadata_WS.php
+++ b/src/data/PhoneNumberMetadata_WS.php
@@ -6,146 +6,109 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:[2-6]|8\\d{5})\\d{4}|[78]\\d{6}|[68]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 10,
+return [
+    'id' => 'WS',
+    'countryCode' => 685,
+    'generalDesc' => [
+        'pattern' => '(?:[2-6]|8\\d{5})\\d{4}|[78]\\d{6}|[68]\\d{5}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '6[1-9]\\d{3}|(?:[2-5]|60)\\d{4}',
-    'ExampleNumber' => '22123',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
+    'fixedLine' => [
+        'pattern' => '6[1-9]\\d{3}|(?:[2-5]|60)\\d{4}',
+        'example' => '22123',
+        'posLength' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:7[1-35-7]|8(?:[3-7]|9\\d{3}))\\d{5}',
-    'ExampleNumber' => '7212345',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 10,
+    'mobile' => [
+        'pattern' => '(?:7[1-35-7]|8(?:[3-7]|9\\d{3}))\\d{5}',
+        'example' => '7212345',
+        'posLength' => [
+            7,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{3}',
-    'ExampleNumber' => '800123',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'tollFree' => [
+        'pattern' => '800\\d{3}',
+        'example' => '800123',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'WS',
-  'countryCode' => 685,
-  'internationalPrefix' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{5})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-5]|6[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{5})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '[2-5]|6[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[68]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[68]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_XK.php b/src/data/PhoneNumberMetadata_XK.php
index e9e73ec09..2faca2905 100644
--- a/src/data/PhoneNumberMetadata_XK.php
+++ b/src/data/PhoneNumberMetadata_XK.php
@@ -6,157 +6,118 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '2\\d{7,8}|3\\d{7,11}|(?:4\\d\\d|[89]00)\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
-      3 => 11,
-      4 => 12,
+return [
+    'id' => 'XK',
+    'countryCode' => 383,
+    'generalDesc' => [
+        'pattern' => '2\\d{7,8}|3\\d{7,11}|(?:4\\d\\d|[89]00)\\d{5}',
+        'posLength' => [
+            8,
+            9,
+            10,
+            11,
+            12,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '38\\d{6,10}|(?:2[89]|39)(?:0\\d{5,6}|[1-9]\\d{5})',
-    'ExampleNumber' => '28012345',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4[3-9]\\d{6}',
-    'ExampleNumber' => '43201234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '38\\d{6,10}|(?:2[89]|39)(?:0\\d{5,6}|[1-9]\\d{5})',
+        'example' => '28012345',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{5}',
-    'ExampleNumber' => '80001234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '4[3-9]\\d{6}',
+        'example' => '43201234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{5}',
-    'ExampleNumber' => '90001234',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'tollFree' => [
+        'pattern' => '800\\d{5}',
+        'example' => '80001234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900\\d{5}',
+        'example' => '90001234',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'XK',
-  'countryCode' => 383,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-4]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-4]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2|39',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7,10})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2|39',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7,10})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_YE.php b/src/data/PhoneNumberMetadata_YE.php
index 0e1732964..6cc5bf823 100644
--- a/src/data/PhoneNumberMetadata_YE.php
+++ b/src/data/PhoneNumberMetadata_YE.php
@@ -6,140 +6,104 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:1|7\\d)\\d{7}|[1-7]\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
+return [
+    'id' => 'YE',
+    'countryCode' => 967,
+    'generalDesc' => [
+        'pattern' => '(?:1|7\\d)\\d{7}|[1-7]\\d{6}',
+        'posLength' => [
+            7,
+            8,
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '78[0-7]\\d{4}|17\\d{6}|(?:[12][2-68]|3[2358]|4[2-58]|5[2-6]|6[3-58]|7[24-6])\\d{5}',
+        'example' => '1234567',
+        'posLength' => [
+            7,
+            8,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '7[01378]\\d{7}',
+        'example' => '712345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-6]|7(?:[24-6]|8[0-7])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '78[0-7]\\d{4}|17\\d{6}|(?:[12][2-68]|3[2358]|4[2-58]|5[2-6]|6[3-58]|7[24-6])\\d{5}',
-    'ExampleNumber' => '1234567',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[01378]\\d{7}',
-    'ExampleNumber' => '712345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'YE',
-  'countryCode' => 967,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-6]|7(?:[24-6]|8[0-7])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_YT.php b/src/data/PhoneNumberMetadata_YT.php
index 4013fdd5b..3bc428768 100644
--- a/src/data/PhoneNumberMetadata_YT.php
+++ b/src/data/PhoneNumberMetadata_YT.php
@@ -6,93 +6,68 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:80|9\\d)\\d{7}|(?:26|63)9\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'YT',
+    'countryCode' => 262,
+    'generalDesc' => [
+        'pattern' => '(?:80|9\\d)\\d{7}|(?:26|63)9\\d{6}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '269(?:0[0-467]|15|5[0-4]|6\\d|[78]0)\\d{4}',
-    'ExampleNumber' => '269601234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '639(?:0[0-79]|1[019]|[267]\\d|3[09]|40|5[05-9]|9[04-79])\\d{4}',
-    'ExampleNumber' => '639012345',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{7}',
-    'ExampleNumber' => '801234567',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '269(?:0[0-467]|15|5[0-4]|6\\d|[78]0)\\d{4}',
+        'example' => '269601234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '639(?:0[0-79]|1[019]|[267]\\d|3[09]|40|5[05-9]|9[04-79])\\d{4}',
+        'example' => '639012345',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d{7}',
+        'example' => '801234567',
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '9(?:(?:39|47)8[01]|769\\d)\\d{4}',
-    'ExampleNumber' => '939801234',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '9(?:(?:39|47)8[01]|769\\d)\\d{4}',
+        'example' => '939801234',
     ],
-  ],
-  'id' => 'YT',
-  'countryCode' => 262,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [],
 ];
diff --git a/src/data/PhoneNumberMetadata_ZA.php b/src/data/PhoneNumberMetadata_ZA.php
index 6c3b281ee..5130cf050 100644
--- a/src/data/PhoneNumberMetadata_ZA.php
+++ b/src/data/PhoneNumberMetadata_ZA.php
@@ -6,185 +6,143 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-79]\\d{8}|8\\d{4,9}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2(?:0330|4302)|52087)0\\d{3}|(?:1[0-8]|2[1-378]|3[1-69]|4\\d|5[1346-8])\\d{7}',
-    'ExampleNumber' => '101234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\\d{3}|8[1-4]\\d{3,7}|(?:2[27]|47|54)4950\\d{3}|(?:1(?:049[2-4]|9[12]\\d\\d)|(?:6\\d|7[0-46-9])\\d{3}|8(?:5\\d{3}|7(?:08[67]|158|28[5-9]|310)))\\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\\d{3}|(?:12|[2-5]1)492\\d{4}',
-    'ExampleNumber' => '711234567',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{7}',
-    'ExampleNumber' => '801234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:86[2-9]|9[0-2]\\d)\\d{6}',
-    'ExampleNumber' => '862345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '860\\d{6}',
-    'ExampleNumber' => '860123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '87(?:08[0-589]|15[0-79]|28[0-4]|31[1-9])\\d{4}|87(?:[02][0-79]|1[0-46-9]|3[02-9]|[4-9]\\d)\\d{5}',
-    'ExampleNumber' => '871234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '861\\d{6,7}',
-    'ExampleNumber' => '861123456',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'ZA',
-  'countryCode' => 27,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[1-4]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[1-4]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '860',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'ZA',
+    'countryCode' => 27,
+    'generalDesc' => [
+        'pattern' => '[1-79]\\d{8}|8\\d{4,9}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2(?:0330|4302)|52087)0\\d{3}|(?:1[0-8]|2[1-378]|3[1-69]|4\\d|5[1346-8])\\d{7}',
+        'example' => '101234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\\d{3}|8[1-4]\\d{3,7}|(?:2[27]|47|54)4950\\d{3}|(?:1(?:049[2-4]|9[12]\\d\\d)|(?:6\\d|7[0-46-9])\\d{3}|8(?:5\\d{3}|7(?:08[67]|158|28[5-9]|310)))\\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\\d{3}|(?:12|[2-5]1)492\\d{4}',
+        'example' => '711234567',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80\\d{7}',
+        'example' => '801234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '(?:86[2-9]|9[0-2]\\d)\\d{6}',
+        'example' => '862345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '860\\d{6}',
+        'example' => '860123456',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '87(?:08[0-589]|15[0-79]|28[0-4]|31[1-9])\\d{4}|87(?:[02][0-79]|1[0-46-9]|3[02-9]|[4-9]\\d)\\d{5}',
+        'example' => '871234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'pattern' => '861\\d{6,7}',
+        'example' => '861123456',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3,4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8[1-4]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8[1-4]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '860',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/src/data/PhoneNumberMetadata_ZM.php b/src/data/PhoneNumberMetadata_ZM.php
index 277ba67d5..69e2dfa23 100644
--- a/src/data/PhoneNumberMetadata_ZM.php
+++ b/src/data/PhoneNumberMetadata_ZM.php
@@ -6,164 +6,122 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}|(?:21|63|[79]\\d)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'ZM',
+    'countryCode' => 260,
+    'generalDesc' => [
+        'pattern' => '800\\d{6}|(?:21|63|[79]\\d)\\d{7}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '21[1-8]\\d{6}',
+        'example' => '211234567',
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '21[1-8]\\d{6}',
-    'ExampleNumber' => '211234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'mobile' => [
+        'pattern' => '(?:7[5-79]|9[5-8])\\d{7}',
+        'example' => '955123456',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:7[5-79]|9[5-8])\\d{7}',
-    'ExampleNumber' => '955123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '63\\d{7}',
-    'ExampleNumber' => '630123456',
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'pattern' => '63\\d{7}',
+        'example' => '630123456',
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'ZM',
-  'countryCode' => 260,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[28]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[79]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[28]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[79]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[28]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[28]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[79]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[79]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/PhoneNumberMetadata_ZW.php b/src/data/PhoneNumberMetadata_ZW.php
index d43edf2c0..a1065bca3 100644
--- a/src/data/PhoneNumberMetadata_ZW.php
+++ b/src/data/PhoneNumberMetadata_ZW.php
@@ -6,243 +6,184 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '2(?:[0-57-9]\\d{6,8}|6[0-24-9]\\d{6,7})|[38]\\d{9}|[35-8]\\d{8}|[3-6]\\d{7}|[1-689]\\d{6}|[1-3569]\\d{5}|[1356]\\d{4}',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 7,
-      3 => 8,
-      4 => 9,
-      5 => 10,
+return [
+    'id' => 'ZW',
+    'countryCode' => 263,
+    'generalDesc' => [
+        'pattern' => '2(?:[0-57-9]\\d{6,8}|6[0-24-9]\\d{6,7})|[38]\\d{9}|[35-8]\\d{8}|[3-6]\\d{7}|[1-689]\\d{6}|[1-3569]\\d{5}|[1356]\\d{4}',
+        'posLength' => [
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            3,
+            4,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:1(?:(?:3\\d|9)\\d|[4-8])|2(?:(?:(?:0(?:2[014]|5)|(?:2[0157]|31|84|9)\\d\\d|[56](?:[14]\\d\\d|20)|7(?:[089]|2[03]|[35]\\d\\d))\\d|4(?:2\\d\\d|8))\\d|1(?:2|[39]\\d{4}))|3(?:(?:123|(?:29\\d|92)\\d)\\d\\d|7(?:[19]|[56]\\d))|5(?:0|1[2-478]|26|[37]2|4(?:2\\d{3}|83)|5(?:25\\d\\d|[78])|[689]\\d)|6(?:(?:[16-8]21|28|52[013])\\d\\d|[39])|8(?:[1349]28|523)\\d\\d)\\d{3}|(?:4\\d\\d|9[2-9])\\d{4,5}|(?:(?:2(?:(?:(?:0|8[146])\\d|7[1-7])\\d|2(?:[278]\\d|92)|58(?:2\\d|3))|3(?:[26]|9\\d{3})|5(?:4\\d|5)\\d\\d)\\d|6(?:(?:(?:[0-246]|[78]\\d)\\d|37)\\d|5[2-8]))\\d\\d|(?:2(?:[569]\\d|8[2-57-9])|3(?:[013-59]\\d|8[37])|6[89]8)\\d{3}',
+        'example' => '1312345',
+        'posLengthLocal' => [
+            3,
+            4,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '7(?:[1278]\\d|3[1-9])\\d{6}',
+        'example' => '712345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80(?:[01]\\d|20|8[0-8])\\d{3}',
+        'example' => '8001234',
+        'posLength' => [
+            7,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '86(?:1[12]|22|30|44|55|77|8[368])\\d{6}',
+        'example' => '8686123456',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2(?:0[45]|2[278]|[49]8)|3(?:[09]8|17)|6(?:[29]8|37|75)|[23][78]|(?:33|5[15]|6[68])[78]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{2,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[49]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '80',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '24|8[13-59]|(?:2[05-79]|39|5[45]|6[15-8])2',
+                '2(?:02[014]|4|[56]20|[79]2)|392|5(?:42|525)|6(?:[16-8]21|52[013])|8[13-59]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '2(?:1[39]|2[0157]|[378]|[56][14])|3(?:12|29)',
+                '2(?:1[39]|2[0157]|[378]|[56][14])|3(?:123|29)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1|2(?:0[0-36-9]|12|29|[56])|3(?:1[0-689]|[24-6])|5(?:[0236-9]|1[2-4])|6(?:[013-59]|7[0-46-9])|(?:33|55|6[68])[0-69]|(?:29|3[09]|62)[0-79]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '29[013-9]|39|54',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3,5})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '(?:25|54)8',
+                '258|5483',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 3,
-      1 => 4,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:(?:3\\d|9)\\d|[4-8])|2(?:(?:(?:0(?:2[014]|5)|(?:2[0157]|31|84|9)\\d\\d|[56](?:[14]\\d\\d|20)|7(?:[089]|2[03]|[35]\\d\\d))\\d|4(?:2\\d\\d|8))\\d|1(?:2|[39]\\d{4}))|3(?:(?:123|(?:29\\d|92)\\d)\\d\\d|7(?:[19]|[56]\\d))|5(?:0|1[2-478]|26|[37]2|4(?:2\\d{3}|83)|5(?:25\\d\\d|[78])|[689]\\d)|6(?:(?:[16-8]21|28|52[013])\\d\\d|[39])|8(?:[1349]28|523)\\d\\d)\\d{3}|(?:4\\d\\d|9[2-9])\\d{4,5}|(?:(?:2(?:(?:(?:0|8[146])\\d|7[1-7])\\d|2(?:[278]\\d|92)|58(?:2\\d|3))|3(?:[26]|9\\d{3})|5(?:4\\d|5)\\d\\d)\\d|6(?:(?:(?:[0-246]|[78]\\d)\\d|37)\\d|5[2-8]))\\d\\d|(?:2(?:[569]\\d|8[2-57-9])|3(?:[013-59]\\d|8[37])|6[89]8)\\d{3}',
-    'ExampleNumber' => '1312345',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 3,
-      1 => 4,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7(?:[1278]\\d|3[1-9])\\d{6}',
-    'ExampleNumber' => '712345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80(?:[01]\\d|20|8[0-8])\\d{3}',
-    'ExampleNumber' => '8001234',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '86(?:1[12]|22|30|44|55|77|8[368])\\d{6}',
-    'ExampleNumber' => '8686123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'ZW',
-  'countryCode' => 263,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:0[45]|2[278]|[49]8)|3(?:[09]8|17)|6(?:[29]8|37|75)|[23][78]|(?:33|5[15]|6[68])[78]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{2,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[49]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '80',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{2})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '24|8[13-59]|(?:2[05-79]|39|5[45]|6[15-8])2',
-        1 => '2(?:02[014]|4|[56]20|[79]2)|392|5(?:42|525)|6(?:[16-8]21|52[013])|8[13-59]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:1[39]|2[0157]|[378]|[56][14])|3(?:12|29)',
-        1 => '2(?:1[39]|2[0157]|[378]|[56][14])|3(?:123|29)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})(\\d{6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1|2(?:0[0-36-9]|12|29|[56])|3(?:1[0-689]|[24-6])|5(?:[0236-9]|1[2-4])|6(?:[013-59]|7[0-46-9])|(?:33|55|6[68])[0-69]|(?:29|3[09]|62)[0-79]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '29[013-9]|39|54',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3,5})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '(?:25|54)8',
-        1 => '258|5483',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/src/data/ShortNumberMetadata_AC.php b/src/data/ShortNumberMetadata_AC.php
index b13a39539..b5fbbf7b6 100644
--- a/src/data/ShortNumberMetadata_AC.php
+++ b/src/data/ShortNumberMetadata_AC.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'AC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'AC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AD.php b/src/data/ShortNumberMetadata_AD.php
index 2e7f5a66a..b17ee2626 100644
--- a/src/data/ShortNumberMetadata_AD.php
+++ b/src/data/ShortNumberMetadata_AD.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'AD',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[0268]',
-    'ExampleNumber' => '110',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[0268]',
+        'example' => '110',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[0268]',
-    'ExampleNumber' => '110',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[0268]',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[0268]',
+        'example' => '110',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[0268]',
+        'example' => '110',
     ],
-  ],
-  'id' => 'AD',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AE.php b/src/data/ShortNumberMetadata_AE.php
index 85f19cd0b..3c7228b65 100644
--- a/src/data/ShortNumberMetadata_AE.php
+++ b/src/data/ShortNumberMetadata_AE.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[149]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'AE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[149]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|99[7-9]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|99[7-9]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|99[7-9]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|99[7-9]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '112|445[16]|99[7-9]',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '112|445[16]|99[7-9]',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '445\\d',
-    'ExampleNumber' => '4450',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '445\\d',
+        'example' => '4450',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AF.php b/src/data/ShortNumberMetadata_AF.php
index 1fe82b202..e1a5d5ffd 100644
--- a/src/data/ShortNumberMetadata_AF.php
+++ b/src/data/ShortNumberMetadata_AF.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'AF',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[02]|19)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:0[02]|19)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[02]|19)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:0[02]|19)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[02]|19)|40404',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[02]|19)|40404',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'AF',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AG.php b/src/data/ShortNumberMetadata_AG.php
index a4eae8913..a24226d48 100644
--- a/src/data/ShortNumberMetadata_AG.php
+++ b/src/data/ShortNumberMetadata_AG.php
@@ -6,61 +6,45 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'AG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '176|9(?:11|88|99)',
-    'ExampleNumber' => '176',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'id' => 'AG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'emergency' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
+    ],
+    'shortCode' => [
+        'pattern' => '176|9(?:11|88|99)',
+        'example' => '176',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'smsServices' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AI.php b/src/data/ShortNumberMetadata_AI.php
index b36029128..393e594a8 100644
--- a/src/data/ShortNumberMetadata_AI.php
+++ b/src/data/ShortNumberMetadata_AI.php
@@ -6,61 +6,45 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'AI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '176|9(?:11|88)',
-    'ExampleNumber' => '176',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'id' => 'AI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
+    ],
+    'shortCode' => [
+        'pattern' => '176|9(?:11|88)',
+        'example' => '176',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'smsServices' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AL.php b/src/data/ShortNumberMetadata_AL.php
index e303be723..22eba47c2 100644
--- a/src/data/ShortNumberMetadata_AL.php
+++ b/src/data/ShortNumberMetadata_AL.php
@@ -6,84 +6,64 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[15]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'AL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[15]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6[01]\\d\\d)|2[7-9]|3[15]|41)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:2|6[01]\\d\\d)|2[7-9]|3[15]|41)',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '5\\d{4}',
-    'ExampleNumber' => '50000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'premiumRate' => [
+        'pattern' => '5\\d{4}',
+        'example' => '50000',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|2[7-9])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|2[7-9])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:6(?:000|1(?:06|11|23))|8\\d\\d)|65\\d|89[12])|5\\d{4}|1(?:[1349]\\d|2[2-9])',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:6(?:000|1(?:06|11|23))|8\\d\\d)|65\\d|89[12])|5\\d{4}|1(?:[1349]\\d|2[2-9])',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '123',
-    'ExampleNumber' => '123',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '131|5\\d{4}',
-    'ExampleNumber' => '131',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'carrierSpecific' => [
+        'pattern' => '123',
+        'example' => '123',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'id' => 'AL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '131|5\\d{4}',
+        'example' => '131',
+        'posLength' => [
+            3,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AM.php b/src/data/ShortNumberMetadata_AM.php
index 07dac97fa..f0b4772a6 100644
--- a/src/data/ShortNumberMetadata_AM.php
+++ b/src/data/ShortNumberMetadata_AM.php
@@ -6,79 +6,59 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[148]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'AM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[148]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '10[1-3]',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '10[1-3]',
+        'example' => '101',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '10[1-3]',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '10[1-3]',
+        'example' => '101',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '(?:1|8[1-7])\\d\\d|40404',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '(?:1|8[1-7])\\d\\d|40404',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'AM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AO.php b/src/data/ShortNumberMetadata_AO.php
index 42b33f9e0..589d57ee0 100644
--- a/src/data/ShortNumberMetadata_AO.php
+++ b/src/data/ShortNumberMetadata_AO.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'AO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[235]',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[235]',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[235]',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[235]',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[235]',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[235]',
+        'example' => '112',
     ],
-  ],
-  'id' => 'AO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AR.php b/src/data/ShortNumberMetadata_AR.php
index 7e4bcd935..491e29bb4 100644
--- a/src/data/ShortNumberMetadata_AR.php
+++ b/src/data/ShortNumberMetadata_AR.php
@@ -6,82 +6,62 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[01389]\\d{1,4}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
-      3 => 5,
+return [
+    'id' => 'AR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[01389]\\d{1,4}',
+        'posLength' => [
+            2,
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '000|1(?:0[0-35-7]|1[0245]|2[015]|3[47]|4[478]|9)|911',
-    'ExampleNumber' => '19',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'tollFree' => [
+        'pattern' => '000|1(?:0[0-35-7]|1[0245]|2[015]|3[47]|4[478]|9)|911',
+        'example' => '19',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '10[017]|911',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '10[017]|911',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '000|1(?:0[0-35-7]|1[02-5]|2[015]|3[47]|4[478]|9)|3372|89338|911',
-    'ExampleNumber' => '19',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '000|1(?:0[0-35-7]|1[02-5]|2[015]|3[47]|4[478]|9)|3372|89338|911',
+        'example' => '19',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '893\\d\\d',
-    'ExampleNumber' => '89300',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:337|893\\d)\\d',
-    'ExampleNumber' => '3370',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'carrierSpecific' => [
+        'pattern' => '893\\d\\d',
+        'example' => '89300',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'AR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:337|893\\d)\\d',
+        'example' => '3370',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AS.php b/src/data/ShortNumberMetadata_AS.php
index 0ceb9a3ae..20db008fc 100644
--- a/src/data/ShortNumberMetadata_AS.php
+++ b/src/data/ShortNumberMetadata_AS.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[49]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'AS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[49]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '40404|9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '40404|9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AT.php b/src/data/ShortNumberMetadata_AT.php
index 96502510e..aa1d74732 100644
--- a/src/data/ShortNumberMetadata_AT.php
+++ b/src/data/ShortNumberMetadata_AT.php
@@ -6,74 +6,55 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[168]\\d\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+return [
+    'id' => 'AT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[168]\\d\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|2[0238]|3[03]|4[0-247])|1(?:16\\d\\d|4[58])\\d',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|2[0238]|3[03]|4[0-247])|1(?:16\\d\\d|4[58])\\d',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:[12]2|33|44)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:17|23)))|2[0238]|3[03]|4(?:[0-247]|5[05]|84))|(?:61|8108[1-3])0',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:[12]2|33|44)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '610|810\\d{3}',
-    'ExampleNumber' => '610',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6(?:00[06]|1(?:17|23)))|2[0238]|3[03]|4(?:[0-247]|5[05]|84))|(?:61|8108[1-3])0',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '610|810\\d{3}',
+        'example' => '610',
+        'posLength' => [
+            3,
+            6,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AU.php b/src/data/ShortNumberMetadata_AU.php
index 0df85bdbf..2998d4f33 100644
--- a/src/data/ShortNumberMetadata_AU.php
+++ b/src/data/ShortNumberMetadata_AU.php
@@ -6,97 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[0-27]\\d{2,7}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
-      4 => 7,
-      5 => 8,
+return [
+    'id' => 'AU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[0-27]\\d{2,7}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '000|1(?:06|12|258885|55\\d)|733',
-    'ExampleNumber' => '000',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 7,
+    'tollFree' => [
+        'pattern' => '000|1(?:06|12|258885|55\\d)|733',
+        'example' => '000',
+        'posLength' => [
+            3,
+            4,
+            7,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1(?:2(?:34|456)|9\\d{4,6})',
-    'ExampleNumber' => '1234',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
+    'premiumRate' => [
+        'pattern' => '1(?:2(?:34|456)|9\\d{4,6})',
+        'example' => '1234',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '000|1(?:06|12)',
-    'ExampleNumber' => '000',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '000|1(?:06|12)',
+        'example' => '000',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '000|1(?:06|1(?:00|2|9[46])|2(?:014[1-3]|[23]\\d|(?:4|5\\d)\\d{2,3}|68[689]|72(?:20|3\\d\\d)|8(?:[013-9]\\d|2))|555|9\\d{4,6})|225|7(?:33|67)',
-    'ExampleNumber' => '000',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '1(?:1[09]\\d|24733)|225|767',
-    'ExampleNumber' => '225',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+    'shortCode' => [
+        'pattern' => '000|1(?:06|1(?:00|2|9[46])|2(?:014[1-3]|[23]\\d|(?:4|5\\d)\\d{2,3}|68[689]|72(?:20|3\\d\\d)|8(?:[013-9]\\d|2))|555|9\\d{4,6})|225|7(?:33|67)',
+        'example' => '000',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:258885|55\\d)',
-    'ExampleNumber' => '1550',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 7,
+    'standardRate' => [
+        'pattern' => '1(?:1[09]\\d|24733)|225|767',
+        'example' => '225',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '19\\d{4,6}',
-    'ExampleNumber' => '190000',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
+    'carrierSpecific' => [
+        'pattern' => '1(?:258885|55\\d)',
+        'example' => '1550',
+        'posLength' => [
+            4,
+            7,
+        ],
     ],
-  ],
-  'id' => 'AU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '19\\d{4,6}',
+        'example' => '190000',
+        'posLength' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AW.php b/src/data/ShortNumberMetadata_AW.php
index bc7e1fec6..f2ac9d6d2 100644
--- a/src/data/ShortNumberMetadata_AW.php
+++ b/src/data/ShortNumberMetadata_AW.php
@@ -6,61 +6,45 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'AW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '100|911',
-    'ExampleNumber' => '100',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '100|911',
+        'example' => '100',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '100|911',
-    'ExampleNumber' => '100',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:00|18|76)|91[13]',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'id' => 'AW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'emergency' => [
+        'pattern' => '100|911',
+        'example' => '100',
+    ],
+    'shortCode' => [
+        'pattern' => '1(?:00|18|76)|91[13]',
+        'example' => '100',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'smsServices' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AX.php b/src/data/ShortNumberMetadata_AX.php
index a2daa6e97..8fb774441 100644
--- a/src/data/ShortNumberMetadata_AX.php
+++ b/src/data/ShortNumberMetadata_AX.php
@@ -6,74 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[17]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'AX',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[17]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '112|75[12]\\d\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '112|75[12]\\d\\d',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AX',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_AZ.php b/src/data/ShortNumberMetadata_AZ.php
index 09f233a2d..8ac50fccb 100644
--- a/src/data/ShortNumberMetadata_AZ.php
+++ b/src/data/ShortNumberMetadata_AZ.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[148]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'AZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[148]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)|(?:404|880)0',
-    'ExampleNumber' => '101',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[1-3]|12)|(?:404|880)0',
+        'example' => '101',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '(?:404|880)\\d',
-    'ExampleNumber' => '4040',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:404|880)\\d',
-    'ExampleNumber' => '4040',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '(?:404|880)\\d',
+        'example' => '4040',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'AZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:404|880)\\d',
+        'example' => '4040',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BA.php b/src/data/ShortNumberMetadata_BA.php
index 75191ac2f..fd030dc81 100644
--- a/src/data/ShortNumberMetadata_BA.php
+++ b/src/data/ShortNumberMetadata_BA.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'BA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:16\\d{3}|2[2-4])',
-    'ExampleNumber' => '122',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:16\\d{3}|2[2-4])',
+        'example' => '122',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '12[2-4]',
-    'ExampleNumber' => '122',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '12[2-4]',
+        'example' => '122',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:16(?:00[06]|1(?:1[17]|23))|2(?:0[0-7]|[2-5]|6[0-26])|(?:[3-5]|7\\d)\\d\\d)|1(?:18|2[78])\\d\\d?',
-    'ExampleNumber' => '122',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:16(?:00[06]|1(?:1[17]|23))|2(?:0[0-7]|[2-5]|6[0-26])|(?:[3-5]|7\\d)\\d\\d)|1(?:18|2[78])\\d\\d?',
+        'example' => '122',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BB.php b/src/data/ShortNumberMetadata_BB.php
index 0735bd45d..1f68ae62c 100644
--- a/src/data/ShortNumberMetadata_BB.php
+++ b/src/data/ShortNumberMetadata_BB.php
@@ -6,63 +6,46 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[2-689]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'BB',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[2-689]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '988|[2359]11',
-    'ExampleNumber' => '211',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '988|[2359]11',
+        'example' => '211',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '[2359]11',
-    'ExampleNumber' => '211',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '988|[2-689]11',
-    'ExampleNumber' => '211',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '[468]11',
-    'ExampleNumber' => '411',
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '[2359]11',
+        'example' => '211',
     ],
-  ],
-  'id' => 'BB',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'shortCode' => [
+        'pattern' => '988|[2-689]11',
+        'example' => '211',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '[468]11',
+        'example' => '411',
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BD.php b/src/data/ShortNumberMetadata_BD.php
index f17878649..0c491df2e 100644
--- a/src/data/ShortNumberMetadata_BD.php
+++ b/src/data/ShortNumberMetadata_BD.php
@@ -6,80 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1579]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'BD',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1579]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '10[0-26]|[19]99',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '10[0-26]|[19]99',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '10[0-2]|[19]99',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '10[0-2]|[19]99',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:[0-369]|5[1-4]|7[0-4]|8[0-29])|1[16-9]|2(?:[134]|2[0-5])|3(?:1\\d?|6[3-6])|5[2-9])|5012|786|9594|[19]99|1(?:0(?:50|6\\d)|33|4(?:0|1\\d))\\d',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:[0-369]|5[1-4]|7[0-4]|8[0-29])|1[16-9]|2(?:[134]|2[0-5])|3(?:1\\d?|6[3-6])|5[2-9])|5012|786|9594|[19]99|1(?:0(?:50|6\\d)|33|4(?:0|1\\d))\\d',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:11|2[13])|(?:501|959)\\d|786',
-    'ExampleNumber' => '111',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '959\\d',
-    'ExampleNumber' => '9590',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '1(?:11|2[13])|(?:501|959)\\d|786',
+        'example' => '111',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'id' => 'BD',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '959\\d',
+        'example' => '9590',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BE.php b/src/data/ShortNumberMetadata_BE.php
index a1c0c2a04..00368d28a 100644
--- a/src/data/ShortNumberMetadata_BE.php
+++ b/src/data/ShortNumberMetadata_BE.php
@@ -6,75 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+return [
+    'id' => 'BE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-35-8]|1[0269]|7(?:12|77)|813)|(?:116|8)\\d{3}',
-    'ExampleNumber' => '100',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1(?:2[03]|40)4|(?:1(?:[24]1|3[01])|[2-79]\\d\\d)\\d',
-    'ExampleNumber' => '1204',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'tollFree' => [
+        'pattern' => '1(?:0[0-35-8]|1[0269]|7(?:12|77)|813)|(?:116|8)\\d{3}',
+        'example' => '100',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[01]|12)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'pattern' => '1(?:2[03]|40)4|(?:1(?:[24]1|3[01])|[2-79]\\d\\d)\\d',
+        'example' => '1204',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-8]|16117|2(?:12|3[0-24])|313|414|5(?:1[05]|5[15]|66|95)|6(?:1[167]|36|6[16])|7(?:[07][017]|1[27-9]|22|33|65)|81[39])|[2-9]\\d{3}|11[02679]|1(?:1600|45)0|1(?:[2-4]9|78)9|1[2-4]0[47]',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:0[01]|12)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[0-8]|16117|2(?:12|3[0-24])|313|414|5(?:1[05]|5[15]|66|95)|6(?:1[167]|36|6[16])|7(?:[07][017]|1[27-9]|22|33|65)|81[39])|[2-9]\\d{3}|11[02679]|1(?:1600|45)0|1(?:[2-4]9|78)9|1[2-4]0[47]',
+        'example' => '100',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{3}',
-    'ExampleNumber' => '2000',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '[2-9]\\d{3}',
+        'example' => '2000',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BF.php b/src/data/ShortNumberMetadata_BF.php
index ce771f6ed..e8f679d28 100644
--- a/src/data/ShortNumberMetadata_BF.php
+++ b/src/data/ShortNumberMetadata_BF.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'BF',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'id' => 'BF',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BG.php b/src/data/ShortNumberMetadata_BG.php
index 3da149b56..a2d8945d4 100644
--- a/src/data/ShortNumberMetadata_BG.php
+++ b/src/data/ShortNumberMetadata_BG.php
@@ -6,70 +6,51 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d{3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+return [
+    'id' => 'BG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d{3})?',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6\\d{3})|50|6[06])',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:2|6\\d{3})|50|6[06])',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|50|6[06])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:000|111))|50|6[06])',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|50|6[06])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6(?:000|111))|50|6[06])',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BH.php b/src/data/ShortNumberMetadata_BH.php
index 6b868cdb9..7620122d7 100644
--- a/src/data/ShortNumberMetadata_BH.php
+++ b/src/data/ShortNumberMetadata_BH.php
@@ -6,76 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[0189]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'BH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[0189]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:0[167]|81)\\d{3}|[19]99',
-    'ExampleNumber' => '199',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9[148]\\d{3}',
-    'ExampleNumber' => '91000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'tollFree' => [
+        'pattern' => '(?:0[167]|81)\\d{3}|[19]99',
+        'example' => '199',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '[19]99',
-    'ExampleNumber' => '199',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'pattern' => '9[148]\\d{3}',
+        'example' => '91000',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:[02]\\d|12|4[01]|51|8[18]|9[169])|99[02489]|(?:0[167]|8[158]|9[148])\\d{3}',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '[19]99',
+        'example' => '199',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '0[67]\\d{3}|88000|98555',
-    'ExampleNumber' => '06000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'shortCode' => [
+        'pattern' => '1(?:[02]\\d|12|4[01]|51|8[18]|9[169])|99[02489]|(?:0[167]|8[158]|9[148])\\d{3}',
+        'example' => '100',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '88000|98555',
-    'ExampleNumber' => '88000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '0[67]\\d{3}|88000|98555',
+        'example' => '06000',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '88000|98555',
+        'example' => '88000',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BI.php b/src/data/ShortNumberMetadata_BI.php
index 150fe1215..20e8790e8 100644
--- a/src/data/ShortNumberMetadata_BI.php
+++ b/src/data/ShortNumberMetadata_BI.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[16-9]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'BI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[16-9]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[237]|611',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[237]|611',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[237]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[237]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1\\d|5[2-9]|6[0-256])|611|7(?:10|77|979)|8[28]8|900',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1\\d|5[2-9]|6[0-256])|611|7(?:10|77|979)|8[28]8|900',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '611|7(?:10|77)|888|900',
-    'ExampleNumber' => '611',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:71|90)0',
-    'ExampleNumber' => '710',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'carrierSpecific' => [
+        'pattern' => '611|7(?:10|77)|888|900',
+        'example' => '611',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'id' => 'BI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:71|90)0',
+        'example' => '710',
+        'posLength' => [
+            3,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BJ.php b/src/data/ShortNumberMetadata_BJ.php
index 4bf840359..3454624e8 100644
--- a/src/data/ShortNumberMetadata_BJ.php
+++ b/src/data/ShortNumberMetadata_BJ.php
@@ -6,72 +6,53 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[17]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'BJ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[17]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[78]|7[3-5]\\d\\d',
-    'ExampleNumber' => '117',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[78]|7[3-5]\\d\\d',
+        'example' => '117',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[78]',
-    'ExampleNumber' => '117',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[78]|2[02-5]|60)|7[0-5]\\d\\d',
-    'ExampleNumber' => '117',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[78]',
+        'example' => '117',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '12[02-5]',
-    'ExampleNumber' => '120',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'shortCode' => [
+        'pattern' => '1(?:1[78]|2[02-5]|60)|7[0-5]\\d\\d',
+        'example' => '117',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BJ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '12[02-5]',
+        'example' => '120',
+        'posLength' => [
+            3,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BL.php b/src/data/ShortNumberMetadata_BL.php
index abbe03432..0d82ed21f 100644
--- a/src/data/ShortNumberMetadata_BL.php
+++ b/src/data/ShortNumberMetadata_BL.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'BL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '18',
-    'ExampleNumber' => '18',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '18',
+        'example' => '18',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '18',
-    'ExampleNumber' => '18',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '18',
-    'ExampleNumber' => '18',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '18',
+        'example' => '18',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '18',
+        'example' => '18',
     ],
-  ],
-  'id' => 'BL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BM.php b/src/data/ShortNumberMetadata_BM.php
index 59c529d1e..b51dac992 100644
--- a/src/data/ShortNumberMetadata_BM.php
+++ b/src/data/ShortNumberMetadata_BM.php
@@ -6,61 +6,45 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'BM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '176|9(?:11|88)',
-    'ExampleNumber' => '176',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'id' => 'BM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
+    ],
+    'shortCode' => [
+        'pattern' => '176|9(?:11|88)',
+        'example' => '176',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'smsServices' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BN.php b/src/data/ShortNumberMetadata_BN.php
index 8b1a66160..4d73c191a 100644
--- a/src/data/ShortNumberMetadata_BN.php
+++ b/src/data/ShortNumberMetadata_BN.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'BN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '99[135]',
-    'ExampleNumber' => '991',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '99[135]',
+        'example' => '991',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '99[135]',
-    'ExampleNumber' => '991',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '99[135]',
-    'ExampleNumber' => '991',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '99[135]',
+        'example' => '991',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '99[135]',
+        'example' => '991',
     ],
-  ],
-  'id' => 'BN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BO.php b/src/data/ShortNumberMetadata_BO.php
index e03a106b6..0f5017462 100644
--- a/src/data/ShortNumberMetadata_BO.php
+++ b/src/data/ShortNumberMetadata_BO.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'BO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[089]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[089]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[089]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[089]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[089]|40404',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[089]|40404',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BQ.php b/src/data/ShortNumberMetadata_BQ.php
index 4b158aba1..a69656069 100644
--- a/src/data/ShortNumberMetadata_BQ.php
+++ b/src/data/ShortNumberMetadata_BQ.php
@@ -6,61 +6,45 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'BQ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '112|911',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|76)|911',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'id' => 'BQ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'emergency' => [
+        'pattern' => '112|911',
+        'example' => '112',
+    ],
+    'shortCode' => [
+        'pattern' => '1(?:12|76)|911',
+        'example' => '112',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'smsServices' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BR.php b/src/data/ShortNumberMetadata_BR.php
index 8bf3cb79c..db9d1745c 100644
--- a/src/data/ShortNumberMetadata_BR.php
+++ b/src/data/ShortNumberMetadata_BR.php
@@ -6,82 +6,63 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-69]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'BR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-69]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:00|12|28|8[015]|9[0-47-9])|4(?:57|82\\d)|911',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'tollFree' => [
+        'pattern' => '1(?:00|12|28|8[015]|9[0-47-9])|4(?:57|82\\d)|911',
+        'example' => '100',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|28|9[023])|911',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|28|9[023])|911',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:[02]|3(?:1[2-579]|2[13-9]|3[124-9]|4[1-3578]|5[1-468]|6[139]|8[149]|9[168])|5[0-35-9]|6(?:0|1[0-35-8]?|2[0145]|3[0137]?|4[37-9]?|5[0-35]|6[016]?|7[137]?|8[5-8]|9[1359]))|1[25-8]|2[357-9]|3[024-68]|4[12568]|5\\d|6[0-8]|8[015]|9[0-47-9])|2(?:7(?:330|878)|85959?)|(?:32|91)1|4(?:0404?|57|828)|55555|6(?:0\\d{4}|10000)|(?:133|411)[12]',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '102|273\\d\\d|321',
-    'ExampleNumber' => '102',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:[02]|3(?:1[2-579]|2[13-9]|3[124-9]|4[1-3578]|5[1-468]|6[139]|8[149]|9[168])|5[0-35-9]|6(?:0|1[0-35-8]?|2[0145]|3[0137]?|4[37-9]?|5[0-35]|6[016]?|7[137]?|8[5-8]|9[1359]))|1[25-8]|2[357-9]|3[024-68]|4[12568]|5\\d|6[0-8]|8[015]|9[0-47-9])|2(?:7(?:330|878)|85959?)|(?:32|91)1|4(?:0404?|57|828)|55555|6(?:0\\d{4}|10000)|(?:133|411)[12]',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '151|(?:278|555)\\d\\d|4(?:04\\d\\d?|11\\d|57)',
-    'ExampleNumber' => '151',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+    'standardRate' => [
+        'pattern' => '102|273\\d\\d|321',
+        'example' => '102',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '285\\d{2,3}|321|40404|(?:27[38]\\d|482)\\d|6(?:0\\d|10)\\d{3}',
-    'ExampleNumber' => '321',
-  ],
-  'id' => 'BR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '151|(?:278|555)\\d\\d|4(?:04\\d\\d?|11\\d|57)',
+        'example' => '151',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '285\\d{2,3}|321|40404|(?:27[38]\\d|482)\\d|6(?:0\\d|10)\\d{3}',
+        'example' => '321',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BS.php b/src/data/ShortNumberMetadata_BS.php
index dff3a2942..8096d7f2c 100644
--- a/src/data/ShortNumberMetadata_BS.php
+++ b/src/data/ShortNumberMetadata_BS.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'BS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:1[19]|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:1[19]|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '91[19]',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:1[19]|88)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '91[19]',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:1[19]|88)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'BS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BT.php b/src/data/ShortNumberMetadata_BT.php
index 0ba7e9674..101dab1fe 100644
--- a/src/data/ShortNumberMetadata_BT.php
+++ b/src/data/ShortNumberMetadata_BT.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'BT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[023]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[023]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[0-6]|40404',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[0-6]|40404',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BW.php b/src/data/ShortNumberMetadata_BW.php
index e4c9834e3..e8a0a6055 100644
--- a/src/data/ShortNumberMetadata_BW.php
+++ b/src/data/ShortNumberMetadata_BW.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'BW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|9[7-9])',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '9(?:11|9[7-9])',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|9[7-9])',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '9(?:11|9[7-9])',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[26]|3123)|9(?:1[14]|9[1-57-9])',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[26]|3123)|9(?:1[14]|9[1-57-9])',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '131\\d\\d',
-    'ExampleNumber' => '13100',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '131\\d\\d',
-    'ExampleNumber' => '13100',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '131\\d\\d',
+        'example' => '13100',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'BW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '131\\d\\d',
+        'example' => '13100',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BY.php b/src/data/ShortNumberMetadata_BY.php
index 99286afaf..9be7e8ba1 100644
--- a/src/data/ShortNumberMetadata_BY.php
+++ b/src/data/ShortNumberMetadata_BY.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'BY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-79]|1[246]|35|5[1-35]|6[89]|7[5-7]|8[58]|9[1-7])',
-    'ExampleNumber' => '101',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[1-79]|1[246]|35|5[1-35]|6[89]|7[5-7]|8[58]|9[1-7])',
+        'example' => '101',
     ],
-  ],
-  'id' => 'BY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_BZ.php b/src/data/ShortNumberMetadata_BZ.php
index 58e2a6fbd..a79648e41 100644
--- a/src/data/ShortNumberMetadata_BZ.php
+++ b/src/data/ShortNumberMetadata_BZ.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'BZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:0|11|22|66|77|9[09])',
-    'ExampleNumber' => '90',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:0|11|22|66|77|9[09])',
+        'example' => '90',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:0|11|90)',
-    'ExampleNumber' => '90',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:0|11|22|66|77|9[09])',
-    'ExampleNumber' => '90',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:0|11|90)',
+        'example' => '90',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:0|11|22|66|77|9[09])',
+        'example' => '90',
     ],
-  ],
-  'id' => 'BZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CA.php b/src/data/ShortNumberMetadata_CA.php
index 322bbabb6..235282383 100644
--- a/src/data/ShortNumberMetadata_CA.php
+++ b/src/data/ShortNumberMetadata_CA.php
@@ -6,82 +6,62 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d\\d(?:\\d\\d(?:\\d(?:\\d{2})?)?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
-      3 => 8,
+return [
+    'id' => 'CA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d\\d(?:\\d\\d(?:\\d(?:\\d{2})?)?)?',
+        'posLength' => [
+            3,
+            5,
+            6,
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|988|[29]11',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|988|[29]11',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|911',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '112|30000\\d{3}|[1-35-9]\\d{4,5}|[2-8]11|9(?:11|88)',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '112|30000\\d{3}|[1-35-9]\\d{4,5}|[2-8]11|9(?:11|88)',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '[235-7]11',
-    'ExampleNumber' => '211',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '300\\d{5}|[1-35-9]\\d{4,5}',
-    'ExampleNumber' => '10000',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
-      2 => 8,
+    'carrierSpecific' => [
+        'pattern' => '[235-7]11',
+        'example' => '211',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'id' => 'CA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '300\\d{5}|[1-35-9]\\d{4,5}',
+        'example' => '10000',
+        'posLength' => [
+            5,
+            6,
+            8,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CC.php b/src/data/ShortNumberMetadata_CC.php
index 51c88d32c..ec3d7e8d4 100644
--- a/src/data/ShortNumberMetadata_CC.php
+++ b/src/data/ShortNumberMetadata_CC.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[01]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'CC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[01]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '000|112',
-    'ExampleNumber' => '000',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '000|112',
+        'example' => '000',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '000|112',
-    'ExampleNumber' => '000',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '000|112',
-    'ExampleNumber' => '000',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '000|112',
+        'example' => '000',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '000|112',
+        'example' => '000',
     ],
-  ],
-  'id' => 'CC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CD.php b/src/data/ShortNumberMetadata_CD.php
index eb046bb3e..81b0c18c4 100644
--- a/src/data/ShortNumberMetadata_CD.php
+++ b/src/data/ShortNumberMetadata_CD.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'CD',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[348]|77|88)',
-    'ExampleNumber' => '113',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[348]|77|88)',
+        'example' => '113',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[348]|77|88)',
-    'ExampleNumber' => '113',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[348]|77|88)',
+        'example' => '113',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[348]|23|77|88)|40404',
-    'ExampleNumber' => '113',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[348]|23|77|88)|40404',
+        'example' => '113',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'CD',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CF.php b/src/data/ShortNumberMetadata_CF.php
index 6a5df58fc..e747a375a 100644
--- a/src/data/ShortNumberMetadata_CF.php
+++ b/src/data/ShortNumberMetadata_CF.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'CF',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[78]|22\\d)',
-    'ExampleNumber' => '117',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:1[78]|22\\d)',
+        'example' => '117',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[78]|220)',
-    'ExampleNumber' => '117',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[478]|220)',
-    'ExampleNumber' => '114',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:1[78]|220)',
+        'example' => '117',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[478]|220)',
+        'example' => '114',
     ],
-  ],
-  'id' => 'CF',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CG.php b/src/data/ShortNumberMetadata_CG.php
index 96056d0c4..9b56fab8d 100644
--- a/src/data/ShortNumberMetadata_CG.php
+++ b/src/data/ShortNumberMetadata_CG.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'CG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[178]',
-    'ExampleNumber' => '111',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[178]',
+        'example' => '111',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[78]',
-    'ExampleNumber' => '117',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[126-8]',
-    'ExampleNumber' => '111',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[78]',
+        'example' => '117',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[126-8]',
+        'example' => '111',
     ],
-  ],
-  'id' => 'CG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CH.php b/src/data/ShortNumberMetadata_CH.php
index 587b6c73d..f5bcc60e3 100644
--- a/src/data/ShortNumberMetadata_CH.php
+++ b/src/data/ShortNumberMetadata_CH.php
@@ -6,92 +6,72 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'CH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[278]|6\\d{3})|4[47])|5200',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:[278]|6\\d{3})|4[47])|5200',
+        'example' => '112',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1(?:14|8[0-2589])\\d|543|83111',
-    'ExampleNumber' => '543',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+    'premiumRate' => [
+        'pattern' => '1(?:14|8[0-2589])\\d|543|83111',
+        'example' => '543',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[278]|44)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[278]|44)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[78]\\d\\d|1(?:[278]|45|6(?:000|111))|4(?:[03-57]|1[0145])|6(?:00|[1-46])|8(?:02|1[189]|[25]0|7|8[08]|99))|[2-9]\\d{2,4}',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '1(?:4[035]|6[1-46])|1(?:41|60)\\d',
-    'ExampleNumber' => '140',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'shortCode' => [
+        'pattern' => '1(?:0[78]\\d\\d|1(?:[278]|45|6(?:000|111))|4(?:[03-57]|1[0145])|6(?:00|[1-46])|8(?:02|1[189]|[25]0|7|8[08]|99))|[2-9]\\d{2,4}',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '5(?:200|35)',
-    'ExampleNumber' => '535',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'standardRate' => [
+        'pattern' => '1(?:4[035]|6[1-46])|1(?:41|60)\\d',
+        'example' => '140',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{2,4}',
-    'ExampleNumber' => '200',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+    'carrierSpecific' => [
+        'pattern' => '5(?:200|35)',
+        'example' => '535',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'id' => 'CH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '[2-9]\\d{2,4}',
+        'example' => '200',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CI.php b/src/data/ShortNumberMetadata_CI.php
index 5be8665b8..009f73900 100644
--- a/src/data/ShortNumberMetadata_CI.php
+++ b/src/data/ShortNumberMetadata_CI.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'CI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[01]|[78]0)',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[01]|[78]0)',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[01]|[78]0)',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[01]|[78]0)',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[01]|[78]0)|4443',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[01]|[78]0)|4443',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '444\\d',
-    'ExampleNumber' => '4440',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '444\\d',
-    'ExampleNumber' => '4440',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '444\\d',
+        'example' => '4440',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'CI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '444\\d',
+        'example' => '4440',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CK.php b/src/data/ShortNumberMetadata_CK.php
index becdf75a9..a15b1f664 100644
--- a/src/data/ShortNumberMetadata_CK.php
+++ b/src/data/ShortNumberMetadata_CK.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'CK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '99[689]',
-    'ExampleNumber' => '996',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '99[689]',
+        'example' => '996',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '99[689]',
-    'ExampleNumber' => '996',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '99[689]',
-    'ExampleNumber' => '996',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '99[689]',
+        'example' => '996',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '99[689]',
+        'example' => '996',
     ],
-  ],
-  'id' => 'CK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CL.php b/src/data/ShortNumberMetadata_CL.php
index 1abb54b11..48b1b3536 100644
--- a/src/data/ShortNumberMetadata_CL.php
+++ b/src/data/ShortNumberMetadata_CL.php
@@ -6,84 +6,64 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'CL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:213|3[1-3])|434\\d|911',
-    'ExampleNumber' => '131',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'tollFree' => [
+        'pattern' => '1(?:213|3[1-3])|434\\d|911',
+        'example' => '131',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1(?:211|3(?:13|[348]0|5[01]))|(?:1(?:[05]6|[48]1|9[18])|2(?:01\\d|[23]2|77|88)|3(?:0[59]|13|3[279]|66)|4(?:[12]4|36\\d|4[017]|55)|5(?:00|41\\d|5[67]|99)|6(?:07\\d|13|22|3[06]|50|69)|787|8(?:[01]1|[48]8)|9(?:01|[12]0|33))\\d',
-    'ExampleNumber' => '1060',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'premiumRate' => [
+        'pattern' => '1(?:211|3(?:13|[348]0|5[01]))|(?:1(?:[05]6|[48]1|9[18])|2(?:01\\d|[23]2|77|88)|3(?:0[59]|13|3[279]|66)|4(?:[12]4|36\\d|4[017]|55)|5(?:00|41\\d|5[67]|99)|6(?:07\\d|13|22|3[06]|50|69)|787|8(?:[01]1|[48]8)|9(?:01|[12]0|33))\\d',
+        'example' => '1060',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '13[1-3]|911',
-    'ExampleNumber' => '131',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '13[1-3]|911',
+        'example' => '131',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:00|21[13]|3(?:13|[348]0|5[01])|4(?:0[02-6]|17|[379])|818|919)|2(?:0(?:01|122)|22[47]|323|777|882)|3(?:0(?:51|99)|132|3(?:29|[37]7)|665)|43656|5(?:(?:00|415)4|5(?:66|77)|995)|6(?:131|222|366|699)|7878|8(?:011|11[28]|482|889)|9(?:01|1)1|13\\d|4(?:[13]42|243|4(?:02|15|77)|554)|(?:1(?:[05]6|98)|339|6(?:07|[35])0|9(?:[12]0|33))0',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '(?:200|333)\\d',
-    'ExampleNumber' => '2000',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'shortCode' => [
+        'pattern' => '1(?:00|21[13]|3(?:13|[348]0|5[01])|4(?:0[02-6]|17|[379])|818|919)|2(?:0(?:01|122)|22[47]|323|777|882)|3(?:0(?:51|99)|132|3(?:29|[37]7)|665)|43656|5(?:(?:00|415)4|5(?:66|77)|995)|6(?:131|222|366|699)|7878|8(?:011|11[28]|482|889)|9(?:01|1)1|13\\d|4(?:[13]42|243|4(?:02|15|77)|554)|(?:1(?:[05]6|98)|339|6(?:07|[35])0|9(?:[12]0|33))0',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'pattern' => '(?:200|333)\\d',
+        'example' => '2000',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '13(?:13|[348]0|5[01])|(?:1(?:[05]6|[28]1|4[01]|9[18])|2(?:0(?:0|1\\d)|[23]2|77|88)|3(?:0[59]|13|3[2379]|66)|436\\d|5(?:00|41\\d|5[67]|99)|6(?:07\\d|13|22|3[06]|50|69)|787|8(?:[01]1|[48]8)|9(?:01|[12]0|33))\\d|4(?:[1-3]4|4[017]|55)\\d',
-    'ExampleNumber' => '1060',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '13(?:13|[348]0|5[01])|(?:1(?:[05]6|[28]1|4[01]|9[18])|2(?:0(?:0|1\\d)|[23]2|77|88)|3(?:0[59]|13|3[2379]|66)|436\\d|5(?:00|41\\d|5[67]|99)|6(?:07\\d|13|22|3[06]|50|69)|787|8(?:[01]1|[48]8)|9(?:01|[12]0|33))\\d|4(?:[1-3]4|4[017]|55)\\d',
+        'example' => '1060',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CM.php b/src/data/ShortNumberMetadata_CM.php
index a1315fc0f..a32560c1d 100644
--- a/src/data/ShortNumberMetadata_CM.php
+++ b/src/data/ShortNumberMetadata_CM.php
@@ -6,81 +6,61 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[18]\\d{1,3}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
+return [
+    'id' => 'CM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[18]\\d{1,3}',
+        'posLength' => [
+            2,
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[37]|[37])',
-    'ExampleNumber' => '13',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[37]|[37])',
+        'example' => '13',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[37]|[37])',
-    'ExampleNumber' => '13',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[37]|[37])',
+        'example' => '13',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[37]|[37])|8711',
-    'ExampleNumber' => '13',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[37]|[37])|8711',
+        'example' => '13',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '871\\d',
-    'ExampleNumber' => '8710',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '871\\d',
-    'ExampleNumber' => '8710',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '871\\d',
+        'example' => '8710',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'CM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '871\\d',
+        'example' => '8710',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CN.php b/src/data/ShortNumberMetadata_CN.php
index b640f7526..6f0dca3cc 100644
--- a/src/data/ShortNumberMetadata_CN.php
+++ b/src/data/ShortNumberMetadata_CN.php
@@ -6,76 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'CN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[09]|2(?:[02]|[13]\\d\\d))',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'tollFree' => [
+        'pattern' => '1(?:1[09]|2(?:[02]|[13]\\d\\d))',
+        'example' => '110',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[09]|20)',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[09]|20)',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:00\\d\\d|1[029]|2(?:[02]|110|395))|95\\d{3,4}',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '1(?:00\\d\\d|12)|95\\d{3,4}',
-    'ExampleNumber' => '112',
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:00\\d\\d|1[029]|2(?:[02]|110|395))|95\\d{3,4}',
+        'example' => '110',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '121\\d\\d',
-    'ExampleNumber' => '12100',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'pattern' => '1(?:00\\d\\d|12)|95\\d{3,4}',
+        'example' => '112',
     ],
-  ],
-  'id' => 'CN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '121\\d\\d',
+        'example' => '12100',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CO.php b/src/data/ShortNumberMetadata_CO.php
index 00749b77f..412a5c599 100644
--- a/src/data/ShortNumberMetadata_CO.php
+++ b/src/data/ShortNumberMetadata_CO.php
@@ -6,79 +6,59 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-589]\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'CO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-589]\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[29]|23|32|56)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[29]|23|32|56)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[29]|23|32|56)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[29]|23|32|56)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:06|1[2-9]|2[35-7]|3[27]|4[467]|5[36]|6[4-7]|95)|(?:29002|39003)9|40404|5930\\d\\d|85432|(?:[2359][57]|8(?:7|9\\d))\\d{3}',
-    'ExampleNumber' => '106',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:06|1[2-9]|2[35-7]|3[27]|4[467]|5[36]|6[4-7]|95)|(?:29002|39003)9|40404|5930\\d\\d|85432|(?:[2359][57]|8(?:7|9\\d))\\d{3}',
+        'example' => '106',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '(?:40|85)4\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:40|85)4\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '(?:40|85)4\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'CO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:40|85)4\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CR.php b/src/data/ShortNumberMetadata_CR.php
index 2a5779187..70e6ccf6f 100644
--- a/src/data/ShortNumberMetadata_CR.php
+++ b/src/data/ShortNumberMetadata_CR.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1359]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'CR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1359]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|911',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|911',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:00|15|2[2-4679])|1(?:1[0-35-9]|2|37|[46]6|7[57]|8[79]|9[0-379])|2(?:00|[12]2|34|55)|3(?:21|33)|4(?:0[06]|1[4-6])|5(?:15|5[15])|693|7(?:00|1[7-9]|2[02]|[67]7)|975)|3855|5(?:0(?:30|49)|510)|911',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:00|15|2[2-4679])|1(?:1[0-35-9]|2|37|[46]6|7[57]|8[79]|9[0-379])|2(?:00|[12]2|34|55)|3(?:21|33)|4(?:0[06]|1[4-6])|5(?:15|5[15])|693|7(?:00|1[7-9]|2[02]|[67]7)|975)|3855|5(?:0(?:30|49)|510)|911',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:385|5(?:0[34]|51))\\d',
-    'ExampleNumber' => '3850',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:385|5(?:0[34]|51))\\d',
+        'example' => '3850',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CU.php b/src/data/ShortNumberMetadata_CU.php
index 726b1784e..4cb80abe7 100644
--- a/src/data/ShortNumberMetadata_CU.php
+++ b/src/data/ShortNumberMetadata_CU.php
@@ -6,71 +6,52 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[12]\\d\\d(?:\\d{3,4})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
-      2 => 7,
+return [
+    'id' => 'CU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[12]\\d\\d(?:\\d{3,4})?',
+        'posLength' => [
+            3,
+            6,
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '10[4-7]|(?:116|204\\d)\\d{3}',
-    'ExampleNumber' => '104',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '10[4-7]|(?:116|204\\d)\\d{3}',
+        'example' => '104',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '10[4-6]',
-    'ExampleNumber' => '104',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[4-7]|1(?:6111|8)|40)|2045252',
-    'ExampleNumber' => '104',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '10[4-6]',
+        'example' => '104',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[4-7]|1(?:6111|8)|40)|2045252',
+        'example' => '104',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CV.php b/src/data/ShortNumberMetadata_CV.php
index f91a5e7be..9d95a2103 100644
--- a/src/data/ShortNumberMetadata_CV.php
+++ b/src/data/ShortNumberMetadata_CV.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'CV',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '13[0-2]',
-    'ExampleNumber' => '130',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '13[0-2]',
+        'example' => '130',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '13[0-2]',
-    'ExampleNumber' => '130',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '13[0-2]',
-    'ExampleNumber' => '130',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '13[0-2]',
+        'example' => '130',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '13[0-2]',
+        'example' => '130',
     ],
-  ],
-  'id' => 'CV',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CW.php b/src/data/ShortNumberMetadata_CW.php
index d641ea554..618056bd5 100644
--- a/src/data/ShortNumberMetadata_CW.php
+++ b/src/data/ShortNumberMetadata_CW.php
@@ -6,61 +6,45 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'CW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '112|911',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|76)|911',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'id' => 'CW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'emergency' => [
+        'pattern' => '112|911',
+        'example' => '112',
+    ],
+    'shortCode' => [
+        'pattern' => '1(?:12|76)|911',
+        'example' => '112',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'smsServices' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CX.php b/src/data/ShortNumberMetadata_CX.php
index c17acbdc3..c3c109e88 100644
--- a/src/data/ShortNumberMetadata_CX.php
+++ b/src/data/ShortNumberMetadata_CX.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[01]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'CX',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[01]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '000|112',
-    'ExampleNumber' => '000',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '000|112',
+        'example' => '000',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '000|112',
-    'ExampleNumber' => '000',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '000|112',
-    'ExampleNumber' => '000',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '000|112',
+        'example' => '000',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '000|112',
+        'example' => '000',
     ],
-  ],
-  'id' => 'CX',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CY.php b/src/data/ShortNumberMetadata_CY.php
index 50943e945..f43fe6533 100644
--- a/src/data/ShortNumberMetadata_CY.php
+++ b/src/data/ShortNumberMetadata_CY.php
@@ -6,70 +6,51 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d{3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+return [
+    'id' => 'CY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d{3})?',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6\\d{3})|99)',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:2|6\\d{3})|99)',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|99)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:000|111))|99)',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|99)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6(?:000|111))|99)',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_CZ.php b/src/data/ShortNumberMetadata_CZ.php
index 5f0de26a4..0e62b9488 100644
--- a/src/data/ShortNumberMetadata_CZ.php
+++ b/src/data/ShortNumberMetadata_CZ.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'CZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:11|23)))|5\\d)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:2|6(?:00[06]|1(?:11|23)))|5\\d)',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|5\\d)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|5\\d)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|8\\d)|(?:2|3\\d)\\d{2,3}|5\\d|99)|1(?:16|4)\\d{3}',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|8\\d)|(?:2|3\\d)\\d{2,3}|5\\d|99)|1(?:16|4)\\d{3}',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_DE.php b/src/data/ShortNumberMetadata_DE.php
index 6cd5e9cee..5e6bbba86 100644
--- a/src/data/ShortNumberMetadata_DE.php
+++ b/src/data/ShortNumberMetadata_DE.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'DE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:[02]|6\\d{3})',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:[02]|6\\d{3})',
+        'example' => '110',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[02]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[02]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11(?:[025]|6(?:00[06]|1(?:1[167]|23))|800\\d)|118\\d\\d',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11(?:[025]|6(?:00[06]|1(?:1[167]|23))|800\\d)|118\\d\\d',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'DE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_DJ.php b/src/data/ShortNumberMetadata_DJ.php
index 64c03735c..a4d2c3661 100644
--- a/src/data/ShortNumberMetadata_DJ.php
+++ b/src/data/ShortNumberMetadata_DJ.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'DJ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'id' => 'DJ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_DK.php b/src/data/ShortNumberMetadata_DK.php
index 52f3c9a0f..35b3f5b5d 100644
--- a/src/data/ShortNumberMetadata_DK.php
+++ b/src/data/ShortNumberMetadata_DK.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'DK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:[24]|6\\d{3})',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:[24]|6\\d{3})',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[24]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[24]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[2-48]|6(?:00[06]|111))|619[0-2]|8(?:01|1[0238]|28|30|5[13]|8[18]))',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:[2-48]|6(?:00[06]|111))|619[0-2]|8(?:01|1[0238]|28|30|5[13]|8[18]))',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'DK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_DM.php b/src/data/ShortNumberMetadata_DM.php
index ca1c02afb..0b10fa40b 100644
--- a/src/data/ShortNumberMetadata_DM.php
+++ b/src/data/ShortNumberMetadata_DM.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[39]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'DM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[39]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '333|9(?:11|88|99)',
-    'ExampleNumber' => '333',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '333|9(?:11|88|99)',
+        'example' => '333',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '333|9(?:11|99)',
-    'ExampleNumber' => '333',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '333|9(?:11|88|99)',
-    'ExampleNumber' => '333',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '333|9(?:11|99)',
+        'example' => '333',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '333|9(?:11|88|99)',
+        'example' => '333',
     ],
-  ],
-  'id' => 'DM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_DO.php b/src/data/ShortNumberMetadata_DO.php
index a39a3e948..f4078aad7 100644
--- a/src/data/ShortNumberMetadata_DO.php
+++ b/src/data/ShortNumberMetadata_DO.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'DO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|9(?:11|88)',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '112|9(?:11|88)',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '112|9(?:11|88)',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112|911',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '112|9(?:11|88)',
+        'example' => '112',
     ],
-  ],
-  'id' => 'DO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_DZ.php b/src/data/ShortNumberMetadata_DZ.php
index 1ea1ed93a..dd31ac2b5 100644
--- a/src/data/ShortNumberMetadata_DZ.php
+++ b/src/data/ShortNumberMetadata_DZ.php
@@ -6,76 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[17]\\d{1,3}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
+return [
+    'id' => 'DZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[17]\\d{1,3}',
+        'posLength' => [
+            2,
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[47]|54\\d)',
-    'ExampleNumber' => '14',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|[47]|54\\d)',
+        'example' => '14',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[47])',
-    'ExampleNumber' => '14',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:055|12|[47]|548)|730',
-    'ExampleNumber' => '14',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|[47])',
+        'example' => '14',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '730',
-    'ExampleNumber' => '730',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'shortCode' => [
+        'pattern' => '1(?:055|12|[47]|548)|730',
+        'example' => '14',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '730',
-    'ExampleNumber' => '730',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'DZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '730',
+        'example' => '730',
+        'posLength' => [
+            3,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '730',
+        'example' => '730',
+        'posLength' => [
+            3,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_EC.php b/src/data/ShortNumberMetadata_EC.php
index 3a4e4c0f8..5024cadce 100644
--- a/src/data/ShortNumberMetadata_EC.php
+++ b/src/data/ShortNumberMetadata_EC.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'EC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[12]|12)|911',
-    'ExampleNumber' => '101',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:0[12]|12)|911',
+        'example' => '101',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[12]|12)|911',
-    'ExampleNumber' => '101',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[12]|12)|911',
-    'ExampleNumber' => '101',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:0[12]|12)|911',
+        'example' => '101',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[12]|12)|911',
+        'example' => '101',
     ],
-  ],
-  'id' => 'EC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_EE.php b/src/data/ShortNumberMetadata_EE.php
index 4553e17ee..b35ca9f63 100644
--- a/src/data/ShortNumberMetadata_EE.php
+++ b/src/data/ShortNumberMetadata_EE.php
@@ -6,80 +6,61 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'EE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[02]|6\\d{3})|2(?:05|28)|3(?:014|3(?:21|5\\d?)|660)|492|5(?:1[03]|410|501)|6(?:112|333|644)|7(?:012|127|89)|8(?:10|8[57])|9(?:0[134]|14))',
-    'ExampleNumber' => '110',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1(?:18(?:00|[12458]\\d?)|2(?:0(?:[02-46-8]\\d?|1[0-36])|1(?:[0-4]\\d?|6[06])|2(?:[0-4]\\d?|5[25])|[367]|4(?:0[04]|[12]\\d?|4[24]|54)|55[12457])|3(?:0(?:[02]\\d?|1[13578]|3[356])|1[1347]|2[02-5]|3(?:[01347]\\d?|2[023]|88)|4(?:[35]\\d?|4[34])|5(?:3[134]|5[035])|666)|4(?:2(?:00|4\\d?)|4(?:0[01358]|1[024]|50|7\\d?)|900)|5(?:0[0-35]|1(?:[1267]\\d?|5[0-7]|82)|2(?:[014-6]\\d?|22)|330|4(?:[35]\\d?|44)|5(?:00|[1-69]\\d?)|9(?:[159]\\d?|[38]0|77))|6(?:1(?:00|1[19]|[35-9]\\d?)|2(?:2[26]|[68]\\d?)|3(?:22|36|6[36])|5|6(?:[0-359]\\d?|6[0-26])|7(?:00|55|7\\d?|8[89])|9(?:00|1\\d?|69))|7(?:0(?:[023]\\d?|1[0578])|1(?:00|2[034]|[4-9]\\d?)|2(?:[07]\\d?|20|44)|7(?:[0-57]\\d?|9[79])|8(?:0[08]|2\\d?|8[0178])|9(?:00|97))|8(?:1[127]|8[1268]|9[269])|9(?:0(?:[02]\\d?|69|9[0269])|1[1-3689]|21))',
-    'ExampleNumber' => '123',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:[02]|6\\d{3})|2(?:05|28)|3(?:014|3(?:21|5\\d?)|660)|492|5(?:1[03]|410|501)|6(?:112|333|644)|7(?:012|127|89)|8(?:10|8[57])|9(?:0[134]|14))',
+        'example' => '110',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[02]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'pattern' => '1(?:18(?:00|[12458]\\d?)|2(?:0(?:[02-46-8]\\d?|1[0-36])|1(?:[0-4]\\d?|6[06])|2(?:[0-4]\\d?|5[25])|[367]|4(?:0[04]|[12]\\d?|4[24]|54)|55[12457])|3(?:0(?:[02]\\d?|1[13578]|3[356])|1[1347]|2[02-5]|3(?:[01347]\\d?|2[023]|88)|4(?:[35]\\d?|4[34])|5(?:3[134]|5[035])|666)|4(?:2(?:00|4\\d?)|4(?:0[01358]|1[024]|50|7\\d?)|900)|5(?:0[0-35]|1(?:[1267]\\d?|5[0-7]|82)|2(?:[014-6]\\d?|22)|330|4(?:[35]\\d?|44)|5(?:00|[1-69]\\d?)|9(?:[159]\\d?|[38]0|77))|6(?:1(?:00|1[19]|[35-9]\\d?)|2(?:2[26]|[68]\\d?)|3(?:22|36|6[36])|5|6(?:[0-359]\\d?|6[0-26])|7(?:00|55|7\\d?|8[89])|9(?:00|1\\d?|69))|7(?:0(?:[023]\\d?|1[0578])|1(?:00|2[034]|[4-9]\\d?)|2(?:[07]\\d?|20|44)|7(?:[0-57]\\d?|9[79])|8(?:0[08]|2\\d?|8[0178])|9(?:00|97))|8(?:1[127]|8[1268]|9[269])|9(?:0(?:[02]\\d?|69|9[0269])|1[1-3689]|21))',
+        'example' => '123',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[02-579]|6(?:000|111)|8(?:[09]\\d|[1-8]))|2[36-9]|3[7-9]|4[05-7]|5[6-8]|6[05]|7[3-6]|8[02-7]|9[3-9])|1(?:2[0-245]|3[0-6]|4[1-489]|5[0-59]|6[1-46-9]|7[0-27-9]|8[189]|9[0-2])\\d\\d?',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[02]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:[02-579]|6(?:000|111)|8(?:[09]\\d|[1-8]))|2[36-9]|3[7-9]|4[05-7]|5[6-8]|6[05]|7[3-6]|8[02-7]|9[3-9])|1(?:2[0-245]|3[0-6]|4[1-489]|5[0-59]|6[1-46-9]|7[0-27-9]|8[189]|9[0-2])\\d\\d?',
+        'example' => '110',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '1(?:18[1258]|2(?:0(?:1[036]|[46]\\d?)|166|21|4(?:0[04]|1\\d?|5[47])|[67])|3(?:0(?:1[13-578]|2\\d?|3[56])|1[15]|2[045]|3(?:[13]\\d?|2[13])|43|5(?:00|3[34]|53))|44(?:0[0135]|14|50|7\\d?)|5(?:05|1(?:[12]\\d?|5[1246]|8[12])|2(?:[01]\\d?|22)|3(?:00|3[03])|4(?:15|5\\d?)|500|9(?:5\\d?|77|80))|6(?:1[35-8]|226|3(?:22|3[36]|66)|644|7(?:00|7\\d?|89)|9(?:00|69))|7(?:01[258]|1(?:00|[15]\\d?)|2(?:44|7\\d?)|8(?:00|87|9\\d?))|8(?:1[128]|8[56]|9(?:[26]\\d?|77))|90(?:2\\d?|69|92))',
-    'ExampleNumber' => '126',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'EE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '1(?:18[1258]|2(?:0(?:1[036]|[46]\\d?)|166|21|4(?:0[04]|1\\d?|5[47])|[67])|3(?:0(?:1[13-578]|2\\d?|3[56])|1[15]|2[045]|3(?:[13]\\d?|2[13])|43|5(?:00|3[34]|53))|44(?:0[0135]|14|50|7\\d?)|5(?:05|1(?:[12]\\d?|5[1246]|8[12])|2(?:[01]\\d?|22)|3(?:00|3[03])|4(?:15|5\\d?)|500|9(?:5\\d?|77|80))|6(?:1[35-8]|226|3(?:22|3[36]|66)|644|7(?:00|7\\d?|89)|9(?:00|69))|7(?:01[258]|1(?:00|[15]\\d?)|2(?:44|7\\d?)|8(?:00|87|9\\d?))|8(?:1[128]|8[56]|9(?:[26]\\d?|77))|90(?:2\\d?|69|92))',
+        'example' => '126',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_EG.php b/src/data/ShortNumberMetadata_EG.php
index a79af2bf6..403e41331 100644
--- a/src/data/ShortNumberMetadata_EG.php
+++ b/src/data/ShortNumberMetadata_EG.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[13]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'EG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[13]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:2[23]|80)',
-    'ExampleNumber' => '122',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:2[23]|80)',
+        'example' => '122',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:2[23]|80)',
-    'ExampleNumber' => '122',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:2[23]|80)',
+        'example' => '122',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:2[23]|[679]\\d{3}|80)|34400',
-    'ExampleNumber' => '122',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:2[23]|[679]\\d{3}|80)|34400',
+        'example' => '122',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '344\\d\\d',
-    'ExampleNumber' => '34400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '344\\d\\d',
-    'ExampleNumber' => '34400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '344\\d\\d',
+        'example' => '34400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'EG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '344\\d\\d',
+        'example' => '34400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_EH.php b/src/data/ShortNumberMetadata_EH.php
index 712581bc8..fd4ab52d2 100644
--- a/src/data/ShortNumberMetadata_EH.php
+++ b/src/data/ShortNumberMetadata_EH.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'EH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:[59]|77)',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:[59]|77)',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:[59]|77)',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:[59]|77)',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:[59]|77)',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:[59]|77)',
+        'example' => '15',
     ],
-  ],
-  'id' => 'EH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ER.php b/src/data/ShortNumberMetadata_ER.php
index 2f962ecc2..05a6aa710 100644
--- a/src/data/ShortNumberMetadata_ER.php
+++ b/src/data/ShortNumberMetadata_ER.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[12]\\d\\d(?:\\d{3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+return [
+    'id' => 'ER',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[12]\\d\\d(?:\\d{3})?',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[2-46]|(?:12[47]|20[12])\\d{3}',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[2-46]|(?:12[47]|20[12])\\d{3}',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[2-46]|24422)|20(?:1(?:606|917)|2914)|(?:1277|2020)99',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[2-6]|24422)|20(?:1(?:606|917)|2914)|(?:1277|2020)99',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:1[2-46]|24422)|20(?:1(?:606|917)|2914)|(?:1277|2020)99',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[2-6]|24422)|20(?:1(?:606|917)|2914)|(?:1277|2020)99',
+        'example' => '112',
     ],
-  ],
-  'id' => 'ER',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ES.php b/src/data/ShortNumberMetadata_ES.php
index 24ea6d942..1a5ca9b03 100644
--- a/src/data/ShortNumberMetadata_ES.php
+++ b/src/data/ShortNumberMetadata_ES.php
@@ -6,80 +6,62 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[0-379]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'ES',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[0-379]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0(?:16|6[57]|8[58])|1(?:006|12|[3-7]\\d\\d)|(?:116|20\\d)\\d{3}',
-    'ExampleNumber' => '016',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+    'tollFree' => [
+        'pattern' => '0(?:16|6[57]|8[58])|1(?:006|12|[3-7]\\d\\d)|(?:116|20\\d)\\d{3}',
+        'example' => '016',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '[12]2\\d{1,4}|90(?:5\\d|7)|(?:118|2(?:[357]\\d|80)|3[357]\\d)\\d\\d|[79]9[57]\\d{3}',
-    'ExampleNumber' => '120',
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '08[58]|112',
-    'ExampleNumber' => '085',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'pattern' => '[12]2\\d{1,4}|90(?:5\\d|7)|(?:118|2(?:[357]\\d|80)|3[357]\\d)\\d\\d|[79]9[57]\\d{3}',
+        'example' => '120',
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0(?:1[0-26]|6[0-257]|8[058]|9[12])|1(?:0[03-57]\\d{1,3}|1(?:2|6(?:000|111)|8\\d\\d)|2\\d{1,4}|[3-9]\\d\\d)|2(?:2\\d{1,4}|80\\d\\d)|90(?:5[124578]|7)|1(?:3[34]|77)|(?:2[01]\\d|[79]9[57])\\d{3}|[23][357]\\d{3}',
-    'ExampleNumber' => '010',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '0(?:[16][0-2]|80|9[12])|21\\d{4}',
-    'ExampleNumber' => '010',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'emergency' => [
+        'pattern' => '08[58]|112',
+        'example' => '085',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:3[34]|77)|[12]2\\d{1,4}',
-    'ExampleNumber' => '120',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:2[0-2]\\d|3[357]|[79]9[57])\\d{3}|2(?:[2357]\\d|80)\\d\\d',
-    'ExampleNumber' => '22000',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
+    'shortCode' => [
+        'pattern' => '0(?:1[0-26]|6[0-257]|8[058]|9[12])|1(?:0[03-57]\\d{1,3}|1(?:2|6(?:000|111)|8\\d\\d)|2\\d{1,4}|[3-9]\\d\\d)|2(?:2\\d{1,4}|80\\d\\d)|90(?:5[124578]|7)|1(?:3[34]|77)|(?:2[01]\\d|[79]9[57])\\d{3}|[23][357]\\d{3}',
+        'example' => '010',
     ],
-  ],
-  'id' => 'ES',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'pattern' => '0(?:[16][0-2]|80|9[12])|21\\d{4}',
+        'example' => '010',
+        'posLength' => [
+            3,
+            6,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '1(?:3[34]|77)|[12]2\\d{1,4}',
+        'example' => '120',
+    ],
+    'smsServices' => [
+        'pattern' => '(?:2[0-2]\\d|3[357]|[79]9[57])\\d{3}|2(?:[2357]\\d|80)\\d\\d',
+        'example' => '22000',
+        'posLength' => [
+            5,
+            6,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ET.php b/src/data/ShortNumberMetadata_ET.php
index a3d38f1b6..843f747c4 100644
--- a/src/data/ShortNumberMetadata_ET.php
+++ b/src/data/ShortNumberMetadata_ET.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'ET',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:07|11?|2|39?|9[17])',
-    'ExampleNumber' => '91',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:07|11?|2|39?|9[17])',
+        'example' => '91',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11?|2|39?|9[17])',
-    'ExampleNumber' => '91',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:07|11?|2|39?|45|9[17])',
-    'ExampleNumber' => '91',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11?|2|39?|9[17])',
+        'example' => '91',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:07|11?|2|39?|45|9[17])',
+        'example' => '91',
     ],
-  ],
-  'id' => 'ET',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_FI.php b/src/data/ShortNumberMetadata_FI.php
index 2de13f8f6..4b84d8dad 100644
--- a/src/data/ShortNumberMetadata_FI.php
+++ b/src/data/ShortNumberMetadata_FI.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[17]\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'FI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[17]\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6\\d{3})',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:2|6\\d{3})',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6(?:00[06]|1(?:1[17]|23)))|75[12]\\d\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11(?:2|6(?:00[06]|1(?:1[17]|23)))|75[12]\\d\\d',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'FI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_FJ.php b/src/data/ShortNumberMetadata_FJ.php
index 830f6c720..8599a0962 100644
--- a/src/data/ShortNumberMetadata_FJ.php
+++ b/src/data/ShortNumberMetadata_FJ.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[0-579]\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 5,
+return [
+    'id' => 'FJ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[0-579]\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            2,
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '91[17]',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '91[17]',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '91[17]',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '91[17]',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0(?:1[34]|8[1-4])|1(?:0[1-3]|[25]9)|2[289]|30|40404|91[137]|[45]4|75',
-    'ExampleNumber' => '22',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '0(?:1[34]|8[1-4])|1(?:0[1-3]|[25]9)|2[289]|30|40404|91[137]|[45]4|75',
+        'example' => '22',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'FJ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_FK.php b/src/data/ShortNumberMetadata_FK.php
index ae02e1baa..cc69ab078 100644
--- a/src/data/ShortNumberMetadata_FK.php
+++ b/src/data/ShortNumberMetadata_FK.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'FK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d|999',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1\\d\\d|999',
+        'example' => '100',
     ],
-  ],
-  'id' => 'FK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_FM.php b/src/data/ShortNumberMetadata_FM.php
index 413ed872d..af9ba89e8 100644
--- a/src/data/ShortNumberMetadata_FM.php
+++ b/src/data/ShortNumberMetadata_FM.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[39]\\d\\d(?:\\d{3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+return [
+    'id' => 'FM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[39]\\d\\d(?:\\d{3})?',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '320\\d{3}|911',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '320\\d{3}|911',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '(?:32022|91)1',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '(?:32022|91)1',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '(?:32022|91)1',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '(?:32022|91)1',
+        'example' => '911',
     ],
-  ],
-  'id' => 'FM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_FO.php b/src/data/ShortNumberMetadata_FO.php
index 6bdc4f214..cfe25ebaf 100644
--- a/src/data/ShortNumberMetadata_FO.php
+++ b/src/data/ShortNumberMetadata_FO.php
@@ -6,70 +6,51 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'FO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[24]|81\\d)',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:1[24]|81\\d)',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[24]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[248]|819)|1(?:4[124]|71|8[7-9])\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[24]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[248]|819)|1(?:4[124]|71|8[7-9])\\d',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'FO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_FR.php b/src/data/ShortNumberMetadata_FR.php
index 6219af255..46f5bbe3e 100644
--- a/src/data/ShortNumberMetadata_FR.php
+++ b/src/data/ShortNumberMetadata_FR.php
@@ -6,89 +6,70 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-8]\\d{1,5}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
-      3 => 5,
-      4 => 6,
+return [
+    'id' => 'FR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-8]\\d{1,5}',
+        'posLength' => [
+            2,
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:07|[13]3)|1[02459]|[578]|9[167])|224|(?:3370|74)0|(?:116\\d|3[01])\\d\\d',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '366\\d\\d|3[2-9]\\d\\d|(?:118|[4-8]\\d)\\d{3}',
-    'ExampleNumber' => '3200',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:0(?:07|[13]3)|1[02459]|[578]|9[167])|224|(?:3370|74)0|(?:116\\d|3[01])\\d\\d',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'premiumRate' => [
+        'pattern' => '366\\d\\d|3[2-9]\\d\\d|(?:118|[4-8]\\d)\\d{3}',
+        'example' => '3200',
+        'posLength' => [
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0\\d\\d|1(?:[02459]|6(?:000|111)|8\\d{3})|[578]|9[167])|2(?:0(?:00|2)0|24)|[3-8]\\d{4}|3\\d{3}|6(?:1[14]|34)|7(?:0[06]|22|40)',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '10(?:[134]4|2[23]|5\\d|99)|202\\d|634|70[06]|(?:106|61)[14]',
-    'ExampleNumber' => '611',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'emergency' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '118777|224|6(?:1[14]|34)|7(?:0[06]|22|40)|20(?:0\\d|2)\\d',
-    'ExampleNumber' => '224',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+    'shortCode' => [
+        'pattern' => '1(?:0\\d\\d|1(?:[02459]|6(?:000|111)|8\\d{3})|[578]|9[167])|2(?:0(?:00|2)0|24)|[3-8]\\d{4}|3\\d{3}|6(?:1[14]|34)|7(?:0[06]|22|40)',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '114|[3-8]\\d{4}',
-    'ExampleNumber' => '114',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'standardRate' => [
+        'pattern' => '10(?:[134]4|2[23]|5\\d|99)|202\\d|634|70[06]|(?:106|61)[14]',
+        'example' => '611',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'id' => 'FR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '118777|224|6(?:1[14]|34)|7(?:0[06]|22|40)|20(?:0\\d|2)\\d',
+        'example' => '224',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '114|[3-8]\\d{4}',
+        'example' => '114',
+        'posLength' => [
+            3,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GA.php b/src/data/ShortNumberMetadata_GA.php
index 03cc702d1..47eb9755f 100644
--- a/src/data/ShortNumberMetadata_GA.php
+++ b/src/data/ShortNumberMetadata_GA.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 4,
+return [
+    'id' => 'GA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d(?:\\d{2})?',
+        'posLength' => [
+            2,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '18|1(?:3\\d|73)\\d',
-    'ExampleNumber' => '18',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '18|1(?:3\\d|73)\\d',
+        'example' => '18',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:3\\d\\d|730|8)',
-    'ExampleNumber' => '18',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:3\\d\\d|730|8)',
-    'ExampleNumber' => '18',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:3\\d\\d|730|8)',
+        'example' => '18',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:3\\d\\d|730|8)',
+        'example' => '18',
     ],
-  ],
-  'id' => 'GA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GB.php b/src/data/ShortNumberMetadata_GB.php
index 85687ab39..d6a38709e 100644
--- a/src/data/ShortNumberMetadata_GB.php
+++ b/src/data/ShortNumberMetadata_GB.php
@@ -6,79 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-46-9]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'GB',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-46-9]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:05|1(?:[29]|6\\d{3})|7[56]\\d|8000)|2(?:20\\d|48)|4444|999',
-    'ExampleNumber' => '105',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:05|1(?:[29]|6\\d{3})|7[56]\\d|8000)|2(?:20\\d|48)|4444|999',
+        'example' => '105',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[015]|1(?:[129]|6(?:000|1(?:11|23))|8\\d{3})|2(?:[1-3]|50)|33|4(?:1|7\\d)|571|7(?:0\\d|[56]0)|800\\d|9[15])|2(?:0202|1300|2(?:02|11)|3(?:02|336|45)|4(?:25|8))|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|(?:[68]\\d|7[089])\\d{3}|15\\d|2[02]2|650|789|9(?:01|99)',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:(?:25|7[56])\\d|571)|2(?:02(?:\\d{2})?|[13]3\\d\\d|48)|4444|901',
-    'ExampleNumber' => '202',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+    'shortCode' => [
+        'pattern' => '1(?:0[015]|1(?:[129]|6(?:000|1(?:11|23))|8\\d{3})|2(?:[1-3]|50)|33|4(?:1|7\\d)|571|7(?:0\\d|[56]0)|800\\d|9[15])|2(?:0202|1300|2(?:02|11)|3(?:02|336|45)|4(?:25|8))|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|(?:[68]\\d|7[089])\\d{3}|15\\d|2[02]2|650|789|9(?:01|99)',
+        'example' => '100',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:125|2(?:020|13\\d)|(?:7[089]|8[01])\\d\\d)\\d',
-    'ExampleNumber' => '1250',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GB',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '1(?:(?:25|7[56])\\d|571)|2(?:02(?:\\d{2})?|[13]3\\d\\d|48)|4444|901',
+        'example' => '202',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '(?:125|2(?:020|13\\d)|(?:7[089]|8[01])\\d\\d)\\d',
+        'example' => '1250',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GD.php b/src/data/ShortNumberMetadata_GD.php
index 7ec1cdf02..b13923dc2 100644
--- a/src/data/ShortNumberMetadata_GD.php
+++ b/src/data/ShortNumberMetadata_GD.php
@@ -6,61 +6,45 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'GD',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '176|9(?:11|88)',
-    'ExampleNumber' => '176',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'id' => 'GD',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
+    ],
+    'shortCode' => [
+        'pattern' => '176|9(?:11|88)',
+        'example' => '176',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'smsServices' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GE.php b/src/data/ShortNumberMetadata_GE.php
index 6051599b0..3e5fd6f3e 100644
--- a/src/data/ShortNumberMetadata_GE.php
+++ b/src/data/ShortNumberMetadata_GE.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[014]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'GE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[014]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0(?:11|33)|11[1-3]|[01]22',
-    'ExampleNumber' => '011',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '0(?:11|33)|11[1-3]|[01]22',
+        'example' => '011',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '0(?:11|33)|11[1-3]|[01]22',
-    'ExampleNumber' => '011',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '0(?:11|33)|11[1-3]|[01]22',
+        'example' => '011',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0(?:11|33)|11[1-3]|40404|[01]22',
-    'ExampleNumber' => '011',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '0(?:11|33)|11[1-3]|40404|[01]22',
+        'example' => '011',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'GE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GF.php b/src/data/ShortNumberMetadata_GF.php
index 316be7d3d..dcba58eb1 100644
--- a/src/data/ShortNumberMetadata_GF.php
+++ b/src/data/ShortNumberMetadata_GF.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'GF',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'id' => 'GF',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GG.php b/src/data/ShortNumberMetadata_GG.php
index 3058df818..ae1c8e24c 100644
--- a/src/data/ShortNumberMetadata_GG.php
+++ b/src/data/ShortNumberMetadata_GG.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'GG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[01]|1[12]|23|41|55|9[05])|999|1(?:1[68]\\d\\d|47|800)\\d',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[01]|1[12]|23|41|55|9[05])|999|1(?:1[68]\\d\\d|47|800)\\d',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GH.php b/src/data/ShortNumberMetadata_GH.php
index 55f88a3d6..42f707bb0 100644
--- a/src/data/ShortNumberMetadata_GH.php
+++ b/src/data/ShortNumberMetadata_GH.php
@@ -6,81 +6,61 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14589]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'GH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14589]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '19[1-3]|999',
-    'ExampleNumber' => '191',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '19[1-3]|999',
+        'example' => '191',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '19[1-3]|999',
-    'ExampleNumber' => '191',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '19[1-3]|999',
+        'example' => '191',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '19[1-3]|40404|(?:54|83)00|999',
-    'ExampleNumber' => '191',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '19[1-3]|40404|(?:54|83)00|999',
+        'example' => '191',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d|(?:54|83)0\\d',
-    'ExampleNumber' => '5400',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d|(?:54|83)0\\d',
-    'ExampleNumber' => '5400',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d|(?:54|83)0\\d',
+        'example' => '5400',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'id' => 'GH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d|(?:54|83)0\\d',
+        'example' => '5400',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GI.php b/src/data/ShortNumberMetadata_GI.php
index 61d5e95dd..a2905df59 100644
--- a/src/data/ShortNumberMetadata_GI.php
+++ b/src/data/ShortNumberMetadata_GI.php
@@ -6,86 +6,66 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[158]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'GI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[158]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:00|1[25]|23|4(?:1|7\\d)|5[15]|9[02-49])|555|(?:116\\d|80)\\d\\d',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:00|1[25]|23|4(?:1|7\\d)|5[15]|9[02-49])|555|(?:116\\d|80)\\d\\d',
+        'example' => '100',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '8[1-69]\\d\\d',
-    'ExampleNumber' => '8100',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'premiumRate' => [
+        'pattern' => '8[1-69]\\d\\d',
+        'example' => '8100',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|9[09])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|9[09])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:00|1(?:[25]|6(?:00[06]|1(?:1[17]|23))|8\\d\\d)|23|4(?:1|7[014])|5[015]|9[02-49])|555|8[0-79]\\d\\d|8(?:00|4[0-2]|8[0-589])',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '150|87\\d\\d',
-    'ExampleNumber' => '150',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'shortCode' => [
+        'pattern' => '1(?:00|1(?:[25]|6(?:00[06]|1(?:1[17]|23))|8\\d\\d)|23|4(?:1|7[014])|5[015]|9[02-49])|555|8[0-79]\\d\\d|8(?:00|4[0-2]|8[0-589])',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:00|1(?:5|8\\d\\d)|23|51|9[2-4])|555|8(?:00|4[0-2]|8[0-589])',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'standardRate' => [
+        'pattern' => '150|87\\d\\d',
+        'example' => '150',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '1(?:00|1(?:5|8\\d\\d)|23|51|9[2-4])|555|8(?:00|4[0-2]|8[0-589])',
+        'example' => '100',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'id' => 'GI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GL.php b/src/data/ShortNumberMetadata_GL.php
index f35d90e3b..95a6011e6 100644
--- a/src/data/ShortNumberMetadata_GL.php
+++ b/src/data/ShortNumberMetadata_GL.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'GL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '112',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[1-8]\\d',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[1-8]\\d',
+        'example' => '110',
     ],
-  ],
-  'id' => 'GL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GM.php b/src/data/ShortNumberMetadata_GM.php
index 05a4d96ce..184bfd66d 100644
--- a/src/data/ShortNumberMetadata_GM.php
+++ b/src/data/ShortNumberMetadata_GM.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'GM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[6-8]|[6-8])',
-    'ExampleNumber' => '16',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:1[6-8]|[6-8])',
+        'example' => '16',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[6-8]|[6-8])',
-    'ExampleNumber' => '16',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[6-8]|[6-8])',
-    'ExampleNumber' => '16',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:1[6-8]|[6-8])',
+        'example' => '16',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[6-8]|[6-8])',
+        'example' => '16',
     ],
-  ],
-  'id' => 'GM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GN.php b/src/data/ShortNumberMetadata_GN.php
index 45cc4ac60..45b69341d 100644
--- a/src/data/ShortNumberMetadata_GN.php
+++ b/src/data/ShortNumberMetadata_GN.php
@@ -6,74 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'GN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '12\\d|40404',
-    'ExampleNumber' => '120',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '12\\d|40404',
+        'example' => '120',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'GN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GP.php b/src/data/ShortNumberMetadata_GP.php
index 529825559..7c63d433f 100644
--- a/src/data/ShortNumberMetadata_GP.php
+++ b/src/data/ShortNumberMetadata_GP.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'GP',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'id' => 'GP',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GR.php b/src/data/ShortNumberMetadata_GR.php
index bc716d2a1..cab07f68f 100644
--- a/src/data/ShortNumberMetadata_GR.php
+++ b/src/data/ShortNumberMetadata_GR.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'GR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[089]|1(?:2|6\\d{3})|66|99)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:0[089]|1(?:2|6\\d{3})|66|99)',
+        'example' => '100',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:00|12|66|99)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:00|12|66|99)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[089]|1(?:2|320|6(?:000|1(?:1[17]|23)))|(?:389|9)9|66)',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '113\\d\\d',
-    'ExampleNumber' => '11300',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'shortCode' => [
+        'pattern' => '1(?:0[089]|1(?:2|320|6(?:000|1(?:1[17]|23)))|(?:389|9)9|66)',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'pattern' => '113\\d\\d',
+        'example' => '11300',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'GR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GT.php b/src/data/ShortNumberMetadata_GT.php
index c97aa4666..8295d3978 100644
--- a/src/data/ShortNumberMetadata_GT.php
+++ b/src/data/ShortNumberMetadata_GT.php
@@ -6,79 +6,59 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'GT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:10|2[03])',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:10|2[03])',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:10|2[03])',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:10|2[03])',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '110|40404|1(?:2|[57]\\d)\\d',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '110|40404|1(?:2|[57]\\d)\\d',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'GT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GU.php b/src/data/ShortNumberMetadata_GU.php
index a4ac591b2..fc0681a1f 100644
--- a/src/data/ShortNumberMetadata_GU.php
+++ b/src/data/ShortNumberMetadata_GU.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'GU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'GU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GW.php b/src/data/ShortNumberMetadata_GW.php
index 86e2be8a3..a4d493207 100644
--- a/src/data/ShortNumberMetadata_GW.php
+++ b/src/data/ShortNumberMetadata_GW.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'GW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[378]',
-    'ExampleNumber' => '113',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[378]',
+        'example' => '113',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[378]',
-    'ExampleNumber' => '113',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[378]',
-    'ExampleNumber' => '113',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[378]',
+        'example' => '113',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[378]',
+        'example' => '113',
     ],
-  ],
-  'id' => 'GW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_GY.php b/src/data/ShortNumberMetadata_GY.php
index 058ed5c50..17409e365 100644
--- a/src/data/ShortNumberMetadata_GY.php
+++ b/src/data/ShortNumberMetadata_GY.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[019]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'GY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[019]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '91[1-3]',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '91[1-3]',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '91[1-3]',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '91[1-3]',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0(?:02|(?:17|80)1|444|7(?:[67]7|9)|9(?:0[78]|[2-47]))|1(?:443|5[568])|91[1-3]',
-    'ExampleNumber' => '002',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '0(?:02|(?:17|80)1|444|7(?:[67]7|9)|9(?:0[78]|[2-47]))|1(?:443|5[568])|91[1-3]',
+        'example' => '002',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '144\\d',
-    'ExampleNumber' => '1440',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '144\\d',
-    'ExampleNumber' => '1440',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '144\\d',
+        'example' => '1440',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'GY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '144\\d',
+        'example' => '1440',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_HK.php b/src/data/ShortNumberMetadata_HK.php
index c2bf7dd98..19a456c34 100644
--- a/src/data/ShortNumberMetadata_HK.php
+++ b/src/data/ShortNumberMetadata_HK.php
@@ -6,83 +6,63 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{2,6}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
-      4 => 7,
+return [
+    'id' => 'HK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{2,6}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|99[29]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|99[29]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|99[29]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|99[29]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:(?:[0136]\\d|2[14])\\d{0,3}|8[138])|12|2(?:[0-3]\\d{0,4}|(?:58|8[13])\\d{0,3})|7(?:[135-9]\\d{0,4}|219\\d{0,2})|8(?:0(?:(?:[13]|60\\d)\\d|8)|1(?:0\\d|[2-8])|2(?:0[5-9]|(?:18|2)2|3|8[128])|(?:(?:3[0-689]\\d|7(?:2[1-389]|8[0235-9]|93))\\d|8)\\d|50[138]|6(?:1(?:11|86)|8)))|99[29]|10[0139]',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:(?:[0136]\\d|2[14])\\d{0,3}|8[138])|12|2(?:[0-3]\\d{0,4}|(?:58|8[13])\\d{0,3})|7(?:[135-9]\\d{0,4}|219\\d{0,2})|8(?:0(?:(?:[13]|60\\d)\\d|8)|1(?:0\\d|[2-8])|2(?:0[5-9]|(?:18|2)2|3|8[128])|(?:(?:3[0-689]\\d|7(?:2[1-389]|8[0235-9]|93))\\d|8)\\d|50[138]|6(?:1(?:11|86)|8)))|99[29]|10[0139]',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '109|1(?:08|85\\d)\\d',
-    'ExampleNumber' => '109',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '992',
-    'ExampleNumber' => '992',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'carrierSpecific' => [
+        'pattern' => '109|1(?:08|85\\d)\\d',
+        'example' => '109',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'id' => 'HK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '992',
+        'example' => '992',
+        'posLength' => [
+            3,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_HN.php b/src/data/ShortNumberMetadata_HN.php
index 6d15be801..c8d9c08fb 100644
--- a/src/data/ShortNumberMetadata_HN.php
+++ b/src/data/ShortNumberMetadata_HN.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'HN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '199',
-    'ExampleNumber' => '199',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '199',
+        'example' => '199',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '199',
-    'ExampleNumber' => '199',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '199',
+        'example' => '199',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '199|40404',
-    'ExampleNumber' => '199',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '199|40404',
+        'example' => '199',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'HN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_HR.php b/src/data/ShortNumberMetadata_HR.php
index e8f5b885e..79f62f632 100644
--- a/src/data/ShortNumberMetadata_HR.php
+++ b/src/data/ShortNumberMetadata_HR.php
@@ -6,87 +6,67 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{1,5}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
-      3 => 5,
-      4 => 6,
+return [
+    'id' => 'HR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{1,5}',
+        'posLength' => [
+            2,
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|9[2-4])|9[34]|1(?:16\\d|39)\\d\\d',
-    'ExampleNumber' => '93',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 5,
-      3 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:12|9[2-4])|9[34]|1(?:16\\d|39)\\d\\d',
+        'example' => '93',
+        'posLength' => [
+            2,
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '118\\d\\d',
-    'ExampleNumber' => '11800',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'premiumRate' => [
+        'pattern' => '118\\d\\d',
+        'example' => '11800',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|9[2-4])|9[34]',
-    'ExampleNumber' => '93',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|9[2-4])|9[34]',
+        'example' => '93',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:1[17]|23))|8\\d\\d)|3977|9(?:[2-5]|87))|9[34]',
-    'ExampleNumber' => '93',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6(?:00[06]|1(?:1[17]|23))|8\\d\\d)|3977|9(?:[2-5]|87))|9[34]',
+        'example' => '93',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '139\\d\\d',
-    'ExampleNumber' => '13900',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '139\\d\\d',
-    'ExampleNumber' => '13900',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '139\\d\\d',
+        'example' => '13900',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'HR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '139\\d\\d',
+        'example' => '13900',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_HT.php b/src/data/ShortNumberMetadata_HT.php
index a306d2120..6cea43362 100644
--- a/src/data/ShortNumberMetadata_HT.php
+++ b/src/data/ShortNumberMetadata_HT.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'HT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[48]',
-    'ExampleNumber' => '114',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[48]',
+        'example' => '114',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[48]',
-    'ExampleNumber' => '114',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[48]',
+        'example' => '114',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[48]|40404',
-    'ExampleNumber' => '114',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[48]|40404',
+        'example' => '114',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'HT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_HU.php b/src/data/ShortNumberMetadata_HU.php
index ab7292ace..be4d5dda0 100644
--- a/src/data/ShortNumberMetadata_HU.php
+++ b/src/data/ShortNumberMetadata_HU.php
@@ -6,77 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'HU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[457]|12|4[0-4]\\d)|1(?:16\\d|37|45)\\d\\d',
-    'ExampleNumber' => '104',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:0[457]|12|4[0-4]\\d)|1(?:16\\d|37|45)\\d\\d',
+        'example' => '104',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[457]|12)',
-    'ExampleNumber' => '104',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[457]|1(?:2|6(?:000|1(?:11|23))|800)|2(?:0[0-4]|1[013489]|2[0-5]|3[0-46]|4[0-24-68]|5[0-2568]|6[06]|7[0-25-7]|8[028]|9[08])|37(?:00|37|7[07])|4(?:0[0-5]|1[013-8]|2[034]|3[23]|4[02-9]|5(?:00|41|67))|777|8(?:1[27-9]|2[04]|40|[589]))',
-    'ExampleNumber' => '104',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:0[457]|12)',
+        'example' => '104',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:4[0-4]|77)\\d|1(?:18|2|45)\\d\\d',
-    'ExampleNumber' => '1200',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'shortCode' => [
+        'pattern' => '1(?:0[457]|1(?:2|6(?:000|1(?:11|23))|800)|2(?:0[0-4]|1[013489]|2[0-5]|3[0-46]|4[0-24-68]|5[0-2568]|6[06]|7[0-25-7]|8[028]|9[08])|37(?:00|37|7[07])|4(?:0[0-5]|1[013-8]|2[034]|3[23]|4[02-9]|5(?:00|41|67))|777|8(?:1[27-9]|2[04]|40|[589]))',
+        'example' => '104',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '184\\d',
-    'ExampleNumber' => '1840',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'HU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '1(?:4[0-4]|77)\\d|1(?:18|2|45)\\d\\d',
+        'example' => '1200',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '184\\d',
+        'example' => '1840',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ID.php b/src/data/ShortNumberMetadata_ID.php
index b87124f3e..e6511f169 100644
--- a/src/data/ShortNumberMetadata_ID.php
+++ b/src/data/ShortNumberMetadata_ID.php
@@ -6,79 +6,59 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[178]\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'ID',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[178]\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[02389]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[02389]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[02389]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[02389]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[02389]|40\\d\\d|50264)|71400|89887',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[02389]|40\\d\\d|50264)|71400|89887',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '(?:714|898)\\d\\d',
-    'ExampleNumber' => '71400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '714\\d\\d',
-    'ExampleNumber' => '71400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '(?:714|898)\\d\\d',
+        'example' => '71400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'ID',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '714\\d\\d',
+        'example' => '71400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_IE.php b/src/data/ShortNumberMetadata_IE.php
index 6d6ce9ee8..41dbaae9b 100644
--- a/src/data/ShortNumberMetadata_IE.php
+++ b/src/data/ShortNumberMetadata_IE.php
@@ -6,85 +6,65 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[159]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'IE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[159]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6\\d{3})|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:2|6\\d{3})|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '5[37]\\d{3}',
-    'ExampleNumber' => '53000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'premiumRate' => [
+        'pattern' => '5[37]\\d{3}',
+        'example' => '53000',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6(?:00[06]|1(?:1[17]|23)))|999|(?:1(?:18|9)|5[0137]\\d)\\d\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '51\\d{3}',
-    'ExampleNumber' => '51000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'shortCode' => [
+        'pattern' => '11(?:2|6(?:00[06]|1(?:1[17]|23)))|999|(?:1(?:18|9)|5[0137]\\d)\\d\\d',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '51210',
-    'ExampleNumber' => '51210',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'pattern' => '51\\d{3}',
+        'example' => '51000',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '51210|(?:118|5[037]\\d)\\d\\d',
-    'ExampleNumber' => '11800',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '51210',
+        'example' => '51210',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'IE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '51210|(?:118|5[037]\\d)\\d\\d',
+        'example' => '11800',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_IL.php b/src/data/ShortNumberMetadata_IL.php
index 8758e5005..7c4da549b 100644
--- a/src/data/ShortNumberMetadata_IL.php
+++ b/src/data/ShortNumberMetadata_IL.php
@@ -6,79 +6,59 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[12]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'IL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[12]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-2]|12)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:0[0-2]|12)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-2]|12)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:0[0-2]|12)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-2]|1(?:[013-9]\\d|2)|[2-9]\\d\\d)|2407|(?:104|27)00',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[0-2]|1(?:[013-9]\\d|2)|[2-9]\\d\\d)|2407|(?:104|27)00',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '104\\d\\d',
-    'ExampleNumber' => '10400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '104\\d\\d',
-    'ExampleNumber' => '10400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '104\\d\\d',
+        'example' => '10400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'IL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '104\\d\\d',
+        'example' => '10400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_IM.php b/src/data/ShortNumberMetadata_IM.php
index 2b715b927..4abf6199b 100644
--- a/src/data/ShortNumberMetadata_IM.php
+++ b/src/data/ShortNumberMetadata_IM.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[189]\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'IM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[189]\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d{3})?|8(?:6444|9887)|999',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1\\d\\d(?:\\d{3})?|8(?:6444|9887)|999',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '8(?:64|98)\\d\\d',
-    'ExampleNumber' => '86400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'IM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '8(?:64|98)\\d\\d',
+        'example' => '86400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_IN.php b/src/data/ShortNumberMetadata_IN.php
index 384216665..d9e8d5a11 100644
--- a/src/data/ShortNumberMetadata_IN.php
+++ b/src/data/ShortNumberMetadata_IN.php
@@ -6,102 +6,82 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[12578]\\d{2,8}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
-      4 => 7,
-      5 => 8,
-      6 => 9,
+return [
+    'id' => 'IN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[12578]\\d{2,8}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-248]|1[289]|21|[39][89]|4[01]|6(?:1|6\\d?)|8[12])|777|800|1[05]5\\d|1(?:07|51|94)\\d\\d?|(?:1(?:[05]5\\d|70)\\d|261)\\d|1(?:0[369]|10|29|3[126]|9[0-256])\\d',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:0[0-248]|1[289]|21|[39][89]|4[01]|6(?:1|6\\d?)|8[12])|777|800|1[05]5\\d|1(?:07|51|94)\\d\\d?|(?:1(?:[05]5\\d|70)\\d|261)\\d|1(?:0[369]|10|29|3[126]|9[0-256])\\d',
+        'example' => '100',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '11[67]\\d{4}|56161561',
-    'ExampleNumber' => '1160000',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+    'premiumRate' => [
+        'pattern' => '11[67]\\d{4}|56161561',
+        'example' => '1160000',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-28]|12|298)|2611',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'emergency' => [
+        'pattern' => '1(?:0[0-28]|12|298)|2611',
+        'example' => '100',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:[0-248]|3[39]|5(?:010|6)|6[3468]|7(?:[01357]|[28]0?|4[01])|9[0135-9])|1(?:00|[289])|2(?:1|98)|3(?:11|2[0-2]|63|[89])|4[01]|5(?:1(?:0[0-36]|[127])|54)|6(?:1|6[01]?)|7000|8[12]|9(?:0[013-59]|12|25|4[4-9]\\d?|50|6[1347]|[89]))|2611|5(?:0(?:0(?:0\\d|1|20?)|325|5[2-79]\\d{3,5})|1(?:234|555|717|818|96[49])|2(?:0(?:0[01]|[14]0)|151|555|666|888|9(?:06|99\\d?))|3(?:0[01]0|131|553|(?:66|77)6)|(?:464|55[05])\\d{1,3}|6(?:070|3[68]|43)|717\\d)|777|800|5(?:05(?:0|1\\d)|221|3(?:03|3[23]))\\d{1,4}|5(?:(?:04|88)0|2(?:2[0267]|3[16])|4(?:1[04]|20|3[02])|5(?:3[16]|67)|6(?:06|[67]\\d)|787|9(?:64|90))\\d\\d?|(?:1(?:05[79]|(?:1[67][0-2]|802)\\d|55[23])\\d|5(?:(?:00(?:0\\d|1)|(?:304|616)\\d\\d)\\d|1(?:0[12]|4[2-4])|2(?:2[3589]|3(?:1\\d{3}|2)|4[04]|7[78])|4(?:[02]4|32\\d{4}|4[04]|99)|5(?:1[25]|[36]5|4[45]|93)|7(?:(?:17\\d|57)\\d\\d|[27]7|88)|8(?:3[4-69]|4[01]|5[58]|88(?:8\\d\\d|9)|99)|9(?:0(?:0|2\\d{3})|55|6[67]|77|88)))\\d',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '5(?:14(?:2[5-9]|[34]\\d)|757555)',
-    'ExampleNumber' => '51425',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 7,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:[0-248]|3[39]|5(?:010|6)|6[3468]|7(?:[01357]|[28]0?|4[01])|9[0135-9])|1(?:00|[289])|2(?:1|98)|3(?:11|2[0-2]|63|[89])|4[01]|5(?:1(?:0[0-36]|[127])|54)|6(?:1|6[01]?)|7000|8[12]|9(?:0[013-59]|12|25|4[4-9]\\d?|50|6[1347]|[89]))|2611|5(?:0(?:0(?:0\\d|1|20?)|325|5[2-79]\\d{3,5})|1(?:234|555|717|818|96[49])|2(?:0(?:0[01]|[14]0)|151|555|666|888|9(?:06|99\\d?))|3(?:0[01]0|131|553|(?:66|77)6)|(?:464|55[05])\\d{1,3}|6(?:070|3[68]|43)|717\\d)|777|800|5(?:05(?:0|1\\d)|221|3(?:03|3[23]))\\d{1,4}|5(?:(?:04|88)0|2(?:2[0267]|3[16])|4(?:1[04]|20|3[02])|5(?:3[16]|67)|6(?:06|[67]\\d)|787|9(?:64|90))\\d\\d?|(?:1(?:05[79]|(?:1[67][0-2]|802)\\d|55[23])\\d|5(?:(?:00(?:0\\d|1)|(?:304|616)\\d\\d)\\d|1(?:0[12]|4[2-4])|2(?:2[3589]|3(?:1\\d{3}|2)|4[04]|7[78])|4(?:[02]4|32\\d{4}|4[04]|99)|5(?:1[25]|[36]5|4[45]|93)|7(?:(?:17\\d|57)\\d\\d|[27]7|88)|8(?:3[4-69]|4[01]|5[58]|88(?:8\\d\\d|9)|99)|9(?:0(?:0|2\\d{3})|55|6[67]|77|88)))\\d',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:(?:1[67]\\d\\d|70)\\d\\d|55330|909)|5(?:300\\d|6161(?:17[89]|561))|1(?:[19][89]|21|4[01])',
-    'ExampleNumber' => '118',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
-      4 => 7,
-      5 => 8,
+    'standardRate' => [
+        'pattern' => '5(?:14(?:2[5-9]|[34]\\d)|757555)',
+        'example' => '51425',
+        'posLength' => [
+            5,
+            7,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '1(?:39|90[019])|5(?:14(?:2[5-9]|[34]\\d)|6161(?:17[89]|561)|757555)',
-    'ExampleNumber' => '139',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 7,
-      4 => 8,
+    'carrierSpecific' => [
+        'pattern' => '1(?:(?:1[67]\\d\\d|70)\\d\\d|55330|909)|5(?:300\\d|6161(?:17[89]|561))|1(?:[19][89]|21|4[01])',
+        'example' => '118',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+        ],
     ],
-  ],
-  'id' => 'IN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '1(?:39|90[019])|5(?:14(?:2[5-9]|[34]\\d)|6161(?:17[89]|561)|757555)',
+        'example' => '139',
+        'posLength' => [
+            3,
+            4,
+            5,
+            7,
+            8,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_IQ.php b/src/data/ShortNumberMetadata_IQ.php
index 54713b23f..c75d1c40c 100644
--- a/src/data/ShortNumberMetadata_IQ.php
+++ b/src/data/ShortNumberMetadata_IQ.php
@@ -6,81 +6,61 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1479]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'IQ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1479]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[04]|15|22)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:0[04]|15|22)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[04]|15|22)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:0[04]|15|22)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[04]|15|22)|4432|71117|9988',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[04]|15|22)|4432|71117|9988',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '(?:443|711\\d|998)\\d',
-    'ExampleNumber' => '4430',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:443|711\\d|998)\\d',
-    'ExampleNumber' => '4430',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'carrierSpecific' => [
+        'pattern' => '(?:443|711\\d|998)\\d',
+        'example' => '4430',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'id' => 'IQ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:443|711\\d|998)\\d',
+        'example' => '4430',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_IR.php b/src/data/ShortNumberMetadata_IR.php
index 0635287f6..8c19c6945 100644
--- a/src/data/ShortNumberMetadata_IR.php
+++ b/src/data/ShortNumberMetadata_IR.php
@@ -6,83 +6,63 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[129]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'IR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[129]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[0-68]|2[0-59]|9[0-579])|911',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[0-68]|2[0-59]|9[0-579])|911',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[025]|25)|911',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[025]|25)|911',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[0-68]|2[0-59]|3[346-8]|4(?:[0147]|[289]0)|5(?:0[14]|1[02479]|2[0-3]|39|[49]0|65)|6(?:[16]6|[27]|90)|8(?:03|1[18]|22|3[37]|4[28]|88|99)|9[0-579])|20(?:[09]0|1(?:[038]|1[079]|26|9[69])|2[01])|9(?:11|9(?:0009|90))',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '1(?:5[0-469]|8[0-489])\\d',
-    'ExampleNumber' => '1500',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'shortCode' => [
+        'pattern' => '1(?:1[0-68]|2[0-59]|3[346-8]|4(?:[0147]|[289]0)|5(?:0[14]|1[02479]|2[0-3]|39|[49]0|65)|6(?:[16]6|[27]|90)|8(?:03|1[18]|22|3[37]|4[28]|88|99)|9[0-579])|20(?:[09]0|1(?:[038]|1[079]|26|9[69])|2[01])|9(?:11|9(?:0009|90))',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:5[0-469]|8[0-489])|99(?:0\\d\\d|9))\\d',
-    'ExampleNumber' => '1500',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 6,
+    'standardRate' => [
+        'pattern' => '1(?:5[0-469]|8[0-489])\\d',
+        'example' => '1500',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '990\\d{3}',
-    'ExampleNumber' => '990000',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'carrierSpecific' => [
+        'pattern' => '(?:1(?:5[0-469]|8[0-489])|99(?:0\\d\\d|9))\\d',
+        'example' => '1500',
+        'posLength' => [
+            4,
+            6,
+        ],
     ],
-  ],
-  'id' => 'IR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '990\\d{3}',
+        'example' => '990000',
+        'posLength' => [
+            6,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_IS.php b/src/data/ShortNumberMetadata_IS.php
index fdca892c8..fa940c8c8 100644
--- a/src/data/ShortNumberMetadata_IS.php
+++ b/src/data/ShortNumberMetadata_IS.php
@@ -6,80 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+return [
+    'id' => 'IS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|71\\d)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'tollFree' => [
+        'pattern' => '1(?:12|71\\d)',
+        'example' => '112',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[28]|61(?:16|23))|4(?:00|1[145]|4[0146])|55|7(?:00|17|7[07-9])|8(?:[02]0|1[16-9]|88)|900)',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:[28]|61(?:16|23))|4(?:00|1[145]|4[0146])|55|7(?:00|17|7[07-9])|8(?:[02]0|1[16-9]|88)|900)',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '14(?:0\\d|41)',
-    'ExampleNumber' => '1400',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '1(?:415|90\\d)',
-    'ExampleNumber' => '1415',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '14(?:0\\d|41)',
+        'example' => '1400',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'IS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '1(?:415|90\\d)',
+        'example' => '1415',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_IT.php b/src/data/ShortNumberMetadata_IT.php
index 174e65f08..2254eaf98 100644
--- a/src/data/ShortNumberMetadata_IT.php
+++ b/src/data/ShortNumberMetadata_IT.php
@@ -6,85 +6,65 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d{2,6}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
-      4 => 7,
+return [
+    'id' => 'IT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d{2,6}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[2358]|6\\d{3})|87)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:[2358]|6\\d{3})|87)',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:12|4(?:[478](?:[0-4]|[5-9]\\d\\d)|55))\\d\\d',
-    'ExampleNumber' => '1200',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 7,
+    'premiumRate' => [
+        'pattern' => '(?:12|4(?:[478](?:[0-4]|[5-9]\\d\\d)|55))\\d\\d',
+        'example' => '1200',
+        'posLength' => [
+            4,
+            5,
+            7,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[2358]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[2358]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0\\d{2,3}|1(?:[2-57-9]|6(?:000|111))|3[39]|4(?:82|9\\d{1,3})|5(?:00|1[58]|2[25]|3[03]|44|[59])|60|8[67]|9(?:[01]|2[2-9]|4\\d|696))|4(?:2323|5045)|(?:1(?:2|92[01])|4(?:3(?:[01]|[45]\\d\\d)|[478](?:[0-4]|[5-9]\\d\\d)|55))\\d\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0\\d{2,3}|1(?:[2-57-9]|6(?:000|111))|3[39]|4(?:82|9\\d{1,3})|5(?:00|1[58]|2[25]|3[03]|44|[59])|60|8[67]|9(?:[01]|2[2-9]|4\\d|696))|4(?:2323|5045)|(?:1(?:2|92[01])|4(?:3(?:[01]|[45]\\d\\d)|[478](?:[0-4]|[5-9]\\d\\d)|55))\\d\\d',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '4(?:3(?:[01]|[45]\\d\\d)|[478](?:[0-4]|[5-9]\\d\\d)|5[05])\\d\\d',
-    'ExampleNumber' => '43000',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 7,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'IT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '4(?:3(?:[01]|[45]\\d\\d)|[478](?:[0-4]|[5-9]\\d\\d)|5[05])\\d\\d',
+        'example' => '43000',
+        'posLength' => [
+            5,
+            7,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_JE.php b/src/data/ShortNumberMetadata_JE.php
index c8e564ba9..5317b91ae 100644
--- a/src/data/ShortNumberMetadata_JE.php
+++ b/src/data/ShortNumberMetadata_JE.php
@@ -6,75 +6,55 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[129]\\d\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+return [
+    'id' => 'JE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[129]\\d\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:00|1(?:2|8\\d{3})|23|4(?:[14]|28|7\\d)|5\\d|7(?:0[12]|[128]|35?)|808|9[0135])|23[2-4]|999',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:00|1(?:2|8\\d{3})|23|4(?:[14]|28|7\\d)|5\\d|7(?:0[12]|[128]|35?)|808|9[0135])|23[2-4]|999',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'JE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_JM.php b/src/data/ShortNumberMetadata_JM.php
index 94ff47689..f40865eb0 100644
--- a/src/data/ShortNumberMetadata_JM.php
+++ b/src/data/ShortNumberMetadata_JM.php
@@ -6,61 +6,45 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'JM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[029]|9(?:11|88)',
-    'ExampleNumber' => '110',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[029]|9(?:11|88)',
+        'example' => '110',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[029]|911',
-    'ExampleNumber' => '110',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[029]|76)|9(?:11|88)',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '176',
-    'ExampleNumber' => '176',
-  ],
-  'id' => 'JM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'emergency' => [
+        'pattern' => '11[029]|911',
+        'example' => '110',
+    ],
+    'shortCode' => [
+        'pattern' => '1(?:1[029]|76)|9(?:11|88)',
+        'example' => '110',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'smsServices' => [
+        'pattern' => '176',
+        'example' => '176',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_JO.php b/src/data/ShortNumberMetadata_JO.php
index 592057e28..3e8494cd0 100644
--- a/src/data/ShortNumberMetadata_JO.php
+++ b/src/data/ShortNumberMetadata_JO.php
@@ -6,80 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'JO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[235]|1[2-6]|9[127])|911',
-    'ExampleNumber' => '102',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:0[235]|1[2-6]|9[127])|911',
+        'example' => '102',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9[0-4689]\\d{3}',
-    'ExampleNumber' => '90000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'premiumRate' => [
+        'pattern' => '9[0-4689]\\d{3}',
+        'example' => '90000',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|9[127])|911',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|9[127])|911',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[2359]|1[0-68]|9[0-24-79])|9[0-4689]\\d{3}|911',
-    'ExampleNumber' => '102',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[2359]|1[0-68]|9[0-24-79])|9[0-4689]\\d{3}|911',
+        'example' => '102',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '9[0-4689]\\d{3}',
-    'ExampleNumber' => '90000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '9[0-4689]\\d{3}',
-    'ExampleNumber' => '90000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '9[0-4689]\\d{3}',
+        'example' => '90000',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'JO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '9[0-4689]\\d{3}',
+        'example' => '90000',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_JP.php b/src/data/ShortNumberMetadata_JP.php
index 9d71498b3..e4407c6dd 100644
--- a/src/data/ShortNumberMetadata_JP.php
+++ b/src/data/ShortNumberMetadata_JP.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[01]\\d\\d(?:\\d{7})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 10,
+return [
+    'id' => 'JP',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[01]\\d\\d(?:\\d{7})?',
+        'posLength' => [
+            3,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[089]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[089]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[09]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[09]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '000[259]\\d{6}|1(?:0[24]|1[089]|44|89)',
-    'ExampleNumber' => '102',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '000[259]\\d{6}|1(?:0[24]|1[089]|44|89)',
+        'example' => '102',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '000[259]\\d{6}',
-    'ExampleNumber' => '0002000000',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'JP',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '000[259]\\d{6}',
+        'example' => '0002000000',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KE.php b/src/data/ShortNumberMetadata_KE.php
index ff9ca6e7a..6dfd75e49 100644
--- a/src/data/ShortNumberMetadata_KE.php
+++ b/src/data/ShortNumberMetadata_KE.php
@@ -6,69 +6,52 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'KE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[246]|9\\d)|5(?:01|2[127]|6[26]\\d))|999',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '909\\d\\d',
-    'ExampleNumber' => '90900',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:[246]|9\\d)|5(?:01|2[127]|6[26]\\d))|999',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[24]|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'pattern' => '909\\d\\d',
+        'example' => '90900',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:[07-9]|1[0-25]|400)|1(?:[024-6]|9[0-579])|2[1-3]|3[01]|4[14]|5(?:[01][01]|2[0-24-79]|33|4[05]|5[59]|6(?:00|29|6[67]))|(?:6[035]\\d|[78])\\d|9(?:[02-9]\\d\\d|19))|(?:(?:2[0-79]|[37][0-29]|4[0-4]|6[2357]|8\\d)\\d|5(?:[0-7]\\d|99))\\d\\d|9(?:09\\d\\d|99)|8988',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[24]|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:(?:04|6[35])\\d\\d|3[01]|4[14]|5(?:1\\d|2[25]))|(?:(?:2[0-79]|[37][0-29]|4[0-4]|6[2357]|8\\d)\\d|5(?:[0-7]\\d|99)|909)\\d\\d|898\\d',
-    'ExampleNumber' => '130',
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '1(?:(?:04|6[035])\\d\\d|4[14]|5(?:01|55|6[26]\\d))|40404|8988|909\\d\\d',
-    'ExampleNumber' => '141',
-  ],
-  'id' => 'KE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:[07-9]|1[0-25]|400)|1(?:[024-6]|9[0-579])|2[1-3]|3[01]|4[14]|5(?:[01][01]|2[0-24-79]|33|4[05]|5[59]|6(?:00|29|6[67]))|(?:6[035]\\d|[78])\\d|9(?:[02-9]\\d\\d|19))|(?:(?:2[0-79]|[37][0-29]|4[0-4]|6[2357]|8\\d)\\d|5(?:[0-7]\\d|99))\\d\\d|9(?:09\\d\\d|99)|8988',
+        'example' => '100',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '1(?:(?:04|6[35])\\d\\d|3[01]|4[14]|5(?:1\\d|2[25]))|(?:(?:2[0-79]|[37][0-29]|4[0-4]|6[2357]|8\\d)\\d|5(?:[0-7]\\d|99)|909)\\d\\d|898\\d',
+        'example' => '130',
+    ],
+    'smsServices' => [
+        'pattern' => '1(?:(?:04|6[035])\\d\\d|4[14]|5(?:01|55|6[26]\\d))|40404|8988|909\\d\\d',
+        'example' => '141',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KG.php b/src/data/ShortNumberMetadata_KG.php
index 5b7559332..11370838c 100644
--- a/src/data/ShortNumberMetadata_KG.php
+++ b/src/data/ShortNumberMetadata_KG.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'KG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '10[1-3]',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '10[1-3]',
+        'example' => '101',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '10[1-3]',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '10[1-3]',
+        'example' => '101',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '10[1-3]|4040',
-    'ExampleNumber' => '101',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '10[1-3]|4040',
+        'example' => '101',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d',
-    'ExampleNumber' => '4040',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d',
-    'ExampleNumber' => '4040',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '404\\d',
+        'example' => '4040',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'KG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d',
+        'example' => '4040',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KH.php b/src/data/ShortNumberMetadata_KH.php
index 55e7e2a4f..073bc1f9a 100644
--- a/src/data/ShortNumberMetadata_KH.php
+++ b/src/data/ShortNumberMetadata_KH.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[146]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'KH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[146]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[7-9]|666',
-    'ExampleNumber' => '117',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[7-9]|666',
+        'example' => '117',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[7-9]|666',
-    'ExampleNumber' => '117',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[7-9]|666',
+        'example' => '117',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[7-9]|40404|666',
-    'ExampleNumber' => '117',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[7-9]|40404|666',
+        'example' => '117',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'KH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KI.php b/src/data/ShortNumberMetadata_KI.php
index b71ac8743..b0bb12832 100644
--- a/src/data/ShortNumberMetadata_KI.php
+++ b/src/data/ShortNumberMetadata_KI.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[179]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'KI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[179]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '19[2-5]|99[2-4]',
-    'ExampleNumber' => '192',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '19[2-5]|99[2-4]',
+        'example' => '192',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '19[2-5]|99[2-4]',
-    'ExampleNumber' => '192',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '19[2-5]|99[2-4]',
+        'example' => '192',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:05[0-259]|88|9[2-5])|777|99[2-4]|10[0-8]',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '103',
-    'ExampleNumber' => '103',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'shortCode' => [
+        'pattern' => '1(?:05[0-259]|88|9[2-5])|777|99[2-4]|10[0-8]',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'pattern' => '103',
+        'example' => '103',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'KI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KM.php b/src/data/ShortNumberMetadata_KM.php
index 3483105f7..a3ee670e7 100644
--- a/src/data/ShortNumberMetadata_KM.php
+++ b/src/data/ShortNumberMetadata_KM.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'KM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'id' => 'KM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KN.php b/src/data/ShortNumberMetadata_KN.php
index da605c241..9f02bcaf3 100644
--- a/src/data/ShortNumberMetadata_KN.php
+++ b/src/data/ShortNumberMetadata_KN.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[39]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'KN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[39]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '333|9(?:11|88|99)',
-    'ExampleNumber' => '333',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '333|9(?:11|88|99)',
+        'example' => '333',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '333|9(?:11|99)',
-    'ExampleNumber' => '333',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '333|9(?:11|88|99)',
-    'ExampleNumber' => '333',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '333|9(?:11|99)',
+        'example' => '333',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '333|9(?:11|88|99)',
+        'example' => '333',
     ],
-  ],
-  'id' => 'KN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KP.php b/src/data/ShortNumberMetadata_KP.php
index da7854f33..b2e743fa3 100644
--- a/src/data/ShortNumberMetadata_KP.php
+++ b/src/data/ShortNumberMetadata_KP.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[18]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'KP',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[18]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[29]|819',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[29]|819',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[29]|819',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[29]|819',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[29]|819',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[29]|819',
+        'example' => '112',
     ],
-  ],
-  'id' => 'KP',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KR.php b/src/data/ShortNumberMetadata_KR.php
index 0cd36ce5d..15d09eb3c 100644
--- a/src/data/ShortNumberMetadata_KR.php
+++ b/src/data/ShortNumberMetadata_KR.php
@@ -6,79 +6,59 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'KR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[27-9]|28|330|82)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'tollFree' => [
+        'pattern' => '1(?:1[27-9]|28|330|82)',
+        'example' => '112',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[29]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[29]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:[016-9]114|3(?:0[01]|2|3[0-35-9]|45?|5[057]|6[569]|7[79]|8[2589]|9[0189]))|1(?:0[015]|1\\d|2[01357-9]|41|8[28])',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:[016-9]114|3(?:0[01]|2|3[0-35-9]|45?|5[057]|6[569]|7[79]|8[2589]|9[0189]))|1(?:0[015]|1\\d|2[01357-9]|41|8[28])',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:0[01]|1[4-6]|41)|1(?:[06-9]1\\d|111)\\d',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '1(?:0[01]|1[4-6]|41)|1(?:[06-9]1\\d|111)\\d',
+        'example' => '100',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'id' => 'KR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KW.php b/src/data/ShortNumberMetadata_KW.php
index 683e9018d..b789fd2b1 100644
--- a/src/data/ShortNumberMetadata_KW.php
+++ b/src/data/ShortNumberMetadata_KW.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[18]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'KW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[18]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[0-7]\\d|89887',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[0-7]\\d|89887',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '898\\d\\d',
-    'ExampleNumber' => '89800',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '898\\d\\d',
+        'example' => '89800',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'KW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KY.php b/src/data/ShortNumberMetadata_KY.php
index 5bb71c817..b1cd40d71 100644
--- a/src/data/ShortNumberMetadata_KY.php
+++ b/src/data/ShortNumberMetadata_KY.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'KY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'KY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_KZ.php b/src/data/ShortNumberMetadata_KZ.php
index 6e48424b9..0b6bd82da 100644
--- a/src/data/ShortNumberMetadata_KZ.php
+++ b/src/data/ShortNumberMetadata_KZ.php
@@ -6,82 +6,62 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-4]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'KZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-4]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)|212\\d',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'tollFree' => [
+        'pattern' => '1(?:0[1-3]|12)|212\\d',
+        'example' => '101',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-4]|12)|2121|(?:3040|404)0',
-    'ExampleNumber' => '101',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[1-4]|12)|2121|(?:3040|404)0',
+        'example' => '101',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '(?:304\\d|404)\\d',
-    'ExampleNumber' => '4040',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:304\\d|404)\\d',
-    'ExampleNumber' => '4040',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'carrierSpecific' => [
+        'pattern' => '(?:304\\d|404)\\d',
+        'example' => '4040',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'id' => 'KZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:304\\d|404)\\d',
+        'example' => '4040',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LA.php b/src/data/ShortNumberMetadata_LA.php
index f5d57b4a2..d785777ea 100644
--- a/src/data/ShortNumberMetadata_LA.php
+++ b/src/data/ShortNumberMetadata_LA.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'LA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '19[015]',
-    'ExampleNumber' => '190',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '19[015]',
+        'example' => '190',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '19[015]',
-    'ExampleNumber' => '190',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '19[015]',
-    'ExampleNumber' => '190',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '19[015]',
+        'example' => '190',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '19[015]',
+        'example' => '190',
     ],
-  ],
-  'id' => 'LA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LB.php b/src/data/ShortNumberMetadata_LB.php
index 21d5caf0c..e9bd9cdeb 100644
--- a/src/data/ShortNumberMetadata_LB.php
+++ b/src/data/ShortNumberMetadata_LB.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'LB',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|40|75)|999',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|40|75)|999',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|40|75)|999',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|40|75)|999',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|40|75)|999',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:12|40|75)|999',
+        'example' => '112',
     ],
-  ],
-  'id' => 'LB',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LC.php b/src/data/ShortNumberMetadata_LC.php
index c4ab52293..4f473a4a7 100644
--- a/src/data/ShortNumberMetadata_LC.php
+++ b/src/data/ShortNumberMetadata_LC.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'LC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'LC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LI.php b/src/data/ShortNumberMetadata_LI.php
index e8362ac38..b863d952d 100644
--- a/src/data/ShortNumberMetadata_LI.php
+++ b/src/data/ShortNumberMetadata_LI.php
@@ -6,74 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'LI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[278]|44)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[278]|44)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[278]|44)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[278]|44)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[278]|45)|4[3-57]|50|75|81[18])',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:[278]|45)|4[3-57]|50|75|81[18])',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LK.php b/src/data/ShortNumberMetadata_LK.php
index 94b40b57e..ac0c17157 100644
--- a/src/data/ShortNumberMetadata_LK.php
+++ b/src/data/ShortNumberMetadata_LK.php
@@ -6,74 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'LK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[02689]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[02689]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[02689]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[02689]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[024-9]|3(?:00|1[2-49]|2[23]|3[1-3]|44|5[07]|[67]9|88|9[039])|9(?:0[0-2589]|1[0-357-9]|2[0-25689]|3[0389]|4[0489]|5[014-69]|6[0-2689]|7[03579]|8[02457-9]|9[0-2569]))',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[024-9]|3(?:00|1[2-49]|2[23]|3[1-3]|44|5[07]|[67]9|88|9[039])|9(?:0[0-2589]|1[0-357-9]|2[0-25689]|3[0389]|4[0489]|5[014-69]|6[0-2689]|7[03579]|8[02457-9]|9[0-2569]))',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LR.php b/src/data/ShortNumberMetadata_LR.php
index e01aa1479..b3229ab07 100644
--- a/src/data/ShortNumberMetadata_LR.php
+++ b/src/data/ShortNumberMetadata_LR.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[3489]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'LR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[3489]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '355|911',
-    'ExampleNumber' => '355',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '355|911',
+        'example' => '355',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '355|911',
-    'ExampleNumber' => '355',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '355|911',
+        'example' => '355',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '355|4040|8(?:400|933)|911',
-    'ExampleNumber' => '355',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '355|4040|8(?:400|933)|911',
+        'example' => '355',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '(?:404|8(?:40|93))\\d',
-    'ExampleNumber' => '4040',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:404|8(?:40|93))\\d',
-    'ExampleNumber' => '4040',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '(?:404|8(?:40|93))\\d',
+        'example' => '4040',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'LR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:404|8(?:40|93))\\d',
+        'example' => '4040',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LS.php b/src/data/ShortNumberMetadata_LS.php
index 8070b7e83..1177a357e 100644
--- a/src/data/ShortNumberMetadata_LS.php
+++ b/src/data/ShortNumberMetadata_LS.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'LS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[257]',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[257]',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[257]',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[257]',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[257]',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[257]',
+        'example' => '112',
     ],
-  ],
-  'id' => 'LS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LT.php b/src/data/ShortNumberMetadata_LT.php
index 76679c78c..a348c9891 100644
--- a/src/data/ShortNumberMetadata_LT.php
+++ b/src/data/ShortNumberMetadata_LT.php
@@ -6,72 +6,53 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[01]\\d(?:\\d(?:\\d{3})?)?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 6,
+return [
+    'id' => 'LT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[01]\\d(?:\\d(?:\\d{3})?)?',
+        'posLength' => [
+            2,
+            3,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0(?:11?|22?|33?)|1(?:0[1-3]|1(?:2|6111))|116(?:0\\d|12)\\d',
-    'ExampleNumber' => '01',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '0(?:11?|22?|33?)|1(?:0[1-3]|1(?:2|6111))|116(?:0\\d|12)\\d',
+        'example' => '01',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '0(?:11?|22?|33?)|1(?:0[1-3]|12)',
-    'ExampleNumber' => '01',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0(?:11?|22?|33?)|1(?:0[1-3]|1(?:[27-9]|6(?:000|1(?:1[17]|23))))',
-    'ExampleNumber' => '01',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '0(?:11?|22?|33?)|1(?:0[1-3]|12)',
+        'example' => '01',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '0(?:11?|22?|33?)|1(?:0[1-3]|1(?:[27-9]|6(?:000|1(?:1[17]|23))))',
+        'example' => '01',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LU.php b/src/data/ShortNumberMetadata_LU.php
index dbcf8eedc..0f6805f70 100644
--- a/src/data/ShortNumberMetadata_LU.php
+++ b/src/data/ShortNumberMetadata_LU.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'LU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:[23]|6\\d{3})',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:[23]|6\\d{3})',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[23]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[23]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11(?:[23]|6(?:000|111))|1(?:18|[25]\\d|3)\\d\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11(?:[23]|6(?:000|111))|1(?:18|[25]\\d|3)\\d\\d',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'LU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LV.php b/src/data/ShortNumberMetadata_LV.php
index 3e933a11b..a6025aa33 100644
--- a/src/data/ShortNumberMetadata_LV.php
+++ b/src/data/ShortNumberMetadata_LV.php
@@ -6,87 +6,67 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[018]\\d{1,5}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
-      3 => 5,
-      4 => 6,
+return [
+    'id' => 'LV',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[018]\\d{1,5}',
+        'posLength' => [
+            2,
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0[1-3]|11(?:[023]|6\\d{3})',
-    'ExampleNumber' => '01',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 6,
+    'tollFree' => [
+        'pattern' => '0[1-3]|11(?:[023]|6\\d{3})',
+        'example' => '01',
+        'posLength' => [
+            2,
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1180|821\\d\\d',
-    'ExampleNumber' => '1180',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'premiumRate' => [
+        'pattern' => '1180|821\\d\\d',
+        'example' => '1180',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '0[1-3]|11[023]',
-    'ExampleNumber' => '01',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'emergency' => [
+        'pattern' => '0[1-3]|11[023]',
+        'example' => '01',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0[1-4]|1(?:1(?:[02-4]|6(?:000|111)|8[0189])|(?:5|65)5|77)|821[57]4',
-    'ExampleNumber' => '01',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '1181',
-    'ExampleNumber' => '1181',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'shortCode' => [
+        'pattern' => '0[1-4]|1(?:1(?:[02-4]|6(?:000|111)|8[0189])|(?:5|65)5|77)|821[57]4',
+        'example' => '01',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '165\\d',
-    'ExampleNumber' => '1650',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'pattern' => '1181',
+        'example' => '1181',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '165\\d',
+        'example' => '1650',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'LV',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_LY.php b/src/data/ShortNumberMetadata_LY.php
index 6d149cbff..2c4ea24fb 100644
--- a/src/data/ShortNumberMetadata_LY.php
+++ b/src/data/ShortNumberMetadata_LY.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'LY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '19[013]',
-    'ExampleNumber' => '190',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '19[013]',
+        'example' => '190',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '19[013]',
-    'ExampleNumber' => '190',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '19[013]',
-    'ExampleNumber' => '190',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '19[013]',
+        'example' => '190',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '19[013]',
+        'example' => '190',
     ],
-  ],
-  'id' => 'LY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MA.php b/src/data/ShortNumberMetadata_MA.php
index 7011789a3..44335aff2 100644
--- a/src/data/ShortNumberMetadata_MA.php
+++ b/src/data/ShortNumberMetadata_MA.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'MA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:[59]|77)',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:[59]|77)',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:[59]|77)',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:[59]|77)',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:[59]|77)',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:[59]|77)',
+        'example' => '15',
     ],
-  ],
-  'id' => 'MA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MC.php b/src/data/ShortNumberMetadata_MC.php
index cf7c6bca4..b109446d1 100644
--- a/src/data/ShortNumberMetadata_MC.php
+++ b/src/data/ShortNumberMetadata_MC.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'MC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|41|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:12|41|[578])',
+        'example' => '15',
     ],
-  ],
-  'id' => 'MC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MD.php b/src/data/ShortNumberMetadata_MD.php
index 245699fce..262b6d650 100644
--- a/src/data/ShortNumberMetadata_MD.php
+++ b/src/data/ShortNumberMetadata_MD.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'MD',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6(?:000|1(?:11|2\\d)))|90[1-3]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:2|6(?:000|1(?:11|2\\d)))|90[1-3]',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|90[1-3]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|90[1-3]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:1[17]|23))|8\\d\\d?|99)|90[04-9])|90[1-3]|1(?:4\\d\\d|6[0-389]|9[1-4])\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6(?:00[06]|1(?:1[17]|23))|8\\d\\d?|99)|90[04-9])|90[1-3]|1(?:4\\d\\d|6[0-389]|9[1-4])\\d',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MD',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ME.php b/src/data/ShortNumberMetadata_ME.php
index 9b0e783e8..4aa5a1b6b 100644
--- a/src/data/ShortNumberMetadata_ME.php
+++ b/src/data/ShortNumberMetadata_ME.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'ME',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|2[2-4])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:12|2[2-4])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|2[2-4])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|2[2-4])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:(?:[013-57-9]|6\\d\\d)\\d|2)|[249]\\d{3}|5999|8(?:0[089]|1[0-8]|888))|1(?:[02-5]\\d\\d|60[06]|700)|12\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:(?:[013-57-9]|6\\d\\d)\\d|2)|[249]\\d{3}|5999|8(?:0[089]|1[0-8]|888))|1(?:[02-5]\\d\\d|60[06]|700)|12\\d',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'ME',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MF.php b/src/data/ShortNumberMetadata_MF.php
index d0b3607cc..879c20279 100644
--- a/src/data/ShortNumberMetadata_MF.php
+++ b/src/data/ShortNumberMetadata_MF.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'MF',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'id' => 'MF',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MG.php b/src/data/ShortNumberMetadata_MG.php
index 7bf270af1..5b36d7432 100644
--- a/src/data/ShortNumberMetadata_MG.php
+++ b/src/data/ShortNumberMetadata_MG.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'MG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[78]|[78])',
-    'ExampleNumber' => '17',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:1[78]|[78])',
+        'example' => '17',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[78]|[78])',
-    'ExampleNumber' => '17',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[78]|[78])',
-    'ExampleNumber' => '17',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:1[78]|[78])',
+        'example' => '17',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[78]|[78])',
+        'example' => '17',
     ],
-  ],
-  'id' => 'MG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MH.php b/src/data/ShortNumberMetadata_MH.php
index 829515141..10f3e9158 100644
--- a/src/data/ShortNumberMetadata_MH.php
+++ b/src/data/ShortNumberMetadata_MH.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'MH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'id' => 'MH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MK.php b/src/data/ShortNumberMetadata_MK.php
index 1ff879ee3..796378e08 100644
--- a/src/data/ShortNumberMetadata_MK.php
+++ b/src/data/ShortNumberMetadata_MK.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+return [
+    'id' => 'MK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6\\d{3})|9[2-4])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:2|6\\d{3})|9[2-4])',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|9[2-4])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|9[2-4])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|8\\d)|3\\d|9[2-4])|1(?:16|2\\d)\\d{3}',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|8\\d)|3\\d|9[2-4])|1(?:16|2\\d)\\d{3}',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ML.php b/src/data/ShortNumberMetadata_ML.php
index 136b422fd..5b05506ab 100644
--- a/src/data/ShortNumberMetadata_ML.php
+++ b/src/data/ShortNumberMetadata_ML.php
@@ -6,89 +6,69 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[136-8]\\d{1,4}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
-      3 => 5,
+return [
+    'id' => 'ML',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[136-8]\\d{1,4}',
+        'posLength' => [
+            2,
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[578]|(?:352|67)00|7402|(?:677|744|8000)\\d',
-    'ExampleNumber' => '15',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 4,
-      2 => 5,
+    'tollFree' => [
+        'pattern' => '1[578]|(?:352|67)00|7402|(?:677|744|8000)\\d',
+        'example' => '15',
+        'posLength' => [
+            2,
+            4,
+            5,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:12|800)2\\d|3(?:52(?:11|2[02]|3[04-6]|99)|7574)',
-    'ExampleNumber' => '1220',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'premiumRate' => [
+        'pattern' => '(?:12|800)2\\d|3(?:52(?:11|2[02]|3[04-6]|99)|7574)',
+        'example' => '1220',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-    'PossibleLength' =>
-     [
-      0 => 2,
+    'emergency' => [
+        'pattern' => '1[578]',
+        'example' => '15',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[013-9]\\d|2)|2(?:1[02-469]|2[13])|[578])|350(?:35|57)|67(?:0[09]|[59]9|77|8[89])|74(?:0[02]|44|55)|800[0-2][12]|3(?:52|[67]\\d)\\d\\d',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '37(?:433|575)|7400|8001\\d',
-    'ExampleNumber' => '7400',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:[013-9]\\d|2)|2(?:1[02-469]|2[13])|[578])|350(?:35|57)|67(?:0[09]|[59]9|77|8[89])|74(?:0[02]|44|55)|800[0-2][12]|3(?:52|[67]\\d)\\d\\d',
+        'example' => '15',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '3503\\d|(?:3[67]\\d|800)\\d\\d',
-    'ExampleNumber' => '35030',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'pattern' => '37(?:433|575)|7400|8001\\d',
+        'example' => '7400',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '374(?:0[24-9]|[1-9]\\d)|7400|3(?:6\\d|75)\\d\\d',
-    'ExampleNumber' => '7400',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'carrierSpecific' => [
+        'pattern' => '3503\\d|(?:3[67]\\d|800)\\d\\d',
+        'example' => '35030',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'ML',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '374(?:0[24-9]|[1-9]\\d)|7400|3(?:6\\d|75)\\d\\d',
+        'example' => '7400',
+        'posLength' => [
+            4,
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MM.php b/src/data/ShortNumberMetadata_MM.php
index 195aff183..3ba889453 100644
--- a/src/data/ShortNumberMetadata_MM.php
+++ b/src/data/ShortNumberMetadata_MM.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'MM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '199',
-    'ExampleNumber' => '199',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '199',
+        'example' => '199',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '199',
-    'ExampleNumber' => '199',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '199',
-    'ExampleNumber' => '199',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '199',
+        'example' => '199',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '199',
+        'example' => '199',
     ],
-  ],
-  'id' => 'MM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MN.php b/src/data/ShortNumberMetadata_MN.php
index 9f22440b1..def26dc6f 100644
--- a/src/data/ShortNumberMetadata_MN.php
+++ b/src/data/ShortNumberMetadata_MN.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'MN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '10[0-35]',
-    'ExampleNumber' => '100',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '10[0-35]',
+        'example' => '100',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '10[0-35]',
-    'ExampleNumber' => '100',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '10[0-35]',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '10[0-35]',
+        'example' => '100',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '10[0-35]',
+        'example' => '100',
     ],
-  ],
-  'id' => 'MN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MO.php b/src/data/ShortNumberMetadata_MO.php
index bfb6fded2..915bffa5e 100644
--- a/src/data/ShortNumberMetadata_MO.php
+++ b/src/data/ShortNumberMetadata_MO.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'MO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'id' => 'MO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MP.php b/src/data/ShortNumberMetadata_MP.php
index 3f7da6bf3..43c590949 100644
--- a/src/data/ShortNumberMetadata_MP.php
+++ b/src/data/ShortNumberMetadata_MP.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'MP',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'MP',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MQ.php b/src/data/ShortNumberMetadata_MQ.php
index 6be5584b9..d38ebb4d7 100644
--- a/src/data/ShortNumberMetadata_MQ.php
+++ b/src/data/ShortNumberMetadata_MQ.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'MQ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
     ],
-  ],
-  'id' => 'MQ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MR.php b/src/data/ShortNumberMetadata_MR.php
index 15b47fa0d..426cac4a2 100644
--- a/src/data/ShortNumberMetadata_MR.php
+++ b/src/data/ShortNumberMetadata_MR.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'MR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'id' => 'MR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MS.php b/src/data/ShortNumberMetadata_MS.php
index f10f306c9..ca51ff6f5 100644
--- a/src/data/ShortNumberMetadata_MS.php
+++ b/src/data/ShortNumberMetadata_MS.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[29]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'MS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[29]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '211|9(?:11|88|99)',
-    'ExampleNumber' => '211',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '211|9(?:11|88|99)',
+        'example' => '211',
     ],
-  ],
-  'id' => 'MS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MT.php b/src/data/ShortNumberMetadata_MT.php
index c5dbaad08..87e6f82b6 100644
--- a/src/data/ShortNumberMetadata_MT.php
+++ b/src/data/ShortNumberMetadata_MT.php
@@ -6,70 +6,51 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d{3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+return [
+    'id' => 'MT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d{3})?',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6\\d{3})',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11(?:2|6\\d{3})',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6(?:000|1(?:11|23)))',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11(?:2|6(?:000|1(?:11|23)))',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MU.php b/src/data/ShortNumberMetadata_MU.php
index 5d4229b91..5bd1ca4f2 100644
--- a/src/data/ShortNumberMetadata_MU.php
+++ b/src/data/ShortNumberMetadata_MU.php
@@ -6,75 +6,55 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[189]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'MU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[189]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[45]|99[59]',
-    'ExampleNumber' => '114',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[45]|99[59]',
+        'example' => '114',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[45]|99[59]',
-    'ExampleNumber' => '114',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[45]|99[59]',
+        'example' => '114',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,4}|(?:8\\d\\d|99)\\d',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1\\d{2,4}|(?:8\\d\\d|99)\\d',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MV.php b/src/data/ShortNumberMetadata_MV.php
index 4c767ddc7..ec90518c7 100644
--- a/src/data/ShortNumberMetadata_MV.php
+++ b/src/data/ShortNumberMetadata_MV.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'MV',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:02|1[89])',
-    'ExampleNumber' => '102',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:02|1[89])',
+        'example' => '102',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:02|1[89])',
-    'ExampleNumber' => '102',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:02|1[89])',
+        'example' => '102',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:[0-37-9]|[4-6]\\d)\\d|4040|1[45]1',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:[0-37-9]|[4-6]\\d)\\d|4040|1[45]1',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1[45]1',
-    'ExampleNumber' => '141',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '1[45]1',
+        'example' => '141',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'id' => 'MV',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MW.php b/src/data/ShortNumberMetadata_MW.php
index f3fa79be3..a68242665 100644
--- a/src/data/ShortNumberMetadata_MW.php
+++ b/src/data/ShortNumberMetadata_MW.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[189]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'MW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[189]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '199|99[7-9]',
-    'ExampleNumber' => '199',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '199|99[7-9]',
+        'example' => '199',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '199|99[7-9]',
-    'ExampleNumber' => '199',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '199|99[7-9]',
+        'example' => '199',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '199|80400|99[7-9]',
-    'ExampleNumber' => '199',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '199|80400|99[7-9]',
+        'example' => '199',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '804\\d\\d',
-    'ExampleNumber' => '80400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '804\\d\\d',
-    'ExampleNumber' => '80400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '804\\d\\d',
+        'example' => '80400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'MW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '804\\d\\d',
+        'example' => '80400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MX.php b/src/data/ShortNumberMetadata_MX.php
index 5d838a3fd..6258139f3 100644
--- a/src/data/ShortNumberMetadata_MX.php
+++ b/src/data/ShortNumberMetadata_MX.php
@@ -6,80 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[0579]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'MX',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[0579]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0(?:6[0568]|80)|911',
-    'ExampleNumber' => '060',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '0(?:6[0568]|80)|911',
+        'example' => '060',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:530\\d|776)\\d',
-    'ExampleNumber' => '7760',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'premiumRate' => [
+        'pattern' => '(?:530\\d|776)\\d',
+        'example' => '7760',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '0(?:6[0568]|80)|911',
-    'ExampleNumber' => '060',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '0(?:6[0568]|80)|911',
+        'example' => '060',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0[1-9]\\d|53053|7766|911',
-    'ExampleNumber' => '010',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '0[1-9]\\d|53053|7766|911',
+        'example' => '010',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '0(?:[249]0|[35][01])',
-    'ExampleNumber' => '020',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '0(?:[249]0|[35][01])',
+        'example' => '020',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'id' => 'MX',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MY.php b/src/data/ShortNumberMetadata_MY.php
index 340a65d6b..6497ba404 100644
--- a/src/data/ShortNumberMetadata_MY.php
+++ b/src/data/ShortNumberMetadata_MY.php
@@ -6,79 +6,59 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1369]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'MY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1369]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|999',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|999',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[01348]|1(?:[02]|1[128]|311)|2(?:0[125]|[13-6]|2\\d{0,2})|(?:3[1-35-79]|7[45])\\d\\d?|5(?:454|5\\d\\d?|77|888|999?)|8(?:18?|2|8[18])|9(?:[124]\\d?|68|71|9[0679]))|66628|99[1-469]|13[5-7]|(?:1(?:0[569]|309|5[12]|7[136-9]|9[03])|3[23679]\\d\\d)\\d',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '666\\d\\d',
-    'ExampleNumber' => '66600',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'shortCode' => [
+        'pattern' => '1(?:0[01348]|1(?:[02]|1[128]|311)|2(?:0[125]|[13-6]|2\\d{0,2})|(?:3[1-35-79]|7[45])\\d\\d?|5(?:454|5\\d\\d?|77|888|999?)|8(?:18?|2|8[18])|9(?:[124]\\d?|68|71|9[0679]))|66628|99[1-469]|13[5-7]|(?:1(?:0[569]|309|5[12]|7[136-9]|9[03])|3[23679]\\d\\d)\\d',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'pattern' => '666\\d\\d',
+        'example' => '66600',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:3[23679]\\d|666)\\d\\d',
-    'ExampleNumber' => '32000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:3[23679]\\d|666)\\d\\d',
+        'example' => '32000',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_MZ.php b/src/data/ShortNumberMetadata_MZ.php
index 5aa527abe..2a934e8f2 100644
--- a/src/data/ShortNumberMetadata_MZ.php
+++ b/src/data/ShortNumberMetadata_MZ.php
@@ -6,74 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'MZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[79]|9[78])',
-    'ExampleNumber' => '117',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[79]|9[78])',
+        'example' => '117',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[79]|9[78])',
-    'ExampleNumber' => '117',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[79]|9[78])',
+        'example' => '117',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:[02-5]\\d\\d|1[79]|9[78])',
-    'ExampleNumber' => '117',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:[02-5]\\d\\d|1[79]|9[78])',
+        'example' => '117',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'MZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NA.php b/src/data/ShortNumberMetadata_NA.php
index 448e1ccf3..5fe4989dd 100644
--- a/src/data/ShortNumberMetadata_NA.php
+++ b/src/data/ShortNumberMetadata_NA.php
@@ -6,75 +6,55 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'NA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '10111',
-    'ExampleNumber' => '10111',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'tollFree' => [
+        'pattern' => '10111',
+        'example' => '10111',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '10111',
-    'ExampleNumber' => '10111',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'emergency' => [
+        'pattern' => '10111',
+        'example' => '10111',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '(?:10|93)111|(?:1\\d|9)\\d\\d',
-    'ExampleNumber' => '900',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '(?:10|93)111|(?:1\\d|9)\\d\\d',
+        'example' => '900',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NC.php b/src/data/ShortNumberMetadata_NC.php
index e9b89d0e5..0a2786f4f 100644
--- a/src/data/ShortNumberMetadata_NC.php
+++ b/src/data/ShortNumberMetadata_NC.php
@@ -6,73 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[135]\\d{1,3}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
+return [
+    'id' => 'NC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[135]\\d{1,3}',
+        'posLength' => [
+            2,
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:00|1[23]|3[0-2]|8\\d)|[5-8])|363\\d|577',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:0(?:00|1[23]|3[0-2]|8\\d)|[5-8])|363\\d|577',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[5-8]',
-    'ExampleNumber' => '15',
-    'PossibleLength' =>
-     [
-      0 => 2,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:0[06]|1[02-46]|20|3[0-25]|42|5[058]|77|88)|[5-8])|3631|5[6-8]\\d',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '5(?:67|88)',
-    'ExampleNumber' => '567',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1[5-8]',
+        'example' => '15',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:0[06]|1[02-46]|20|3[0-25]|42|5[058]|77|88)|[5-8])|3631|5[6-8]\\d',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'pattern' => '5(?:67|88)',
+        'example' => '567',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'id' => 'NC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NE.php b/src/data/ShortNumberMetadata_NE.php
index b7f1ecba1..595b1f1a9 100644
--- a/src/data/ShortNumberMetadata_NE.php
+++ b/src/data/ShortNumberMetadata_NE.php
@@ -6,69 +6,51 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-3578]\\d(?:\\d(?:\\d{3})?)?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 6,
+return [
+    'id' => 'NE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-3578]\\d(?:\\d(?:\\d{3})?)?',
+        'posLength' => [
+            2,
+            3,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:18|[578])|723\\d{3}',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:18|[578])|723\\d{3}',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:18|[578])|723141',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[01]|1[128]|2[034]|3[013]|[46]0|55?|[78])|222|333|555|723141|888',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:0[01]|1[12]|2[034]|3[013]|[46]0|55)|222|333|555|888',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:18|[578])|723141',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[01]|1[128]|2[034]|3[013]|[46]0|55?|[78])|222|333|555|723141|888',
+        'example' => '15',
     ],
-  ],
-  'id' => 'NE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '1(?:0[01]|1[12]|2[034]|3[013]|[46]0|55)|222|333|555|888',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NF.php b/src/data/ShortNumberMetadata_NF.php
index 3b44aa17b..deb7089dc 100644
--- a/src/data/ShortNumberMetadata_NF.php
+++ b/src/data/ShortNumberMetadata_NF.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'NF',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|55|77)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|55|77)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|55|77)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|55|77)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|55|77)',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|55|77)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'NF',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NG.php b/src/data/ShortNumberMetadata_NG.php
index 3a9510cbd..dbf8bf2b4 100644
--- a/src/data/ShortNumberMetadata_NG.php
+++ b/src/data/ShortNumberMetadata_NG.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'NG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '199',
-    'ExampleNumber' => '199',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '199',
+        'example' => '199',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '199',
-    'ExampleNumber' => '199',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '199',
+        'example' => '199',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '199|40700',
-    'ExampleNumber' => '199',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '199|40700',
+        'example' => '199',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '407\\d\\d',
-    'ExampleNumber' => '40700',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '407\\d\\d',
-    'ExampleNumber' => '40700',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '407\\d\\d',
+        'example' => '40700',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'NG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '407\\d\\d',
+        'example' => '40700',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NI.php b/src/data/ShortNumberMetadata_NI.php
index 8258d38a9..2e9b9661a 100644
--- a/src/data/ShortNumberMetadata_NI.php
+++ b/src/data/ShortNumberMetadata_NI.php
@@ -6,70 +6,51 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[12467]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'NI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[12467]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[58]|2[08])|737\\d',
-    'ExampleNumber' => '115',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:1[58]|2[08])|737\\d',
+        'example' => '115',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[58]|2[08])',
-    'ExampleNumber' => '115',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[58]|200)|4878|7(?:010|373)|12[0158]|(?:19|[267]1)00',
-    'ExampleNumber' => '115',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:1[58]|2[08])',
+        'example' => '115',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[58]|200)|4878|7(?:010|373)|12[0158]|(?:19|[267]1)00',
+        'example' => '115',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NL.php b/src/data/ShortNumberMetadata_NL.php
index 5d6e79652..3e5ee2de2 100644
--- a/src/data/ShortNumberMetadata_NL.php
+++ b/src/data/ShortNumberMetadata_NL.php
@@ -6,80 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1349]\\d\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+return [
+    'id' => 'NL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1349]\\d\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6\\d{3})|911',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:2|6\\d{3})|911',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|911',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:11|23)))|2(?:0[0-4]|3[34]|44)|3[03-9]\\d|400|8(?:[02-9]\\d|1[0-79]))|[34]000|911',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6(?:00[06]|1(?:11|23)))|2(?:0[0-4]|3[34]|44)|3[03-9]\\d|400|8(?:[02-9]\\d|1[0-79]))|[34]000|911',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '120\\d',
-    'ExampleNumber' => '1200',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '[34]00\\d',
-    'ExampleNumber' => '3000',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'pattern' => '120\\d',
+        'example' => '1200',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'NL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '[34]00\\d',
+        'example' => '3000',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NO.php b/src/data/ShortNumberMetadata_NO.php
index 80c537477..d9e71c2b0 100644
--- a/src/data/ShortNumberMetadata_NO.php
+++ b/src/data/ShortNumberMetadata_NO.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+return [
+    'id' => 'NO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:[023]|6\\d{3})',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:[023]|6\\d{3})',
+        'example' => '110',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[023]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|8[5-9]\\d|90)',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|8[5-9]\\d|90)',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NP.php b/src/data/ShortNumberMetadata_NP.php
index 6d67b26b4..aae571102 100644
--- a/src/data/ShortNumberMetadata_NP.php
+++ b/src/data/ShortNumberMetadata_NP.php
@@ -6,70 +6,51 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'NP',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-36]|12)|1(?:09|11)\\d',
-    'ExampleNumber' => '100',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:0[0-36]|12)|1(?:09|11)\\d',
+        'example' => '100',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-3]|12)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:[0-36]|98)|1(?:1[1-4]|2))',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:0[0-3]|12)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:[0-36]|98)|1(?:1[1-4]|2))',
+        'example' => '100',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NP',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NR.php b/src/data/ShortNumberMetadata_NR.php
index 82280eb23..1c1ce60ef 100644
--- a/src/data/ShortNumberMetadata_NR.php
+++ b/src/data/ShortNumberMetadata_NR.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'NR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[0-2]',
-    'ExampleNumber' => '110',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[0-2]',
+        'example' => '110',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[0-2]',
-    'ExampleNumber' => '110',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[0-2]|23|92)',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[0-2]',
+        'example' => '110',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1[0-2]|23|92)',
+        'example' => '110',
     ],
-  ],
-  'id' => 'NR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NU.php b/src/data/ShortNumberMetadata_NU.php
index 654ec7e4f..81ce7442e 100644
--- a/src/data/ShortNumberMetadata_NU.php
+++ b/src/data/ShortNumberMetadata_NU.php
@@ -6,63 +6,46 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[019]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'NU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[019]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '01[05]|101|999',
-    'ExampleNumber' => '010',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '010',
-    'ExampleNumber' => '010',
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'id' => 'NU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'shortCode' => [
+        'pattern' => '01[05]|101|999',
+        'example' => '010',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '010',
+        'example' => '010',
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_NZ.php b/src/data/ShortNumberMetadata_NZ.php
index 5423f8984..6f732ebee 100644
--- a/src/data/ShortNumberMetadata_NZ.php
+++ b/src/data/ShortNumberMetadata_NZ.php
@@ -6,74 +6,55 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{3,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'NZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '\\d{3,4}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '111',
-    'ExampleNumber' => '111',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '111',
+        'example' => '111',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '018',
-    'ExampleNumber' => '018',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'pattern' => '018',
+        'example' => '018',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '111',
-    'ExampleNumber' => '111',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '111',
+        'example' => '111',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '018|1(?:(?:1|37)1|(?:23|94)4|7[03]7)|[2-57-9]\\d{2,3}|6(?:161|26[0-3]|742)',
-    'ExampleNumber' => '018',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '018|1(?:(?:1|37)1|(?:23|94)4|7[03]7)|[2-57-9]\\d{2,3}|6(?:161|26[0-3]|742)',
+        'example' => '018',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '018|(?:1(?:23|37|7[03]|94)|6(?:[12]6|74))\\d|[2-57-9]\\d{2,3}',
-    'ExampleNumber' => '018',
-  ],
-  'id' => 'NZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '018|(?:1(?:23|37|7[03]|94)|6(?:[12]6|74))\\d|[2-57-9]\\d{2,3}',
+        'example' => '018',
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_OM.php b/src/data/ShortNumberMetadata_OM.php
index 3de980500..963965fd7 100644
--- a/src/data/ShortNumberMetadata_OM.php
+++ b/src/data/ShortNumberMetadata_OM.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{3}',
-    'PossibleLength' =>
-     [
-      0 => 4,
+return [
+    'id' => 'OM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{3}',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1444|999\\d',
-    'ExampleNumber' => '1444',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1444|999\\d',
+        'example' => '1444',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1444|9999',
-    'ExampleNumber' => '1444',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:111|222|4(?:4[0-5]|50|66|7[7-9])|51[0-8])|9999|1(?:2[3-5]|3[0-2]|50)\\d',
-    'ExampleNumber' => '1111',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1444|9999',
+        'example' => '1444',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:111|222|4(?:4[0-5]|50|66|7[7-9])|51[0-8])|9999|1(?:2[3-5]|3[0-2]|50)\\d',
+        'example' => '1111',
     ],
-  ],
-  'id' => 'OM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PA.php b/src/data/ShortNumberMetadata_PA.php
index 1effa1163..2109b68ac 100644
--- a/src/data/ShortNumberMetadata_PA.php
+++ b/src/data/ShortNumberMetadata_PA.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'PA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '10[2-4]|911',
-    'ExampleNumber' => '102',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '10[2-4]|911',
+        'example' => '102',
     ],
-  ],
-  'id' => 'PA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PE.php b/src/data/ShortNumberMetadata_PE.php
index 79f022986..8289ed2af 100644
--- a/src/data/ShortNumberMetadata_PE.php
+++ b/src/data/ShortNumberMetadata_PE.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'PE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:05|1[67])',
-    'ExampleNumber' => '105',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:05|1[67])',
+        'example' => '105',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:05|1[67])',
-    'ExampleNumber' => '105',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:05|1[67])',
-    'ExampleNumber' => '105',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:05|1[67])',
+        'example' => '105',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:05|1[67])',
+        'example' => '105',
     ],
-  ],
-  'id' => 'PE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PF.php b/src/data/ShortNumberMetadata_PF.php
index e6bfbff33..4f963b050 100644
--- a/src/data/ShortNumberMetadata_PF.php
+++ b/src/data/ShortNumberMetadata_PF.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'PF',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'id' => 'PF',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PG.php b/src/data/ShortNumberMetadata_PG.php
index ebb1f7610..1e4f4a695 100644
--- a/src/data/ShortNumberMetadata_PG.php
+++ b/src/data/ShortNumberMetadata_PG.php
@@ -6,82 +6,62 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[01]\\d{2,6}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
-      4 => 7,
+return [
+    'id' => 'PG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[01]\\d{2,6}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+            7,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '000|11[01]',
-    'ExampleNumber' => '000',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '000|11[01]',
+        'example' => '000',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '000|11[01]',
-    'ExampleNumber' => '000',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '000|11[01]',
+        'example' => '000',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '000|1(?:1[01]|5\\d\\d|6\\d{2,5})',
-    'ExampleNumber' => '000',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '000|1(?:1[01]|5\\d\\d|6\\d{2,5})',
+        'example' => '000',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '16\\d{2,5}',
-    'ExampleNumber' => '1600',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '16\\d{2,5}',
+        'example' => '1600',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PH.php b/src/data/ShortNumberMetadata_PH.php
index bf274829b..9907b7613 100644
--- a/src/data/ShortNumberMetadata_PH.php
+++ b/src/data/ShortNumberMetadata_PH.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'PH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[27]|911',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[27]|911',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[27]|911',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[27]|911',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[27]|911',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[27]|911',
+        'example' => '112',
     ],
-  ],
-  'id' => 'PH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PK.php b/src/data/ShortNumberMetadata_PK.php
index 93fa22880..5602f35b3 100644
--- a/src/data/ShortNumberMetadata_PK.php
+++ b/src/data/ShortNumberMetadata_PK.php
@@ -6,67 +6,49 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{1,3}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
+return [
+    'id' => 'PK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{1,3}',
+        'posLength' => [
+            2,
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2\\d?|5)|[56])',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:2\\d?|5)|[56])',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:22?|5)|[56])',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:122|3[014]|[56])|11[2457-9]',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:1(?:22?|5)|[56])',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:122|3[014]|[56])|11[2457-9]',
+        'example' => '15',
     ],
-  ],
-  'id' => 'PK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PL.php b/src/data/ShortNumberMetadata_PL.php
index 5a4f6ca7f..2af12c9f7 100644
--- a/src/data/ShortNumberMetadata_PL.php
+++ b/src/data/ShortNumberMetadata_PL.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'PL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6\\d{3})|99[7-9]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:2|6\\d{3})|99[7-9]',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|99[7-9]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|99[7-9]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|61(?:11|23)|891[23])|9\\d{3})|9(?:8[4-7]|9[1-9])|11[68]000',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|61(?:11|23)|891[23])|9\\d{3})|9(?:8[4-7]|9[1-9])|11[68]000',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PM.php b/src/data/ShortNumberMetadata_PM.php
index 37e8a810e..e24d1ce00 100644
--- a/src/data/ShortNumberMetadata_PM.php
+++ b/src/data/ShortNumberMetadata_PM.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[13]\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 4,
+return [
+    'id' => 'PM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[13]\\d(?:\\d{2})?',
+        'posLength' => [
+            2,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-    'PossibleLength' =>
-     [
-      0 => 2,
+    'tollFree' => [
+        'pattern' => '1[578]',
+        'example' => '15',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-    'PossibleLength' =>
-     [
-      0 => 2,
+    'emergency' => [
+        'pattern' => '1[578]',
+        'example' => '15',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[578]|3103',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[578]|3103',
+        'example' => '15',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '310\\d',
-    'ExampleNumber' => '3100',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '310\\d',
+        'example' => '3100',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'PM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PR.php b/src/data/ShortNumberMetadata_PR.php
index a9f016283..fc7dd7715 100644
--- a/src/data/ShortNumberMetadata_PR.php
+++ b/src/data/ShortNumberMetadata_PR.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'PR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'PR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PS.php b/src/data/ShortNumberMetadata_PS.php
index 96215d56d..0e43c63be 100644
--- a/src/data/ShortNumberMetadata_PS.php
+++ b/src/data/ShortNumberMetadata_PS.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'PS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-2]|66)',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:0[0-2]|66)',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '10[0-2]',
-    'ExampleNumber' => '100',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '10[0-2]',
+        'example' => '100',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-2]|122|44|66|99)',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[0-2]|122|44|66|99)',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '112\\d',
-    'ExampleNumber' => '1120',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '112\\d',
+        'example' => '1120',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'PS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PT.php b/src/data/ShortNumberMetadata_PT.php
index fddf72825..103edebb1 100644
--- a/src/data/ShortNumberMetadata_PT.php
+++ b/src/data/ShortNumberMetadata_PT.php
@@ -6,71 +6,52 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 6,
+return [
+    'id' => 'PT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            3,
+            4,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[257]|1(?:16\\d\\d|5[1589]|8[279])\\d',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[257]|1(?:16\\d\\d|5[1589]|8[279])\\d',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[25]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:45|5[01])|1(?:[2578]|600[06])|4(?:1[45]|4)|583|6(?:1[0236]|3[02]|9[169]))|1(?:1611|59)1|1[068]78|1[08]9[16]|1(?:0[1-38]|40|5[15]|6[258]|82)0',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[25]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:45|5[01])|1(?:[2578]|600[06])|4(?:1[45]|4)|583|6(?:1[0236]|3[02]|9[169]))|1(?:1611|59)1|1[068]78|1[08]9[16]|1(?:0[1-38]|40|5[15]|6[258]|82)0',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PW.php b/src/data/ShortNumberMetadata_PW.php
index 8457227c4..12397d574 100644
--- a/src/data/ShortNumberMetadata_PW.php
+++ b/src/data/ShortNumberMetadata_PW.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'PW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'id' => 'PW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_PY.php b/src/data/ShortNumberMetadata_PY.php
index 66afd5ebb..80bdf3245 100644
--- a/src/data/ShortNumberMetadata_PY.php
+++ b/src/data/ShortNumberMetadata_PY.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'PY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '128|911',
-    'ExampleNumber' => '128',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '128|911',
+        'example' => '128',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '128|911',
-    'ExampleNumber' => '128',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[1-9]\\d|911',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '128|911',
+        'example' => '128',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[1-9]\\d|911',
+        'example' => '110',
     ],
-  ],
-  'id' => 'PY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_QA.php b/src/data/ShortNumberMetadata_QA.php
index fce19e49a..36e95f3a4 100644
--- a/src/data/ShortNumberMetadata_QA.php
+++ b/src/data/ShortNumberMetadata_QA.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[129]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'QA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[129]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '99\\d',
-    'ExampleNumber' => '990',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '99\\d',
+        'example' => '990',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900',
-    'ExampleNumber' => '900',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'pattern' => '900',
+        'example' => '900',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:00|[19]\\d)|(?:1|20|9[27]\\d)\\d\\d',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:00|[19]\\d)|(?:1|20|9[27]\\d)\\d\\d',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'QA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_RE.php b/src/data/ShortNumberMetadata_RE.php
index 089baec81..3fdb63225 100644
--- a/src/data/ShortNumberMetadata_RE.php
+++ b/src/data/ShortNumberMetadata_RE.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'RE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|[578])',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:12|[578])',
+        'example' => '15',
     ],
-  ],
-  'id' => 'RE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_RO.php b/src/data/ShortNumberMetadata_RO.php
index 7284542cb..161a4049e 100644
--- a/src/data/ShortNumberMetadata_RO.php
+++ b/src/data/ShortNumberMetadata_RO.php
@@ -6,82 +6,62 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[18]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'RO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[18]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6\\d{3})',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:2|6\\d{3})',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '(?:1(?:18[39]|[24])|8[48])\\d\\d',
-    'ExampleNumber' => '1200',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 6,
+    'premiumRate' => [
+        'pattern' => '(?:1(?:18[39]|[24])|8[48])\\d\\d',
+        'example' => '1200',
+        'posLength' => [
+            4,
+            6,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:000|1(?:11|23))|8(?:(?:01|8[18])1|119|[23]00|932))|[24]\\d\\d|9(?:0(?:00|19)|1[19]|21|3[02]|5[178]))|8[48]\\d\\d',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6(?:000|1(?:11|23))|8(?:(?:01|8[18])1|119|[23]00|932))|[24]\\d\\d|9(?:0(?:00|19)|1[19]|21|3[02]|5[178]))|8[48]\\d\\d',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '(?:1[24]|8[48])\\d\\d',
-    'ExampleNumber' => '1200',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'RO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '(?:1[24]|8[48])\\d\\d',
+        'example' => '1200',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_RS.php b/src/data/ShortNumberMetadata_RS.php
index 57e7f8eef..3d312e9ef 100644
--- a/src/data/ShortNumberMetadata_RS.php
+++ b/src/data/ShortNumberMetadata_RS.php
@@ -6,79 +6,59 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{1,5}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
-      3 => 5,
-      4 => 6,
+return [
+    'id' => 'RS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{1,5}',
+        'posLength' => [
+            2,
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|9[2-4]',
-    'ExampleNumber' => '92',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'tollFree' => [
+        'pattern' => '112|9[2-4]',
+        'example' => '92',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|9[2-4]',
-    'ExampleNumber' => '92',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'emergency' => [
+        'pattern' => '112|9[2-4]',
+        'example' => '92',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[189]\\d{1,4}|9[2-4]',
-    'ExampleNumber' => '92',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[189]\\d{1,4}|9[2-4]',
+        'example' => '92',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'RS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_RU.php b/src/data/ShortNumberMetadata_RU.php
index 6bd656c78..b27e2258c 100644
--- a/src/data/ShortNumberMetadata_RU.php
+++ b/src/data/ShortNumberMetadata_RU.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[01]\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'RU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[01]\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|(?:0|10)[1-3]',
-    'ExampleNumber' => '01',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '112|(?:0|10)[1-3]',
+        'example' => '01',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|(?:0|10)[1-3]',
-    'ExampleNumber' => '01',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '112|(?:0|10)[1-4]',
-    'ExampleNumber' => '01',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112|(?:0|10)[1-3]',
+        'example' => '01',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '112|(?:0|10)[1-4]',
+        'example' => '01',
     ],
-  ],
-  'id' => 'RU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_RW.php b/src/data/ShortNumberMetadata_RW.php
index e146d1705..1b8abd71d 100644
--- a/src/data/ShortNumberMetadata_RW.php
+++ b/src/data/ShortNumberMetadata_RW.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[14]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'RW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[14]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[1245]',
-    'ExampleNumber' => '111',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[1245]',
+        'example' => '111',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[12]',
-    'ExampleNumber' => '111',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-2]|1[0-24-6]|2[13]|70|99)|456',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[12]',
+        'example' => '111',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[0-2]|1[0-24-6]|2[13]|70|99)|456',
+        'example' => '100',
     ],
-  ],
-  'id' => 'RW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SA.php b/src/data/ShortNumberMetadata_SA.php
index 0a0f602ee..1499e55f7 100644
--- a/src/data/ShortNumberMetadata_SA.php
+++ b/src/data/ShortNumberMetadata_SA.php
@@ -6,82 +6,62 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'SA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|6\\d{3})|9(?:11|37|9[7-9])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:2|6\\d{3})|9(?:11|37|9[7-9])',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|9(?:11|9[79])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|9(?:11|9[79])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:00|2|6111)|410|9(?:00|1[89]|9(?:099|22|9[0-3])))|9(?:0[24-79]|11|3[379]|40|66|8[5-9]|9[02-9])',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '141\\d',
-    'ExampleNumber' => '1410',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:00|2|6111)|410|9(?:00|1[89]|9(?:099|22|9[0-3])))|9(?:0[24-79]|11|3[379]|40|66|8[5-9]|9[02-9])',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1(?:10|41)\\d|90[24679]',
-    'ExampleNumber' => '902',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'standardRate' => [
+        'pattern' => '141\\d',
+        'example' => '1410',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '1(?:10|41)\\d|90[24679]',
+        'example' => '902',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'id' => 'SA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SB.php b/src/data/ShortNumberMetadata_SB.php
index 596e101a1..70076a697 100644
--- a/src/data/ShortNumberMetadata_SB.php
+++ b/src/data/ShortNumberMetadata_SB.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[127-9]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SB',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[127-9]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:[02]\\d|1[12]|[35][01]|[49][1-9]|6[2-9]|7[7-9]|8[0-8])|269|777|835|9(?:[01]1|22|33|55|77|88|99)',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:[02]\\d|1[12]|[35][01]|[49][1-9]|6[2-9]|7[7-9]|8[0-8])|269|777|835|9(?:[01]1|22|33|55|77|88|99)',
+        'example' => '100',
     ],
-  ],
-  'id' => 'SB',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SC.php b/src/data/ShortNumberMetadata_SC.php
index 8964a927b..df21bdbfe 100644
--- a/src/data/ShortNumberMetadata_SC.php
+++ b/src/data/ShortNumberMetadata_SC.php
@@ -6,74 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'SC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[1468]|60)|999',
-    'ExampleNumber' => '111',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[1468]|60)|999',
+        'example' => '111',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:[06]\\d|1[0-246-8]|2[0-8]|3[13]|4[0-2]|5[15]|7[124-6]|8[158]|9[015])|9(?:6\\d\\d|99)',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:[06]\\d|1[0-246-8]|2[0-8]|3[13]|4[0-2]|5[15]|7[124-6]|8[158]|9[015])|9(?:6\\d\\d|99)',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SD.php b/src/data/ShortNumberMetadata_SD.php
index e5d4dbe05..d9bb43612 100644
--- a/src/data/ShortNumberMetadata_SD.php
+++ b/src/data/ShortNumberMetadata_SD.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SD',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'id' => 'SD',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SE.php b/src/data/ShortNumberMetadata_SE.php
index 3e6f739e4..841e2c2f1 100644
--- a/src/data/ShortNumberMetadata_SE.php
+++ b/src/data/ShortNumberMetadata_SE.php
@@ -6,80 +6,61 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-37-9]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'SE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-37-9]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:2|(?:3|6\\d)\\d\\d|414|77)|900\\d\\d',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '11811[89]|72\\d{3}',
-    'ExampleNumber' => '72000',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '11(?:2|(?:3|6\\d)\\d\\d|414|77)|900\\d\\d',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|90000',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'premiumRate' => [
+        'pattern' => '11811[89]|72\\d{3}',
+        'example' => '72000',
+        'posLength' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11(?:[25]|313|6(?:00[06]|1(?:1[17]|23))|7[0-8])|2(?:2[02358]|33|4[01]|50|6[1-4])|32[13]|8(?:22|88)|9(?:0(?:00|51)0|12)|(?:11(?:4|8[02-46-9])|7\\d\\d|90[2-4])\\d\\d|(?:118|90)1(?:[02-9]\\d|1[013-9])',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112|90000',
+        'example' => '112',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '2(?:2[02358]|33|4[01]|50|6[1-4])|32[13]|8(?:22|88)|912',
-    'ExampleNumber' => '220',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'shortCode' => [
+        'pattern' => '11(?:[25]|313|6(?:00[06]|1(?:1[17]|23))|7[0-8])|2(?:2[02358]|33|4[01]|50|6[1-4])|32[13]|8(?:22|88)|9(?:0(?:00|51)0|12)|(?:11(?:4|8[02-46-9])|7\\d\\d|90[2-4])\\d\\d|(?:118|90)1(?:[02-9]\\d|1[013-9])',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '7\\d{4}',
-    'ExampleNumber' => '70000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'pattern' => '2(?:2[02358]|33|4[01]|50|6[1-4])|32[13]|8(?:22|88)|912',
+        'example' => '220',
+        'posLength' => [
+            3,
+        ],
+    ],
+    'smsServices' => [
+        'pattern' => '7\\d{4}',
+        'example' => '70000',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SG.php b/src/data/ShortNumberMetadata_SG.php
index 61d84738b..4360569a7 100644
--- a/src/data/ShortNumberMetadata_SG.php
+++ b/src/data/ShortNumberMetadata_SG.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[179]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'SG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[179]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '99[359]',
-    'ExampleNumber' => '993',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '99[359]',
+        'example' => '993',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '99[359]',
-    'ExampleNumber' => '993',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '99[359]',
+        'example' => '993',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:(?:[01368]\\d|44)\\d|[57]\\d{2,3}|9(?:0[1-9]|[1-9]\\d))|77222|99[02-9]|100',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:(?:[01368]\\d|44)\\d|[57]\\d{2,3}|9(?:0[1-9]|[1-9]\\d))|77222|99[02-9]|100',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '772\\d\\d',
-    'ExampleNumber' => '77200',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '772\\d\\d',
+        'example' => '77200',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SH.php b/src/data/ShortNumberMetadata_SH.php
index d2c8bc48b..6af154011 100644
--- a/src/data/ShortNumberMetadata_SH.php
+++ b/src/data/ShortNumberMetadata_SH.php
@@ -6,75 +6,55 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[129]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'SH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[129]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}|26[01]\\d\\d|9(?:11|99)',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1\\d{2,3}|26[01]\\d\\d|9(?:11|99)',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SI.php b/src/data/ShortNumberMetadata_SI.php
index 0e94aa52a..f44470858 100644
--- a/src/data/ShortNumberMetadata_SI.php
+++ b/src/data/ShortNumberMetadata_SI.php
@@ -6,72 +6,53 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'SI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11(?:(?:0|6\\d)\\d\\d|[23]|8\\d\\d?)',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11(?:(?:0|6\\d)\\d\\d|[23]|8\\d\\d?)',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[23]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:00[146]|[23]|6(?:000|1(?:11|23))|8(?:[08]|99))|9(?:059|1(?:0[12]|16)|5|70|87|9(?:00|[149])))|19(?:08|81)[09]',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[23]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:00[146]|[23]|6(?:000|1(?:11|23))|8(?:[08]|99))|9(?:059|1(?:0[12]|16)|5|70|87|9(?:00|[149])))|19(?:08|81)[09]',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SJ.php b/src/data/ShortNumberMetadata_SJ.php
index cc57db78f..2f3052835 100644
--- a/src/data/ShortNumberMetadata_SJ.php
+++ b/src/data/ShortNumberMetadata_SJ.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SJ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[023]',
+        'example' => '110',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[023]',
+        'example' => '110',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[023]',
+        'example' => '110',
     ],
-  ],
-  'id' => 'SJ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SK.php b/src/data/ShortNumberMetadata_SK.php
index 6b1298c08..ac9353828 100644
--- a/src/data/ShortNumberMetadata_SK.php
+++ b/src/data/ShortNumberMetadata_SK.php
@@ -6,77 +6,57 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'SK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6\\d{3})|5[058])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:2|6\\d{3})|5[058])',
+        'example' => '112',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|5[058])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:12|5[058])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6(?:000|111)|8[0-8])|[248]\\d{3}|5[0589])',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6(?:000|111)|8[0-8])|[248]\\d{3}|5[0589])',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SL.php b/src/data/ShortNumberMetadata_SL.php
index f5163f126..e537b5354 100644
--- a/src/data/ShortNumberMetadata_SL.php
+++ b/src/data/ShortNumberMetadata_SL.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[069]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'SL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[069]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '(?:01|99)9',
-    'ExampleNumber' => '019',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '(?:01|99)9',
+        'example' => '019',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '(?:01|99)9',
-    'ExampleNumber' => '019',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '(?:01|99)9',
+        'example' => '019',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '(?:01|99)9|60400',
-    'ExampleNumber' => '019',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '(?:01|99)9|60400',
+        'example' => '019',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '604\\d\\d',
-    'ExampleNumber' => '60400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '604\\d\\d',
-    'ExampleNumber' => '60400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '604\\d\\d',
+        'example' => '60400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'SL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '604\\d\\d',
+        'example' => '60400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SM.php b/src/data/ShortNumberMetadata_SM.php
index 207f61a30..ae6bee651 100644
--- a/src/data/ShortNumberMetadata_SM.php
+++ b/src/data/ShortNumberMetadata_SM.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[358]',
-    'ExampleNumber' => '113',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[358]',
+        'example' => '113',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[358]',
-    'ExampleNumber' => '113',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[358]',
-    'ExampleNumber' => '113',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[358]',
+        'example' => '113',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[358]',
+        'example' => '113',
     ],
-  ],
-  'id' => 'SM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SN.php b/src/data/ShortNumberMetadata_SN.php
index 80965cf56..05a5a46af 100644
--- a/src/data/ShortNumberMetadata_SN.php
+++ b/src/data/ShortNumberMetadata_SN.php
@@ -6,90 +6,70 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[12]\\d{1,5}',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 4,
-      3 => 5,
-      4 => 6,
+return [
+    'id' => 'SN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[12]\\d{1,5}',
+        'posLength' => [
+            2,
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:515|[78])|2(?:00|1)\\d{3}',
-    'ExampleNumber' => '17',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:515|[78])|2(?:00|1)\\d{3}',
+        'example' => '17',
+        'posLength' => [
+            2,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '2(?:0[246]|[468])\\d{3}',
-    'ExampleNumber' => '24000',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
+    'premiumRate' => [
+        'pattern' => '2(?:0[246]|[468])\\d{3}',
+        'example' => '24000',
+        'posLength' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-    'PossibleLength' =>
-     [
-      0 => 2,
+    'emergency' => [
+        'pattern' => '1[78]',
+        'example' => '17',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[69]|(?:[246]\\d|51)\\d)|2(?:0[0-246]|[12468])\\d{3}|1[278]',
-    'ExampleNumber' => '12',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '2(?:01|2)\\d{3}',
-    'ExampleNumber' => '22000',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
+    'shortCode' => [
+        'pattern' => '1(?:1[69]|(?:[246]\\d|51)\\d)|2(?:0[0-246]|[12468])\\d{3}|1[278]',
+        'example' => '12',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '1[46]\\d\\d',
-    'ExampleNumber' => '1400',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'standardRate' => [
+        'pattern' => '2(?:01|2)\\d{3}',
+        'example' => '22000',
+        'posLength' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '2[468]\\d{3}',
-    'ExampleNumber' => '24000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '1[46]\\d\\d',
+        'example' => '1400',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'id' => 'SN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '2[468]\\d{3}',
+        'example' => '24000',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SO.php b/src/data/ShortNumberMetadata_SO.php
index f118d954e..2e9895b77 100644
--- a/src/data/ShortNumberMetadata_SO.php
+++ b/src/data/ShortNumberMetadata_SO.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[57-9]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[57-9]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '555|888|999',
-    'ExampleNumber' => '555',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '555|888|999',
+        'example' => '555',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '555|888|999',
-    'ExampleNumber' => '555',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '555|777|888|999',
-    'ExampleNumber' => '555',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '555|888|999',
+        'example' => '555',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '555|777|888|999',
+        'example' => '555',
     ],
-  ],
-  'id' => 'SO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SR.php b/src/data/ShortNumberMetadata_SR.php
index 5fc801275..ea5055384 100644
--- a/src/data/ShortNumberMetadata_SR.php
+++ b/src/data/ShortNumberMetadata_SR.php
@@ -6,74 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'SR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '115',
-    'ExampleNumber' => '115',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '115',
+        'example' => '115',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '115',
-    'ExampleNumber' => '115',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '115',
+        'example' => '115',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1\\d{2,3}',
+        'example' => '100',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SS.php b/src/data/ShortNumberMetadata_SS.php
index 7805d58e3..5227c975c 100644
--- a/src/data/ShortNumberMetadata_SS.php
+++ b/src/data/ShortNumberMetadata_SS.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'id' => 'SS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ST.php b/src/data/ShortNumberMetadata_ST.php
index 6ca64d6ef..b6d741456 100644
--- a/src/data/ShortNumberMetadata_ST.php
+++ b/src/data/ShortNumberMetadata_ST.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'ST',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '112',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '112',
+        'example' => '112',
     ],
-  ],
-  'id' => 'ST',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SV.php b/src/data/ShortNumberMetadata_SV.php
index affb16630..6acbca284 100644
--- a/src/data/ShortNumberMetadata_SV.php
+++ b/src/data/ShortNumberMetadata_SV.php
@@ -6,80 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[149]\\d\\d(?:\\d{2,3})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
-      2 => 6,
+return [
+    'id' => 'SV',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[149]\\d\\d(?:\\d{2,3})?',
+        'posLength' => [
+            3,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '116\\d{3}|911',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '116\\d{3}|911',
+        'example' => '911',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '91[13]',
-    'ExampleNumber' => '911',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '91[13]',
+        'example' => '911',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:2|6111)|2[136-8]|3[0-6]|9[05])|40404|9(?:1\\d|29)',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:2|6111)|2[136-8]|3[0-6]|9[05])|40404|9(?:1\\d|29)',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '404\\d\\d',
-    'ExampleNumber' => '40400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'SV',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '404\\d\\d',
+        'example' => '40400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SX.php b/src/data/ShortNumberMetadata_SX.php
index ff2adad84..1a156a00e 100644
--- a/src/data/ShortNumberMetadata_SX.php
+++ b/src/data/ShortNumberMetadata_SX.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SX',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:19|88)',
-    'ExampleNumber' => '919',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:19|88)',
+        'example' => '919',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '919',
-    'ExampleNumber' => '919',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:19|88)',
-    'ExampleNumber' => '919',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '919',
+        'example' => '919',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:19|88)',
+        'example' => '919',
     ],
-  ],
-  'id' => 'SX',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SY.php b/src/data/ShortNumberMetadata_SY.php
index 6daaa1402..2fdba632a 100644
--- a/src/data/ShortNumberMetadata_SY.php
+++ b/src/data/ShortNumberMetadata_SY.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[023]',
+        'example' => '110',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[023]',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[023]',
+        'example' => '110',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[023]',
+        'example' => '110',
     ],
-  ],
-  'id' => 'SY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_SZ.php b/src/data/ShortNumberMetadata_SZ.php
index 770ea6acd..e9d789b22 100644
--- a/src/data/ShortNumberMetadata_SZ.php
+++ b/src/data/ShortNumberMetadata_SZ.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'SZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'id' => 'SZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TC.php b/src/data/ShortNumberMetadata_TC.php
index 6977a3822..e14055c61 100644
--- a/src/data/ShortNumberMetadata_TC.php
+++ b/src/data/ShortNumberMetadata_TC.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'TC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'TC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TD.php b/src/data/ShortNumberMetadata_TD.php
index 4bcc6b8ae..d9d98e03d 100644
--- a/src/data/ShortNumberMetadata_TD.php
+++ b/src/data/ShortNumberMetadata_TD.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'TD',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[78]',
-    'ExampleNumber' => '17',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[78]',
+        'example' => '17',
     ],
-  ],
-  'id' => 'TD',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TG.php b/src/data/ShortNumberMetadata_TG.php
index 014f9324f..fa60b3ecd 100644
--- a/src/data/ShortNumberMetadata_TG.php
+++ b/src/data/ShortNumberMetadata_TG.php
@@ -6,74 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'TG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[78]|7[127])',
-    'ExampleNumber' => '117',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[78]|7[127])',
+        'example' => '117',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[78]|7[127])',
-    'ExampleNumber' => '117',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[78]|7[127])',
+        'example' => '117',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:011|1[078]|7[127])',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:011|1[078]|7[127])',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TH.php b/src/data/ShortNumberMetadata_TH.php
index e0e64a07a..152654be9 100644
--- a/src/data/ShortNumberMetadata_TH.php
+++ b/src/data/ShortNumberMetadata_TH.php
@@ -6,72 +6,54 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'TH',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:00|2[03]|3[3479]|7[67]|9[0246])|578|6(?:44|6[79]|88|9[16])|88\\d|9[19])|1[15]55',
-    'ExampleNumber' => '191',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1(?:113|2[23]\\d|5(?:09|56))',
-    'ExampleNumber' => '1113',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'tollFree' => [
+        'pattern' => '1(?:1(?:00|2[03]|3[3479]|7[67]|9[0246])|578|6(?:44|6[79]|88|9[16])|88\\d|9[19])|1[15]55',
+        'example' => '191',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:669|9[19])',
-    'ExampleNumber' => '191',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[0-2]|1(?:0[03]|1[1-35]|2[0358]|3[03-79]|4[02-489]|5[04-9]|6[04-79]|7[03-9]|8[027-9]|9[02-9])|2(?:22|3[89]|66)|3(?:18|2[23]|3[013]|5[56]|6[45]|73)|477|5(?:0\\d|4[0-37-9]|5[1-8]|6[01679]|7[12568]|8[0-24589]|9[013589])|6(?:0[0-29]|2[03]|4[3-6]|6[1-9]|7[0257-9]|8[0158]|9[014-9])|7(?:[14]9|7[27]|90)|888|9[19])',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:03|1[15]|2[58]|3[056]|4[02-49]|5[046-9]|7[03-589]|9[57-9])|5(?:0[0-8]|4[0-378]|5[1-478]|7[156])|6(?:20|4[356]|6[1-68]|7[057-9]|8[015]|9[0457-9]))|1(?:1[68]|26|3[1-35]|5[689]|60|7[17])\\d',
-    'ExampleNumber' => '1103',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'premiumRate' => [
+        'pattern' => '1(?:113|2[23]\\d|5(?:09|56))',
+        'example' => '1113',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '114[89]',
-    'ExampleNumber' => '1148',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'emergency' => [
+        'pattern' => '1(?:669|9[19])',
+        'example' => '191',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[0-2]|1(?:0[03]|1[1-35]|2[0358]|3[03-79]|4[02-489]|5[04-9]|6[04-79]|7[03-9]|8[027-9]|9[02-9])|2(?:22|3[89]|66)|3(?:18|2[23]|3[013]|5[56]|6[45]|73)|477|5(?:0\\d|4[0-37-9]|5[1-8]|6[01679]|7[12568]|8[0-24589]|9[013589])|6(?:0[0-29]|2[03]|4[3-6]|6[1-9]|7[0257-9]|8[0158]|9[014-9])|7(?:[14]9|7[27]|90)|888|9[19])',
+        'example' => '100',
     ],
-  ],
-  'id' => 'TH',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'pattern' => '1(?:1(?:03|1[15]|2[58]|3[056]|4[02-49]|5[046-9]|7[03-589]|9[57-9])|5(?:0[0-8]|4[0-378]|5[1-478]|7[156])|6(?:20|4[356]|6[1-68]|7[057-9]|8[015]|9[0457-9]))|1(?:1[68]|26|3[1-35]|5[689]|60|7[17])\\d',
+        'example' => '1103',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '114[89]',
+        'example' => '1148',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TJ.php b/src/data/ShortNumberMetadata_TJ.php
index 0026dbb6a..d58c45712 100644
--- a/src/data/ShortNumberMetadata_TJ.php
+++ b/src/data/ShortNumberMetadata_TJ.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'TJ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
     ],
-  ],
-  'id' => 'TJ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TL.php b/src/data/ShortNumberMetadata_TL.php
index d5a26f353..6b280ca07 100644
--- a/src/data/ShortNumberMetadata_TL.php
+++ b/src/data/ShortNumberMetadata_TL.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'TL',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[25]',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[25]',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[25]',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[02]|1[25]|2[0138]|72|9[07])',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[25]',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[02]|1[25]|2[0138]|72|9[07])',
+        'example' => '100',
     ],
-  ],
-  'id' => 'TL',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TM.php b/src/data/ShortNumberMetadata_TM.php
index 494ae2c72..f8d3bdd01 100644
--- a/src/data/ShortNumberMetadata_TM.php
+++ b/src/data/ShortNumberMetadata_TM.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '0\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'TM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '0\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0[1-49]',
-    'ExampleNumber' => '01',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '0[1-49]',
+        'example' => '01',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '0[1-3]',
-    'ExampleNumber' => '01',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0[1-49]',
-    'ExampleNumber' => '01',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '0[1-3]',
+        'example' => '01',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '0[1-49]',
+        'example' => '01',
     ],
-  ],
-  'id' => 'TM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TN.php b/src/data/ShortNumberMetadata_TN.php
index a9eb10bed..effa436b1 100644
--- a/src/data/ShortNumberMetadata_TN.php
+++ b/src/data/ShortNumberMetadata_TN.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'TN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '19[078]',
-    'ExampleNumber' => '190',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '19[078]',
+        'example' => '190',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '19[078]',
-    'ExampleNumber' => '190',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '19[078]',
-    'ExampleNumber' => '190',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '19[078]',
+        'example' => '190',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '19[078]',
+        'example' => '190',
     ],
-  ],
-  'id' => 'TN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TO.php b/src/data/ShortNumberMetadata_TO.php
index 9b48af189..f7f943928 100644
--- a/src/data/ShortNumberMetadata_TO.php
+++ b/src/data/ShortNumberMetadata_TO.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'TO',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|22|33|99)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|22|33|99)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|22|33|99)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|22|33|99)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|22|33|99)',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|22|33|99)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'TO',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TR.php b/src/data/ShortNumberMetadata_TR.php
index 8cbe474ff..e62383cde 100644
--- a/src/data/ShortNumberMetadata_TR.php
+++ b/src/data/ShortNumberMetadata_TR.php
@@ -6,80 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'TR',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[02]|22|3[126]|4[04]|5[15-9]|6[18]|77|83)',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[02]|22|3[126]|4[04]|5[15-9]|6[18]|77|83)',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:1[02]|55)',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:1[02]|55)',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1(?:[02-79]|8(?:1[018]|2[0245]|3[2-4]|42|5[058]|6[06]|7[07]|8[01389]|9[089]))|3(?:37|[58]6|65)|471|5(?:07|78)|6(?:[02]6|99)|8(?:63|95))|2(?:077|268|4(?:17|23)|5(?:7[26]|82)|6[14]4|8\\d\\d|9(?:30|89))|3(?:0(?:05|72)|353|4(?:06|30|64)|502|674|747|851|9(?:1[29]|60))|4(?:0(?:25|3[12]|[47]2)|3(?:3[13]|[89]1)|439|5(?:43|55)|717|832)|5(?:145|290|[4-6]\\d\\d|772|833|9(?:[06]1|92))|6(?:236|6(?:12|39|8[59])|769)|7890|8(?:688|7(?:28|65)|85[06])|9(?:159|290)|1[2-9]\\d',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '(?:285|542)0',
-    'ExampleNumber' => '2850',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'shortCode' => [
+        'pattern' => '1(?:1(?:[02-79]|8(?:1[018]|2[0245]|3[2-4]|42|5[058]|6[06]|7[07]|8[01389]|9[089]))|3(?:37|[58]6|65)|471|5(?:07|78)|6(?:[02]6|99)|8(?:63|95))|2(?:077|268|4(?:17|23)|5(?:7[26]|82)|6[14]4|8\\d\\d|9(?:30|89))|3(?:0(?:05|72)|353|4(?:06|30|64)|502|674|747|851|9(?:1[29]|60))|4(?:0(?:25|3[12]|[47]2)|3(?:3[13]|[89]1)|439|5(?:43|55)|717|832)|5(?:145|290|[4-6]\\d\\d|772|833|9(?:[06]1|92))|6(?:236|6(?:12|39|8[59])|769)|7890|8(?:688|7(?:28|65)|85[06])|9(?:159|290)|1[2-9]\\d',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'pattern' => '(?:285|542)0',
+        'example' => '2850',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '1(?:3(?:37|[58]6|65)|4(?:4|71)|5(?:07|78)|6(?:[02]6|99)|8(?:3|63|95))|(?:2(?:07|26|4[12]|5[78]|6[14]|8\\d|9[38])|3(?:0[07]|[38]5|4[036]|50|67|74|9[16])|4(?:0[2-47]|3[389]|[48]3|5[45]|71)|5(?:14|29|[4-6]\\d|77|83|9[069])|6(?:23|6[138]|76)|789|8(?:68|7[26]|85)|9(?:15|29))\\d',
-    'ExampleNumber' => '144',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TR',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '1(?:3(?:37|[58]6|65)|4(?:4|71)|5(?:07|78)|6(?:[02]6|99)|8(?:3|63|95))|(?:2(?:07|26|4[12]|5[78]|6[14]|8\\d|9[38])|3(?:0[07]|[38]5|4[036]|50|67|74|9[16])|4(?:0[2-47]|3[389]|[48]3|5[45]|71)|5(?:14|29|[4-6]\\d|77|83|9[069])|6(?:23|6[138]|76)|789|8(?:68|7[26]|85)|9(?:15|29))\\d',
+        'example' => '144',
+        'posLength' => [
+            3,
+            4,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TT.php b/src/data/ShortNumberMetadata_TT.php
index 15c5ac107..17651fec1 100644
--- a/src/data/ShortNumberMetadata_TT.php
+++ b/src/data/ShortNumberMetadata_TT.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'TT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:88|9[09])',
-    'ExampleNumber' => '988',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:88|9[09])',
+        'example' => '988',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '99[09]',
-    'ExampleNumber' => '990',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:88|9[09])',
-    'ExampleNumber' => '988',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '99[09]',
+        'example' => '990',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:88|9[09])',
+        'example' => '988',
     ],
-  ],
-  'id' => 'TT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TV.php b/src/data/ShortNumberMetadata_TV.php
index 4135124b7..b1f393cb6 100644
--- a/src/data/ShortNumberMetadata_TV.php
+++ b/src/data/ShortNumberMetadata_TV.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'TV',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d|911',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1\\d\\d|911',
+        'example' => '100',
     ],
-  ],
-  'id' => 'TV',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TW.php b/src/data/ShortNumberMetadata_TW.php
index 556a2b3b9..b344594c1 100644
--- a/src/data/ShortNumberMetadata_TW.php
+++ b/src/data/ShortNumberMetadata_TW.php
@@ -6,70 +6,52 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'TW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[0289]|1(?:81|92)\\d',
-    'ExampleNumber' => '110',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '10[56]',
-    'ExampleNumber' => '105',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '11[0289]|1(?:81|92)\\d',
+        'example' => '110',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[029]',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'premiumRate' => [
+        'pattern' => '10[56]',
+        'example' => '105',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[04-6]|1[0237-9]|3[389]|6[05-8]|7[07]|8(?:0|11)|9(?:19|22|5[057]|68|8[05]|9[15689]))',
-    'ExampleNumber' => '100',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '1(?:65|9(?:1\\d|50|85|98))',
-    'ExampleNumber' => '165',
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[029]',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[04-6]|1[0237-9]|3[389]|6[05-8]|7[07]|8(?:0|11)|9(?:19|22|5[057]|68|8[05]|9[15689]))',
+        'example' => '100',
     ],
-  ],
-  'id' => 'TW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'pattern' => '1(?:65|9(?:1\\d|50|85|98))',
+        'example' => '165',
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_TZ.php b/src/data/ShortNumberMetadata_TZ.php
index e9909ea1e..86fabc173 100644
--- a/src/data/ShortNumberMetadata_TZ.php
+++ b/src/data/ShortNumberMetadata_TZ.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[149]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'TZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[149]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:1[0-79]|9[09])|999',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '1(?:1[0-79]|9[09])|999',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[0-245]|999',
-    'ExampleNumber' => '110',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '11[0-245]|999',
+        'example' => '110',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1\\d|9[09])|46400|999',
-    'ExampleNumber' => '110',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:1\\d|9[09])|46400|999',
+        'example' => '110',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '464\\d\\d',
-    'ExampleNumber' => '46400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '464\\d\\d',
-    'ExampleNumber' => '46400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '464\\d\\d',
+        'example' => '46400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'TZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '464\\d\\d',
+        'example' => '46400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_UA.php b/src/data/ShortNumberMetadata_UA.php
index 47c1a1c7e..272fda657 100644
--- a/src/data/ShortNumberMetadata_UA.php
+++ b/src/data/ShortNumberMetadata_UA.php
@@ -6,80 +6,60 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[189]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'UA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[189]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|1(?:2|6\\d{3}))',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 6,
+    'tollFree' => [
+        'pattern' => '1(?:0[1-3]|1(?:2|6\\d{3}))',
+        'example' => '101',
+        'posLength' => [
+            3,
+            6,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-3]|12)',
-    'ExampleNumber' => '101',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '1(?:0[1-3]|12)',
+        'example' => '101',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[1-49]|1(?:2|6(?:000|1(?:11|23))|8\\d\\d?)|(?:[278]|5\\d)\\d)|[89]00\\d\\d?|151|1(?:06|4\\d|6)\\d\\d',
-    'ExampleNumber' => '101',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:0[1-49]|1(?:2|6(?:000|1(?:11|23))|8\\d\\d?)|(?:[278]|5\\d)\\d)|[89]00\\d\\d?|151|1(?:06|4\\d|6)\\d\\d',
+        'example' => '101',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '(?:118|[89]00)\\d\\d?',
-    'ExampleNumber' => '1180',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '(?:118|[89]00)\\d\\d?',
+        'example' => '1180',
+        'posLength' => [
+            4,
+            5,
+        ],
     ],
-  ],
-  'id' => 'UA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_UG.php b/src/data/ShortNumberMetadata_UG.php
index 18b8afafd..093d0e1e1 100644
--- a/src/data/ShortNumberMetadata_UG.php
+++ b/src/data/ShortNumberMetadata_UG.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'UG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '999',
-    'ExampleNumber' => '999',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '999',
+        'example' => '999',
     ],
-  ],
-  'id' => 'UG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_US.php b/src/data/ShortNumberMetadata_US.php
index 93446b15c..73c3df0b1 100644
--- a/src/data/ShortNumberMetadata_US.php
+++ b/src/data/ShortNumberMetadata_US.php
@@ -6,88 +6,68 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{2,5}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
-      3 => 6,
+return [
+    'id' => 'US',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{2,5}',
+        'posLength' => [
+            3,
+            4,
+            5,
+            6,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|611|9(?:11|33|88)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|611|9(?:11|33|88)',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '24280|(?:381|968)35|4(?:3355|7553|8221)|5(?:(?:489|934)2|5928)|72078|(?:323|960)40|(?:276|414)63|(?:2(?:520|744)|7390|9968)9|(?:693|732|976)88|(?:3(?:556|825)|5294|8623|9729)4|(?:3378|4136|7642|8961|9979)6|(?:4(?:6(?:15|32)|827)|(?:591|720)8|9529)7',
-    'ExampleNumber' => '24280',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'premiumRate' => [
+        'pattern' => '24280|(?:381|968)35|4(?:3355|7553|8221)|5(?:(?:489|934)2|5928)|72078|(?:323|960)40|(?:276|414)63|(?:2(?:520|744)|7390|9968)9|(?:693|732|976)88|(?:3(?:556|825)|5294|8623|9729)4|(?:3378|4136|7642|8961|9979)6|(?:4(?:6(?:15|32)|827)|(?:591|720)8|9529)7',
+        'example' => '24280',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|911',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|911',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    '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',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '2(?:3333|(?:4224|7562|900)2|56447|6688)|3(?:1010|2665|7404)|40404|560560|6(?:0060|22639|5246|7622)|7(?:0701|3822|4666)|8(?:(?:3825|7226)5|4816)|99099',
-    'ExampleNumber' => '23333',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
+    'shortCode' => [
+        'pattern' => '11(?:2|5[1-47]|[68]\\d|7[0-57]|98)|[2-9]\\d{3,5}|[2-8]11|9(?:11|33|88)',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '336\\d\\d|[2-9]\\d{3}|[2356]11',
-    'ExampleNumber' => '211',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+    'standardRate' => [
+        'pattern' => '2(?:3333|(?:4224|7562|900)2|56447|6688)|3(?:1010|2665|7404)|40404|560560|6(?:0060|22639|5246|7622)|7(?:0701|3822|4666)|8(?:(?:3825|7226)5|4816)|99099',
+        'example' => '23333',
+        'posLength' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{4,5}',
-    'ExampleNumber' => '20000',
-    'PossibleLength' =>
-     [
-      0 => 5,
-      1 => 6,
+    'carrierSpecific' => [
+        'pattern' => '336\\d\\d|[2-9]\\d{3}|[2356]11',
+        'example' => '211',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'id' => 'US',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '[2-9]\\d{4,5}',
+        'example' => '20000',
+        'posLength' => [
+            5,
+            6,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_UY.php b/src/data/ShortNumberMetadata_UY.php
index 6026fed41..59cc27438 100644
--- a/src/data/ShortNumberMetadata_UY.php
+++ b/src/data/ShortNumberMetadata_UY.php
@@ -6,76 +6,56 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d{2,3}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
+return [
+    'id' => 'UY',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d{2,3}',
+        'posLength' => [
+            3,
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '128|911',
-    'ExampleNumber' => '128',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '128|911',
+        'example' => '128',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '128|911',
-    'ExampleNumber' => '128',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '128|911',
+        'example' => '128',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0[4-9]|1[2368]|2[0-3568]|787)|911',
-    'ExampleNumber' => '104',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '178\\d',
-    'ExampleNumber' => '1780',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'shortCode' => [
+        'pattern' => '1(?:0[4-9]|1[2368]|2[0-3568]|787)|911',
+        'example' => '104',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'standardRate' => [
+        'pattern' => '178\\d',
+        'example' => '1780',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'UY',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_UZ.php b/src/data/ShortNumberMetadata_UZ.php
index bc564f415..5a4eb6f0a 100644
--- a/src/data/ShortNumberMetadata_UZ.php
+++ b/src/data/ShortNumberMetadata_UZ.php
@@ -6,81 +6,61 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[04]\\d(?:\\d(?:\\d{2})?)?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
-      2 => 5,
+return [
+    'id' => 'UZ',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[04]\\d(?:\\d(?:\\d{2})?)?',
+        'posLength' => [
+            2,
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0(?:0[1-3]|[1-3]|50)',
-    'ExampleNumber' => '01',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'tollFree' => [
+        'pattern' => '0(?:0[1-3]|[1-3]|50)',
+        'example' => '01',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '0(?:0[1-3]|[1-3]|50)',
-    'ExampleNumber' => '01',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+    'emergency' => [
+        'pattern' => '0(?:0[1-3]|[1-3]|50)',
+        'example' => '01',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '0(?:0[1-3]|[1-3]|50)|45400',
-    'ExampleNumber' => '01',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '0(?:0[1-3]|[1-3]|50)|45400',
+        'example' => '01',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '454\\d\\d',
-    'ExampleNumber' => '45400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '454\\d\\d',
-    'ExampleNumber' => '45400',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '454\\d\\d',
+        'example' => '45400',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'id' => 'UZ',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '454\\d\\d',
+        'example' => '45400',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_VA.php b/src/data/ShortNumberMetadata_VA.php
index a91835988..e63c8b071 100644
--- a/src/data/ShortNumberMetadata_VA.php
+++ b/src/data/ShortNumberMetadata_VA.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'VA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[2358]',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[2358]',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[2358]',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[2358]',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[2358]',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[2358]',
+        'example' => '112',
     ],
-  ],
-  'id' => 'VA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_VC.php b/src/data/ShortNumberMetadata_VC.php
index fb98fdf8c..013fbeb1b 100644
--- a/src/data/ShortNumberMetadata_VC.php
+++ b/src/data/ShortNumberMetadata_VC.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'VC',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'VC',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_VE.php b/src/data/ShortNumberMetadata_VE.php
index e22c0aeac..aa0007c00 100644
--- a/src/data/ShortNumberMetadata_VE.php
+++ b/src/data/ShortNumberMetadata_VE.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'VE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|71)|911',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|71)|911',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|71)|911',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|71)|911',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|71)|911',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:12|71)|911',
+        'example' => '112',
     ],
-  ],
-  'id' => 'VE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_VG.php b/src/data/ShortNumberMetadata_VG.php
index 6f1d2cc02..2da20d998 100644
--- a/src/data/ShortNumberMetadata_VG.php
+++ b/src/data/ShortNumberMetadata_VG.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'VG',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|99)',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88|99)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|99)',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88|99)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'VG',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_VI.php b/src/data/ShortNumberMetadata_VI.php
index ffba5139f..b932cf182 100644
--- a/src/data/ShortNumberMetadata_VI.php
+++ b/src/data/ShortNumberMetadata_VI.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '9\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'VI',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '9\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '911',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '9(?:11|88)',
-    'ExampleNumber' => '911',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '911',
+        'example' => '911',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '9(?:11|88)',
+        'example' => '911',
     ],
-  ],
-  'id' => 'VI',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_VN.php b/src/data/ShortNumberMetadata_VN.php
index e63ac9ca3..e7d4ba1d7 100644
--- a/src/data/ShortNumberMetadata_VN.php
+++ b/src/data/ShortNumberMetadata_VN.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'VN',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '11[3-5]',
-    'ExampleNumber' => '113',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '11[3-5]',
+        'example' => '113',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '11[3-5]',
-    'ExampleNumber' => '113',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[3-5]',
-    'ExampleNumber' => '113',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '11[3-5]',
+        'example' => '113',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[3-5]',
+        'example' => '113',
     ],
-  ],
-  'id' => 'VN',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_VU.php b/src/data/ShortNumberMetadata_VU.php
index 23ecaf525..1fc3ebf4d 100644
--- a/src/data/ShortNumberMetadata_VU.php
+++ b/src/data/ShortNumberMetadata_VU.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'VU',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '112',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '112',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '112',
+        'example' => '112',
     ],
-  ],
-  'id' => 'VU',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_WF.php b/src/data/ShortNumberMetadata_WF.php
index 1faa4357c..e5182cbe5 100644
--- a/src/data/ShortNumberMetadata_WF.php
+++ b/src/data/ShortNumberMetadata_WF.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d',
-    'PossibleLength' =>
-     [
-      0 => 2,
+return [
+    'id' => 'WF',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d',
+        'posLength' => [
+            2,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1[578]',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1[578]',
+        'example' => '15',
     ],
-  ],
-  'id' => 'WF',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_WS.php b/src/data/ShortNumberMetadata_WS.php
index 85401b1cc..bcc10aca6 100644
--- a/src/data/ShortNumberMetadata_WS.php
+++ b/src/data/ShortNumberMetadata_WS.php
@@ -6,63 +6,46 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'WS',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '9(?:11|9[4-69])',
-    'ExampleNumber' => '911',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '9(?:11|9[4-69])',
+        'example' => '911',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '9(?:11|9[4-69])',
-    'ExampleNumber' => '911',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:1[12]|2[0-6]|[39]0)|9(?:11|9[4-79])',
-    'ExampleNumber' => '111',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '12[0-6]',
-    'ExampleNumber' => '120',
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '9(?:11|9[4-69])',
+        'example' => '911',
     ],
-  ],
-  'id' => 'WS',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'shortCode' => [
+        'pattern' => '1(?:1[12]|2[0-6]|[39]0)|9(?:11|9[4-79])',
+        'example' => '111',
+    ],
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'pattern' => '12[0-6]',
+        'example' => '120',
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_XK.php b/src/data/ShortNumberMetadata_XK.php
index 5cfae3aa8..c37ba447d 100644
--- a/src/data/ShortNumberMetadata_XK.php
+++ b/src/data/ShortNumberMetadata_XK.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'XK',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|9[2-4])',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|9[2-4])',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|9[2-4])',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|9[2-4])',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|9[2-4])',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:12|9[2-4])',
+        'example' => '112',
     ],
-  ],
-  'id' => 'XK',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_YE.php b/src/data/ShortNumberMetadata_YE.php
index b9be8454f..66f8517fe 100644
--- a/src/data/ShortNumberMetadata_YE.php
+++ b/src/data/ShortNumberMetadata_YE.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'YE',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '19[1459]',
-    'ExampleNumber' => '191',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '19[1459]',
+        'example' => '191',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '19[1459]',
-    'ExampleNumber' => '191',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '19[1459]',
-    'ExampleNumber' => '191',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '19[1459]',
+        'example' => '191',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '19[1459]',
+        'example' => '191',
     ],
-  ],
-  'id' => 'YE',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_YT.php b/src/data/ShortNumberMetadata_YT.php
index 19633f555..863af2f13 100644
--- a/src/data/ShortNumberMetadata_YT.php
+++ b/src/data/ShortNumberMetadata_YT.php
@@ -6,66 +6,48 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '1\\d\\d?',
-    'PossibleLength' =>
-     [
-      0 => 2,
-      1 => 3,
+return [
+    'id' => 'YT',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '1\\d\\d?',
+        'posLength' => [
+            2,
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:12|5)',
-    'ExampleNumber' => '15',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '1(?:12|5)',
+        'example' => '15',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:12|5)',
-    'ExampleNumber' => '15',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:12|5)',
-    'ExampleNumber' => '15',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '1(?:12|5)',
+        'example' => '15',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '1(?:12|5)',
+        'example' => '15',
     ],
-  ],
-  'id' => 'YT',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ZA.php b/src/data/ShortNumberMetadata_ZA.php
index ce861f069..6dceba0b7 100644
--- a/src/data/ShortNumberMetadata_ZA.php
+++ b/src/data/ShortNumberMetadata_ZA.php
@@ -6,85 +6,65 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[134]\\d{2,4}',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 4,
-      2 => 5,
+return [
+    'id' => 'ZA',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[134]\\d{2,4}',
+        'posLength' => [
+            3,
+            4,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1(?:01\\d\\d|12)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'tollFree' => [
+        'pattern' => '1(?:01\\d\\d|12)',
+        'example' => '112',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '41(?:348|851)',
-    'ExampleNumber' => '41348',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'premiumRate' => [
+        'pattern' => '41(?:348|851)',
+        'example' => '41348',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '1(?:01(?:11|77)|12)',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+    'emergency' => [
+        'pattern' => '1(?:01(?:11|77)|12)',
+        'example' => '112',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '1(?:0(?:1(?:11|77)|20|7)|1[12]|77(?:3[237]|[45]7|6[279]|9[26]))|[34]\\d{4}',
-    'ExampleNumber' => '107',
-  ],
-  'standardRate' =>
-   [
-    'NationalNumberPattern' => '3(?:078[23]|7(?:064|567)|8126)|4(?:394[16]|7751|8837)|4[23]699',
-    'ExampleNumber' => '30782',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'shortCode' => [
+        'pattern' => '1(?:0(?:1(?:11|77)|20|7)|1[12]|77(?:3[237]|[45]7|6[279]|9[26]))|[34]\\d{4}',
+        'example' => '107',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '111',
-    'ExampleNumber' => '111',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'standardRate' => [
+        'pattern' => '3(?:078[23]|7(?:064|567)|8126)|4(?:394[16]|7751|8837)|4[23]699',
+        'example' => '30782',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'NationalNumberPattern' => '[34]\\d{4}',
-    'ExampleNumber' => '30000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'carrierSpecific' => [
+        'pattern' => '111',
+        'example' => '111',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'id' => 'ZA',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'pattern' => '[34]\\d{4}',
+        'example' => '30000',
+        'posLength' => [
+            5,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ZM.php b/src/data/ShortNumberMetadata_ZM.php
index 43961b408..674a5fff3 100644
--- a/src/data/ShortNumberMetadata_ZM.php
+++ b/src/data/ShortNumberMetadata_ZM.php
@@ -6,65 +6,47 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[19]\\d\\d',
-    'PossibleLength' =>
-     [
-      0 => 3,
+return [
+    'id' => 'ZM',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[19]\\d\\d',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|99[139]',
-    'ExampleNumber' => '112',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '112|99[139]',
+        'example' => '112',
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|99[139]',
-    'ExampleNumber' => '112',
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '112|99[139]',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'emergency' => [
+        'pattern' => '112|99[139]',
+        'example' => '112',
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '112|99[139]',
+        'example' => '112',
     ],
-  ],
-  'id' => 'ZM',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'carrierSpecific' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/src/data/ShortNumberMetadata_ZW.php b/src/data/ShortNumberMetadata_ZW.php
index bf697fdf7..7661cb781 100644
--- a/src/data/ShortNumberMetadata_ZW.php
+++ b/src/data/ShortNumberMetadata_ZW.php
@@ -6,78 +6,58 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[139]\\d\\d(?:\\d{2})?',
-    'PossibleLength' =>
-     [
-      0 => 3,
-      1 => 5,
+return [
+    'id' => 'ZW',
+    'countryCode' => 0,
+    'generalDesc' => [
+        'pattern' => '[139]\\d\\d(?:\\d{2})?',
+        'posLength' => [
+            3,
+            5,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '112|9(?:5[023]|61|9[3-59])',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'tollFree' => [
+        'pattern' => '112|9(?:5[023]|61|9[3-59])',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '3[013-57-9]\\d{3}',
-    'ExampleNumber' => '30000',
-    'PossibleLength' =>
-     [
-      0 => 5,
+    'premiumRate' => [
+        'pattern' => '3[013-57-9]\\d{3}',
+        'example' => '30000',
+        'posLength' => [
+            5,
+        ],
     ],
-  ],
-  'emergency' =>
-   [
-    'NationalNumberPattern' => '112|99[3-59]',
-    'ExampleNumber' => '112',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'emergency' => [
+        'pattern' => '112|99[3-59]',
+        'example' => '112',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'shortCode' =>
-   [
-    'NationalNumberPattern' => '11[2469]|3[013-57-9]\\d{3}|9(?:5[023]|6[0-25]|9[3-59])',
-    'ExampleNumber' => '112',
-  ],
-  'standardRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'shortCode' => [
+        'pattern' => '11[2469]|3[013-57-9]\\d{3}|9(?:5[023]|6[0-25]|9[3-59])',
+        'example' => '112',
     ],
-  ],
-  'carrierSpecific' =>
-   [
-    'NationalNumberPattern' => '114|9(?:5[023]|6[0-25])',
-    'ExampleNumber' => '114',
-    'PossibleLength' =>
-     [
-      0 => 3,
+    'standardRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'smsServices' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'carrierSpecific' => [
+        'pattern' => '114|9(?:5[023]|6[0-25])',
+        'example' => '114',
+        'posLength' => [
+            3,
+        ],
     ],
-  ],
-  'id' => 'ZW',
-  'countryCode' => 0,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'smsServices' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_800.php b/tests/core/data/PhoneNumberMetadataForTesting_800.php
index 8da7c2a87..dafb4d52f 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_800.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_800.php
@@ -6,108 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => '001',
+    'countryCode' => 800,
+    'generalDesc' => [
+        'pattern' => '\\d{8}',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '\\d{8}',
-    'ExampleNumber' => '12345678',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '\\d{8}',
+        'example' => '12345678',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 800,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_882.php b/tests/core/data/PhoneNumberMetadataForTesting_882.php
index b7cdccc28..10e08e8e6 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_882.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_882.php
@@ -6,108 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => '001',
+    'countryCode' => 882,
+    'generalDesc' => [
+        'pattern' => '\\d{9}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '\\d{9}',
-    'ExampleNumber' => '123456789',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '\\d{9}',
+        'example' => '123456789',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 882,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_979.php b/tests/core/data/PhoneNumberMetadataForTesting_979.php
index 1dc9aaf2d..33747ebfa 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_979.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_979.php
@@ -6,108 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => '001',
+    'countryCode' => 979,
+    'generalDesc' => [
+        'pattern' => '\\d{9}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '\\d{9}',
-    'ExampleNumber' => '123456789',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '\\d{9}',
+        'example' => '123456789',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => '001',
-  'countryCode' => 979,
-  'internationalPrefix' => '',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_AD.php b/tests/core/data/PhoneNumberMetadataForTesting_AD.php
index 1be91f2da..d5f7fb2d8 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_AD.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_AD.php
@@ -6,97 +6,69 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 6,
+return [
+    'id' => 'AD',
+    'countryCode' => 376,
+    'generalDesc' => [
+        'pattern' => '\\d{6}',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '\\d{6}',
-    'ExampleNumber' => '123456',
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '\\d{6}',
+        'example' => '123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AD',
-  'countryCode' => 376,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_AE.php b/tests/core/data/PhoneNumberMetadataForTesting_AE.php
index 1cc312e6f..0eaa7b37c 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_AE.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_AE.php
@@ -6,97 +6,70 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'AE',
+    'countryCode' => 971,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'NationalNumberPattern' => '600\\d{6}',
-    'ExampleNumber' => '600123456',
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'pattern' => '600\\d{6}',
+        'example' => '600123456',
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AE',
-  'countryCode' => 971,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_AM.php b/tests/core/data/PhoneNumberMetadataForTesting_AM.php
index 032f63ae9..02a998c6f 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_AM.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_AM.php
@@ -6,112 +6,83 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 8,
+return [
+    'id' => 'AM',
+    'countryCode' => 374,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{7}',
+        'posLength' => [
+            8,
+        ],
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
+    'fixedLine' => [
+        'pattern' => '[1-9]\\d{7}',
+        'example' => '10123456',
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{7}',
-    'ExampleNumber' => '10123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
+    'mobile' => [
+        'pattern' => '[1-9]\\d{7}',
+        'example' => '10123456',
+        'posLengthLocal' => [
+            5,
+            6,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{7}',
-    'ExampleNumber' => '10123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 5,
-      1 => 6,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'AM',
-  'countryCode' => 374,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_AO.php b/tests/core/data/PhoneNumberMetadataForTesting_AO.php
index 7f5186d60..e946f6046 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_AO.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_AO.php
@@ -6,108 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[29]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'AO',
+    'countryCode' => 244,
+    'generalDesc' => [
+        'pattern' => '[29]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2\\d(?:[26-9]\\d|\\d[26-9])\\d{5}',
-    'ExampleNumber' => '222123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9[1-3]\\d{7}',
-    'ExampleNumber' => '923123456',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2\\d(?:[26-9]\\d|\\d[26-9])\\d{5}',
+        'example' => '222123456',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '9[1-3]\\d{7}',
+        'example' => '923123456',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AO',
-  'countryCode' => 244,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0~0',
-  'nationalPrefixForParsing' => '0~0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0~0',
+    'nationalPrefixForParsing' => '0~0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_AR.php b/tests/core/data/PhoneNumberMetadataForTesting_AR.php
index 9fefd5f0b..45628d8ed 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_AR.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_AR.php
@@ -6,237 +6,180 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-3689]\\d{9,10}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-      5 => 11,
+return [
+    'id' => 'AR',
+    'countryCode' => 54,
+    'generalDesc' => [
+        'pattern' => '[1-3689]\\d{9,10}',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '[1-3]\\d{5,9}',
+        'example' => '1234567890',
+        'posLength' => [
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '9\\d{10}|[1-3]\\d{9}',
+        'example' => '9234567890',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80\\d{8}',
+        'example' => '8034567890',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '6(0\\d|10)\\d{7}',
+        'example' => '6234567890',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0(?:(11|343|3715)15)?',
+    'nationalPrefixTransformRule' => '9$1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '11',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '1[02-9]|[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$2 15 $3-$4',
+            'leadingDigitsPatterns' => [
+                '911',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$2 $3-$4',
+            'leadingDigitsPatterns' => [
+                '9(?:1[02-9]|[23])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '0$1 $CC',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[68]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '11',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$1 $2-$3',
+            'leadingDigitsPatterns' => [
+                '1[02-9]|[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '911',
+            ],
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '9(?:1[02-9]|[23])',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '[68]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[1-3]\\d{5,9}',
-    'ExampleNumber' => '1234567890',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-      3 => 9,
-      4 => 10,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9\\d{10}|[1-3]\\d{9}',
-    'ExampleNumber' => '9234567890',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{8}',
-    'ExampleNumber' => '8034567890',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '6(0\\d|10)\\d{7}',
-    'ExampleNumber' => '6234567890',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'AR',
-  'countryCode' => 54,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0(?:(11|343|3715)15)?',
-  'nationalPrefixTransformRule' => '9$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '11',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[02-9]|[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$2 15 $3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '911',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$2 $3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:1[02-9]|[23])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '0$1 $CC',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[68]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '11',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$1 $2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[02-9]|[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '911',
-      ],
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '9(?:1[02-9]|[23])',
-      ],
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[68]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_AU.php b/tests/core/data/PhoneNumberMetadataForTesting_AU.php
index d46b1916c..3bd19edaf 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_AU.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_AU.php
@@ -6,135 +6,101 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-578]\\d{4,14}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+return [
+    'id' => 'AU',
+    'countryCode' => 61,
+    'generalDesc' => [
+        'pattern' => '[1-578]\\d{4,14}',
+        'posLength' => [
+            9,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[2378]\\d{8}',
-    'ExampleNumber' => '212345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'fixedLine' => [
+        'pattern' => '[2378]\\d{8}',
+        'example' => '212345678',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '4\\d{8}',
-    'ExampleNumber' => '412345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
+    'mobile' => [
+        'pattern' => '4\\d{8}',
+        'example' => '412345678',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1800\\d{6}',
-    'ExampleNumber' => '1800123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'tollFree' => [
+        'pattern' => '1800\\d{6}',
+        'example' => '1800123456',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '190[0126]\\d{6}',
-    'ExampleNumber' => '1900123456',
-    'PossibleLength' =>
-     [
-      0 => 10,
+    'premiumRate' => [
+        'pattern' => '190[0126]\\d{6}',
+        'example' => '1900123456',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'AU',
-  'countryCode' => 61,
-  'internationalPrefix' => '001[12]',
-  'preferredInternationalPrefix' => '0011',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '001[12]',
+    'preferredInternationalPrefix' => '0011',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2-478]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2-478]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_BB.php b/tests/core/data/PhoneNumberMetadataForTesting_BB.php
index e45eb8ddf..a340cf80a 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_BB.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_BB.php
@@ -6,105 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '246\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'BB',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '246\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '246\\d{7}',
+        'example' => '2464567890',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '246\\d{7}',
-    'ExampleNumber' => '2464567890',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'BB',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '011',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_BR.php b/tests/core/data/PhoneNumberMetadataForTesting_BR.php
index 7da257d7c..f95512898 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_BR.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_BR.php
@@ -6,105 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{8,10}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'BR',
+    'countryCode' => 55,
+    'generalDesc' => [
+        'pattern' => '\\d{8,10}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            8,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '\\d{8,10}',
+        'example' => '12345678',
+        'posLengthLocal' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '\\d{8,10}',
-    'ExampleNumber' => '12345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'BR',
-  'countryCode' => 55,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_BS.php b/tests/core/data/PhoneNumberMetadataForTesting_BS.php
index 89b6fd565..9cff3b45d 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_BS.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_BS.php
@@ -6,101 +6,74 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(242|8(00|66|77|88)|900)\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'BS',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '(242|8(00|66|77|88)|900)\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '242(?:3(?:02|[236][1-9]|4[0-24-9]|5[0-68]|7[3-57]|9[2-5])|4(?:2[237]|51|64|77)|502|636|702)\\d{4}',
+        'example' => '2425027890',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '242(?:3(?:02|[236][1-9]|4[0-24-9]|5[0-68]|7[3-57]|9[2-5])|4(?:2[237]|51|64|77)|502|636|702)\\d{4}',
-    'ExampleNumber' => '2425027890',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '242(357|359|457|557)\\d{4}',
+        'example' => '2423577890',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '242(357|359|457|557)\\d{4}',
-    'ExampleNumber' => '2423577890',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(00|66|77|88)\\d{7}',
-    'ExampleNumber' => '8001234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{7}',
-    'ExampleNumber' => '9001234567',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '8(00|66|77|88)\\d{7}',
+        'example' => '8001234567',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900\\d{7}',
+        'example' => '9001234567',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BS',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'nationalPrefixForParsing' => '1',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_BY.php b/tests/core/data/PhoneNumberMetadataForTesting_BY.php
index 96efa7080..bb1a7dd1e 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_BY.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_BY.php
@@ -6,135 +6,99 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{5}',
-    'PossibleLength' =>
-     [
-      0 => 6,
+return [
+    'id' => 'BY',
+    'countryCode' => 375,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{5}',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{5}',
-    'ExampleNumber' => '112345',
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '[1-9]\\d{5}',
+        'example' => '112345',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'BY',
-  'countryCode' => 375,
-  'internationalPrefix' => '810',
-  'nationalPrefix' => '8',
-  'nationalPrefixForParsing' => '80?|99999',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})',
-      'format' => '$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-8]',
-      ],
-      'nationalPrefixFormattingRule' => '8 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-8]',
-      ],
-      'nationalPrefixFormattingRule' => '8$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '810',
+    'nationalPrefix' => '8',
+    'nationalPrefixForParsing' => '80?|99999',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})',
+            'format' => '$1',
+            'leadingDigitsPatterns' => [
+                '[1-8]',
+            ],
+            'nationalPrefixFormattingRule' => '8 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-8]',
+            ],
+            'nationalPrefixFormattingRule' => '8$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[1-8]',
+            ],
+            'nationalPrefixFormattingRule' => '8 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-8]',
-      ],
-      'nationalPrefixFormattingRule' => '8 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_CA.php b/tests/core/data/PhoneNumberMetadataForTesting_CA.php
index f48ae40b0..f386066b3 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_CA.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_CA.php
@@ -6,105 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '226\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'CA',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '226\\d{7}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '226\\d{7}',
+        'example' => '2261234567',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '226\\d{7}',
-    'ExampleNumber' => '2261234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'CA',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '011',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_CC.php b/tests/core/data/PhoneNumberMetadataForTesting_CC.php
index 79c2ed721..2845dfd28 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_CC.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_CC.php
@@ -6,105 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{6,10}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'CC',
+    'countryCode' => 61,
+    'generalDesc' => [
+        'pattern' => '\\d{6,10}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '\\d{6,10}',
+        'example' => '2261234567',
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '\\d{6,10}',
-    'ExampleNumber' => '2261234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'CC',
-  'countryCode' => 61,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_CN.php b/tests/core/data/PhoneNumberMetadataForTesting_CN.php
index 0c783b8a5..5beb3a3ec 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_CN.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_CN.php
@@ -6,123 +6,91 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-7]\\d{6,11}|8[0-357-9]\\d{6,9}|9\\d{7,10}',
-    'PossibleLength' =>
-     [
-      0 => 11,
+return [
+    'id' => 'CN',
+    'countryCode' => 86,
+    'generalDesc' => [
+        'pattern' => '[1-7]\\d{6,11}|8[0-357-9]\\d{6,9}|9\\d{7,10}',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{10}',
-    'ExampleNumber' => '91234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '1(?:[38]\\d|4[57]|5[0-35-9]|7[0136-8])\\d{8}',
-    'ExampleNumber' => '13123456789',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '[2-9]\\d{10}',
+        'example' => '91234567',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '1(?:[38]\\d|4[57]|5[0-35-9]|7[0136-8])\\d{8}',
+        'example' => '13123456789',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CN',
-  'countryCode' => 86,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{5,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-9]',
-        1 => '[3-9]\\d{2}[19]',
-        2 => '[3-9]\\d{2}(?:10|95)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1',
-      ],
-      'nationalPrefixFormattingRule' => '$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{5,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[3-9]',
+                '[3-9]\\d{2}[19]',
+                '[3-9]\\d{2}(?:10|95)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '1',
+            ],
+            'nationalPrefixFormattingRule' => '$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_CO.php b/tests/core/data/PhoneNumberMetadataForTesting_CO.php
index 3208436f7..820c8f34e 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_CO.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_CO.php
@@ -6,121 +6,90 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '(?:60|3\\d)\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'CO',
+    'countryCode' => 57,
+    'generalDesc' => [
+        'pattern' => '(?:60|3\\d)\\d{8}',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '60\\d{8}',
-    'ExampleNumber' => '6012345678',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '3(?:0[0-5]|1\\d|2[0-3]|5[01]|70)\\d{7}',
-    'ExampleNumber' => '3211234567',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '60\\d{8}',
+        'example' => '6012345678',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '3(?:0[0-5]|1\\d|2[0-3]|5[01]|70)\\d{7}',
+        'example' => '3211234567',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'CO',
-  'countryCode' => 57,
-  'internationalPrefix' => '',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0(4(?:[14]4|56)|[579])?',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '($1)',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '0$CC $1',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+    'internationalPrefix' => '',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0(4(?:[14]4|56)|[579])?',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '($1)',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '0$CC $1',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_CX.php b/tests/core/data/PhoneNumberMetadataForTesting_CX.php
index 74627d10e..ede60ea91 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_CX.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_CX.php
@@ -6,105 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{8,10}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'CX',
+    'countryCode' => 61,
+    'generalDesc' => [
+        'pattern' => '\\d{8,10}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            8,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '\\d{8,10}',
+        'example' => '2261234567',
+        'posLengthLocal' => [
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '\\d{8,10}',
-    'ExampleNumber' => '2261234567',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'CX',
-  'countryCode' => 61,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_DE.php b/tests/core/data/PhoneNumberMetadataForTesting_DE.php
index 6b67883ef..fb2748843 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_DE.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_DE.php
@@ -6,198 +6,151 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{4,14}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-      5 => 9,
-      6 => 10,
-      7 => 11,
+return [
+    'id' => 'DE',
+    'countryCode' => 49,
+    'generalDesc' => [
+        'pattern' => '\\d{4,14}',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            2,
+            3,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}',
+        'example' => '30123456',
+        'posLengthLocal' => [
+            2,
+            3,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '1(5\\d{9}|7\\d{8}|6[02]\\d{8}|63\\d{7})',
+        'example' => '15123456789',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '900([135]\\d{6}|9\\d{7})',
+        'example' => '9001234567',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3,8})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '2|3[3-9]|906|[4-9][1-9]1',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4,11})',
+            'format' => '$1/$2',
+            'leadingDigitsPatterns' => [
+                '[34]0|[68]9',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[4-9]',
+                '[4-6]|[7-9](?:\\d[1-9]|[1-9]\\d)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{2,7})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[4-9]',
+                '[4-6]|[7-9](?:\\d[1-9]|[1-9]\\d)',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{1})(\\d{6})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '900',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 2,
-      1 => 3,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}',
-    'ExampleNumber' => '30123456',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 2,
-      1 => 3,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '1(5\\d{9}|7\\d{8}|6[02]\\d{8}|63\\d{7})',
-    'ExampleNumber' => '15123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900([135]\\d{6}|9\\d{7})',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'DE',
-  'countryCode' => 49,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,8})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2|3[3-9]|906|[4-9][1-9]1',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4,11})',
-      'format' => '$1/$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[34]0|[68]9',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[4-9]',
-        1 => '[4-6]|[7-9](?:\\d[1-9]|[1-9]\\d)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d{2,7})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[4-9]',
-        1 => '[4-6]|[7-9](?:\\d[1-9]|[1-9]\\d)',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{1})(\\d{6})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '900',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_FR.php b/tests/core/data/PhoneNumberMetadataForTesting_FR.php
index effcfefdc..e3ab9808c 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_FR.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_FR.php
@@ -6,111 +6,81 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '3\\d{6}',
-    'PossibleLength' =>
-     [
-      0 => 7,
+return [
+    'id' => 'FR',
+    'countryCode' => 33,
+    'generalDesc' => [
+        'pattern' => '3\\d{6}',
+        'posLength' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '3\\d{6}',
-    'ExampleNumber' => '3123456',
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '3\\d{6}',
+        'example' => '3123456',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'FR',
-  'countryCode' => 33,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_GB.php b/tests/core/data/PhoneNumberMetadataForTesting_GB.php
index 5782c78b9..8d3a1c7c6 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_GB.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_GB.php
@@ -6,174 +6,134 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{10}',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[1-6]\\d{9}',
-    'ExampleNumber' => '3123456789',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
-      1 => 7,
-      2 => 8,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '7[1-57-9]\\d{8}',
-    'ExampleNumber' => '7123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{8}',
-    'ExampleNumber' => '8023456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '9[018]\\d{8}',
-    'ExampleNumber' => '9023456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'NationalNumberPattern' => '8(?:4[3-5]|7[0-2])\\d{7}',
-    'ExampleNumber' => '8433456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '70\\d{8}',
-    'ExampleNumber' => '7033456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '56\\d{8}',
-    'ExampleNumber' => '5633456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'NationalNumberPattern' => '76\\d{8}',
-    'ExampleNumber' => '7623456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'GB',
-  'countryCode' => 44,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[1-59]|[78]0',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '6',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '7[1-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8[47]',
-      ],
-      'nationalPrefixFormattingRule' => '(0$1)',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => true,
+return [
+    'id' => 'GB',
+    'countryCode' => 44,
+    'generalDesc' => [
+        'pattern' => '\\d{10}',
+        'posLength' => [
+            9,
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '[1-6]\\d{9}',
+        'example' => '3123456789',
+        'posLengthLocal' => [
+            6,
+            7,
+            8,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '7[1-57-9]\\d{8}',
+        'example' => '7123456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80\\d{8}',
+        'example' => '8023456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '9[018]\\d{8}',
+        'example' => '9023456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'pattern' => '8(?:4[3-5]|7[0-2])\\d{7}',
+        'example' => '8433456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '70\\d{8}',
+        'example' => '7033456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '56\\d{8}',
+        'example' => '5633456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'pattern' => '76\\d{8}',
+        'example' => '7623456789',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[1-59]|[78]0',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '6',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{3})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '7[1-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '8[47]',
+            ],
+            'nationalPrefixFormattingRule' => '(0$1)',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_GG.php b/tests/core/data/PhoneNumberMetadataForTesting_GG.php
index 527682deb..5b2834c80 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_GG.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_GG.php
@@ -6,105 +6,75 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{6,10}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'GG',
+    'countryCode' => 44,
+    'generalDesc' => [
+        'pattern' => '\\d{6,10}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '\\d{6,10}',
+        'example' => '7033456789',
+        'posLengthLocal' => [
+            6,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '\\d{6,10}',
-    'ExampleNumber' => '7033456789',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 6,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'GG',
-  'countryCode' => 44,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_IT.php b/tests/core/data/PhoneNumberMetadataForTesting_IT.php
index 4daee1cfe..09e057d9c 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_IT.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_IT.php
@@ -6,162 +6,122 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[0389]\\d{5,10}',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
-      2 => 10,
-      3 => 11,
+return [
+    'id' => 'IT',
+    'countryCode' => 39,
+    'generalDesc' => [
+        'pattern' => '[0389]\\d{5,10}',
+        'posLength' => [
+            6,
+            9,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '0\\d{9,10}',
+        'example' => '0123456789',
+        'posLength' => [
+            10,
+            11,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '3\\d{8,9}',
+        'example' => '3123456789',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80(?:0\\d{6}|3\\d{3})',
+        'example' => '800123456',
+        'posLength' => [
+            6,
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '89(?:2\\d{3}|9\\d{6})',
+        'example' => '892123',
+        'posLength' => [
+            6,
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0[26]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '0[13-57-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '3',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3,6})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '8',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '0\\d{9,10}',
-    'ExampleNumber' => '0123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '3\\d{8,9}',
-    'ExampleNumber' => '3123456789',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80(?:0\\d{6}|3\\d{3})',
-    'ExampleNumber' => '800123456',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '89(?:2\\d{3}|9\\d{6})',
-    'ExampleNumber' => '892123',
-    'PossibleLength' =>
-     [
-      0 => 6,
-      1 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'IT',
-  'countryCode' => 39,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[26]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '0[13-57-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '3',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3,6})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '8',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_JP.php b/tests/core/data/PhoneNumberMetadataForTesting_JP.php
index 5696ffcff..9823cc540 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_JP.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_JP.php
@@ -6,199 +6,151 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '07\\d{5}|[1-357-9]\\d{3,10}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-      5 => 9,
-      6 => 10,
-      7 => 11,
+return [
+    'id' => 'JP',
+    'countryCode' => 81,
+    'generalDesc' => [
+        'pattern' => '07\\d{5}|[1-357-9]\\d{3,10}',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '07\\d{5}|[1-357-9]\\d{3,10}',
+        'example' => '0712345',
+    ],
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '0777[01]\\d{2}',
+        'example' => '0777012',
+        'posLength' => [
+            7,
+        ],
+    ],
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'pattern' => '[23]\\d{3}',
+        'example' => '2123',
+        'posLength' => [
+            4,
+        ],
+    ],
+    'internationalPrefix' => '010',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[57-9]0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[57-9]0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '111|222|333',
+                '(?:111|222|333)1',
+                '(?:111|222|333)11',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d)(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '222|333',
+                '2221|3332',
+                '22212|3332',
+                '222120|3332',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[23]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '077',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})',
+            'format' => '*$1',
+            'leadingDigitsPatterns' => [
+                '[23]',
+            ],
+            'nationalPrefixFormattingRule' => '$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '07\\d{5}|[1-357-9]\\d{3,10}',
-    'ExampleNumber' => '0712345',
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '0777[01]\\d{2}',
-    'ExampleNumber' => '0777012',
-    'PossibleLength' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '[23]\\d{3}',
-    'ExampleNumber' => '2123',
-    'PossibleLength' =>
-     [
-      0 => 4,
-    ],
-  ],
-  'id' => 'JP',
-  'countryCode' => 81,
-  'internationalPrefix' => '010',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[57-9]0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[57-9]0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '111|222|333',
-        1 => '(?:111|222|333)1',
-        2 => '(?:111|222|333)11',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{4})(\\d)(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '222|333',
-        1 => '2221|3332',
-        2 => '22212|3332',
-        3 => '222120|3332',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '077',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d{4})',
-      'format' => '*$1',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[23]',
-      ],
-      'nationalPrefixFormattingRule' => '$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_KR.php b/tests/core/data/PhoneNumberMetadataForTesting_KR.php
index 13829e450..dd86d8a5b 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_KR.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_KR.php
@@ -6,272 +6,209 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-7]\\d{3,9}|8\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 5,
-      2 => 6,
-      3 => 7,
-      4 => 8,
-      5 => 9,
-      6 => 10,
+return [
+    'id' => 'KR',
+    'countryCode' => 82,
+    'generalDesc' => [
+        'pattern' => '[1-7]\\d{3,9}|8\\d{8}',
+        'posLength' => [
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '(?:2|[34][1-3]|5[1-5]|6[1-4])(?:1\\d{2,3}|[2-9]\\d{6,7})',
+        'example' => '22123456',
+    ],
+    'mobile' => [
+        'pattern' => '1[0-25-9]\\d{7,8}',
+        'example' => '1023456789',
+        'posLength' => [
+            9,
+            10,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '80\\d{7}',
+        'example' => '801234567',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '60[2-9]\\d{6}',
+        'example' => '602345678',
+        'posLength' => [
+            9,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'pattern' => '50\\d{8}',
+        'example' => '5012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'voip' => [
+        'pattern' => '70\\d{8}',
+        'example' => '7012345678',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00(?:[124-68]|[37]\\d{2})',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0(8[1-46-8]|85\\d{2})?',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '1(?:0|1[19]|[69]9|5[458])|[57]0',
+                '1(?:0|1[19]|[69]9|5(?:44|59|8))|[57]0',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '1(?:[169][2-8]|[78]|5[1-4])|[68]0|[3-6][1-9][2-9]',
+                '1(?:[169][2-8]|[78]|5(?:[1-3]|4[56]))|[68]0|[3-6][1-9][2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d)(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '131',
+                '1312',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '131',
+                '131[13-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '13[2-9]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3-$4',
+            'leadingDigitsPatterns' => [
+                '30',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '2(?:[26]|3[0-467])',
+                '2(?:[26]|3(?:01|1[45]|2[17-9]|39|4|6[67]|7[078]))',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1-$2-$3',
+            'leadingDigitsPatterns' => [
+                '2(?:3[0-35-9]|[457-9])',
+                '2(?:3(?:0[02-9]|1[0-36-9]|2[02-6]|3[0-8]|6[0-589]|7[1-69]|[589])|[457-9])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '21[0-46-9]',
+                '21(?:[0-247-9]|3[124]|6[1269])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '21[36]',
+                '21(?:3[035-9]|6[03-578])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{3})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[3-6][1-9]1',
+                '[3-6][1-9]1(?:[0-46-9])',
+                '[3-6][1-9]1(?:[0-247-9]|3[124]|6[1269])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})',
+            'format' => '$1-$2',
+            'leadingDigitsPatterns' => [
+                '[3-6][1-9]1',
+                '[3-6][1-9]1[36]',
+                '[3-6][1-9]1(?:3[035-9]|6[03-578])',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '(?:2|[34][1-3]|5[1-5]|6[1-4])(?:1\\d{2,3}|[2-9]\\d{6,7})',
-    'ExampleNumber' => '22123456',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '1[0-25-9]\\d{7,8}',
-    'ExampleNumber' => '1023456789',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{7}',
-    'ExampleNumber' => '801234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '60[2-9]\\d{6}',
-    'ExampleNumber' => '602345678',
-    'PossibleLength' =>
-     [
-      0 => 9,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'NationalNumberPattern' => '50\\d{8}',
-    'ExampleNumber' => '5012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'voip' =>
-   [
-    'NationalNumberPattern' => '70\\d{8}',
-    'ExampleNumber' => '7012345678',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'KR',
-  'countryCode' => 82,
-  'internationalPrefix' => '00(?:[124-68]|[37]\\d{2})',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0(8[1-46-8]|85\\d{2})?',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:0|1[19]|[69]9|5[458])|[57]0',
-        1 => '1(?:0|1[19]|[69]9|5(?:44|59|8))|[57]0',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[169][2-8]|[78]|5[1-4])|[68]0|[3-6][1-9][2-9]',
-        1 => '1(?:[169][2-8]|[78]|5(?:[1-3]|4[56]))|[68]0|[3-6][1-9][2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d)(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '131',
-        1 => '1312',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '131',
-        1 => '131[13-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '13[2-9]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3-$4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '30',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    6 =>
-     [
-      'pattern' => '(\\d)(\\d{4})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:[26]|3[0-467])',
-        1 => '2(?:[26]|3(?:01|1[45]|2[17-9]|39|4|6[67]|7[078]))',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    7 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1-$2-$3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2(?:3[0-35-9]|[457-9])',
-        1 => '2(?:3(?:0[02-9]|1[0-36-9]|2[02-6]|3[0-8]|6[0-589]|7[1-69]|[589])|[457-9])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    8 =>
-     [
-      'pattern' => '(\\d)(\\d{3})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '21[0-46-9]',
-        1 => '21(?:[0-247-9]|3[124]|6[1269])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    9 =>
-     [
-      'pattern' => '(\\d)(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '21[36]',
-        1 => '21(?:3[035-9]|6[03-578])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    10 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-6][1-9]1',
-        1 => '[3-6][1-9]1(?:[0-46-9])',
-        2 => '[3-6][1-9]1(?:[0-247-9]|3[124]|6[1269])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    11 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})',
-      'format' => '$1-$2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[3-6][1-9]1',
-        1 => '[3-6][1-9]1[36]',
-        2 => '[3-6][1-9]1(?:3[035-9]|6[03-578])',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_MX.php b/tests/core/data/PhoneNumberMetadataForTesting_MX.php
index e62a0a4a1..a1c2780f6 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_MX.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_MX.php
@@ -6,257 +6,202 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{9,10}',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
+return [
+    'id' => 'MX',
+    'countryCode' => 52,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{9,10}',
+        'posLength' => [
+            10,
+            11,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'fixedLine' => [
+        'pattern' => '[2-9]\\d{9}',
+        'example' => '2123456789',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
+    ],
+    'mobile' => [
+        'pattern' => '1\\d{10}',
+        'example' => '11234567890',
+        'posLength' => [
+            11,
+        ],
+    ],
+    'tollFree' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'premiumRate' => [
+        'pattern' => '900\\d{7}',
+        'example' => '9001234567',
+        'posLength' => [
+            10,
+        ],
+    ],
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '01',
+    'nationalPrefixForParsing' => '01|04[45](\\d{10})',
+    'nationalPrefixTransformRule' => '1$1',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]00',
+            ],
+            'nationalPrefixFormattingRule' => '01 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{5})',
+            'format' => '$2 $3',
+            'leadingDigitsPatterns' => [
+                '901',
+            ],
+            'nationalPrefixFormattingRule' => '01 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '33|55|81',
+            ],
+            'nationalPrefixFormattingRule' => '01 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2467]|3[0-24-9]|5[0-46-9]|8[2-9]|9[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '01 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '045 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1(?:33|55|81)',
+            ],
+            'nationalPrefixFormattingRule' => '$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '045 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1(?:[124579]|3[0-24-9]|5[0-46-9]|8[02-9])',
+            ],
+            'nationalPrefixFormattingRule' => '$1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]00',
+            ],
+            'nationalPrefixFormattingRule' => '01 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{5})',
+            'format' => '$2 $3',
+            'leadingDigitsPatterns' => [
+                '901',
+            ],
+        ],
+        [
+            'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '33|55|81',
+            ],
+            'nationalPrefixFormattingRule' => '01 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[2467]|3[0-24-9]|5[0-46-9]|8[2-9]|9[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '01 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+        [
+            'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1(?:33|55|81)',
+            ],
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '1(?:[124579]|3[0-24-9]|5[0-46-9]|8[02-9])',
+            ],
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[2-9]\\d{9}',
-    'ExampleNumber' => '2123456789',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
-    ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '1\\d{10}',
-    'ExampleNumber' => '11234567890',
-    'PossibleLength' =>
-     [
-      0 => 11,
-    ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{7}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-    ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
-    ],
-  ],
-  'id' => 'MX',
-  'countryCode' => 52,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '01',
-  'nationalPrefixForParsing' => '01|04[45](\\d{10})',
-  'nationalPrefixTransformRule' => '1$1',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]00',
-      ],
-      'nationalPrefixFormattingRule' => '01 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{5})',
-      'format' => '$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '901',
-      ],
-      'nationalPrefixFormattingRule' => '01 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '33|55|81',
-      ],
-      'nationalPrefixFormattingRule' => '01 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2467]|3[0-24-9]|5[0-46-9]|8[2-9]|9[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '01 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '045 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:33|55|81)',
-      ],
-      'nationalPrefixFormattingRule' => '$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '045 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[124579]|3[0-24-9]|5[0-46-9]|8[02-9])',
-      ],
-      'nationalPrefixFormattingRule' => '$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]00',
-      ],
-      'nationalPrefixFormattingRule' => '01 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{5})',
-      'format' => '$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '901',
-      ],
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '33|55|81',
-      ],
-      'nationalPrefixFormattingRule' => '01 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    3 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[2467]|3[0-24-9]|5[0-46-9]|8[2-9]|9[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '01 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
-    ],
-    4 =>
-     [
-      'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:33|55|81)',
-      ],
-    ],
-    5 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1(?:[124579]|3[0-24-9]|5[0-46-9]|8[02-9])',
-      ],
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_NZ.php b/tests/core/data/PhoneNumberMetadataForTesting_NZ.php
index d60198b3c..a8fead4bb 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_NZ.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_NZ.php
@@ -6,153 +6,116 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[289]\\d{7,9}|[3-7]\\d{7}',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
-      2 => 9,
-      3 => 10,
+return [
+    'id' => 'NZ',
+    'countryCode' => 64,
+    'generalDesc' => [
+        'pattern' => '[289]\\d{7,9}|[3-7]\\d{7}',
+        'posLength' => [
+            7,
+            8,
+            9,
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '24099\\d{3}|(?:3[2-79]|[479][2-689]|6[235-9])\\d{6}',
-    'ExampleNumber' => '24099123',
-    'PossibleLength' =>
-     [
-      0 => 7,
-      1 => 8,
+    'fixedLine' => [
+        'pattern' => '24099\\d{3}|(?:3[2-79]|[479][2-689]|6[235-9])\\d{6}',
+        'example' => '24099123',
+        'posLength' => [
+            7,
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '2(?:[027]\\d{7}|9\\d{6,7}|1(?:0\\d{5,7}|[12]\\d{5,6}|[3-9]\\d{5})|4[1-9]\\d{6}|8\\d{7,8})',
-    'ExampleNumber' => '201234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 9,
-      2 => 10,
+    'mobile' => [
+        'pattern' => '2(?:[027]\\d{7}|9\\d{6,7}|1(?:0\\d{5,7}|[12]\\d{5,6}|[3-9]\\d{5})|4[1-9]\\d{6}|8\\d{7,8})',
+        'example' => '201234567',
+        'posLength' => [
+            8,
+            9,
+            10,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6,7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+    'tollFree' => [
+        'pattern' => '800\\d{6,7}',
+        'example' => '8001234567',
+        'posLength' => [
+            9,
+            10,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{6,7}',
-    'ExampleNumber' => '9001234567',
-    'PossibleLength' =>
-     [
-      0 => 9,
-      1 => 10,
+    'premiumRate' => [
+        'pattern' => '900\\d{6,7}',
+        'example' => '9001234567',
+        'posLength' => [
+            9,
+            10,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'NZ',
-  'countryCode' => 64,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{4})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '24|[34679]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{4})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '24|[34679]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d)(\\d{3})(\\d{3,5})',
+            'format' => '$1-$2 $3',
+            'leadingDigitsPatterns' => [
+                '2[179]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '[89]',
+            ],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d)(\\d{3})(\\d{3,5})',
-      'format' => '$1-$2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '2[179]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[89]',
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_PL.php b/tests/core/data/PhoneNumberMetadataForTesting_PL.php
index 422cbf1df..3fb7f0f25 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_PL.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_PL.php
@@ -6,106 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[1-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'PL',
+    'countryCode' => 48,
+    'generalDesc' => [
+        'pattern' => '[1-9]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '(?:5[01]|6[069]|7[289]|88)\\d{7}',
-    'ExampleNumber' => '501234567',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '800\\d{6}',
-    'ExampleNumber' => '800123456',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '70\\d{7}',
-    'ExampleNumber' => '701234567',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '(?:5[01]|6[069]|7[289]|88)\\d{7}',
+        'example' => '501234567',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '800\\d{6}',
+        'example' => '800123456',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '70\\d{7}',
+        'example' => '701234567',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'PL',
-  'countryCode' => 48,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_RE.php b/tests/core/data/PhoneNumberMetadataForTesting_RE.php
index daa7d87c5..9c63b64c7 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_RE.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_RE.php
@@ -6,105 +6,77 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[268]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'RE',
+    'countryCode' => 262,
+    'generalDesc' => [
+        'pattern' => '[268]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '262\\d{6}',
-    'ExampleNumber' => '262161234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '6(?:9[23]|47)\\d{6}',
-    'ExampleNumber' => '692123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{7}',
-    'ExampleNumber' => '801234567',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '8(?:1[01]|2[0156]|84|9[0-37-9])\\d{6}',
-    'ExampleNumber' => '810123456',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '262\\d{6}',
+        'example' => '262161234',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '6(?:9[23]|47)\\d{6}',
+        'example' => '692123456',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d{7}',
+        'example' => '801234567',
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '8(?:1[01]|2[0156]|84|9[0-37-9])\\d{6}',
+        'example' => '810123456',
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'RE',
-  'countryCode' => 262,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '0$1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '262|6(?:9[23]|47)|8',
-  'mobileNumberPortableRegion' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '0$1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+    ],
+    'leadingDigits' => '262|6(?:9[23]|47)|8',
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_RU.php b/tests/core/data/PhoneNumberMetadataForTesting_RU.php
index 6b835e69b..0edc41c33 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_RU.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_RU.php
@@ -6,97 +6,70 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[347-9]\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'RU',
+    'countryCode' => 7,
+    'generalDesc' => [
+        'pattern' => '[347-9]\\d{9}',
+        'posLength' => [
+            10,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[348]\\d{9}',
-    'ExampleNumber' => '3011234567',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9\\d{9}',
-    'ExampleNumber' => '9123456789',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '[348]\\d{9}',
+        'example' => '3011234567',
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '9\\d{9}',
+        'example' => '9123456789',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'RU',
-  'countryCode' => 7,
-  'internationalPrefix' => '810',
-  'nationalPrefix' => '8',
-  'nationalPrefixForParsing' => '8',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '810',
+    'nationalPrefix' => '8',
+    'nationalPrefixForParsing' => '8',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_SE.php b/tests/core/data/PhoneNumberMetadataForTesting_SE.php
index fd336472d..3f09f4bf3 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_SE.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_SE.php
@@ -6,97 +6,69 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '\\d{9}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'SE',
+    'countryCode' => 46,
+    'generalDesc' => [
+        'pattern' => '\\d{9}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '\\d{9}',
-    'ExampleNumber' => '123456789',
-  ],
-  'mobile' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '\\d{9}',
+        'example' => '123456789',
     ],
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SE',
-  'countryCode' => 46,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_SG.php b/tests/core/data/PhoneNumberMetadataForTesting_SG.php
index e27a42e4c..d66565eeb 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_SG.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_SG.php
@@ -6,147 +6,110 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[13689]\\d{7,10}',
-    'PossibleLength' =>
-     [
-      0 => 8,
-      1 => 10,
-      2 => 11,
+return [
+    'id' => 'SG',
+    'countryCode' => 65,
+    'generalDesc' => [
+        'pattern' => '[13689]\\d{7,10}',
+        'posLength' => [
+            8,
+            10,
+            11,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[36]\\d{7}',
-    'ExampleNumber' => '31234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'fixedLine' => [
+        'pattern' => '[36]\\d{7}',
+        'example' => '31234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[89]\\d{7}',
-    'ExampleNumber' => '81234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'mobile' => [
+        'pattern' => '[89]\\d{7}',
+        'example' => '81234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '1?800\\d{7}',
-    'ExampleNumber' => '8001234567',
-    'PossibleLength' =>
-     [
-      0 => 10,
-      1 => 11,
+    'tollFree' => [
+        'pattern' => '1?800\\d{7}',
+        'example' => '8001234567',
+        'posLength' => [
+            10,
+            11,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '1900\\d{7}',
-    'ExampleNumber' => '19001234567',
-    'PossibleLength' =>
-     [
-      0 => 11,
+    'premiumRate' => [
+        'pattern' => '1900\\d{7}',
+        'example' => '19001234567',
+        'posLength' => [
+            11,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'SG',
-  'countryCode' => 65,
-  'internationalPrefix' => '0[0-3][0-9]',
-  'nationalPrefixForParsing' => '777777',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{4})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[369]|8[1-9]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '0[0-3][0-9]',
+    'nationalPrefixForParsing' => '777777',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{4})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [
+                '[369]|8[1-9]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '1[89]',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [
+                '800',
+            ],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '1[89]',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-    2 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '800',
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
-    ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_TA.php b/tests/core/data/PhoneNumberMetadataForTesting_TA.php
index f5e1ef2d6..e92e94ad8 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_TA.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_TA.php
@@ -6,107 +6,78 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '8\\d{3,7}',
-    'PossibleLength' =>
-     [
-      0 => 4,
-      1 => 6,
-      2 => 8,
+return [
+    'id' => 'TA',
+    'countryCode' => 290,
+    'generalDesc' => [
+        'pattern' => '8\\d{3,7}',
+        'posLength' => [
+            4,
+            6,
+            8,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '8\\d{5}',
-    'ExampleNumber' => '812345',
-    'PossibleLength' =>
-     [
-      0 => 6,
+    'fixedLine' => [
+        'pattern' => '8\\d{5}',
+        'example' => '812345',
+        'posLength' => [
+            6,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '8\\d{3}',
-    'ExampleNumber' => '8123',
-    'PossibleLength' =>
-     [
-      0 => 4,
+    'mobile' => [
+        'pattern' => '8\\d{3}',
+        'example' => '8123',
+        'posLength' => [
+            4,
+        ],
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8\\d{7}',
-    'ExampleNumber' => '81234567',
-    'PossibleLength' =>
-     [
-      0 => 8,
+    'tollFree' => [
+        'pattern' => '8\\d{7}',
+        'example' => '81234567',
+        'posLength' => [
+            8,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'TA',
-  'countryCode' => 290,
-  'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
+    'internationalPrefix' => '00',
+    'numberFormat' => [],
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_US.php b/tests/core/data/PhoneNumberMetadataForTesting_US.php
index e1b7b0ecc..7e1b8e1da 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_US.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_US.php
@@ -6,140 +6,106 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[13-689]\\d{9}|2[0-35-9]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 10,
+return [
+    'id' => 'US',
+    'countryCode' => 1,
+    'generalDesc' => [
+        'pattern' => '[13-689]\\d{9}|2[0-35-9]\\d{8}',
+        'posLength' => [
+            10,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '[13-689]\\d{9}|2[0-35-9]\\d{8}',
+        'example' => '1234567890',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '[13-689]\\d{9}|2[0-35-9]\\d{8}',
-    'ExampleNumber' => '1234567890',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '[13-689]\\d{9}|2[0-35-9]\\d{8}',
+        'example' => '1234567890',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '[13-689]\\d{9}|2[0-35-9]\\d{8}',
-    'ExampleNumber' => '1234567890',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'tollFree' => [
+        'pattern' => '8(?:00|66|77|88)\\d{7}',
+        'example' => '8004567890',
     ],
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '8(?:00|66|77|88)\\d{7}',
-    'ExampleNumber' => '8004567890',
-  ],
-  'premiumRate' =>
-   [
-    'NationalNumberPattern' => '900\\d{7}',
-    'ExampleNumber' => '9004567890',
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'pattern' => '900\\d{7}',
+        'example' => '9004567890',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'NationalNumberPattern' => '800\\d{7}',
-    'ExampleNumber' => '8004567890',
-  ],
-  'id' => 'US',
-  'countryCode' => 1,
-  'internationalPrefix' => '011',
-  'nationalPrefix' => '1',
-  'preferredExtnPrefix' => ' extn. ',
-  'nationalPrefixForParsing' => '1',
-  'sameMobileAndFixedLinePattern' => true,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{4})',
-      'format' => '$1 $2',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-    1 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'noInternationalDialling' => [
+        'pattern' => '800\\d{7}',
+        'example' => '8004567890',
     ],
-  ],
-  'intlNumberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
-      'format' => '$1 $2 $3',
-      'leadingDigitsPatterns' =>
-       [
-      ],
-      'nationalPrefixFormattingRule' => '',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => true,
+    'internationalPrefix' => '011',
+    'nationalPrefix' => '1',
+    'preferredExtnPrefix' => ' extn. ',
+    'nationalPrefixForParsing' => '1',
+    'sameMobileAndFixedLinePattern' => true,
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{4})',
+            'format' => '$1 $2',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
     ],
-  ],
-  'mainCountryForCode' => true,
-  'mobileNumberPortableRegion' => true,
+    'intlNumberFormat' => [
+        [
+            'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+            'format' => '$1 $2 $3',
+            'leadingDigitsPatterns' => [],
+            'nationalPrefixFormattingRule' => '',
+            'domesticCarrierCodeFormattingRule' => '',
+            'nationalPrefixOptionalWhenFormatting' => true,
+        ],
+    ],
+    'mainCountryForCode' => true,
+    'mobileNumberPortableRegion' => true,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_UZ.php b/tests/core/data/PhoneNumberMetadataForTesting_UZ.php
index 1d34e9d2c..30dbb79f2 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_UZ.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_UZ.php
@@ -6,118 +6,87 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[69]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'UZ',
+    'countryCode' => 998,
+    'generalDesc' => [
+        'pattern' => '[69]\\d{8}',
+        'posLength' => [
+            9,
+        ],
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'fixedLine' => [
+        'pattern' => '6122\\d{5}',
+        'example' => '662345678',
+        'posLengthLocal' => [
+            7,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '6122\\d{5}',
-    'ExampleNumber' => '662345678',
-    'PossibleLengthLocalOnly' =>
-     [
-      0 => 7,
+    'mobile' => [
+        'pattern' => '9[0-57-9]\\d{7}',
+        'example' => '912345678',
     ],
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '9[0-57-9]\\d{7}',
-    'ExampleNumber' => '912345678',
-  ],
-  'tollFree' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'UZ',
-  'countryCode' => 998,
-  'internationalPrefix' => '810',
-  'preferredInternationalPrefix' => '8~10',
-  'nationalPrefix' => '8',
-  'nationalPrefixForParsing' => '8',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-    0 =>
-     [
-      'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
-      'format' => '$1 $2 $3 $4',
-      'leadingDigitsPatterns' =>
-       [
-        0 => '[679]',
-      ],
-      'nationalPrefixFormattingRule' => '8 $1',
-      'domesticCarrierCodeFormattingRule' => '',
-      'nationalPrefixOptionalWhenFormatting' => false,
+    'internationalPrefix' => '810',
+    'preferredInternationalPrefix' => '8~10',
+    'nationalPrefix' => '8',
+    'nationalPrefixForParsing' => '8',
+    'numberFormat' => [
+        [
+            'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})',
+            'format' => '$1 $2 $3 $4',
+            'leadingDigitsPatterns' => [
+                '[679]',
+            ],
+            'nationalPrefixFormattingRule' => '8 $1',
+            'domesticCarrierCodeFormattingRule' => '',
+        ],
     ],
-  ],
-  'mainCountryForCode' => false,
-  'mobileNumberPortableRegion' => false,
 ];
diff --git a/tests/core/data/PhoneNumberMetadataForTesting_YT.php b/tests/core/data/PhoneNumberMetadataForTesting_YT.php
index aced841b7..ac807a15c 100644
--- a/tests/core/data/PhoneNumberMetadataForTesting_YT.php
+++ b/tests/core/data/PhoneNumberMetadataForTesting_YT.php
@@ -6,96 +6,70 @@
  * @internal
  */
 
-return  [
-  'generalDesc' =>
-   [
-    'NationalNumberPattern' => '[268]\\d{8}',
-    'PossibleLength' =>
-     [
-      0 => 9,
+return [
+    'id' => 'YT',
+    'countryCode' => 262,
+    'generalDesc' => [
+        'pattern' => '[268]\\d{8}',
+        'posLength' => [
+            9,
+        ],
     ],
-  ],
-  'fixedLine' =>
-   [
-    'NationalNumberPattern' => '2696[0-4]\\d{4}',
-    'ExampleNumber' => '269601234',
-  ],
-  'mobile' =>
-   [
-    'NationalNumberPattern' => '639\\d{6}',
-    'ExampleNumber' => '639123456',
-  ],
-  'tollFree' =>
-   [
-    'NationalNumberPattern' => '80\\d{7}',
-    'ExampleNumber' => '801234567',
-  ],
-  'premiumRate' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'fixedLine' => [
+        'pattern' => '2696[0-4]\\d{4}',
+        'example' => '269601234',
     ],
-  ],
-  'sharedCost' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'mobile' => [
+        'pattern' => '639\\d{6}',
+        'example' => '639123456',
     ],
-  ],
-  'personalNumber' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'tollFree' => [
+        'pattern' => '80\\d{7}',
+        'example' => '801234567',
     ],
-  ],
-  'voip' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'premiumRate' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'pager' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'sharedCost' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'uan' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'personalNumber' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'voicemail' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'voip' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'noInternationalDialling' =>
-   [
-    'PossibleLength' =>
-     [
-      0 => -1,
+    'pager' => [
+        'posLength' => [
+            -1,
+        ],
     ],
-  ],
-  'id' => 'YT',
-  'countryCode' => 262,
-  'internationalPrefix' => '00',
-  'nationalPrefix' => '0',
-  'nationalPrefixForParsing' => '0',
-  'sameMobileAndFixedLinePattern' => false,
-  'numberFormat' =>
-   [
-  ],
-  'mainCountryForCode' => false,
-  'leadingDigits' => '269|639',
-  'mobileNumberPortableRegion' => false,
+    'uan' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'voicemail' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'noInternationalDialling' => [
+        'posLength' => [
+            -1,
+        ],
+    ],
+    'internationalPrefix' => '00',
+    'nationalPrefix' => '0',
+    'nationalPrefixForParsing' => '0',
+    'numberFormat' => [],
+    'leadingDigits' => '269|639',
 ];