diff --git a/Localization/ISO3166CharEnum.php b/Localization/ISO3166CharEnum.php
index a2333f3e8..838bf8a3c 100644
--- a/Localization/ISO3166CharEnum.php
+++ b/Localization/ISO3166CharEnum.php
@@ -30,253 +30,253 @@ use phpOMS\Datatypes\EnumArray;
  */
 class ISO3166CharEnum extends EnumArray
 {
-    const C_AFG = 'AFG';
-    const C_ALA = 'ALA';
-    const C_ALB = 'ALB';
-    const C_DZA = 'DZA';
-    const C_ASM = 'ASM';
-    const C_AND = 'AND';
-    const C_AGO = 'AGO';
-    const C_AIA = 'AIA';
-    const C_ATA = 'ATA';
-    const C_ATG = 'ATG';
-    const C_ARG = 'ARG';
-    const C_ARM = 'ARM';
-    const C_ABW = 'ABW';
-    const C_AUS = 'AUS';
-    const C_AUT = 'AUT';
-    const C_AZE = 'AZE';
-    const C_BHS = 'BHS';
-    const C_BHR = 'BHR';
-    const C_BGD = 'BGD';
-    const C_BRB = 'BRB';
-    const C_BLR = 'BLR';
-    const C_BEL = 'BEL';
-    const C_BLZ = 'BLZ';
-    const C_BEN = 'BEN';
-    const C_BMU = 'BMU';
-    const C_BTN = 'BTN';
-    const C_BOL = 'BOL';
-    const C_BES = 'BES';
-    const C_BIH = 'BIH';
-    const C_BWA = 'BWA';
-    const C_BVT = 'BVT';
-    const C_BRA = 'BRA';
-    const C_IOT = 'IOT';
-    const C_BRN = 'BRN';
-    const C_BGR = 'BGR';
-    const C_BFA = 'BFA';
-    const C_BDI = 'BDI';
-    const C_CPV = 'CPV';
-    const C_KHM = 'KHM';
-    const C_CMR = 'CMR';
-    const C_CAN = 'CAN';
-    const C_CYM = 'CYM';
-    const C_CAF = 'CAF';
-    const C_TCD = 'TCD';
-    const C_CHL = 'CHL';
-    const C_CHN = 'CHN';
-    const C_CXR = 'CXR';
-    const C_CCK = 'CCK';
-    const C_COL = 'COL';
-    const C_COM = 'COM';
-    const C_COG = 'COG';
-    const C_COD = 'COD';
-    const C_COK = 'COK';
-    const C_CRI = 'CRI';
-    const C_CIV = 'CIV';
-    const C_HRV = 'HRV';
-    const C_CUB = 'CUB';
-    const C_CUW = 'CUW';
-    const C_CYP = 'CYP';
-    const C_CZE = 'CZE';
-    const C_DNK = 'DNK';
-    const C_DJI = 'DJI';
-    const C_DMA = 'DMA';
-    const C_DOM = 'DOM';
-    const C_ECU = 'ECU';
-    const C_EGY = 'EGY';
-    const C_SLV = 'SLV';
-    const C_GNQ = 'GNQ';
-    const C_ERI = 'ERI';
-    const C_EST = 'EST';
-    const C_ETH = 'ETH';
-    const C_FLK = 'FLK';
-    const C_FRO = 'FRO';
-    const C_FJI = 'FJI';
-    const C_FIN = 'FIN';
-    const C_FRA = 'FRA';
-    const C_GUF = 'GUF';
-    const C_PYF = 'PYF';
-    const C_ATF = 'ATF';
-    const C_GAB = 'GAB';
-    const C_GMB = 'GMB';
-    const C_GEO = 'GEO';
-    const C_DEU = 'DEU';
-    const C_GHA = 'GHA';
-    const C_GIB = 'GIB';
-    const C_GRC = 'GRC';
-    const C_GRL = 'GRL';
-    const C_GRD = 'GRD';
-    const C_GLP = 'GLP';
-    const C_GUM = 'GUM';
-    const C_GTM = 'GTM';
-    const C_GGY = 'GGY';
-    const C_GIN = 'GIN';
-    const C_GNB = 'GNB';
-    const C_GUY = 'GUY';
-    const C_HTI = 'HTI';
-    const C_HMD = 'HMD';
-    const C_VAT = 'VAT';
-    const C_HND = 'HND';
-    const C_HKG = 'HKG';
-    const C_HUN = 'HUN';
-    const C_ISL = 'ISL';
-    const C_IND = 'IND';
-    const C_IDN = 'IDN';
-    const C_IRN = 'IRN';
-    const C_IRQ = 'IRQ';
-    const C_IRL = 'IRL';
-    const C_IMN = 'IMN';
-    const C_ISR = 'ISR';
-    const C_ITA = 'ITA';
-    const C_JAM = 'JAM';
-    const C_JPN = 'JPN';
-    const C_JEY = 'JEY';
-    const C_JOR = 'JOR';
-    const C_KAZ = 'KAZ';
-    const C_KEN = 'KEN';
-    const C_KIR = 'KIR';
-    const C_PRK = 'PRK';
-    const C_KOR = 'KOR';
-    const C_KWT = 'KWT';
-    const C_KGZ = 'KGZ';
-    const C_LAO = 'LAO';
-    const C_LVA = 'LVA';
-    const C_LBN = 'LBN';
-    const C_LSO = 'LSO';
-    const C_LBR = 'LBR';
-    const C_LBY = 'LBY';
-    const C_LIE = 'LIE';
-    const C_LTU = 'LTU';
-    const C_LUX = 'LUX';
-    const C_MAC = 'MAC';
-    const C_MKD = 'MKD';
-    const C_MDG = 'MDG';
-    const C_MWI = 'MWI';
-    const C_MYS = 'MYS';
-    const C_MDV = 'MDV';
-    const C_MLI = 'MLI';
-    const C_MLT = 'MLT';
-    const C_MHL = 'MHL';
-    const C_MTQ = 'MTQ';
-    const C_MRT = 'MRT';
-    const C_MUS = 'MUS';
-    const C_MYT = 'MYT';
-    const C_MEX = 'MEX';
-    const C_FSM = 'FSM';
-    const C_MDA = 'MDA';
-    const C_MCO = 'MCO';
-    const C_MNG = 'MNG';
-    const C_MNE = 'MNE';
-    const C_MSR = 'MSR';
-    const C_MAR = 'MAR';
-    const C_MOZ = 'MOZ';
-    const C_MMR = 'MMR';
-    const C_NAM = 'NAM';
-    const C_NRU = 'NRU';
-    const C_NPL = 'NPL';
-    const C_NLD = 'NLD';
-    const C_NCL = 'NCL';
-    const C_NZL = 'NZL';
-    const C_NIC = 'NIC';
-    const C_NER = 'NER';
-    const C_NGA = 'NGA';
-    const C_NIU = 'NIU';
-    const C_NFK = 'NFK';
-    const C_MNP = 'MNP';
-    const C_NOR = 'NOR';
-    const C_OMN = 'OMN';
-    const C_PAK = 'PAK';
-    const C_PLW = 'PLW';
-    const C_PSE = 'PSE';
-    const C_PAN = 'PAN';
-    const C_PNG = 'PNG';
-    const C_PRY = 'PRY';
-    const C_PER = 'PER';
-    const C_PHL = 'PHL';
-    const C_PCN = 'PCN';
-    const C_POL = 'POL';
-    const C_PRT = 'PRT';
-    const C_PRI = 'PRI';
-    const C_QAT = 'QAT';
-    const C_REU = 'REU';
-    const C_ROU = 'ROU';
-    const C_RUS = 'RUS';
-    const C_RWA = 'RWA';
-    const C_BLM = 'BLM';
-    const C_SHN = 'SHN';
-    const C_KNA = 'KNA';
-    const C_LCA = 'LCA';
-    const C_MAF = 'MAF';
-    const C_SPM = 'SPM';
-    const C_VCT = 'VCT';
-    const C_WSM = 'WSM';
-    const C_SMR = 'SMR';
-    const C_STP = 'STP';
-    const C_SAU = 'SAU';
-    const C_SEN = 'SEN';
-    const C_SRB = 'SRB';
-    const C_SYC = 'SYC';
-    const C_SLE = 'SLE';
-    const C_SGP = 'SGP';
-    const C_SXM = 'SXM';
-    const C_SVK = 'SVK';
-    const C_SVN = 'SVN';
-    const C_SLB = 'SLB';
-    const C_SOM = 'SOM';
-    const C_ZAF = 'ZAF';
-    const C_SGS = 'SGS';
-    const C_SSD = 'SSD';
-    const C_ESP = 'ESP';
-    const C_LKA = 'LKA';
-    const C_SDN = 'SDN';
-    const C_SUR = 'SUR';
-    const C_SJM = 'SJM';
-    const C_SWZ = 'SWZ';
-    const C_SWE = 'SWE';
-    const C_CHE = 'CHE';
-    const C_SYR = 'SYR';
-    const C_TWN = 'TWN';
-    const C_TJK = 'TJK';
-    const C_TZA = 'TZA';
-    const C_THA = 'THA';
-    const C_TLS = 'TLS';
-    const C_TGO = 'TGO';
-    const C_TKL = 'TKL';
-    const C_TON = 'TON';
-    const C_TTO = 'TTO';
-    const C_TUN = 'TUN';
-    const C_TUR = 'TUR';
-    const C_TKM = 'TKM';
-    const C_TCA = 'TCA';
-    const C_TUV = 'TUV';
-    const C_UGA = 'UGA';
-    const C_UKR = 'UKR';
-    const C_ARE = 'ARE';
-    const C_GBR = 'GBR';
-    const C_USA = 'USA';
-    const C_UMI = 'UMI';
-    const C_URY = 'URY';
-    const C_UZB = 'UZB';
-    const C_VUT = 'VUT';
-    const C_VEN = 'VEN';
-    const C_VNM = 'VNM';
-    const C_VGB = 'VGB';
-    const C_VIR = 'VIR';
-    const C_WLF = 'WLF';
-    const C_ESH = 'ESH';
-    const C_YEM = 'YEM';
-    const C_ZMB = 'ZMB';
-    const C_ZWE = 'ZWE';
+    const _AFG = 'AFG';
+    const _ALA = 'ALA';
+    const _ALB = 'ALB';
+    const _DZA = 'DZA';
+    const _ASM = 'ASM';
+    const _AND = 'AND';
+    const _AGO = 'AGO';
+    const _AIA = 'AIA';
+    const _ATA = 'ATA';
+    const _ATG = 'ATG';
+    const _ARG = 'ARG';
+    const _ARM = 'ARM';
+    const _ABW = 'ABW';
+    const _AUS = 'AUS';
+    const _AUT = 'AUT';
+    const _AZE = 'AZE';
+    const _BHS = 'BHS';
+    const _BHR = 'BHR';
+    const _BGD = 'BGD';
+    const _BRB = 'BRB';
+    const _BLR = 'BLR';
+    const _BEL = 'BEL';
+    const _BLZ = 'BLZ';
+    const _BEN = 'BEN';
+    const _BMU = 'BMU';
+    const _BTN = 'BTN';
+    const _BOL = 'BOL';
+    const _BES = 'BES';
+    const _BIH = 'BIH';
+    const _BWA = 'BWA';
+    const _BVT = 'BVT';
+    const _BRA = 'BRA';
+    const _IOT = 'IOT';
+    const _BRN = 'BRN';
+    const _BGR = 'BGR';
+    const _BFA = 'BFA';
+    const _BDI = 'BDI';
+    const _CPV = 'CPV';
+    const _KHM = 'KHM';
+    const _CMR = 'CMR';
+    const _CAN = 'CAN';
+    const _CYM = 'CYM';
+    const _CAF = 'CAF';
+    const _TCD = 'TCD';
+    const _CHL = 'CHL';
+    const _CHN = 'CHN';
+    const _CXR = 'CXR';
+    const _CCK = 'CCK';
+    const _COL = 'COL';
+    const _COM = 'COM';
+    const _COG = 'COG';
+    const _COD = 'COD';
+    const _COK = 'COK';
+    const _CRI = 'CRI';
+    const _CIV = 'CIV';
+    const _HRV = 'HRV';
+    const _CUB = 'CUB';
+    const _CUW = 'CUW';
+    const _CYP = 'CYP';
+    const _CZE = 'CZE';
+    const _DNK = 'DNK';
+    const _DJI = 'DJI';
+    const _DMA = 'DMA';
+    const _DOM = 'DOM';
+    const _ECU = 'ECU';
+    const _EGY = 'EGY';
+    const _SLV = 'SLV';
+    const _GNQ = 'GNQ';
+    const _ERI = 'ERI';
+    const _EST = 'EST';
+    const _ETH = 'ETH';
+    const _FLK = 'FLK';
+    const _FRO = 'FRO';
+    const _FJI = 'FJI';
+    const _FIN = 'FIN';
+    const _FRA = 'FRA';
+    const _GUF = 'GUF';
+    const _PYF = 'PYF';
+    const _ATF = 'ATF';
+    const _GAB = 'GAB';
+    const _GMB = 'GMB';
+    const _GEO = 'GEO';
+    const _DEU = 'DEU';
+    const _GHA = 'GHA';
+    const _GIB = 'GIB';
+    const _GRC = 'GRC';
+    const _GRL = 'GRL';
+    const _GRD = 'GRD';
+    const _GLP = 'GLP';
+    const _GUM = 'GUM';
+    const _GTM = 'GTM';
+    const _GGY = 'GGY';
+    const _GIN = 'GIN';
+    const _GNB = 'GNB';
+    const _GUY = 'GUY';
+    const _HTI = 'HTI';
+    const _HMD = 'HMD';
+    const _VAT = 'VAT';
+    const _HND = 'HND';
+    const _HKG = 'HKG';
+    const _HUN = 'HUN';
+    const _ISL = 'ISL';
+    const _IND = 'IND';
+    const _IDN = 'IDN';
+    const _IRN = 'IRN';
+    const _IRQ = 'IRQ';
+    const _IRL = 'IRL';
+    const _IMN = 'IMN';
+    const _ISR = 'ISR';
+    const _ITA = 'ITA';
+    const _JAM = 'JAM';
+    const _JPN = 'JPN';
+    const _JEY = 'JEY';
+    const _JOR = 'JOR';
+    const _KAZ = 'KAZ';
+    const _KEN = 'KEN';
+    const _KIR = 'KIR';
+    const _PRK = 'PRK';
+    const _KOR = 'KOR';
+    const _KWT = 'KWT';
+    const _KGZ = 'KGZ';
+    const _LAO = 'LAO';
+    const _LVA = 'LVA';
+    const _LBN = 'LBN';
+    const _LSO = 'LSO';
+    const _LBR = 'LBR';
+    const _LBY = 'LBY';
+    const _LIE = 'LIE';
+    const _LTU = 'LTU';
+    const _LUX = 'LUX';
+    const _MAC = 'MAC';
+    const _MKD = 'MKD';
+    const _MDG = 'MDG';
+    const _MWI = 'MWI';
+    const _MYS = 'MYS';
+    const _MDV = 'MDV';
+    const _MLI = 'MLI';
+    const _MLT = 'MLT';
+    const _MHL = 'MHL';
+    const _MTQ = 'MTQ';
+    const _MRT = 'MRT';
+    const _MUS = 'MUS';
+    const _MYT = 'MYT';
+    const _MEX = 'MEX';
+    const _FSM = 'FSM';
+    const _MDA = 'MDA';
+    const _MCO = 'MCO';
+    const _MNG = 'MNG';
+    const _MNE = 'MNE';
+    const _MSR = 'MSR';
+    const _MAR = 'MAR';
+    const _MOZ = 'MOZ';
+    const _MMR = 'MMR';
+    const _NAM = 'NAM';
+    const _NRU = 'NRU';
+    const _NPL = 'NPL';
+    const _NLD = 'NLD';
+    const _NCL = 'NCL';
+    const _NZL = 'NZL';
+    const _NIC = 'NIC';
+    const _NER = 'NER';
+    const _NGA = 'NGA';
+    const _NIU = 'NIU';
+    const _NFK = 'NFK';
+    const _MNP = 'MNP';
+    const _NOR = 'NOR';
+    const _OMN = 'OMN';
+    const _PAK = 'PAK';
+    const _PLW = 'PLW';
+    const _PSE = 'PSE';
+    const _PAN = 'PAN';
+    const _PNG = 'PNG';
+    const _PRY = 'PRY';
+    const _PER = 'PER';
+    const _PHL = 'PHL';
+    const _PCN = 'PCN';
+    const _POL = 'POL';
+    const _PRT = 'PRT';
+    const _PRI = 'PRI';
+    const _QAT = 'QAT';
+    const _REU = 'REU';
+    const _ROU = 'ROU';
+    const _RUS = 'RUS';
+    const _RWA = 'RWA';
+    const _BLM = 'BLM';
+    const _SHN = 'SHN';
+    const _KNA = 'KNA';
+    const _LCA = 'LCA';
+    const _MAF = 'MAF';
+    const _SPM = 'SPM';
+    const _VCT = 'VCT';
+    const _WSM = 'WSM';
+    const _SMR = 'SMR';
+    const _STP = 'STP';
+    const _SAU = 'SAU';
+    const _SEN = 'SEN';
+    const _SRB = 'SRB';
+    const _SYC = 'SYC';
+    const _SLE = 'SLE';
+    const _SGP = 'SGP';
+    const _SXM = 'SXM';
+    const _SVK = 'SVK';
+    const _SVN = 'SVN';
+    const _SLB = 'SLB';
+    const _SOM = 'SOM';
+    const _ZAF = 'ZAF';
+    const _SGS = 'SGS';
+    const _SSD = 'SSD';
+    const _ESP = 'ESP';
+    const _LKA = 'LKA';
+    const _SDN = 'SDN';
+    const _SUR = 'SUR';
+    const _SJM = 'SJM';
+    const _SWZ = 'SWZ';
+    const _SWE = 'SWE';
+    const _CHE = 'CHE';
+    const _SYR = 'SYR';
+    const _TWN = 'TWN';
+    const _TJK = 'TJK';
+    const _TZA = 'TZA';
+    const _THA = 'THA';
+    const _TLS = 'TLS';
+    const _TGO = 'TGO';
+    const _TKL = 'TKL';
+    const _TON = 'TON';
+    const _TTO = 'TTO';
+    const _TUN = 'TUN';
+    const _TUR = 'TUR';
+    const _TKM = 'TKM';
+    const _TCA = 'TCA';
+    const _TUV = 'TUV';
+    const _UGA = 'UGA';
+    const _UKR = 'UKR';
+    const _ARE = 'ARE';
+    const _GBR = 'GBR';
+    const _USA = 'USA';
+    const _UMI = 'UMI';
+    const _URY = 'URY';
+    const _UZB = 'UZB';
+    const _VUT = 'VUT';
+    const _VEN = 'VEN';
+    const _VNM = 'VNM';
+    const _VGB = 'VGB';
+    const _VIR = 'VIR';
+    const _WLF = 'WLF';
+    const _ESH = 'ESH';
+    const _YEM = 'YEM';
+    const _ZMB = 'ZMB';
+    const _ZWE = 'ZWE';
 }
\ No newline at end of file
diff --git a/Localization/ISO3166NameEnum.php b/Localization/ISO3166NameEnum.php
index 60034da18..b9dfbd066 100644
--- a/Localization/ISO3166NameEnum.php
+++ b/Localization/ISO3166NameEnum.php
@@ -30,254 +30,254 @@ use phpOMS\Datatypes\Enum;
  */
 class ISO3166NameEnum extends Enum
 {
-    const C_AFG = 'Afghanistan';
-    const C_ALA = 'Åland Islands';
-    const C_ALB = 'Albania';
-    const C_DZA = 'Algeria';
-    const C_ASM = 'American Samoa';
-    const C_AND = 'Andorra';
-    const C_AGO = 'Angola';
-    const C_AIA = 'Anguilla';
-    const C_ATA = 'Antarctica';
-    const C_ATG = 'Antigua and Barbuda';
-    const C_ARG = 'Argentina';
-    const C_ARM = 'Armenia';
-    const C_ABW = 'Aruba';
-    const C_AUS = 'Australia';
-    const C_AUT = 'Austria';
-    const C_AZE = 'Azerbaijan';
-    const C_BHS = 'Bahamas';
-    const C_BHR = 'Bahrain';
-    const C_BGD = 'Bangladesh';
-    const C_BRB = 'Barbados';
-    const C_BLR = 'Belarus';
-    const C_BEL = 'Belgium';
-    const C_BLZ = 'Belize';
-    const C_BEN = 'Benin';
-    const C_BMU = 'Bermuda';
-    const C_BTN = 'Bhutan';
-    const C_BOL = 'Bolivia (Plurinational State of)';
-    const C_BES = 'Bonaire, Sint Eustatius and Saba';
-    const C_BIH = 'Bosnia and Herzegovina';
-    const C_BWA = 'Botswana';
-    const C_BVT = 'Bouvet Island';
-    const C_BRA = 'Brazil';
-    const C_IOT = 'British Indian Ocean Territory';
-    const C_BRN = 'Brunei Darussalam';
-    const C_BGR = 'Bulgaria';
-    const C_BFA = 'Burkina Faso';
-    const C_BDI = 'Burundi';
-    const C_CPV = 'Cabo Verde';
-    const C_KHM = 'Cambodia';
-    const C_CMR = 'Cameroon';
-    const C_CAN = 'Canada';
-    const C_CYM = 'Cayman Islands';
-    const C_CAF = 'Central African Republic';
-    const C_TCD = 'Chad';
-    const C_CHL = 'Chile';
-    const C_CHN = 'China';
-    const C_CXR = 'Christmas Island';
-    const C_CCK = 'Cocos (Keeling) Islands';
-    const C_COL = 'Colombia';
-    const C_COM = 'Comoros';
-    const C_COG = 'Congo';
-    const C_COD = 'Congo (Democratic Republic of the)';
-    const C_COK = 'Cook Islands';
-    const C_CRI = 'Costa Rica';
-    const C_CIV = 'Côte d\'Ivoire';
-    const C_HRV = 'Croatia';
-    const C_CUB = 'Cuba';
-    const C_CUW = 'Curaçao';
-    const C_CYP = 'Cyprus';
-    const C_CZE = 'Czech Republic';
-    const C_DNK = 'Denmark';
-    const C_DJI = 'Djibouti';
-    const C_DMA = 'Dominica';
-    const C_DOM = 'Dominican Republic';
-    const C_ECU = 'Ecuador';
-    const C_EGY = 'Egypt';
-    const C_SLV = 'El Salvador';
-    const C_GNQ = 'Equatorial Guinea';
-    const C_ERI = 'Eritrea';
-    const C_EST = 'Estonia';
-    const C_ETH = 'Ethiopia';
-    const C_FLK = 'Falkland Islands (Malvinas)';
-    const C_FRO = 'Faroe Islands';
-    const C_FJI = 'Fiji';
-    const C_FIN = 'Finland';
-    const C_FRA = 'France';
-    const C_GUF = 'French Guiana';
-    const C_PYF = 'French Polynesia';
-    const C_ATF = 'French Southern Territories';
-    const C_GAB = 'Gabon';
-    const C_GMB = 'Gambia';
-    const C_GEO = 'Georgia';
-    const C_DEU = 'Germany';
-    const C_GHA = 'Ghana';
-    const C_GIB = 'Gibraltar';
-    const C_GRC = 'Greece';
-    const C_GRL = 'Greenland';
-    const C_GRD = 'Grenada';
-    const C_GLP = 'Guadeloupe';
-    const C_GUM = 'Guam';
-    const C_GTM = 'Guatemala';
-    const C_GGY = 'Guernsey';
-    const C_GIN = 'Guinea';
-    const C_GNB = 'Guinea-Bissau';
-    const C_GUY = 'Guyana';
-    const C_HTI = 'Haiti';
-    const C_HMD = 'Heard Island and McDonald Islands';
-    const C_VAT = 'Holy See';
-    const C_HND = 'Honduras';
-    const C_HKG = 'Hong Kong';
-    const C_HUN = 'Hungary';
-    const C_ISL = 'Iceland';
-    const C_IND = 'India';
-    const C_IDN = 'Indonesia';
-    const C_IRN = 'Iran (Islamic Republic of)';
-    const C_IRQ = 'Iraq';
-    const C_IRL = 'Ireland';
-    const C_IMN = 'Isle of Man';
-    const C_ISR = 'Israel';
-    const C_ITA = 'Italy';
-    const C_JAM = 'Jamaica';
-    const C_JPN = 'Japan';
-    const C_JEY = 'Jersey';
-    const C_JOR = 'Jordan';
-    const C_KAZ = 'Kazakhstan';
-    const C_KEN = 'Kenya';
-    const C_KIR = 'Kiribati';
-    const C_PRK = 'Korea (Democratic People\'s Republic of)';
-    const C_KOR = 'Korea (Republic of)';
-    const C_KWT = 'Kuwait';
-    const C_KGZ = 'Kyrgyzstan';
-    const C_LAO = 'Lao People\'s Democratic Republic';
-    const C_LVA = 'Latvia';
-    const C_LBN = 'Lebanon';
-    const C_LSO = 'Lesotho';
-    const C_LBR = 'Liberia';
-    const C_LBY = 'Libya';
-    const C_LIE = 'Liechtenstein';
-    const C_LTU = 'Lithuania';
-    const C_LUX = 'Luxembourg';
-    const C_MAC = 'Macao';
-    const C_MKD = 'Macedonia (the former Yugoslav Republic of)';
-    const C_MDG = 'Madagascar';
-    const C_MWI = 'Malawi';
-    const C_MYS = 'Malaysia';
-    const C_MDV = 'Maldives';
-    const C_MLI = 'Mali';
-    const C_MLT = 'Malta';
-    const C_MHL = 'Marshall Islands';
-    const C_MTQ = 'Martinique';
-    const C_MRT = 'Mauritania';
-    const C_MUS = 'Mauritius';
-    const C_MYT = 'Mayotte';
-    const C_MEX = 'Mexico';
-    const C_FSM = 'Micronesia (Federated States of)';
-    const C_MDA = 'Moldova (Republic of)';
-    const C_MCO = 'Monaco';
-    const C_MNG = 'Mongolia';
-    const C_MNE = 'Montenegro';
-    const C_MSR = 'Montserrat';
-    const C_MAR = 'Morocco';
-    const C_MOZ = 'Mozambique';
-    const C_MMR = 'Myanmar';
-    const C_NAM = 'Namibia';
-    const C_NRU = 'Nauru';
-    const C_NPL = 'Nepal';
-    const C_NLD = 'Netherlands';
-    const C_NCL = 'New Caledonia';
-    const C_NZL = 'New Zealand';
-    const C_NIC = 'Nicaragua';
-    const C_NER = 'Niger';
-    const C_NGA = 'Nigeria';
-    const C_NIU = 'Niue';
-    const C_NFK = 'Norfolk Island';
-    const C_MNP = 'Northern Mariana Islands';
-    const C_NOR = 'Norway';
-    const C_OMN = 'Oman';
-    const C_PAK = 'Pakistan';
-    const C_PLW = 'Palau';
-    const C_PSE = 'Palestine, State of';
-    const C_PAN = 'Panama';
-    const C_PNG = 'Papua New Guinea';
-    const C_PRY = 'Paraguay';
-    const C_PER = 'Peru';
-    const C_PHL = 'Philippines';
-    const C_PCN = 'Pitcairn';
-    const C_POL = 'Poland';
-    const C_PRT = 'Portugal';
-    const C_PRI = 'Puerto Rico';
-    const C_QAT = 'Qatar';
-    const C_REU = 'Réunion';
-    const C_ROU = 'Romania';
-    const C_RUS = 'Russian Federation';
-    const C_RWA = 'Rwanda';
-    const C_BLM = 'Saint Barthélemy';
-    const C_SHN = 'Saint Helena, Ascension and Tristan da Cunha';
-    const C_KNA = 'Saint Kitts and Nevis';
-    const C_LCA = 'Saint Lucia';
-    const C_MAF = 'Saint Martin (French part)';
-    const C_SPM = 'Saint Pierre and Miquelon';
-    const C_VCT = 'Saint Vincent and the Grenadines';
-    const C_WSM = 'Samoa';
-    const C_SMR = 'San Marino';
-    const C_STP = 'Sao Tome and Principe';
-    const C_SAU = 'Saudi Arabia';
-    const C_SEN = 'Senegal';
-    const C_SRB = 'Serbia';
-    const C_SYC = 'Seychelles';
-    const C_SLE = 'Sierra Leone';
-    const C_SGP = 'Singapore';
-    const C_SXM = 'Sint Maarten (Dutch part)';
-    const C_SVK = 'Slovakia';
-    const C_SVN = 'Slovenia';
-    const C_SLB = 'Solomon Islands';
-    const C_SOM = 'Somalia';
-    const C_ZAF = 'South Africa';
-    const C_SGS = 'South Georgia and the South Sandwich Islands';
-    const C_SSD = 'South Sudan';
-    const C_ESP = 'Spain';
-    const C_LKA = 'Sri Lanka';
-    const C_SDN = 'Sudan';
-    const C_SUR = 'Suriname';
-    const C_SJM = 'Svalbard and Jan Mayen';
-    const C_SWZ = 'Swaziland';
-    const C_SWE = 'Sweden';
-    const C_CHE = 'Switzerland';
-    const C_SYR = 'Syrian Arab Republic';
-    const C_TWN = 'Taiwan, Province of China[a]';
-    const C_TJK = 'Tajikistan';
-    const C_TZA = 'Tanzania, United Republic of';
-    const C_THA = 'Thailand';
-    const C_TLS = 'Timor-Leste';
-    const C_TGO = 'Togo';
-    const C_TKL = 'Tokelau';
-    const C_TON = 'Tonga';
-    const C_TTO = 'Trinidad and Tobago';
-    const C_TUN = 'Tunisia';
-    const C_TUR = 'Turkey';
-    const C_TKM = 'Turkmenistan';
-    const C_TCA = 'Turks and Caicos Islands';
-    const C_TUV = 'Tuvalu';
-    const C_UGA = 'Uganda';
-    const C_UKR = 'Ukraine';
-    const C_ARE = 'United Arab Emirates';
-    const C_GBR = 'United Kingdom of Great Britain and Northern Ireland';
-    const C_USA = 'United States of America';
-    const C_UMI = 'United States Minor Outlying Islands';
-    const C_URY = 'Uruguay';
-    const C_UZB = 'Uzbekistan';
-    const C_VUT = 'Vanuatu';
-    const C_VEN = 'Venezuela (Bolivarian Republic of)';
-    const C_VNM = 'Viet Nam';
-    const C_VGB = 'Virgin Islands (British)';
-    const C_VIR = 'Virgin Islands (U.S.)';
-    const C_WLF = 'Wallis and Futuna';
-    const C_ESH = 'Western Sahara';
-    const C_YEM = 'Yemen';
-    const C_ZMB = 'Zambia';
-    const C_ZWE = 'Zimbabwe';
-    const C_XKK = 'Kosovo';
+    const _AFG = 'Afghanistan';
+    const _ALA = 'Åland Islands';
+    const _ALB = 'Albania';
+    const _DZA = 'Algeria';
+    const _ASM = 'American Samoa';
+    const _AND = 'Andorra';
+    const _AGO = 'Angola';
+    const _AIA = 'Anguilla';
+    const _ATA = 'Antarctica';
+    const _ATG = 'Antigua and Barbuda';
+    const _ARG = 'Argentina';
+    const _ARM = 'Armenia';
+    const _ABW = 'Aruba';
+    const _AUS = 'Australia';
+    const _AUT = 'Austria';
+    const _AZE = 'Azerbaijan';
+    const _BHS = 'Bahamas';
+    const _BHR = 'Bahrain';
+    const _BGD = 'Bangladesh';
+    const _BRB = 'Barbados';
+    const _BLR = 'Belarus';
+    const _BEL = 'Belgium';
+    const _BLZ = 'Belize';
+    const _BEN = 'Benin';
+    const _BMU = 'Bermuda';
+    const _BTN = 'Bhutan';
+    const _BOL = 'Bolivia (Plurinational State of)';
+    const _BES = 'Bonaire, Sint Eustatius and Saba';
+    const _BIH = 'Bosnia and Herzegovina';
+    const _BWA = 'Botswana';
+    const _BVT = 'Bouvet Island';
+    const _BRA = 'Brazil';
+    const _IOT = 'British Indian Ocean Territory';
+    const _BRN = 'Brunei Darussalam';
+    const _BGR = 'Bulgaria';
+    const _BFA = 'Burkina Faso';
+    const _BDI = 'Burundi';
+    const _CPV = 'Cabo Verde';
+    const _KHM = 'Cambodia';
+    const _CMR = 'Cameroon';
+    const _CAN = 'Canada';
+    const _CYM = 'Cayman Islands';
+    const _CAF = 'Central African Republic';
+    const _TCD = 'Chad';
+    const _CHL = 'Chile';
+    const _CHN = 'China';
+    const _CXR = 'Christmas Island';
+    const _CCK = 'Cocos (Keeling) Islands';
+    const _COL = 'Colombia';
+    const _COM = 'Comoros';
+    const _COG = 'Congo';
+    const _COD = 'Congo (Democratic Republic of the)';
+    const _COK = 'Cook Islands';
+    const _CRI = 'Costa Rica';
+    const _CIV = 'Côte d\'Ivoire';
+    const _HRV = 'Croatia';
+    const _CUB = 'Cuba';
+    const _CUW = 'Curaçao';
+    const _CYP = 'Cyprus';
+    const _CZE = 'Czech Republic';
+    const _DNK = 'Denmark';
+    const _DJI = 'Djibouti';
+    const _DMA = 'Dominica';
+    const _DOM = 'Dominican Republic';
+    const _ECU = 'Ecuador';
+    const _EGY = 'Egypt';
+    const _SLV = 'El Salvador';
+    const _GNQ = 'Equatorial Guinea';
+    const _ERI = 'Eritrea';
+    const _EST = 'Estonia';
+    const _ETH = 'Ethiopia';
+    const _FLK = 'Falkland Islands (Malvinas)';
+    const _FRO = 'Faroe Islands';
+    const _FJI = 'Fiji';
+    const _FIN = 'Finland';
+    const _FRA = 'France';
+    const _GUF = 'French Guiana';
+    const _PYF = 'French Polynesia';
+    const _ATF = 'French Southern Territories';
+    const _GAB = 'Gabon';
+    const _GMB = 'Gambia';
+    const _GEO = 'Georgia';
+    const _DEU = 'Germany';
+    const _GHA = 'Ghana';
+    const _GIB = 'Gibraltar';
+    const _GRC = 'Greece';
+    const _GRL = 'Greenland';
+    const _GRD = 'Grenada';
+    const _GLP = 'Guadeloupe';
+    const _GUM = 'Guam';
+    const _GTM = 'Guatemala';
+    const _GGY = 'Guernsey';
+    const _GIN = 'Guinea';
+    const _GNB = 'Guinea-Bissau';
+    const _GUY = 'Guyana';
+    const _HTI = 'Haiti';
+    const _HMD = 'Heard Island and McDonald Islands';
+    const _VAT = 'Holy See';
+    const _HND = 'Honduras';
+    const _HKG = 'Hong Kong';
+    const _HUN = 'Hungary';
+    const _ISL = 'Iceland';
+    const _IND = 'India';
+    const _IDN = 'Indonesia';
+    const _IRN = 'Iran (Islamic Republic of)';
+    const _IRQ = 'Iraq';
+    const _IRL = 'Ireland';
+    const _IMN = 'Isle of Man';
+    const _ISR = 'Israel';
+    const _ITA = 'Italy';
+    const _JAM = 'Jamaica';
+    const _JPN = 'Japan';
+    const _JEY = 'Jersey';
+    const _JOR = 'Jordan';
+    const _KAZ = 'Kazakhstan';
+    const _KEN = 'Kenya';
+    const _KIR = 'Kiribati';
+    const _PRK = 'Korea (Democratic People\'s Republic of)';
+    const _KOR = 'Korea (Republic of)';
+    const _KWT = 'Kuwait';
+    const _KGZ = 'Kyrgyzstan';
+    const _LAO = 'Lao People\'s Democratic Republic';
+    const _LVA = 'Latvia';
+    const _LBN = 'Lebanon';
+    const _LSO = 'Lesotho';
+    const _LBR = 'Liberia';
+    const _LBY = 'Libya';
+    const _LIE = 'Liechtenstein';
+    const _LTU = 'Lithuania';
+    const _LUX = 'Luxembourg';
+    const _MAC = 'Macao';
+    const _MKD = 'Macedonia (the former Yugoslav Republic of)';
+    const _MDG = 'Madagascar';
+    const _MWI = 'Malawi';
+    const _MYS = 'Malaysia';
+    const _MDV = 'Maldives';
+    const _MLI = 'Mali';
+    const _MLT = 'Malta';
+    const _MHL = 'Marshall Islands';
+    const _MTQ = 'Martinique';
+    const _MRT = 'Mauritania';
+    const _MUS = 'Mauritius';
+    const _MYT = 'Mayotte';
+    const _MEX = 'Mexico';
+    const _FSM = 'Micronesia (Federated States of)';
+    const _MDA = 'Moldova (Republic of)';
+    const _MCO = 'Monaco';
+    const _MNG = 'Mongolia';
+    const _MNE = 'Montenegro';
+    const _MSR = 'Montserrat';
+    const _MAR = 'Morocco';
+    const _MOZ = 'Mozambique';
+    const _MMR = 'Myanmar';
+    const _NAM = 'Namibia';
+    const _NRU = 'Nauru';
+    const _NPL = 'Nepal';
+    const _NLD = 'Netherlands';
+    const _NCL = 'New Caledonia';
+    const _NZL = 'New Zealand';
+    const _NIC = 'Nicaragua';
+    const _NER = 'Niger';
+    const _NGA = 'Nigeria';
+    const _NIU = 'Niue';
+    const _NFK = 'Norfolk Island';
+    const _MNP = 'Northern Mariana Islands';
+    const _NOR = 'Norway';
+    const _OMN = 'Oman';
+    const _PAK = 'Pakistan';
+    const _PLW = 'Palau';
+    const _PSE = 'Palestine, State of';
+    const _PAN = 'Panama';
+    const _PNG = 'Papua New Guinea';
+    const _PRY = 'Paraguay';
+    const _PER = 'Peru';
+    const _PHL = 'Philippines';
+    const _PCN = 'Pitcairn';
+    const _POL = 'Poland';
+    const _PRT = 'Portugal';
+    const _PRI = 'Puerto Rico';
+    const _QAT = 'Qatar';
+    const _REU = 'Réunion';
+    const _ROU = 'Romania';
+    const _RUS = 'Russian Federation';
+    const _RWA = 'Rwanda';
+    const _BLM = 'Saint Barthélemy';
+    const _SHN = 'Saint Helena, Ascension and Tristan da Cunha';
+    const _KNA = 'Saint Kitts and Nevis';
+    const _LCA = 'Saint Lucia';
+    const _MAF = 'Saint Martin (French part)';
+    const _SPM = 'Saint Pierre and Miquelon';
+    const _VCT = 'Saint Vincent and the Grenadines';
+    const _WSM = 'Samoa';
+    const _SMR = 'San Marino';
+    const _STP = 'Sao Tome and Principe';
+    const _SAU = 'Saudi Arabia';
+    const _SEN = 'Senegal';
+    const _SRB = 'Serbia';
+    const _SYC = 'Seychelles';
+    const _SLE = 'Sierra Leone';
+    const _SGP = 'Singapore';
+    const _SXM = 'Sint Maarten (Dutch part)';
+    const _SVK = 'Slovakia';
+    const _SVN = 'Slovenia';
+    const _SLB = 'Solomon Islands';
+    const _SOM = 'Somalia';
+    const _ZAF = 'South Africa';
+    const _SGS = 'South Georgia and the South Sandwich Islands';
+    const _SSD = 'South Sudan';
+    const _ESP = 'Spain';
+    const _LKA = 'Sri Lanka';
+    const _SDN = 'Sudan';
+    const _SUR = 'Suriname';
+    const _SJM = 'Svalbard and Jan Mayen';
+    const _SWZ = 'Swaziland';
+    const _SWE = 'Sweden';
+    const _CHE = 'Switzerland';
+    const _SYR = 'Syrian Arab Republic';
+    const _TWN = 'Taiwan, Province of China[a]';
+    const _TJK = 'Tajikistan';
+    const _TZA = 'Tanzania, United Republic of';
+    const _THA = 'Thailand';
+    const _TLS = 'Timor-Leste';
+    const _TGO = 'Togo';
+    const _TKL = 'Tokelau';
+    const _TON = 'Tonga';
+    const _TTO = 'Trinidad and Tobago';
+    const _TUN = 'Tunisia';
+    const _TUR = 'Turkey';
+    const _TKM = 'Turkmenistan';
+    const _TCA = 'Turks and Caicos Islands';
+    const _TUV = 'Tuvalu';
+    const _UGA = 'Uganda';
+    const _UKR = 'Ukraine';
+    const _ARE = 'United Arab Emirates';
+    const _GBR = 'United Kingdom of Great Britain and Northern Ireland';
+    const _USA = 'United States of America';
+    const _UMI = 'United States Minor Outlying Islands';
+    const _URY = 'Uruguay';
+    const _UZB = 'Uzbekistan';
+    const _VUT = 'Vanuatu';
+    const _VEN = 'Venezuela (Bolivarian Republic of)';
+    const _VNM = 'Viet Nam';
+    const _VGB = 'Virgin Islands (British)';
+    const _VIR = 'Virgin Islands (U.S.)';
+    const _WLF = 'Wallis and Futuna';
+    const _ESH = 'Western Sahara';
+    const _YEM = 'Yemen';
+    const _ZMB = 'Zambia';
+    const _ZWE = 'Zimbabwe';
+    const _XKK = 'Kosovo';
 }
\ No newline at end of file
diff --git a/Localization/ISO3166NumEnum.php b/Localization/ISO3166NumEnum.php
index 227705966..b495dfd26 100644
--- a/Localization/ISO3166NumEnum.php
+++ b/Localization/ISO3166NumEnum.php
@@ -30,253 +30,253 @@ use phpOMS\Datatypes\Enum;
  */
 class ISO3166NumEnum extends Enum
 {
-    const C_AFG = '004';
-    const C_ALA = '248';
-    const C_ALB = '008';
-    const C_DZA = '012';
-    const C_ASM = '016';
-    const C_AND = '020';
-    const C_AGO = '024';
-    const C_AIA = '660';
-    const C_ATA = '010';
-    const C_ATG = '028';
-    const C_ARG = '032';
-    const C_ARM = '051';
-    const C_ABW = '533';
-    const C_AUS = '036';
-    const C_AUT = '040';
-    const C_AZE = '031';
-    const C_BHS = '044';
-    const C_BHR = '048';
-    const C_BGD = '050';
-    const C_BRB = '052';
-    const C_BLR = '112';
-    const C_BEL = '056';
-    const C_BLZ = '084';
-    const C_BEN = '204';
-    const C_BMU = '060';
-    const C_BTN = '064';
-    const C_BOL = '068';
-    const C_BES = '535';
-    const C_BIH = '070';
-    const C_BWA = '072';
-    const C_BVT = '074';
-    const C_BRA = '076';
-    const C_IOT = '086';
-    const C_BRN = '096';
-    const C_BGR = '100';
-    const C_BFA = '854';
-    const C_BDI = '108';
-    const C_CPV = '132';
-    const C_KHM = '116';
-    const C_CMR = '120';
-    const C_CAN = '124';
-    const C_CYM = '136';
-    const C_CAF = '140';
-    const C_TCD = '148';
-    const C_CHL = '152';
-    const C_CHN = '156';
-    const C_CXR = '162';
-    const C_CCK = '166';
-    const C_COL = '170';
-    const C_COM = '174';
-    const C_COG = '178';
-    const C_COD = '180';
-    const C_COK = '184';
-    const C_CRI = '188';
-    const C_CIV = '384';
-    const C_HRV = '191';
-    const C_CUB = '192';
-    const C_CUW = '531';
-    const C_CYP = '196';
-    const C_CZE = '203';
-    const C_DNK = '208';
-    const C_DJI = '262';
-    const C_DMA = '212';
-    const C_DOM = '214';
-    const C_ECU = '218';
-    const C_EGY = '818';
-    const C_SLV = '222';
-    const C_GNQ = '226';
-    const C_ERI = '232';
-    const C_EST = '233';
-    const C_ETH = '231';
-    const C_FLK = '238';
-    const C_FRO = '234';
-    const C_FJI = '242';
-    const C_FIN = '246';
-    const C_FRA = '250';
-    const C_GUF = '254';
-    const C_PYF = '258';
-    const C_ATF = '260';
-    const C_GAB = '266';
-    const C_GMB = '270';
-    const C_GEO = '268';
-    const C_DEU = '276';
-    const C_GHA = '288';
-    const C_GIB = '292';
-    const C_GRC = '300';
-    const C_GRL = '304';
-    const C_GRD = '308';
-    const C_GLP = '312';
-    const C_GUM = '316';
-    const C_GTM = '320';
-    const C_GGY = '831';
-    const C_GIN = '324';
-    const C_GNB = '624';
-    const C_GUY = '328';
-    const C_HTI = '332';
-    const C_HMD = '334';
-    const C_VAT = '336';
-    const C_HND = '340';
-    const C_HKG = '344';
-    const C_HUN = '348';
-    const C_ISL = '352';
-    const C_IND = '356';
-    const C_IDN = '360';
-    const C_IRN = '364';
-    const C_IRQ = '368';
-    const C_IRL = '372';
-    const C_IMN = '833';
-    const C_ISR = '376';
-    const C_ITA = '380';
-    const C_JAM = '388';
-    const C_JPN = '392';
-    const C_JEY = '832';
-    const C_JOR = '400';
-    const C_KAZ = '398';
-    const C_KEN = '404';
-    const C_KIR = '296';
-    const C_PRK = '408';
-    const C_KOR = '410';
-    const C_KWT = '414';
-    const C_KGZ = '417';
-    const C_LAO = '418';
-    const C_LVA = '428';
-    const C_LBN = '422';
-    const C_LSO = '426';
-    const C_LBR = '430';
-    const C_LBY = '434';
-    const C_LIE = '438';
-    const C_LTU = '440';
-    const C_LUX = '442';
-    const C_MAC = '446';
-    const C_MKD = '807';
-    const C_MDG = '450';
-    const C_MWI = '454';
-    const C_MYS = '458';
-    const C_MDV = '462';
-    const C_MLI = '466';
-    const C_MLT = '470';
-    const C_MHL = '584';
-    const C_MTQ = '474';
-    const C_MRT = '478';
-    const C_MUS = '480';
-    const C_MYT = '175';
-    const C_MEX = '484';
-    const C_FSM = '583';
-    const C_MDA = '498';
-    const C_MCO = '492';
-    const C_MNG = '496';
-    const C_MNE = '499';
-    const C_MSR = '500';
-    const C_MAR = '504';
-    const C_MOZ = '508';
-    const C_MMR = '104';
-    const C_NAM = '516';
-    const C_NRU = '520';
-    const C_NPL = '524';
-    const C_NLD = '528';
-    const C_NCL = '540';
-    const C_NZL = '554';
-    const C_NIC = '558';
-    const C_NER = '562';
-    const C_NGA = '566';
-    const C_NIU = '570';
-    const C_NFK = '574';
-    const C_MNP = '580';
-    const C_NOR = '578';
-    const C_OMN = '512';
-    const C_PAK = '586';
-    const C_PLW = '585';
-    const C_PSE = '275';
-    const C_PAN = '591';
-    const C_PNG = '598';
-    const C_PRY = '600';
-    const C_PER = '604';
-    const C_PHL = '608';
-    const C_PCN = '612';
-    const C_POL = '616';
-    const C_PRT = '620';
-    const C_PRI = '630';
-    const C_QAT = '634';
-    const C_REU = '638';
-    const C_ROU = '642';
-    const C_RUS = '643';
-    const C_RWA = '646';
-    const C_BLM = '652';
-    const C_SHN = '654';
-    const C_KNA = '659';
-    const C_LCA = '662';
-    const C_MAF = '663';
-    const C_SPM = '666';
-    const C_VCT = '670';
-    const C_WSM = '882';
-    const C_SMR = '674';
-    const C_STP = '678';
-    const C_SAU = '682';
-    const C_SEN = '686';
-    const C_SRB = '688';
-    const C_SYC = '690';
-    const C_SLE = '694';
-    const C_SGP = '702';
-    const C_SXM = '534';
-    const C_SVK = '703';
-    const C_SVN = '705';
-    const C_SLB = '090';
-    const C_SOM = '706';
-    const C_ZAF = '710';
-    const C_SGS = '239';
-    const C_SSD = '728';
-    const C_ESP = '724';
-    const C_LKA = '144';
-    const C_SDN = '729';
-    const C_SUR = '740';
-    const C_SJM = '744';
-    const C_SWZ = '748';
-    const C_SWE = '752';
-    const C_CHE = '756';
-    const C_SYR = '760';
-    const C_TWN = '158';
-    const C_TJK = '762';
-    const C_TZA = '834';
-    const C_THA = '764';
-    const C_TLS = '626';
-    const C_TGO = '768';
-    const C_TKL = '772';
-    const C_TON = '776';
-    const C_TTO = '780';
-    const C_TUN = '788';
-    const C_TUR = '792';
-    const C_TKM = '795';
-    const C_TCA = '796';
-    const C_TUV = '798';
-    const C_UGA = '800';
-    const C_UKR = '804';
-    const C_ARE = '784';
-    const C_GBR = '826';
-    const C_USA = '840';
-    const C_UMI = '581';
-    const C_URY = '858';
-    const C_UZB = '860';
-    const C_VUT = '548';
-    const C_VEN = '862';
-    const C_VNM = '704';
-    const C_VGB = '092';
-    const C_VIR = '850';
-    const C_WLF = '876';
-    const C_ESH = '732';
-    const C_YEM = '887';
-    const C_ZMB = '894';
-    const C_ZWE = '716';
+    const _AFG = '004';
+    const _ALA = '248';
+    const _ALB = '008';
+    const _DZA = '012';
+    const _ASM = '016';
+    const _AND = '020';
+    const _AGO = '024';
+    const _AIA = '660';
+    const _ATA = '010';
+    const _ATG = '028';
+    const _ARG = '032';
+    const _ARM = '051';
+    const _ABW = '533';
+    const _AUS = '036';
+    const _AUT = '040';
+    const _AZE = '031';
+    const _BHS = '044';
+    const _BHR = '048';
+    const _BGD = '050';
+    const _BRB = '052';
+    const _BLR = '112';
+    const _BEL = '056';
+    const _BLZ = '084';
+    const _BEN = '204';
+    const _BMU = '060';
+    const _BTN = '064';
+    const _BOL = '068';
+    const _BES = '535';
+    const _BIH = '070';
+    const _BWA = '072';
+    const _BVT = '074';
+    const _BRA = '076';
+    const _IOT = '086';
+    const _BRN = '096';
+    const _BGR = '100';
+    const _BFA = '854';
+    const _BDI = '108';
+    const _CPV = '132';
+    const _KHM = '116';
+    const _CMR = '120';
+    const _CAN = '124';
+    const _CYM = '136';
+    const _CAF = '140';
+    const _TCD = '148';
+    const _CHL = '152';
+    const _CHN = '156';
+    const _CXR = '162';
+    const _CCK = '166';
+    const _COL = '170';
+    const _COM = '174';
+    const _COG = '178';
+    const _COD = '180';
+    const _COK = '184';
+    const _CRI = '188';
+    const _CIV = '384';
+    const _HRV = '191';
+    const _CUB = '192';
+    const _CUW = '531';
+    const _CYP = '196';
+    const _CZE = '203';
+    const _DNK = '208';
+    const _DJI = '262';
+    const _DMA = '212';
+    const _DOM = '214';
+    const _ECU = '218';
+    const _EGY = '818';
+    const _SLV = '222';
+    const _GNQ = '226';
+    const _ERI = '232';
+    const _EST = '233';
+    const _ETH = '231';
+    const _FLK = '238';
+    const _FRO = '234';
+    const _FJI = '242';
+    const _FIN = '246';
+    const _FRA = '250';
+    const _GUF = '254';
+    const _PYF = '258';
+    const _ATF = '260';
+    const _GAB = '266';
+    const _GMB = '270';
+    const _GEO = '268';
+    const _DEU = '276';
+    const _GHA = '288';
+    const _GIB = '292';
+    const _GRC = '300';
+    const _GRL = '304';
+    const _GRD = '308';
+    const _GLP = '312';
+    const _GUM = '316';
+    const _GTM = '320';
+    const _GGY = '831';
+    const _GIN = '324';
+    const _GNB = '624';
+    const _GUY = '328';
+    const _HTI = '332';
+    const _HMD = '334';
+    const _VAT = '336';
+    const _HND = '340';
+    const _HKG = '344';
+    const _HUN = '348';
+    const _ISL = '352';
+    const _IND = '356';
+    const _IDN = '360';
+    const _IRN = '364';
+    const _IRQ = '368';
+    const _IRL = '372';
+    const _IMN = '833';
+    const _ISR = '376';
+    const _ITA = '380';
+    const _JAM = '388';
+    const _JPN = '392';
+    const _JEY = '832';
+    const _JOR = '400';
+    const _KAZ = '398';
+    const _KEN = '404';
+    const _KIR = '296';
+    const _PRK = '408';
+    const _KOR = '410';
+    const _KWT = '414';
+    const _KGZ = '417';
+    const _LAO = '418';
+    const _LVA = '428';
+    const _LBN = '422';
+    const _LSO = '426';
+    const _LBR = '430';
+    const _LBY = '434';
+    const _LIE = '438';
+    const _LTU = '440';
+    const _LUX = '442';
+    const _MAC = '446';
+    const _MKD = '807';
+    const _MDG = '450';
+    const _MWI = '454';
+    const _MYS = '458';
+    const _MDV = '462';
+    const _MLI = '466';
+    const _MLT = '470';
+    const _MHL = '584';
+    const _MTQ = '474';
+    const _MRT = '478';
+    const _MUS = '480';
+    const _MYT = '175';
+    const _MEX = '484';
+    const _FSM = '583';
+    const _MDA = '498';
+    const _MCO = '492';
+    const _MNG = '496';
+    const _MNE = '499';
+    const _MSR = '500';
+    const _MAR = '504';
+    const _MOZ = '508';
+    const _MMR = '104';
+    const _NAM = '516';
+    const _NRU = '520';
+    const _NPL = '524';
+    const _NLD = '528';
+    const _NCL = '540';
+    const _NZL = '554';
+    const _NIC = '558';
+    const _NER = '562';
+    const _NGA = '566';
+    const _NIU = '570';
+    const _NFK = '574';
+    const _MNP = '580';
+    const _NOR = '578';
+    const _OMN = '512';
+    const _PAK = '586';
+    const _PLW = '585';
+    const _PSE = '275';
+    const _PAN = '591';
+    const _PNG = '598';
+    const _PRY = '600';
+    const _PER = '604';
+    const _PHL = '608';
+    const _PCN = '612';
+    const _POL = '616';
+    const _PRT = '620';
+    const _PRI = '630';
+    const _QAT = '634';
+    const _REU = '638';
+    const _ROU = '642';
+    const _RUS = '643';
+    const _RWA = '646';
+    const _BLM = '652';
+    const _SHN = '654';
+    const _KNA = '659';
+    const _LCA = '662';
+    const _MAF = '663';
+    const _SPM = '666';
+    const _VCT = '670';
+    const _WSM = '882';
+    const _SMR = '674';
+    const _STP = '678';
+    const _SAU = '682';
+    const _SEN = '686';
+    const _SRB = '688';
+    const _SYC = '690';
+    const _SLE = '694';
+    const _SGP = '702';
+    const _SXM = '534';
+    const _SVK = '703';
+    const _SVN = '705';
+    const _SLB = '090';
+    const _SOM = '706';
+    const _ZAF = '710';
+    const _SGS = '239';
+    const _SSD = '728';
+    const _ESP = '724';
+    const _LKA = '144';
+    const _SDN = '729';
+    const _SUR = '740';
+    const _SJM = '744';
+    const _SWZ = '748';
+    const _SWE = '752';
+    const _CHE = '756';
+    const _SYR = '760';
+    const _TWN = '158';
+    const _TJK = '762';
+    const _TZA = '834';
+    const _THA = '764';
+    const _TLS = '626';
+    const _TGO = '768';
+    const _TKL = '772';
+    const _TON = '776';
+    const _TTO = '780';
+    const _TUN = '788';
+    const _TUR = '792';
+    const _TKM = '795';
+    const _TCA = '796';
+    const _TUV = '798';
+    const _UGA = '800';
+    const _UKR = '804';
+    const _ARE = '784';
+    const _GBR = '826';
+    const _USA = '840';
+    const _UMI = '581';
+    const _URY = '858';
+    const _UZB = '860';
+    const _VUT = '548';
+    const _VEN = '862';
+    const _VNM = '704';
+    const _VGB = '092';
+    const _VIR = '850';
+    const _WLF = '876';
+    const _ESH = '732';
+    const _YEM = '887';
+    const _ZMB = '894';
+    const _ZWE = '716';
 }
\ No newline at end of file
diff --git a/Localization/ISO3166TwoEnum.php b/Localization/ISO3166TwoEnum.php
index 8d3100b74..37b942f1a 100644
--- a/Localization/ISO3166TwoEnum.php
+++ b/Localization/ISO3166TwoEnum.php
@@ -30,254 +30,254 @@ use phpOMS\Datatypes\Enum;
  */
 class ISO3166TwoEnum extends Enum
 {
-    const C_AFG = 'AF';
-    const C_ALA = 'AX';
-    const C_ALB = 'AL';
-    const C_DZA = 'DZ';
-    const C_ASM = 'AS';
-    const C_AND = 'AD';
-    const C_AGO = 'AO';
-    const C_AIA = 'AI';
-    const C_ATA = 'AQ';
-    const C_ATG = 'AG';
-    const C_ARG = 'AR';
-    const C_ARM = 'AM';
-    const C_ABW = 'AW';
-    const C_AUS = 'AU';
-    const C_AUT = 'AT';
-    const C_AZE = 'AZ';
-    const C_BHS = 'BS';
-    const C_BHR = 'BH';
-    const C_BGD = 'BD';
-    const C_BRB = 'BB';
-    const C_BLR = 'BY';
-    const C_BEL = 'BE';
-    const C_BLZ = 'BZ';
-    const C_BEN = 'BJ';
-    const C_BMU = 'BM';
-    const C_BTN = 'BT';
-    const C_BOL = 'BO';
-    const C_BES = 'BQ';
-    const C_BIH = 'BA';
-    const C_BWA = 'BW';
-    const C_BVT = 'BV';
-    const C_BRA = 'BR';
-    const C_IOT = 'IO';
-    const C_BRN = 'BN';
-    const C_BGR = 'BG';
-    const C_BFA = 'BF';
-    const C_BDI = 'BI';
-    const C_CPV = 'CV';
-    const C_KHM = 'KH';
-    const C_CMR = 'CM';
-    const C_CAN = 'CA';
-    const C_CYM = 'KY';
-    const C_CAF = 'CF';
-    const C_TCD = 'TD';
-    const C_CHL = 'CL';
-    const C_CHN = 'CN';
-    const C_CXR = 'CX';
-    const C_CCK = 'CC';
-    const C_COL = 'CO';
-    const C_COM = 'KM';
-    const C_COG = 'CG';
-    const C_COD = 'CD';
-    const C_COK = 'CK';
-    const C_CRI = 'CR';
-    const C_CIV = 'CI';
-    const C_HRV = 'HR';
-    const C_CUB = 'CU';
-    const C_CUW = 'CW';
-    const C_CYP = 'CY';
-    const C_CZE = 'CZ';
-    const C_DNK = 'DK';
-    const C_DJI = 'DJ';
-    const C_DMA = 'DM';
-    const C_DOM = 'DO';
-    const C_ECU = 'EC';
-    const C_EGY = 'EG';
-    const C_SLV = 'SV';
-    const C_GNQ = 'GQ';
-    const C_ERI = 'ER';
-    const C_EST = 'EE';
-    const C_ETH = 'ET';
-    const C_FLK = 'FK';
-    const C_FRO = 'FO';
-    const C_FJI = 'FJ';
-    const C_FIN = 'FI';
-    const C_FRA = 'FR';
-    const C_GUF = 'GF';
-    const C_PYF = 'PF';
-    const C_ATF = 'TF';
-    const C_GAB = 'GA';
-    const C_GMB = 'GM';
-    const C_GEO = 'GE';
-    const C_DEU = 'DE';
-    const C_GHA = 'GH';
-    const C_GIB = 'GI';
-    const C_GRC = 'GR';
-    const C_GRL = 'GL';
-    const C_GRD = 'GD';
-    const C_GLP = 'GP';
-    const C_GUM = 'GU';
-    const C_GTM = 'GT';
-    const C_GGY = 'GG';
-    const C_GIN = 'GN';
-    const C_GNB = 'GW';
-    const C_GUY = 'GY';
-    const C_HTI = 'HT';
-    const C_HMD = 'HM';
-    const C_VAT = 'VA';
-    const C_HND = 'HN';
-    const C_HKG = 'HK';
-    const C_HUN = 'HU';
-    const C_ISL = 'IS';
-    const C_IND = 'IN';
-    const C_IDN = 'ID';
-    const C_IRN = 'IR';
-    const C_IRQ = 'IQ';
-    const C_IRL = 'IE';
-    const C_IMN = 'IM';
-    const C_ISR = 'IL';
-    const C_ITA = 'IT';
-    const C_JAM = 'JM';
-    const C_JPN = 'JP';
-    const C_JEY = 'JE';
-    const C_JOR = 'JO';
-    const C_KAZ = 'KZ';
-    const C_KEN = 'KE';
-    const C_KIR = 'KI';
-    const C_PRK = 'KP';
-    const C_KOR = 'KR';
-    const C_KWT = 'KW';
-    const C_KGZ = 'KG';
-    const C_LAO = 'LA';
-    const C_LVA = 'LV';
-    const C_LBN = 'LB';
-    const C_LSO = 'LS';
-    const C_LBR = 'LR';
-    const C_LBY = 'LY';
-    const C_LIE = 'LI';
-    const C_LTU = 'LT';
-    const C_LUX = 'LU';
-    const C_MAC = 'MO';
-    const C_MKD = 'MK';
-    const C_MDG = 'MG';
-    const C_MWI = 'MW';
-    const C_MYS = 'MY';
-    const C_MDV = 'MV';
-    const C_MLI = 'ML';
-    const C_MLT = 'MT';
-    const C_MHL = 'MH';
-    const C_MTQ = 'MQ';
-    const C_MRT = 'MR';
-    const C_MUS = 'MU';
-    const C_MYT = 'YT';
-    const C_MEX = 'MX';
-    const C_FSM = 'FM';
-    const C_MDA = 'MD';
-    const C_MCO = 'MC';
-    const C_MNG = 'MN';
-    const C_MNE = 'ME';
-    const C_MSR = 'MS';
-    const C_MAR = 'MA';
-    const C_MOZ = 'MZ';
-    const C_MMR = 'MM';
-    const C_NAM = 'NA';
-    const C_NRU = 'NR';
-    const C_NPL = 'NP';
-    const C_NLD = 'NL';
-    const C_NCL = 'NC';
-    const C_NZL = 'NZ';
-    const C_NIC = 'NI';
-    const C_NER = 'NE';
-    const C_NGA = 'NG';
-    const C_NIU = 'NU';
-    const C_NFK = 'NF';
-    const C_MNP = 'MP';
-    const C_NOR = 'NO';
-    const C_OMN = 'OM';
-    const C_PAK = 'PK';
-    const C_PLW = 'PW';
-    const C_PSE = 'PS';
-    const C_PAN = 'PA';
-    const C_PNG = 'PG';
-    const C_PRY = 'PY';
-    const C_PER = 'PE';
-    const C_PHL = 'PH';
-    const C_PCN = 'PN';
-    const C_POL = 'PL';
-    const C_PRT = 'PT';
-    const C_PRI = 'PR';
-    const C_QAT = 'QA';
-    const C_REU = 'RE';
-    const C_ROU = 'RO';
-    const C_RUS = 'RU';
-    const C_RWA = 'RW';
-    const C_BLM = 'BL';
-    const C_SHN = 'SH';
-    const C_KNA = 'KN';
-    const C_LCA = 'LC';
-    const C_MAF = 'MF';
-    const C_SPM = 'PM';
-    const C_VCT = 'VC';
-    const C_WSM = 'WS';
-    const C_SMR = 'SM';
-    const C_STP = 'ST';
-    const C_SAU = 'SA';
-    const C_SEN = 'SN';
-    const C_SRB = 'RS';
-    const C_SYC = 'SC';
-    const C_SLE = 'SL';
-    const C_SGP = 'SG';
-    const C_SXM = 'SX';
-    const C_SVK = 'SK';
-    const C_SVN = 'SI';
-    const C_SLB = 'SB';
-    const C_SOM = 'SO';
-    const C_ZAF = 'ZA';
-    const C_SGS = 'GS';
-    const C_SSD = 'SS';
-    const C_ESP = 'ES';
-    const C_LKA = 'LK';
-    const C_SDN = 'SD';
-    const C_SUR = 'SR';
-    const C_SJM = 'SJ';
-    const C_SWZ = 'SZ';
-    const C_SWE = 'SE';
-    const C_CHE = 'CH';
-    const C_SYR = 'SY';
-    const C_TWN = 'TW';
-    const C_TJK = 'TJ';
-    const C_TZA = 'TZ';
-    const C_THA = 'TH';
-    const C_TLS = 'TL';
-    const C_TGO = 'TG';
-    const C_TKL = 'TK';
-    const C_TON = 'TO';
-    const C_TTO = 'TT';
-    const C_TUN = 'TN';
-    const C_TUR = 'TR';
-    const C_TKM = 'TM';
-    const C_TCA = 'TC';
-    const C_TUV = 'TV';
-    const C_UGA = 'UG';
-    const C_UKR = 'UA';
-    const C_ARE = 'AE';
-    const C_GBR = 'GB';
-    const C_USA = 'US';
-    const C_UMI = 'UM';
-    const C_URY = 'UY';
-    const C_UZB = 'UZ';
-    const C_VUT = 'VU';
-    const C_VEN = 'VE';
-    const C_VNM = 'VN';
-    const C_VGB = 'VG';
-    const C_VIR = 'VI';
-    const C_WLF = 'WF';
-    const C_ESH = 'EH';
-    const C_YEM = 'YE';
-    const C_ZMB = 'ZM';
-    const C_ZWE = 'ZW';
-    const C_XKK = 'XK';
+    const _AFG = 'AF';
+    const _ALA = 'AX';
+    const _ALB = 'AL';
+    const _DZA = 'DZ';
+    const _ASM = 'AS';
+    const _AND = 'AD';
+    const _AGO = 'AO';
+    const _AIA = 'AI';
+    const _ATA = 'AQ';
+    const _ATG = 'AG';
+    const _ARG = 'AR';
+    const _ARM = 'AM';
+    const _ABW = 'AW';
+    const _AUS = 'AU';
+    const _AUT = 'AT';
+    const _AZE = 'AZ';
+    const _BHS = 'BS';
+    const _BHR = 'BH';
+    const _BGD = 'BD';
+    const _BRB = 'BB';
+    const _BLR = 'BY';
+    const _BEL = 'BE';
+    const _BLZ = 'BZ';
+    const _BEN = 'BJ';
+    const _BMU = 'BM';
+    const _BTN = 'BT';
+    const _BOL = 'BO';
+    const _BES = 'BQ';
+    const _BIH = 'BA';
+    const _BWA = 'BW';
+    const _BVT = 'BV';
+    const _BRA = 'BR';
+    const _IOT = 'IO';
+    const _BRN = 'BN';
+    const _BGR = 'BG';
+    const _BFA = 'BF';
+    const _BDI = 'BI';
+    const _CPV = 'CV';
+    const _KHM = 'KH';
+    const _CMR = 'CM';
+    const _CAN = 'CA';
+    const _CYM = 'KY';
+    const _CAF = 'CF';
+    const _TCD = 'TD';
+    const _CHL = 'CL';
+    const _CHN = 'CN';
+    const _CXR = 'CX';
+    const _CCK = 'CC';
+    const _COL = 'CO';
+    const _COM = 'KM';
+    const _COG = 'CG';
+    const _COD = 'CD';
+    const _COK = 'CK';
+    const _CRI = 'CR';
+    const _CIV = 'CI';
+    const _HRV = 'HR';
+    const _CUB = 'CU';
+    const _CUW = 'CW';
+    const _CYP = 'CY';
+    const _CZE = 'CZ';
+    const _DNK = 'DK';
+    const _DJI = 'DJ';
+    const _DMA = 'DM';
+    const _DOM = 'DO';
+    const _ECU = 'EC';
+    const _EGY = 'EG';
+    const _SLV = 'SV';
+    const _GNQ = 'GQ';
+    const _ERI = 'ER';
+    const _EST = 'EE';
+    const _ETH = 'ET';
+    const _FLK = 'FK';
+    const _FRO = 'FO';
+    const _FJI = 'FJ';
+    const _FIN = 'FI';
+    const _FRA = 'FR';
+    const _GUF = 'GF';
+    const _PYF = 'PF';
+    const _ATF = 'TF';
+    const _GAB = 'GA';
+    const _GMB = 'GM';
+    const _GEO = 'GE';
+    const _DEU = 'DE';
+    const _GHA = 'GH';
+    const _GIB = 'GI';
+    const _GRC = 'GR';
+    const _GRL = 'GL';
+    const _GRD = 'GD';
+    const _GLP = 'GP';
+    const _GUM = 'GU';
+    const _GTM = 'GT';
+    const _GGY = 'GG';
+    const _GIN = 'GN';
+    const _GNB = 'GW';
+    const _GUY = 'GY';
+    const _HTI = 'HT';
+    const _HMD = 'HM';
+    const _VAT = 'VA';
+    const _HND = 'HN';
+    const _HKG = 'HK';
+    const _HUN = 'HU';
+    const _ISL = 'IS';
+    const _IND = 'IN';
+    const _IDN = 'ID';
+    const _IRN = 'IR';
+    const _IRQ = 'IQ';
+    const _IRL = 'IE';
+    const _IMN = 'IM';
+    const _ISR = 'IL';
+    const _ITA = 'IT';
+    const _JAM = 'JM';
+    const _JPN = 'JP';
+    const _JEY = 'JE';
+    const _JOR = 'JO';
+    const _KAZ = 'KZ';
+    const _KEN = 'KE';
+    const _KIR = 'KI';
+    const _PRK = 'KP';
+    const _KOR = 'KR';
+    const _KWT = 'KW';
+    const _KGZ = 'KG';
+    const _LAO = 'LA';
+    const _LVA = 'LV';
+    const _LBN = 'LB';
+    const _LSO = 'LS';
+    const _LBR = 'LR';
+    const _LBY = 'LY';
+    const _LIE = 'LI';
+    const _LTU = 'LT';
+    const _LUX = 'LU';
+    const _MAC = 'MO';
+    const _MKD = 'MK';
+    const _MDG = 'MG';
+    const _MWI = 'MW';
+    const _MYS = 'MY';
+    const _MDV = 'MV';
+    const _MLI = 'ML';
+    const _MLT = 'MT';
+    const _MHL = 'MH';
+    const _MTQ = 'MQ';
+    const _MRT = 'MR';
+    const _MUS = 'MU';
+    const _MYT = 'YT';
+    const _MEX = 'MX';
+    const _FSM = 'FM';
+    const _MDA = 'MD';
+    const _MCO = 'MC';
+    const _MNG = 'MN';
+    const _MNE = 'ME';
+    const _MSR = 'MS';
+    const _MAR = 'MA';
+    const _MOZ = 'MZ';
+    const _MMR = 'MM';
+    const _NAM = 'NA';
+    const _NRU = 'NR';
+    const _NPL = 'NP';
+    const _NLD = 'NL';
+    const _NCL = 'NC';
+    const _NZL = 'NZ';
+    const _NIC = 'NI';
+    const _NER = 'NE';
+    const _NGA = 'NG';
+    const _NIU = 'NU';
+    const _NFK = 'NF';
+    const _MNP = 'MP';
+    const _NOR = 'NO';
+    const _OMN = 'OM';
+    const _PAK = 'PK';
+    const _PLW = 'PW';
+    const _PSE = 'PS';
+    const _PAN = 'PA';
+    const _PNG = 'PG';
+    const _PRY = 'PY';
+    const _PER = 'PE';
+    const _PHL = 'PH';
+    const _PCN = 'PN';
+    const _POL = 'PL';
+    const _PRT = 'PT';
+    const _PRI = 'PR';
+    const _QAT = 'QA';
+    const _REU = 'RE';
+    const _ROU = 'RO';
+    const _RUS = 'RU';
+    const _RWA = 'RW';
+    const _BLM = 'BL';
+    const _SHN = 'SH';
+    const _KNA = 'KN';
+    const _LCA = 'LC';
+    const _MAF = 'MF';
+    const _SPM = 'PM';
+    const _VCT = 'VC';
+    const _WSM = 'WS';
+    const _SMR = 'SM';
+    const _STP = 'ST';
+    const _SAU = 'SA';
+    const _SEN = 'SN';
+    const _SRB = 'RS';
+    const _SYC = 'SC';
+    const _SLE = 'SL';
+    const _SGP = 'SG';
+    const _SXM = 'SX';
+    const _SVK = 'SK';
+    const _SVN = 'SI';
+    const _SLB = 'SB';
+    const _SOM = 'SO';
+    const _ZAF = 'ZA';
+    const _SGS = 'GS';
+    const _SSD = 'SS';
+    const _ESP = 'ES';
+    const _LKA = 'LK';
+    const _SDN = 'SD';
+    const _SUR = 'SR';
+    const _SJM = 'SJ';
+    const _SWZ = 'SZ';
+    const _SWE = 'SE';
+    const _CHE = 'CH';
+    const _SYR = 'SY';
+    const _TWN = 'TW';
+    const _TJK = 'TJ';
+    const _TZA = 'TZ';
+    const _THA = 'TH';
+    const _TLS = 'TL';
+    const _TGO = 'TG';
+    const _TKL = 'TK';
+    const _TON = 'TO';
+    const _TTO = 'TT';
+    const _TUN = 'TN';
+    const _TUR = 'TR';
+    const _TKM = 'TM';
+    const _TCA = 'TC';
+    const _TUV = 'TV';
+    const _UGA = 'UG';
+    const _UKR = 'UA';
+    const _ARE = 'AE';
+    const _GBR = 'GB';
+    const _USA = 'US';
+    const _UMI = 'UM';
+    const _URY = 'UY';
+    const _UZB = 'UZ';
+    const _VUT = 'VU';
+    const _VEN = 'VE';
+    const _VNM = 'VN';
+    const _VGB = 'VG';
+    const _VIR = 'VI';
+    const _WLF = 'WF';
+    const _ESH = 'EH';
+    const _YEM = 'YE';
+    const _ZMB = 'ZM';
+    const _ZWE = 'ZW';
+    const _XKK = 'XK';
 }
\ No newline at end of file
diff --git a/Localization/ISO4217CharEnum.php b/Localization/ISO4217CharEnum.php
index 2c870b01f..d45338f21 100644
--- a/Localization/ISO4217CharEnum.php
+++ b/Localization/ISO4217CharEnum.php
@@ -30,118 +30,118 @@ use phpOMS\Datatypes\Enum;
  */
 class ISO4217CharEnum extends Enum
 {
-    const C_ALL = 'ALL';
-    const C_AFN = 'AFN';
-    const C_ARS = 'ARS';
-    const C_AWG = 'AWG';
-    const C_AUD = 'AUD';
-    const C_AZN = 'AZN';
-    const C_BSD = 'BSD';
-    const C_BBD = 'BBD';
-    const C_BYR = 'BYR';
-    const C_BZD = 'BZD';
-    const C_BMD = 'BMD';
-    const C_BOB = 'BOB';
-    const C_BAM = 'BAM';
-    const C_BWP = 'BWP';
-    const C_BGN = 'BGN';
-    const C_BRL = 'BRL';
-    const C_BND = 'BND';
-    const C_KHR = 'KHR';
-    const C_CAD = 'CAD';
-    const C_KYD = 'KYD';
-    const C_CLP = 'CLP';
-    const C_CNY = 'CNY';
-    const C_COP = 'COP';
-    const C_CRC = 'CRC';
-    const C_HRK = 'HRK';
-    const C_CUP = 'CUP';
-    const C_CZK = 'CZK';
-    const C_DKK = 'DKK';
-    const C_DOP = 'DOP';
-    const C_XCD = 'XCD';
-    const C_EGP = 'EGP';
-    const C_SVC = 'SVC';
-    const C_EEK = 'EEK';
-    const C_EUR = 'EUR';
-    const C_FKP = 'FKP';
-    const C_FJD = 'FJD';
-    const C_GHC = 'GHC';
-    const C_GIP = 'GIP';
-    const C_GTQ = 'GTQ';
-    const C_GGP = 'GGP';
-    const C_GYD = 'GYD';
-    const C_HNL = 'HNL';
-    const C_HKD = 'HKD';
-    const C_HUF = 'HUF';
-    const C_ISK = 'ISK';
-    const C_INR = 'INR';
-    const C_IDR = 'IDR';
-    const C_IRR = 'IRR';
-    const C_IMP = 'IMP';
-    const C_ILS = 'ILS';
-    const C_JMD = 'JMD';
-    const C_JPY = 'JPY';
-    const C_JEP = 'JEP';
-    const C_KZT = 'KZT';
-    const C_KES = 'KES';
-    const C_KGS = 'KGS';
-    const C_LAK = 'LAK';
-    const C_LVL = 'LVL';
-    const C_LBP = 'LBP';
-    const C_LRD = 'LRD';
-    const C_LTL = 'LTL';
-    const C_MKD = 'MKD';
-    const C_MYR = 'MYR';
-    const C_MUR = 'MUR';
-    const C_MXN = 'MXN';
-    const C_MNT = 'MNT';
-    const C_MZN = 'MZN';
-    const C_NAD = 'NAD';
-    const C_NPR = 'NPR';
-    const C_ANG = 'ANG';
-    const C_NZD = 'NZD';
-    const C_NIO = 'NIO';
-    const C_NGN = 'NGN';
-    const C_KPW = 'KPW';
-    const C_NOK = 'NOK';
-    const C_OMR = 'OMR';
-    const C_PKR = 'PKR';
-    const C_PAB = 'PAB';
-    const C_PYG = 'PYG';
-    const C_PEN = 'PEN';
-    const C_PHP = 'PHP';
-    const C_PLN = 'PLN';
-    const C_QAR = 'QAR';
-    const C_RON = 'RON';
-    const C_RUB = 'RUB';
-    const C_SHP = 'SHP';
-    const C_SAR = 'SAR';
-    const C_RSD = 'RSD';
-    const C_SCR = 'SCR';
-    const C_SGD = 'SGD';
-    const C_SBD = 'SBD';
-    const C_SOS = 'SOS';
-    const C_ZAR = 'ZAR';
-    const C_KRW = 'KRW';
-    const C_LKR = 'LKR';
-    const C_SEK = 'SEK';
-    const C_CHF = 'CHF';
-    const C_SRD = 'SRD';
-    const C_SYP = 'SYP';
-    const C_TWD = 'TWD';
-    const C_THB = 'THB';
-    const C_TTD = 'TTD';
-    const C_TRY = 'TRY';
-    const C_TRL = 'TRL';
-    const C_TVD = 'TVD';
-    const C_UAH = 'UAH';
-    const C_GBP = 'GBP';
-    const C_USD = 'USD';
-    const C_UYU = 'UYU';
-    const C_UZS = 'UZS';
-    const C_VEF = 'VEF';
-    const C_VND = 'VND';
-    const C_YER = 'YER';
-    const C_ZWD = 'ZWD';
+    const _ALL = 'ALL';
+    const _AFN = 'AFN';
+    const _ARS = 'ARS';
+    const _AWG = 'AWG';
+    const _AUD = 'AUD';
+    const _AZN = 'AZN';
+    const _BSD = 'BSD';
+    const _BBD = 'BBD';
+    const _BYR = 'BYR';
+    const _BZD = 'BZD';
+    const _BMD = 'BMD';
+    const _BOB = 'BOB';
+    const _BAM = 'BAM';
+    const _BWP = 'BWP';
+    const _BGN = 'BGN';
+    const _BRL = 'BRL';
+    const _BND = 'BND';
+    const _KHR = 'KHR';
+    const _CAD = 'CAD';
+    const _KYD = 'KYD';
+    const _CLP = 'CLP';
+    const _CNY = 'CNY';
+    const _COP = 'COP';
+    const _CRC = 'CRC';
+    const _HRK = 'HRK';
+    const _CUP = 'CUP';
+    const _CZK = 'CZK';
+    const _DKK = 'DKK';
+    const _DOP = 'DOP';
+    const _XCD = 'XCD';
+    const _EGP = 'EGP';
+    const _SVC = 'SVC';
+    const _EEK = 'EEK';
+    const _EUR = 'EUR';
+    const _FKP = 'FKP';
+    const _FJD = 'FJD';
+    const _GHC = 'GHC';
+    const _GIP = 'GIP';
+    const _GTQ = 'GTQ';
+    const _GGP = 'GGP';
+    const _GYD = 'GYD';
+    const _HNL = 'HNL';
+    const _HKD = 'HKD';
+    const _HUF = 'HUF';
+    const _ISK = 'ISK';
+    const _INR = 'INR';
+    const _IDR = 'IDR';
+    const _IRR = 'IRR';
+    const _IMP = 'IMP';
+    const _ILS = 'ILS';
+    const _JMD = 'JMD';
+    const _JPY = 'JPY';
+    const _JEP = 'JEP';
+    const _KZT = 'KZT';
+    const _KES = 'KES';
+    const _KGS = 'KGS';
+    const _LAK = 'LAK';
+    const _LVL = 'LVL';
+    const _LBP = 'LBP';
+    const _LRD = 'LRD';
+    const _LTL = 'LTL';
+    const _MKD = 'MKD';
+    const _MYR = 'MYR';
+    const _MUR = 'MUR';
+    const _MXN = 'MXN';
+    const _MNT = 'MNT';
+    const _MZN = 'MZN';
+    const _NAD = 'NAD';
+    const _NPR = 'NPR';
+    const _ANG = 'ANG';
+    const _NZD = 'NZD';
+    const _NIO = 'NIO';
+    const _NGN = 'NGN';
+    const _KPW = 'KPW';
+    const _NOK = 'NOK';
+    const _OMR = 'OMR';
+    const _PKR = 'PKR';
+    const _PAB = 'PAB';
+    const _PYG = 'PYG';
+    const _PEN = 'PEN';
+    const _PHP = 'PHP';
+    const _PLN = 'PLN';
+    const _QAR = 'QAR';
+    const _RON = 'RON';
+    const _RUB = 'RUB';
+    const _SHP = 'SHP';
+    const _SAR = 'SAR';
+    const _RSD = 'RSD';
+    const _SCR = 'SCR';
+    const _SGD = 'SGD';
+    const _SBD = 'SBD';
+    const _SOS = 'SOS';
+    const _ZAR = 'ZAR';
+    const _KRW = 'KRW';
+    const _LKR = 'LKR';
+    const _SEK = 'SEK';
+    const _CHF = 'CHF';
+    const _SRD = 'SRD';
+    const _SYP = 'SYP';
+    const _TWD = 'TWD';
+    const _THB = 'THB';
+    const _TTD = 'TTD';
+    const _TRY = 'TRY';
+    const _TRL = 'TRL';
+    const _TVD = 'TVD';
+    const _UAH = 'UAH';
+    const _GBP = 'GBP';
+    const _USD = 'USD';
+    const _UYU = 'UYU';
+    const _UZS = 'UZS';
+    const _VEF = 'VEF';
+    const _VND = 'VND';
+    const _YER = 'YER';
+    const _ZWD = 'ZWD';
 }
diff --git a/Localization/ISO4217DecimalEnum.php b/Localization/ISO4217DecimalEnum.php
index a2846ac18..bd6146256 100644
--- a/Localization/ISO4217DecimalEnum.php
+++ b/Localization/ISO4217DecimalEnum.php
@@ -30,182 +30,182 @@ use phpOMS\Datatypes\Enum;
  */
 class ISO4217DecimalEnum extends Enum
 {
-    const C_AED = 2;
-    const C_AFN = 2;
-    const C_ALL = 2;
-    const C_AMD = 2;
-    const C_ANG = 2;
-    const C_AOA = 2;
-    const C_ARS = 2;
-    const C_AUD = 2;
-    const C_AWG = 2;
-    const C_AZN = 2;
-    const C_BAM = 2;
-    const C_BBD = 2;
-    const C_BDT = 2;
-    const C_BGN = 2;
-    const C_BHD = 3;
-    const C_BIF = 0;
-    const C_BMD = 2;
-    const C_BND = 2;
-    const C_BOB = 2;
-    const C_BOV = 2;
-    const C_BRL = 2;
-    const C_BSD = 2;
-    const C_BTN = 2;
-    const C_BWP = 2;
-    const C_BYR = 0;
-    const C_BZD = 2;
-    const C_CAD = 2;
-    const C_CDF = 2;
-    const C_CHE = 2;
-    const C_CHF = 2;
-    const C_CHW = 2;
-    const C_CLF = 4;
-    const C_CLP = 0;
-    const C_CNY = 2;
-    const C_COP = 2;
-    const C_COU = 2;
-    const C_CRC = 2;
-    const C_CUC = 2;
-    const C_CUP = 2;
-    const C_CVE = 0;
-    const C_CZK = 2;
-    const C_DJF = 0;
-    const C_DKK = 2;
-    const C_DOP = 2;
-    const C_DZD = 2;
-    const C_EGP = 2;
-    const C_ERN = 2;
-    const C_ETB = 2;
-    const C_EUR = 2;
-    const C_FJD = 2;
-    const C_FKP = 2;
-    const C_GBP = 2;
-    const C_GEL = 2;
-    const C_GHS = 2;
-    const C_GIP = 2;
-    const C_GMD = 2;
-    const C_GNF = 0;
-    const C_GTQ = 2;
-    const C_GYD = 2;
-    const C_HKD = 2;
-    const C_HNL = 2;
-    const C_HRK = 2;
-    const C_HTG = 2;
-    const C_HUF = 2;
-    const C_IDR = 2;
-    const C_ILS = 2;
-    const C_INR = 2;
-    const C_IQD = 3;
-    const C_IRR = 2;
-    const C_ISK = 0;
-    const C_JMD = 2;
-    const C_JOD = 3;
-    const C_JPY = 0;
-    const C_KES = 2;
-    const C_KGS = 2;
-    const C_KHR = 2;
-    const C_KMF = 0;
-    const C_KPW = 2;
-    const C_KRW = 0;
-    const C_KWD = 3;
-    const C_KYD = 2;
-    const C_KZT = 2;
-    const C_LAK = 2;
-    const C_LBP = 2;
-    const C_LKR = 2;
-    const C_LRD = 2;
-    const C_LSL = 2;
-    const C_LYD = 3;
-    const C_MAD = 2;
-    const C_MDL = 2;
-    const C_MGA = 1;
-    const C_MKD = 2;
-    const C_MMK = 2;
-    const C_MNT = 2;
-    const C_MOP = 2;
-    const C_MRO = 1;
-    const C_MUR = 2;
-    const C_MVR = 2;
-    const C_MWK = 2;
-    const C_MXN = 2;
-    const C_MXV = 2;
-    const C_MYR = 2;
-    const C_MZN = 2;
-    const C_NAD = 2;
-    const C_NGN = 2;
-    const C_NIO = 2;
-    const C_NOK = 2;
-    const C_NPR = 2;
-    const C_NZD = 2;
-    const C_OMR = 3;
-    const C_PAB = 2;
-    const C_PEN = 2;
-    const C_PGK = 2;
-    const C_PHP = 2;
-    const C_PKR = 2;
-    const C_PLN = 2;
-    const C_PYG = 0;
-    const C_QAR = 2;
-    const C_RON = 2;
-    const C_RSD = 2;
-    const C_RUB = 2;
-    const C_RWF = 0;
-    const C_SAR = 2;
-    const C_SBD = 2;
-    const C_SCR = 2;
-    const C_SDG = 2;
-    const C_SEK = 2;
-    const C_SGD = 2;
-    const C_SHP = 2;
-    const C_SLL = 2;
-    const C_SOS = 2;
-    const C_SRD = 2;
-    const C_SSP = 2;
-    const C_STD = 2;
-    const C_SYP = 2;
-    const C_SZL = 2;
-    const C_THB = 2;
-    const C_TJS = 2;
-    const C_TMT = 2;
-    const C_TND = 3;
-    const C_TOP = 2;
-    const C_TRY = 2;
-    const C_TTD = 2;
-    const C_TWD = 2;
-    const C_TZS = 2;
-    const C_UAH = 2;
-    const C_UGX = 0;
-    const C_USD = 2;
-    const C_USN = 2;
-    const C_USS = 2;
-    const C_UYI = 0;
-    const C_UYU = 2;
-    const C_UZS = 2;
-    const C_VEF = 2;
-    const C_VND = 0;
-    const C_VUV = 0;
-    const C_WST = 2;
-    const C_XAF = 0;
-    const C_XAG = -1;
-    const C_XAU = -1;
-    const C_XBA = -1;
-    const C_XBB = -1;
-    const C_XBC = -1;
-    const C_XBD = -1;
-    const C_XCD = 2;
-    const C_XDR = -1;
-    const C_XFU = -1;
-    const C_XOF = 0;
-    const C_XPD = -1;
-    const C_XPF = 0;
-    const C_XPT = -1;
-    const C_XSU = -1;
-    const C_XTS = -1;
-    const C_XUA = -1;
-    const C_XXX = -1;
-    const C_YER = 2;
-    const C_ZAR = 2;
-    const C_ZMW = 2;
+    const _AED = 2;
+    const _AFN = 2;
+    const _ALL = 2;
+    const _AMD = 2;
+    const _ANG = 2;
+    const _AOA = 2;
+    const _ARS = 2;
+    const _AUD = 2;
+    const _AWG = 2;
+    const _AZN = 2;
+    const _BAM = 2;
+    const _BBD = 2;
+    const _BDT = 2;
+    const _BGN = 2;
+    const _BHD = 3;
+    const _BIF = 0;
+    const _BMD = 2;
+    const _BND = 2;
+    const _BOB = 2;
+    const _BOV = 2;
+    const _BRL = 2;
+    const _BSD = 2;
+    const _BTN = 2;
+    const _BWP = 2;
+    const _BYR = 0;
+    const _BZD = 2;
+    const _CAD = 2;
+    const _CDF = 2;
+    const _CHE = 2;
+    const _CHF = 2;
+    const _CHW = 2;
+    const _CLF = 4;
+    const _CLP = 0;
+    const _CNY = 2;
+    const _COP = 2;
+    const _COU = 2;
+    const _CRC = 2;
+    const _CUC = 2;
+    const _CUP = 2;
+    const _CVE = 0;
+    const _CZK = 2;
+    const _DJF = 0;
+    const _DKK = 2;
+    const _DOP = 2;
+    const _DZD = 2;
+    const _EGP = 2;
+    const _ERN = 2;
+    const _ETB = 2;
+    const _EUR = 2;
+    const _FJD = 2;
+    const _FKP = 2;
+    const _GBP = 2;
+    const _GEL = 2;
+    const _GHS = 2;
+    const _GIP = 2;
+    const _GMD = 2;
+    const _GNF = 0;
+    const _GTQ = 2;
+    const _GYD = 2;
+    const _HKD = 2;
+    const _HNL = 2;
+    const _HRK = 2;
+    const _HTG = 2;
+    const _HUF = 2;
+    const _IDR = 2;
+    const _ILS = 2;
+    const _INR = 2;
+    const _IQD = 3;
+    const _IRR = 2;
+    const _ISK = 0;
+    const _JMD = 2;
+    const _JOD = 3;
+    const _JPY = 0;
+    const _KES = 2;
+    const _KGS = 2;
+    const _KHR = 2;
+    const _KMF = 0;
+    const _KPW = 2;
+    const _KRW = 0;
+    const _KWD = 3;
+    const _KYD = 2;
+    const _KZT = 2;
+    const _LAK = 2;
+    const _LBP = 2;
+    const _LKR = 2;
+    const _LRD = 2;
+    const _LSL = 2;
+    const _LYD = 3;
+    const _MAD = 2;
+    const _MDL = 2;
+    const _MGA = 1;
+    const _MKD = 2;
+    const _MMK = 2;
+    const _MNT = 2;
+    const _MOP = 2;
+    const _MRO = 1;
+    const _MUR = 2;
+    const _MVR = 2;
+    const _MWK = 2;
+    const _MXN = 2;
+    const _MXV = 2;
+    const _MYR = 2;
+    const _MZN = 2;
+    const _NAD = 2;
+    const _NGN = 2;
+    const _NIO = 2;
+    const _NOK = 2;
+    const _NPR = 2;
+    const _NZD = 2;
+    const _OMR = 3;
+    const _PAB = 2;
+    const _PEN = 2;
+    const _PGK = 2;
+    const _PHP = 2;
+    const _PKR = 2;
+    const _PLN = 2;
+    const _PYG = 0;
+    const _QAR = 2;
+    const _RON = 2;
+    const _RSD = 2;
+    const _RUB = 2;
+    const _RWF = 0;
+    const _SAR = 2;
+    const _SBD = 2;
+    const _SCR = 2;
+    const _SDG = 2;
+    const _SEK = 2;
+    const _SGD = 2;
+    const _SHP = 2;
+    const _SLL = 2;
+    const _SOS = 2;
+    const _SRD = 2;
+    const _SSP = 2;
+    const _STD = 2;
+    const _SYP = 2;
+    const _SZL = 2;
+    const _THB = 2;
+    const _TJS = 2;
+    const _TMT = 2;
+    const _TND = 3;
+    const _TOP = 2;
+    const _TRY = 2;
+    const _TTD = 2;
+    const _TWD = 2;
+    const _TZS = 2;
+    const _UAH = 2;
+    const _UGX = 0;
+    const _USD = 2;
+    const _USN = 2;
+    const _USS = 2;
+    const _UYI = 0;
+    const _UYU = 2;
+    const _UZS = 2;
+    const _VEF = 2;
+    const _VND = 0;
+    const _VUV = 0;
+    const _WST = 2;
+    const _XAF = 0;
+    const _XAG = -1;
+    const _XAU = -1;
+    const _XBA = -1;
+    const _XBB = -1;
+    const _XBC = -1;
+    const _XBD = -1;
+    const _XCD = 2;
+    const _XDR = -1;
+    const _XFU = -1;
+    const _XOF = 0;
+    const _XPD = -1;
+    const _XPF = 0;
+    const _XPT = -1;
+    const _XSU = -1;
+    const _XTS = -1;
+    const _XUA = -1;
+    const _XXX = -1;
+    const _YER = 2;
+    const _ZAR = 2;
+    const _ZMW = 2;
 }
\ No newline at end of file
diff --git a/Localization/ISO4217Enum.php b/Localization/ISO4217Enum.php
index 55f184907..e2009f7d0 100644
--- a/Localization/ISO4217Enum.php
+++ b/Localization/ISO4217Enum.php
@@ -30,118 +30,118 @@ use phpOMS\Datatypes\Enum;
  */
 class ISO4217Enum extends Enum
 {
-    const C_ALL = 'Albania, Leke';
-    const C_AFN = 'Afghanistan, Afghanis';
-    const C_ARS = 'Argentina, Pesos';
-    const C_AWG = 'Aruba, Guilders';
-    const C_AUD = 'Australia, Dollars';
-    const C_AZN = 'Azerbaijan, New Manats';
-    const C_BSD = 'Bahamas, Dollars';
-    const C_BBD = 'Barbados, Dollars';
-    const C_BYR = 'Belarus, Rubles';
-    const C_BZD = 'Belize, Dollars';
-    const C_BMD = 'Bermuda, Dollars';
-    const C_BOB = 'Bolivia, Bolivianos';
-    const C_BAM = 'Bosnia and Herzegovina, Convertible Marka';
-    const C_BWP = 'Botswana, Pulas';
-    const C_BGN = 'Bulgaria, Leva';
-    const C_BRL = 'Brazil, Reais';
-    const C_BND = 'Brunei Darussalam, Dollars';
-    const C_KHR = 'Cambodia, Riels';
-    const C_CAD = 'Canada, Dollars';
-    const C_KYD = 'Cayman Islands, Dollars';
-    const C_CLP = 'Chile, Pesos';
-    const C_CNY = 'China, Yuan Renminbi';
-    const C_COP = 'Colombia, Pesos';
-    const C_CRC = 'Costa Rica, Colón';
-    const C_HRK = 'Croatia, Kuna';
-    const C_CUP = 'Cuba, Pesos';
-    const C_CZK = 'Czech Republic, Koruny';
-    const C_DKK = 'Denmark, Kroner';
-    const C_DOP = 'Dominican Republic, Pesos';
-    const C_XCD = 'East Caribbean, Dollars';
-    const C_EGP = 'Egypt, Pounds';
-    const C_SVC = 'El Salvador, Colones';
-    const C_EEK = 'Estonia, Krooni';
-    const C_EUR = 'Euro';
-    const C_FKP = 'Falkland Islands, Pounds';
-    const C_FJD = 'Fiji, Dollars';
-    const C_GHC = 'Ghana, Cedis';
-    const C_GIP = 'Gibraltar, Pounds';
-    const C_GTQ = 'Guatemala, Quetzales';
-    const C_GGP = 'Guernsey, Pounds';
-    const C_GYD = 'Guyana, Dollars';
-    const C_HNL = 'Honduras, Lempiras';
-    const C_HKD = 'Hong Kong, Dollars';
-    const C_HUF = 'Hungary, Forint';
-    const C_ISK = 'Iceland, Kronur';
-    const C_INR = 'India, Rupees';
-    const C_IDR = 'Indonesia, Rupiahs';
-    const C_IRR = 'Iran, Rials';
-    const C_IMP = 'Isle of Man, Pounds';
-    const C_ILS = 'Israel, New Shekels';
-    const C_JMD = 'Jamaica, Dollars';
-    const C_JPY = 'Japan, Yen';
-    const C_JEP = 'Jersey, Pounds';
-    const C_KZT = 'Kazakhstan, Tenge';
-    const C_KES = 'Kenyan Shilling';
-    const C_KGS = 'Kyrgyzstan, Soms';
-    const C_LAK = 'Laos, Kips';
-    const C_LVL = 'Latvia, Lati';
-    const C_LBP = 'Lebanon, Pounds';
-    const C_LRD = 'Liberia, Dollars';
-    const C_LTL = 'Lithuania, Litai';
-    const C_MKD = 'Macedonia, Denars';
-    const C_MYR = 'Malaysia, Ringgits';
-    const C_MUR = 'Mauritius, Rupees';
-    const C_MXN = 'Mexico, Pesos';
-    const C_MNT = 'Mongolia, Tugriks';
-    const C_MZN = 'Mozambique, Meticais';
-    const C_NAD = 'Namibia, Dollars';
-    const C_NPR = 'Nepal, Rupees';
-    const C_ANG = 'Netherlands Antilles, Guilders';
-    const C_NZD = 'New Zealand, Dollars';
-    const C_NIO = 'Nicaragua, Cordobas';
-    const C_NGN = 'Nigeria, Nairas';
-    const C_KPW = 'North Korea, Won';
-    const C_NOK = 'Norway, Krone';
-    const C_OMR = 'Oman, Rials';
-    const C_PKR = 'Pakistan, Rupees';
-    const C_PAB = 'Panama, Balboa';
-    const C_PYG = 'Paraguay, Guarani';
-    const C_PEN = 'Peru, Nuevos Soles';
-    const C_PHP = 'Philippines, Pesos';
-    const C_PLN = 'Poland, Zlotych';
-    const C_QAR = 'Qatar, Rials';
-    const C_RON = 'Romania, New Lei';
-    const C_RUB = 'Russia, Rubles';
-    const C_SHP = 'Saint Helena, Pounds';
-    const C_SAR = 'Saudi Arabia, Riyals';
-    const C_RSD = 'Serbia, Dinars';
-    const C_SCR = 'Seychelles, Rupees';
-    const C_SGD = 'Singapore, Dollars';
-    const C_SBD = 'Solomon Islands, Dollars';
-    const C_SOS = 'Somalia, Shillings';
-    const C_ZAR = 'South Africa, Rand';
-    const C_KRW = 'South Korea, Won';
-    const C_LKR = 'Sri Lanka, Rupees';
-    const C_SEK = 'Sweden, Kronor';
-    const C_CHF = 'Switzerland, Francs';
-    const C_SRD = 'Suriname, Dollars';
-    const C_SYP = 'Syria, Pounds';
-    const C_TWD = 'Taiwan, New Dollars';
-    const C_THB = 'Thailand, Baht';
-    const C_TTD = 'Trinidad and Tobago, Dollars';
-    const C_TRY = 'Turkey, Lira';
-    const C_TRL = 'Turkey, Liras';
-    const C_TVD = 'Tuvalu, Dollars';
-    const C_UAH = 'Ukraine, Hryvnia';
-    const C_GBP = 'United Kingdom, Pounds';
-    const C_USD = 'United States of America, Dollars';
-    const C_UYU = 'Uruguay, Pesos';
-    const C_UZS = 'Uzbekistan, Sums';
-    const C_VEF = 'Venezuela, Bolivares Fuertes';
-    const C_VND = 'Vietnam, Dong';
-    const C_YER = 'Yemen, Rials';
-    const C_ZWD = 'Zimbabwe, Zimbabwe Dollars';
+    const _ALL = 'Albania, Leke';
+    const _AFN = 'Afghanistan, Afghanis';
+    const _ARS = 'Argentina, Pesos';
+    const _AWG = 'Aruba, Guilders';
+    const _AUD = 'Australia, Dollars';
+    const _AZN = 'Azerbaijan, New Manats';
+    const _BSD = 'Bahamas, Dollars';
+    const _BBD = 'Barbados, Dollars';
+    const _BYR = 'Belarus, Rubles';
+    const _BZD = 'Belize, Dollars';
+    const _BMD = 'Bermuda, Dollars';
+    const _BOB = 'Bolivia, Bolivianos';
+    const _BAM = 'Bosnia and Herzegovina, Convertible Marka';
+    const _BWP = 'Botswana, Pulas';
+    const _BGN = 'Bulgaria, Leva';
+    const _BRL = 'Brazil, Reais';
+    const _BND = 'Brunei Darussalam, Dollars';
+    const _KHR = 'Cambodia, Riels';
+    const _CAD = 'Canada, Dollars';
+    const _KYD = 'Cayman Islands, Dollars';
+    const _CLP = 'Chile, Pesos';
+    const _CNY = 'China, Yuan Renminbi';
+    const _COP = 'Colombia, Pesos';
+    const _CRC = 'Costa Rica, Colón';
+    const _HRK = 'Croatia, Kuna';
+    const _CUP = 'Cuba, Pesos';
+    const _CZK = 'Czech Republic, Koruny';
+    const _DKK = 'Denmark, Kroner';
+    const _DOP = 'Dominican Republic, Pesos';
+    const _XCD = 'East Caribbean, Dollars';
+    const _EGP = 'Egypt, Pounds';
+    const _SVC = 'El Salvador, Colones';
+    const _EEK = 'Estonia, Krooni';
+    const _EUR = 'Euro';
+    const _FKP = 'Falkland Islands, Pounds';
+    const _FJD = 'Fiji, Dollars';
+    const _GHC = 'Ghana, Cedis';
+    const _GIP = 'Gibraltar, Pounds';
+    const _GTQ = 'Guatemala, Quetzales';
+    const _GGP = 'Guernsey, Pounds';
+    const _GYD = 'Guyana, Dollars';
+    const _HNL = 'Honduras, Lempiras';
+    const _HKD = 'Hong Kong, Dollars';
+    const _HUF = 'Hungary, Forint';
+    const _ISK = 'Iceland, Kronur';
+    const _INR = 'India, Rupees';
+    const _IDR = 'Indonesia, Rupiahs';
+    const _IRR = 'Iran, Rials';
+    const _IMP = 'Isle of Man, Pounds';
+    const _ILS = 'Israel, New Shekels';
+    const _JMD = 'Jamaica, Dollars';
+    const _JPY = 'Japan, Yen';
+    const _JEP = 'Jersey, Pounds';
+    const _KZT = 'Kazakhstan, Tenge';
+    const _KES = 'Kenyan Shilling';
+    const _KGS = 'Kyrgyzstan, Soms';
+    const _LAK = 'Laos, Kips';
+    const _LVL = 'Latvia, Lati';
+    const _LBP = 'Lebanon, Pounds';
+    const _LRD = 'Liberia, Dollars';
+    const _LTL = 'Lithuania, Litai';
+    const _MKD = 'Macedonia, Denars';
+    const _MYR = 'Malaysia, Ringgits';
+    const _MUR = 'Mauritius, Rupees';
+    const _MXN = 'Mexico, Pesos';
+    const _MNT = 'Mongolia, Tugriks';
+    const _MZN = 'Mozambique, Meticais';
+    const _NAD = 'Namibia, Dollars';
+    const _NPR = 'Nepal, Rupees';
+    const _ANG = 'Netherlands Antilles, Guilders';
+    const _NZD = 'New Zealand, Dollars';
+    const _NIO = 'Nicaragua, Cordobas';
+    const _NGN = 'Nigeria, Nairas';
+    const _KPW = 'North Korea, Won';
+    const _NOK = 'Norway, Krone';
+    const _OMR = 'Oman, Rials';
+    const _PKR = 'Pakistan, Rupees';
+    const _PAB = 'Panama, Balboa';
+    const _PYG = 'Paraguay, Guarani';
+    const _PEN = 'Peru, Nuevos Soles';
+    const _PHP = 'Philippines, Pesos';
+    const _PLN = 'Poland, Zlotych';
+    const _QAR = 'Qatar, Rials';
+    const _RON = 'Romania, New Lei';
+    const _RUB = 'Russia, Rubles';
+    const _SHP = 'Saint Helena, Pounds';
+    const _SAR = 'Saudi Arabia, Riyals';
+    const _RSD = 'Serbia, Dinars';
+    const _SCR = 'Seychelles, Rupees';
+    const _SGD = 'Singapore, Dollars';
+    const _SBD = 'Solomon Islands, Dollars';
+    const _SOS = 'Somalia, Shillings';
+    const _ZAR = 'South Africa, Rand';
+    const _KRW = 'South Korea, Won';
+    const _LKR = 'Sri Lanka, Rupees';
+    const _SEK = 'Sweden, Kronor';
+    const _CHF = 'Switzerland, Francs';
+    const _SRD = 'Suriname, Dollars';
+    const _SYP = 'Syria, Pounds';
+    const _TWD = 'Taiwan, New Dollars';
+    const _THB = 'Thailand, Baht';
+    const _TTD = 'Trinidad and Tobago, Dollars';
+    const _TRY = 'Turkey, Lira';
+    const _TRL = 'Turkey, Liras';
+    const _TVD = 'Tuvalu, Dollars';
+    const _UAH = 'Ukraine, Hryvnia';
+    const _GBP = 'United Kingdom, Pounds';
+    const _USD = 'United States of America, Dollars';
+    const _UYU = 'Uruguay, Pesos';
+    const _UZS = 'Uzbekistan, Sums';
+    const _VEF = 'Venezuela, Bolivares Fuertes';
+    const _VND = 'Vietnam, Dong';
+    const _YER = 'Yemen, Rials';
+    const _ZWD = 'Zimbabwe, Zimbabwe Dollars';
 }
diff --git a/Localization/ISO4217NumEnum.php b/Localization/ISO4217NumEnum.php
index 879980cd7..9d6f76e30 100644
--- a/Localization/ISO4217NumEnum.php
+++ b/Localization/ISO4217NumEnum.php
@@ -30,182 +30,182 @@ use phpOMS\Datatypes\Enum;
  */
 class ISO4217NumEnum extends Enum
 {
-    const C_AED = '784';
-    const C_AFN = '971';
-    const C_ALL = '008';
-    const C_AMD = '051';
-    const C_ANG = '532';
-    const C_AOA = '973';
-    const C_ARS = '032';
-    const C_AUD = '036';
-    const C_AWG = '533';
-    const C_AZN = '944';
-    const C_BAM = '977';
-    const C_BBD = '052';
-    const C_BDT = '050';
-    const C_BGN = '975';
-    const C_BHD = '048';
-    const C_BIF = '108';
-    const C_BMD = '060';
-    const C_BND = '096';
-    const C_BOB = '068';
-    const C_BOV = '984';
-    const C_BRL = '986';
-    const C_BSD = '044';
-    const C_BTN = '064';
-    const C_BWP = '072';
-    const C_BYR = '974';
-    const C_BZD = '084';
-    const C_CAD = '124';
-    const C_CDF = '976';
-    const C_CHE = '947';
-    const C_CHF = '756';
-    const C_CHW = '948';
-    const C_CLF = '990';
-    const C_CLP = '152';
-    const C_CNY = '156';
-    const C_COP = '170';
-    const C_COU = '970';
-    const C_CRC = '188';
-    const C_CUC = '931';
-    const C_CUP = '192';
-    const C_CVE = '132';
-    const C_CZK = '203';
-    const C_DJF = '262';
-    const C_DKK = '208';
-    const C_DOP = '214';
-    const C_DZD = '012';
-    const C_EGP = '818';
-    const C_ERN = '232';
-    const C_ETB = '230';
-    const C_EUR = '978';
-    const C_FJD = '242';
-    const C_FKP = '238';
-    const C_GBP = '826';
-    const C_GEL = '981';
-    const C_GHS = '936';
-    const C_GIP = '292';
-    const C_GMD = '270';
-    const C_GNF = '324';
-    const C_GTQ = '320';
-    const C_GYD = '328';
-    const C_HKD = '344';
-    const C_HNL = '340';
-    const C_HRK = '191';
-    const C_HTG = '332';
-    const C_HUF = '348';
-    const C_IDR = '360';
-    const C_ILS = '376';
-    const C_INR = '356';
-    const C_IQD = '368';
-    const C_IRR = '364';
-    const C_ISK = '352';
-    const C_JMD = '388';
-    const C_JOD = '400';
-    const C_JPY = '392';
-    const C_KES = '404';
-    const C_KGS = '417';
-    const C_KHR = '116';
-    const C_KMF = '174';
-    const C_KPW = '408';
-    const C_KRW = '410';
-    const C_KWD = '414';
-    const C_KYD = '136';
-    const C_KZT = '398';
-    const C_LAK = '418';
-    const C_LBP = '422';
-    const C_LKR = '144';
-    const C_LRD = '430';
-    const C_LSL = '426';
-    const C_LYD = '434';
-    const C_MAD = '504';
-    const C_MDL = '498';
-    const C_MGA = '969';
-    const C_MKD = '807';
-    const C_MMK = '104';
-    const C_MNT = '496';
-    const C_MOP = '446';
-    const C_MRO = '478';
-    const C_MUR = '480';
-    const C_MVR = '462';
-    const C_MWK = '454';
-    const C_MXN = '484';
-    const C_MXV = '979';
-    const C_MYR = '458';
-    const C_MZN = '943';
-    const C_NAD = '516';
-    const C_NGN = '566';
-    const C_NIO = '558';
-    const C_NOK = '578';
-    const C_NPR = '524';
-    const C_NZD = '554';
-    const C_OMR = '512';
-    const C_PAB = '590';
-    const C_PEN = '604';
-    const C_PGK = '598';
-    const C_PHP = '608';
-    const C_PKR = '586';
-    const C_PLN = '985';
-    const C_PYG = '600';
-    const C_QAR = '634';
-    const C_RON = '946';
-    const C_RSD = '941';
-    const C_RUB = '643';
-    const C_RWF = '646';
-    const C_SAR = '682';
-    const C_SBD = '090';
-    const C_SCR = '690';
-    const C_SDG = '938';
-    const C_SEK = '752';
-    const C_SGD = '702';
-    const C_SHP = '654';
-    const C_SLL = '694';
-    const C_SOS = '706';
-    const C_SRD = '968';
-    const C_SSP = '728';
-    const C_STD = '678';
-    const C_SYP = '760';
-    const C_SZL = '748';
-    const C_THB = '764';
-    const C_TJS = '972';
-    const C_TMT = '934';
-    const C_TND = '788';
-    const C_TOP = '776';
-    const C_TRY = '949';
-    const C_TTD = '780';
-    const C_TWD = '901';
-    const C_TZS = '834';
-    const C_UAH = '980';
-    const C_UGX = '800';
-    const C_USD = '840';
-    const C_USN = '997';
-    const C_USS = '998';
-    const C_UYI = '940';
-    const C_UYU = '858';
-    const C_UZS = '860';
-    const C_VEF = '937';
-    const C_VND = '704';
-    const C_VUV = '548';
-    const C_WST = '882';
-    const C_XAF = '950';
-    const C_XAG = '961';
-    const C_XAU = '959';
-    const C_XBA = '955';
-    const C_XBB = '956';
-    const C_XBC = '957';
-    const C_XBD = '958';
-    const C_XCD = '951';
-    const C_XDR = '960';
-    const C_XFU = 'Nil';
-    const C_XOF = '952';
-    const C_XPD = '964';
-    const C_XPF = '953';
-    const C_XPT = '962';
-    const C_XSU = '994';
-    const C_XTS = '963';
-    const C_XUA = '965';
-    const C_XXX = '999';
-    const C_YER = '886';
-    const C_ZAR = '710';
-    const C_ZMW = '967';
+    const _AED = '784';
+    const _AFN = '971';
+    const _ALL = '008';
+    const _AMD = '051';
+    const _ANG = '532';
+    const _AOA = '973';
+    const _ARS = '032';
+    const _AUD = '036';
+    const _AWG = '533';
+    const _AZN = '944';
+    const _BAM = '977';
+    const _BBD = '052';
+    const _BDT = '050';
+    const _BGN = '975';
+    const _BHD = '048';
+    const _BIF = '108';
+    const _BMD = '060';
+    const _BND = '096';
+    const _BOB = '068';
+    const _BOV = '984';
+    const _BRL = '986';
+    const _BSD = '044';
+    const _BTN = '064';
+    const _BWP = '072';
+    const _BYR = '974';
+    const _BZD = '084';
+    const _CAD = '124';
+    const _CDF = '976';
+    const _CHE = '947';
+    const _CHF = '756';
+    const _CHW = '948';
+    const _CLF = '990';
+    const _CLP = '152';
+    const _CNY = '156';
+    const _COP = '170';
+    const _COU = '970';
+    const _CRC = '188';
+    const _CUC = '931';
+    const _CUP = '192';
+    const _CVE = '132';
+    const _CZK = '203';
+    const _DJF = '262';
+    const _DKK = '208';
+    const _DOP = '214';
+    const _DZD = '012';
+    const _EGP = '818';
+    const _ERN = '232';
+    const _ETB = '230';
+    const _EUR = '978';
+    const _FJD = '242';
+    const _FKP = '238';
+    const _GBP = '826';
+    const _GEL = '981';
+    const _GHS = '936';
+    const _GIP = '292';
+    const _GMD = '270';
+    const _GNF = '324';
+    const _GTQ = '320';
+    const _GYD = '328';
+    const _HKD = '344';
+    const _HNL = '340';
+    const _HRK = '191';
+    const _HTG = '332';
+    const _HUF = '348';
+    const _IDR = '360';
+    const _ILS = '376';
+    const _INR = '356';
+    const _IQD = '368';
+    const _IRR = '364';
+    const _ISK = '352';
+    const _JMD = '388';
+    const _JOD = '400';
+    const _JPY = '392';
+    const _KES = '404';
+    const _KGS = '417';
+    const _KHR = '116';
+    const _KMF = '174';
+    const _KPW = '408';
+    const _KRW = '410';
+    const _KWD = '414';
+    const _KYD = '136';
+    const _KZT = '398';
+    const _LAK = '418';
+    const _LBP = '422';
+    const _LKR = '144';
+    const _LRD = '430';
+    const _LSL = '426';
+    const _LYD = '434';
+    const _MAD = '504';
+    const _MDL = '498';
+    const _MGA = '969';
+    const _MKD = '807';
+    const _MMK = '104';
+    const _MNT = '496';
+    const _MOP = '446';
+    const _MRO = '478';
+    const _MUR = '480';
+    const _MVR = '462';
+    const _MWK = '454';
+    const _MXN = '484';
+    const _MXV = '979';
+    const _MYR = '458';
+    const _MZN = '943';
+    const _NAD = '516';
+    const _NGN = '566';
+    const _NIO = '558';
+    const _NOK = '578';
+    const _NPR = '524';
+    const _NZD = '554';
+    const _OMR = '512';
+    const _PAB = '590';
+    const _PEN = '604';
+    const _PGK = '598';
+    const _PHP = '608';
+    const _PKR = '586';
+    const _PLN = '985';
+    const _PYG = '600';
+    const _QAR = '634';
+    const _RON = '946';
+    const _RSD = '941';
+    const _RUB = '643';
+    const _RWF = '646';
+    const _SAR = '682';
+    const _SBD = '090';
+    const _SCR = '690';
+    const _SDG = '938';
+    const _SEK = '752';
+    const _SGD = '702';
+    const _SHP = '654';
+    const _SLL = '694';
+    const _SOS = '706';
+    const _SRD = '968';
+    const _SSP = '728';
+    const _STD = '678';
+    const _SYP = '760';
+    const _SZL = '748';
+    const _THB = '764';
+    const _TJS = '972';
+    const _TMT = '934';
+    const _TND = '788';
+    const _TOP = '776';
+    const _TRY = '949';
+    const _TTD = '780';
+    const _TWD = '901';
+    const _TZS = '834';
+    const _UAH = '980';
+    const _UGX = '800';
+    const _USD = '840';
+    const _USN = '997';
+    const _USS = '998';
+    const _UYI = '940';
+    const _UYU = '858';
+    const _UZS = '860';
+    const _VEF = '937';
+    const _VND = '704';
+    const _VUV = '548';
+    const _WST = '882';
+    const _XAF = '950';
+    const _XAG = '961';
+    const _XAU = '959';
+    const _XBA = '955';
+    const _XBB = '956';
+    const _XBC = '957';
+    const _XBD = '958';
+    const _XCD = '951';
+    const _XDR = '960';
+    const _XFU = 'Nil';
+    const _XOF = '952';
+    const _XPD = '964';
+    const _XPF = '953';
+    const _XPT = '962';
+    const _XSU = '994';
+    const _XTS = '963';
+    const _XUA = '965';
+    const _XXX = '999';
+    const _YER = '886';
+    const _ZAR = '710';
+    const _ZMW = '967';
 }
\ No newline at end of file
diff --git a/Localization/ISO4217SymbolEnum.php b/Localization/ISO4217SymbolEnum.php
index 082f09ef7..1b575d60e 100644
--- a/Localization/ISO4217SymbolEnum.php
+++ b/Localization/ISO4217SymbolEnum.php
@@ -30,115 +30,115 @@ use phpOMS\Datatypes\Enum;
  */
 class ISO4217SymbolEnum extends Enum
 {
-    const C_ALL = 'Lek';
-    const C_AFN = '؋';
-    const C_ARS = '$';
-    const C_AWG = 'ƒ';
-    const C_AUD = '$';
-    const C_AZN = 'ман';
-    const C_BSD = '$';
-    const C_BBD = '$';
-    const C_BYR = 'p.';
-    const C_BZD = 'BZ$';
-    const C_BMD = '$';
-    const C_BOB = '$b';
-    const C_BAM = 'KM';
-    const C_BWP = 'P';
-    const C_BGN = 'лв';
-    const C_BRL = 'R$';
-    const C_BND = '$';
-    const C_KHR = '៛';
-    const C_CAD = '$';
-    const C_KYD = '$';
-    const C_CLP = '$';
-    const C_CNY = '¥';
-    const C_COP = '$';
-    const C_CRC = '₡';
-    const C_HRK = 'kn';
-    const C_CUP = '₱';
-    const C_CZK = 'Kč';
-    const C_DKK = 'kr';
-    const C_DOP = 'RD$';
-    const C_XCD = '$';
-    const C_EGP = '£';
-    const C_SVC = '$';
-    const C_EUR = '€';
-    const C_FKP = '£';
-    const C_FJD = '$';
-    const C_GHS = '¢';
-    const C_GIP = '£';
-    const C_GTQ = 'Q';
-    const C_GGP = '£';
-    const C_GYD = '$';
-    const C_HNL = 'L';
-    const C_HKD = '$';
-    const C_HUF = 'Ft';
-    const C_ISK = 'kr';
-    const C_INR = 'INR';
-    const C_IDR = 'Rp';
-    const C_IRR = '﷼';
-    const C_IMP = '£';
-    const C_ILS = '₪';
-    const C_JMD = 'J$';
-    const C_JPY = '¥';
-    const C_JEP = '£';
-    const C_KZT = 'лв';
-    const C_KPW = '₩';
-    const C_KRW = '₩';
-    const C_KGS = 'лв';
-    const C_LAK = '₭';
-    const C_LBP = '£';
-    const C_LRD = '$';
-    const C_MKD = 'ден';
-    const C_MYR = 'RM';
-    const C_MUR = '₨';
-    const C_MXN = '$';
-    const C_MNT = '₮';
-    const C_MZN = 'MT';
-    const C_NAD = '$';
-    const C_NPR = '₨';
-    const C_ANG = 'ƒ';
-    const C_NZD = '$';
-    const C_NIO = 'C$';
-    const C_NGN = '₦';
-    const C_KPW = '₩';
-    const C_NOK = 'kr';
-    const C_OMR = '﷼';
-    const C_PKR = '₨';
-    const C_PAB = 'B/.';
-    const C_PYG = 'Gs';
-    const C_PEN = 'S/.';
-    const C_PHP = '₱';
-    const C_PLN = 'zł';
-    const C_QAR = '﷼';
-    const C_RON = 'lei';
-    const C_RUB = 'руб';
-    const C_SHP = '£';
-    const C_SAR = '﷼';
-    const C_RSD = 'Дин.';
-    const C_SCR = '₨';
-    const C_SGD = '$';
-    const C_SBD = '$';
-    const C_SOS = 'S';
-    const C_ZAR = 'R';
-    const C_KRW = '₩';
-    const C_LKR = '₨';
-    const C_SEK = 'kr';
-    const C_CHF = 'CHF';
-    const C_SRD = '$';
-    const C_SYP = '£';
-    const C_TWD = 'NT$';
-    const C_THB = '฿';
-    const C_TTD = 'TT$';
-    const C_TRY = 'TRY';
-    const C_TVD = '$';
-    const C_UAH = '₴';
-    const C_GBP = '£';
-    const C_USD = '$';
-    const C_UYU = '$U';
-    const C_UZS = 'лв';
-    const C_VEF = 'Bs';
-    const C_VND = '₫';
-    const C_YER = '﷼';
-    const C_ZWD = 'Z$';
+    const _ALL = 'Lek';
+    const _AFN = '؋';
+    const _ARS = '$';
+    const _AWG = 'ƒ';
+    const _AUD = '$';
+    const _AZN = 'ман';
+    const _BSD = '$';
+    const _BBD = '$';
+    const _BYR = 'p.';
+    const _BZD = 'BZ$';
+    const _BMD = '$';
+    const _BOB = '$b';
+    const _BAM = 'KM';
+    const _BWP = 'P';
+    const _BGN = 'лв';
+    const _BRL = 'R$';
+    const _BND = '$';
+    const _KHR = '៛';
+    const _CAD = '$';
+    const _KYD = '$';
+    const _CLP = '$';
+    const _CNY = '¥';
+    const _COP = '$';
+    const _CRC = '₡';
+    const _HRK = 'kn';
+    const _CUP = '₱';
+    const _CZK = 'Kč';
+    const _DKK = 'kr';
+    const _DOP = 'RD$';
+    const _XCD = '$';
+    const _EGP = '£';
+    const _SVC = '$';
+    const _EUR = '€';
+    const _FKP = '£';
+    const _FJD = '$';
+    const _GHS = '¢';
+    const _GIP = '£';
+    const _GTQ = 'Q';
+    const _GGP = '£';
+    const _GYD = '$';
+    const _HNL = 'L';
+    const _HKD = '$';
+    const _HUF = 'Ft';
+    const _ISK = 'kr';
+    const _INR = 'INR';
+    const _IDR = 'Rp';
+    const _IRR = '﷼';
+    const _IMP = '£';
+    const _ILS = '₪';
+    const _JMD = 'J$';
+    const _JPY = '¥';
+    const _JEP = '£';
+    const _KZT = 'лв';
+    const _KPW = '₩';
+    const _KRW = '₩';
+    const _KGS = 'лв';
+    const _LAK = '₭';
+    const _LBP = '£';
+    const _LRD = '$';
+    const _MKD = 'ден';
+    const _MYR = 'RM';
+    const _MUR = '₨';
+    const _MXN = '$';
+    const _MNT = '₮';
+    const _MZN = 'MT';
+    const _NAD = '$';
+    const _NPR = '₨';
+    const _ANG = 'ƒ';
+    const _NZD = '$';
+    const _NIO = 'C$';
+    const _NGN = '₦';
+    const _KPW = '₩';
+    const _NOK = 'kr';
+    const _OMR = '﷼';
+    const _PKR = '₨';
+    const _PAB = 'B/.';
+    const _PYG = 'Gs';
+    const _PEN = 'S/.';
+    const _PHP = '₱';
+    const _PLN = 'zł';
+    const _QAR = '﷼';
+    const _RON = 'lei';
+    const _RUB = 'руб';
+    const _SHP = '£';
+    const _SAR = '﷼';
+    const _RSD = 'Дин.';
+    const _SCR = '₨';
+    const _SGD = '$';
+    const _SBD = '$';
+    const _SOS = 'S';
+    const _ZAR = 'R';
+    const _KRW = '₩';
+    const _LKR = '₨';
+    const _SEK = 'kr';
+    const _CHF = 'CHF';
+    const _SRD = '$';
+    const _SYP = '£';
+    const _TWD = 'NT$';
+    const _THB = '฿';
+    const _TTD = 'TT$';
+    const _TRY = 'TRY';
+    const _TVD = '$';
+    const _UAH = '₴';
+    const _GBP = '£';
+    const _USD = '$';
+    const _UYU = '$U';
+    const _UZS = 'лв';
+    const _VEF = 'Bs';
+    const _VND = '₫';
+    const _YER = '﷼';
+    const _ZWD = 'Z$';
 }
\ No newline at end of file
diff --git a/Localization/PhoneEnumArray.php b/Localization/PhoneEnumArray.php
deleted file mode 100644
index d3d10bf7d..000000000
--- a/Localization/PhoneEnumArray.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.0
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  2013 Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace phpOMS\Localization;
-
-use phpOMS\Datatypes\EnumArray;
-
-/**
- * Currency codes ISO list.
- *
- * @category   Framework
- * @package    phpOMS\Localization
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class PhoneEnumArray extends EnumArray
-{
-    protected static $constants = [
-        'AF' => 93,
-        'AL' => 355,
-        'DZ' => 213,
-        'AS' => 1684,
-        'AD' => 376,
-        'AO' => 244,
-        'AI' => 1264,
-        'AQ' => 672,
-        'AG' => 1268,
-        'AR' => 54,
-        'AM' => 374,
-        'AW' => 297,
-        'AU' => 61,
-        'AT' => 43,
-        'AZ' => 994,
-        'BS' => 1242,
-        'BH' => 973,
-        'BD' => 880,
-        'BB' => 1246,
-        'BY' => 375,
-        'BE' => 32,
-        'BZ' => 501,
-        'BJ' => 229,
-        'BM' => 1441,
-        'BT' => 975,
-        'BO' => 591,
-        'BA' => 387,
-        'BW' => 267,
-        'BR' => 55,
-        'VG' => 1284,
-        'BN' => 673,
-        'BG' => 359,
-        'BF' => 226,
-        'MM' => 95,
-        'BI' => 257,
-        'KH' => 855,
-        'CM' => 237,
-        'CA' => 1,
-        'CV' => 238,
-        'KY' => 1345,
-        'CF' => 236,
-        'TD' => 235,
-        'CL' => 56,
-        'CN' => 86,
-        'CX' => 61,
-        'CC' => 61,
-        'CO' => 57,
-        'KM' => 269,
-        'CK' => 682,
-        'CR' => 506,
-        'HR' => 385,
-        'CU' => 53,
-        'CY' => 357,
-        'CZ' => 420,
-        'CD' => 243,
-        'DK' => 45,
-        'DJ' => 253,
-        'DM' => 1767,
-        'DO' => 1809,
-        'EC' => 593,
-        'EG' => 20,
-        'SV' => 503,
-        'GQ' => 240,
-        'ER' => 291,
-        'EE' => 372,
-        'ET' => 251,
-        'FK' => 500,
-        'FO' => 298,
-        'FJ' => 679,
-        'FI' => 358,
-        'FR' => 33,
-        'PF' => 689,
-        'GA' => 241,
-        'GM' => 220,
-        'GE' => 995,
-        'DE' => 49,
-        'GH' => 233,
-        'GI' => 350,
-        'GR' => 30,
-        'GL' => 299,
-        'GD' => 1473,
-        'GU' => 1671,
-        'GT' => 502,
-        'GN' => 224,
-        'GW' => 245,
-        'GY' => 592,
-        'HT' => 509,
-        'VA' => 39,
-        'HN' => 504,
-        'HK' => 852,
-        'HU' => 36,
-        'IS' => 354,
-        'IN' => 91,
-        'ID' => 62,
-        'IR' => 98,
-        'IQ' => 964,
-        'IE' => 353,
-        'IM' => 44,
-        'IL' => 972,
-        'IT' => 39,
-        'CI' => 225,
-        'JM' => 1876,
-        'JP' => 81,
-        'JO' => 962,
-        'KZ' => 7,
-        'KE' => 254,
-        'KI' => 686,
-        'KW' => 965,
-        'KG' => 996,
-        'LA' => 856,
-        'LV' => 371,
-        'LB' => 961,
-        'LS' => 266,
-        'LR' => 231,
-        'LY' => 218,
-        'LI' => 423,
-        'LT' => 370,
-        'LU' => 352,
-        'MO' => 853,
-        'MK' => 389,
-        'MG' => 261,
-        'MW' => 265,
-        'MY' => 60,
-        'MV' => 960,
-        'ML' => 223,
-        'MT' => 356,
-        'MH' => 692,
-        'MR' => 222,
-        'MU' => 230,
-        'YT' => 262,
-        'MX' => 52,
-        'FM' => 691,
-        'MD' => 373,
-        'MC' => 377,
-        'MN' => 976,
-        'ME' => 382,
-        'MS' => 1664,
-        'MA' => 212,
-        'MZ' => 258,
-        'NA' => 264,
-        'NR' => 674,
-        'NP' => 977,
-        'NL' => 31,
-        'AN' => 599,
-        'NC' => 687,
-        'NZ' => 64,
-        'NI' => 505,
-        'NE' => 227,
-        'NG' => 234,
-        'NU' => 683,
-        'KP' => 850,
-        'MP' => 1670,
-        'NO' => 47,
-        'OM' => 968,
-        'PK' => 92,
-        'PW' => 680,
-        'PA' => 507,
-        'PG' => 675,
-        'PY' => 595,
-        'PE' => 51,
-        'PH' => 63,
-        'PN' => 870,
-        'PL' => 48,
-        'PT' => 351,
-        'PR' => 1,
-        'QA' => 974,
-        'CG' => 242,
-        'RO' => 40,
-        'RU' => 7,
-        'RW' => 250,
-        'BL' => 590,
-        'SH' => 290,
-        'KN' => 1869,
-        'LC' => 1758,
-        'MF' => 1599,
-        'PM' => 508,
-        'VC' => 1784,
-        'WS' => 685,
-        'SM' => 378,
-        'ST' => 239,
-        'SA' => 966,
-        'SN' => 221,
-        'RS' => 381,
-        'SC' => 248,
-        'SL' => 232,
-        'SG' => 65,
-        'SK' => 421,
-        'SI' => 386,
-        'SB' => 677,
-        'SO' => 252,
-        'ZA' => 27,
-        'KR' => 82,
-        'ES' => 34,
-        'LK' => 94,
-        'SD' => 249,
-        'SR' => 597,
-        'SZ' => 268,
-        'SE' => 46,
-        'CH' => 41,
-        'SY' => 963,
-        'TW' => 886,
-        'TJ' => 992,
-        'TZ' => 255,
-        'TH' => 66,
-        'TL' => 670,
-        'TG' => 228,
-        'TK' => 690,
-        'TO' => 676,
-        'TT' => 1868,
-        'TN' => 216,
-        'TR' => 90,
-        'TM' => 993,
-        'TC' => 1649,
-        'TV' => 688,
-        'UG' => 256,
-        'UA' => 380,
-        'AE' => 971,
-        'GB' => 44,
-        'US' => 1,
-        'UY' => 598,
-        'VI' => 1340,
-        'UZ' => 998,
-        'VU' => 678,
-        'VE' => 58,
-        'VN' => 84,
-        'WF' => 681,
-        'YE' => 967,
-        'ZM' => 260,
-        'ZW' => 263,
-    ];
-}