diff --git a/README.md b/README.md
index c756c83..ff9f2cc 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ Adding a library api:
 <dependency>
     <groupId>org.densy.polyglot</groupId>
     <artifactId>api</artifactId>
-    <vearsion>1.1.2-SNAPSHOT</vearsion>
+    <vearsion>1.1.3-SNAPSHOT</vearsion>
 </dependency>
 ```
 
@@ -82,7 +82,7 @@ Adding a library implementation:
 <dependency>
     <groupId>org.densy.polyglot</groupId>
     <artifactId>core</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.3-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -97,10 +97,10 @@ maven {
 
 Adding a library api:
 ```groovy
-implementation "org.densy.polyglot:api:1.1.2-SNAPSHOT"
+implementation "org.densy.polyglot:api:1.1.3-SNAPSHOT"
 ```
 
 Adding a library implementation:
 ```groovy
-implementation "org.densy.polyglot:core:1.1.2-SNAPSHOT"
+implementation "org.densy.polyglot:core:1.1.3-SNAPSHOT"
 ```
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index f645f82..2379366 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ java {
 
 allprojects {
     group = "org.densy.polyglot"
-    version = "1.1.2-SNAPSHOT"
+    version = "1.1.3-SNAPSHOT"
 }
 
 subprojects {
diff --git a/common/src/main/java/org/densy/polyglot/common/language/LocaleLanguage.java b/common/src/main/java/org/densy/polyglot/common/language/LocaleLanguage.java
index 5bf77ca..ea2dae6 100644
--- a/common/src/main/java/org/densy/polyglot/common/language/LocaleLanguage.java
+++ b/common/src/main/java/org/densy/polyglot/common/language/LocaleLanguage.java
@@ -2,9 +2,6 @@
 
 import org.densy.polyglot.core.language.BaseLanguage;
 
-/**
- * Built-in languages in standard locale format.
- */
 public interface LocaleLanguage {
     BaseLanguage EN_US = new BaseLanguage("en", "US");
     BaseLanguage EN_GB = new BaseLanguage("en", "GB");
@@ -35,4 +32,26 @@ public interface LocaleLanguage {
     BaseLanguage SV_SE = new BaseLanguage("sv", "SE");
     BaseLanguage TR_TR = new BaseLanguage("tr", "TR");
     BaseLanguage UK_UA = new BaseLanguage("uk", "UA");
-}
+    BaseLanguage BE_BY = new BaseLanguage("be", "BY");
+    BaseLanguage KK_KZ = new BaseLanguage("kk", "KZ");
+    BaseLanguage SL_SI = new BaseLanguage("sl", "SI");
+    BaseLanguage BS_BA = new BaseLanguage("bs", "BA");
+    BaseLanguage MK_MK = new BaseLanguage("mk", "MK");
+    BaseLanguage VI_VN = new BaseLanguage("vi", "VN");
+    BaseLanguage AR_SA = new BaseLanguage("ar", "SA");
+    BaseLanguage HI_IN = new BaseLanguage("hi", "IN");
+    BaseLanguage BN_BD = new BaseLanguage("bn", "BD");
+    BaseLanguage UR_PK = new BaseLanguage("ur", "PK");
+    BaseLanguage TH_TH = new BaseLanguage("th", "TH");
+    BaseLanguage RO_RO = new BaseLanguage("ro", "RO");
+    BaseLanguage HR_HR = new BaseLanguage("hr", "HR");
+    BaseLanguage SR_RS = new BaseLanguage("sr", "RS");
+    BaseLanguage FA_IR = new BaseLanguage("fa", "IR");
+    BaseLanguage HE_IL = new BaseLanguage("he", "IL");
+    BaseLanguage SW_KE = new BaseLanguage("sw", "KE");
+    BaseLanguage AM_ET = new BaseLanguage("am", "ET");
+    BaseLanguage TA_IN = new BaseLanguage("ta", "IN");
+    BaseLanguage TE_IN = new BaseLanguage("te", "IN");
+    BaseLanguage MR_IN = new BaseLanguage("mr", "IN");
+    BaseLanguage FIL_PH = new BaseLanguage("fil", "PH");
+}
\ No newline at end of file
diff --git a/common/src/main/java/org/densy/polyglot/common/language/SimpleLanguage.java b/common/src/main/java/org/densy/polyglot/common/language/SimpleLanguage.java
index e9a080d..07f1199 100644
--- a/common/src/main/java/org/densy/polyglot/common/language/SimpleLanguage.java
+++ b/common/src/main/java/org/densy/polyglot/common/language/SimpleLanguage.java
@@ -2,12 +2,9 @@
 
 import org.densy.polyglot.core.language.BaseLanguage;
 
-/**
- * Built-in languages in a simple format.
- */
 public interface SimpleLanguage {
     BaseLanguage ENG = new BaseLanguage("eng");
-    BaseLanguage GER = new BaseLanguage("ger");
+    BaseLanguage DEU = new BaseLanguage("deu");
     BaseLanguage SPA = new BaseLanguage("spa");
     BaseLanguage FRA = new BaseLanguage("fra");
     BaseLanguage ITA = new BaseLanguage("ita");
@@ -15,19 +12,41 @@ public interface SimpleLanguage {
     BaseLanguage KOR = new BaseLanguage("kor");
     BaseLanguage POR = new BaseLanguage("por");
     BaseLanguage RUS = new BaseLanguage("rus");
-    BaseLanguage CHI = new BaseLanguage("chi");
-    BaseLanguage DUT = new BaseLanguage("dut");
+    BaseLanguage ZHO = new BaseLanguage("zho");
+    BaseLanguage NLD = new BaseLanguage("nld");
     BaseLanguage BUL = new BaseLanguage("bul");
-    BaseLanguage CZE = new BaseLanguage("cze");
+    BaseLanguage CES = new BaseLanguage("ces");
     BaseLanguage DAN = new BaseLanguage("dan");
-    BaseLanguage GRE = new BaseLanguage("gre");
+    BaseLanguage ELL = new BaseLanguage("ell");
     BaseLanguage FIN = new BaseLanguage("fin");
     BaseLanguage HUN = new BaseLanguage("hun");
     BaseLanguage IND = new BaseLanguage("ind");
     BaseLanguage NOR = new BaseLanguage("nor");
     BaseLanguage POL = new BaseLanguage("pol");
-    BaseLanguage SLO = new BaseLanguage("slo");
+    BaseLanguage SLK = new BaseLanguage("slk");
     BaseLanguage SWE = new BaseLanguage("swe");
     BaseLanguage TUR = new BaseLanguage("tur");
     BaseLanguage UKR = new BaseLanguage("ukr");
+    BaseLanguage BEL = new BaseLanguage("bel");
+    BaseLanguage KAZ = new BaseLanguage("kaz");
+    BaseLanguage SLV = new BaseLanguage("slv");
+    BaseLanguage BOS = new BaseLanguage("bos");
+    BaseLanguage MKD = new BaseLanguage("mkd");
+    BaseLanguage VIE = new BaseLanguage("vie");
+    BaseLanguage ARA = new BaseLanguage("ara");
+    BaseLanguage HIN = new BaseLanguage("hin");
+    BaseLanguage BEN = new BaseLanguage("ben");
+    BaseLanguage URD = new BaseLanguage("urd");
+    BaseLanguage THA = new BaseLanguage("tha");
+    BaseLanguage RON = new BaseLanguage("ron");
+    BaseLanguage HRV = new BaseLanguage("hrv");
+    BaseLanguage SRP = new BaseLanguage("srp");
+    BaseLanguage FAS = new BaseLanguage("fas");
+    BaseLanguage HEB = new BaseLanguage("heb");
+    BaseLanguage SWA = new BaseLanguage("swa");
+    BaseLanguage AMH = new BaseLanguage("amh");
+    BaseLanguage TAM = new BaseLanguage("tam");
+    BaseLanguage TEL = new BaseLanguage("tel");
+    BaseLanguage MAR = new BaseLanguage("mar");
+    BaseLanguage FIL = new BaseLanguage("fil");
 }
\ No newline at end of file
diff --git a/common/src/main/java/org/densy/polyglot/common/language/converter/SimpleLocaleLanguageConverter.java b/common/src/main/java/org/densy/polyglot/common/language/converter/SimpleLocaleLanguageConverter.java
index 98c04ee..4ded08e 100644
--- a/common/src/main/java/org/densy/polyglot/common/language/converter/SimpleLocaleLanguageConverter.java
+++ b/common/src/main/java/org/densy/polyglot/common/language/converter/SimpleLocaleLanguageConverter.java
@@ -12,35 +12,76 @@ public SimpleLocaleLanguageConverter() {
         // English
         addMapping(SimpleLanguage.ENG, LocaleLanguage.EN_GB);
         addMapping(SimpleLanguage.ENG, LocaleLanguage.EN_US);
+
         // Spanish
         addMapping(SimpleLanguage.SPA, LocaleLanguage.ES_ES);
         addMapping(SimpleLanguage.SPA, LocaleLanguage.ES_MX);
+
         // French
         addMapping(SimpleLanguage.FRA, LocaleLanguage.FR_FR);
         addMapping(SimpleLanguage.FRA, LocaleLanguage.FR_CA);
-        // Other
-        addMapping(SimpleLanguage.GER, LocaleLanguage.DE_DE);
-        addMapping(SimpleLanguage.ITA, LocaleLanguage.IT_IT);
-        addMapping(SimpleLanguage.JPN, LocaleLanguage.JA_JP);
-        addMapping(SimpleLanguage.KOR, LocaleLanguage.KO_KR);
+
+        // Portuguese
         addMapping(SimpleLanguage.POR, LocaleLanguage.PT_BR);
         addMapping(SimpleLanguage.POR, LocaleLanguage.PT_PT);
-        addMapping(SimpleLanguage.RUS, LocaleLanguage.RU_RU);
-        addMapping(SimpleLanguage.CHI, LocaleLanguage.ZH_CN);
-        addMapping(SimpleLanguage.CHI, LocaleLanguage.ZH_TW);
-        addMapping(SimpleLanguage.DUT, LocaleLanguage.NL_NL);
+
+        // Chinese
+        addMapping(SimpleLanguage.ZHO, LocaleLanguage.ZH_CN);
+        addMapping(SimpleLanguage.ZHO, LocaleLanguage.ZH_TW);
+
+        // Core European languages
+        addMapping(SimpleLanguage.DEU, LocaleLanguage.DE_DE);
+        addMapping(SimpleLanguage.ITA, LocaleLanguage.IT_IT);
+        addMapping(SimpleLanguage.NLD, LocaleLanguage.NL_NL);
         addMapping(SimpleLanguage.BUL, LocaleLanguage.BG_BG);
-        addMapping(SimpleLanguage.CZE, LocaleLanguage.CS_CZ);
+        addMapping(SimpleLanguage.CES, LocaleLanguage.CS_CZ);
         addMapping(SimpleLanguage.DAN, LocaleLanguage.DA_DK);
-        addMapping(SimpleLanguage.GRE, LocaleLanguage.EL_GR);
+        addMapping(SimpleLanguage.ELL, LocaleLanguage.EL_GR);
         addMapping(SimpleLanguage.FIN, LocaleLanguage.FI_FI);
         addMapping(SimpleLanguage.HUN, LocaleLanguage.HU_HU);
-        addMapping(SimpleLanguage.IND, LocaleLanguage.ID_ID);
         addMapping(SimpleLanguage.NOR, LocaleLanguage.NB_NO);
         addMapping(SimpleLanguage.POL, LocaleLanguage.PL_PL);
-        addMapping(SimpleLanguage.SLO, LocaleLanguage.SK_SK);
+        addMapping(SimpleLanguage.SLK, LocaleLanguage.SK_SK);
         addMapping(SimpleLanguage.SWE, LocaleLanguage.SV_SE);
         addMapping(SimpleLanguage.TUR, LocaleLanguage.TR_TR);
+        addMapping(SimpleLanguage.RON, LocaleLanguage.RO_RO);
+
+        // Slavic languages
+        addMapping(SimpleLanguage.RUS, LocaleLanguage.RU_RU);
         addMapping(SimpleLanguage.UKR, LocaleLanguage.UK_UA);
+        addMapping(SimpleLanguage.BEL, LocaleLanguage.BE_BY);
+        addMapping(SimpleLanguage.SLV, LocaleLanguage.SL_SI);
+        addMapping(SimpleLanguage.HRV, LocaleLanguage.HR_HR);
+        addMapping(SimpleLanguage.SRP, LocaleLanguage.SR_RS);
+        addMapping(SimpleLanguage.BOS, LocaleLanguage.BS_BA);
+        addMapping(SimpleLanguage.MKD, LocaleLanguage.MK_MK);
+
+        // Central Asia
+        addMapping(SimpleLanguage.KAZ, LocaleLanguage.KK_KZ);
+
+        // East / South-East Asia
+        addMapping(SimpleLanguage.JPN, LocaleLanguage.JA_JP);
+        addMapping(SimpleLanguage.KOR, LocaleLanguage.KO_KR);
+        addMapping(SimpleLanguage.THA, LocaleLanguage.TH_TH);
+        addMapping(SimpleLanguage.VIE, LocaleLanguage.VI_VN);
+        addMapping(SimpleLanguage.FIL, LocaleLanguage.FIL_PH);
+        addMapping(SimpleLanguage.IND, LocaleLanguage.ID_ID);
+
+        // Middle East
+        addMapping(SimpleLanguage.ARA, LocaleLanguage.AR_SA);
+        addMapping(SimpleLanguage.FAS, LocaleLanguage.FA_IR);
+        addMapping(SimpleLanguage.HEB, LocaleLanguage.HE_IL);
+        addMapping(SimpleLanguage.URD, LocaleLanguage.UR_PK);
+
+        // South Asia
+        addMapping(SimpleLanguage.HIN, LocaleLanguage.HI_IN);
+        addMapping(SimpleLanguage.BEN, LocaleLanguage.BN_BD);
+        addMapping(SimpleLanguage.TAM, LocaleLanguage.TA_IN);
+        addMapping(SimpleLanguage.TEL, LocaleLanguage.TE_IN);
+        addMapping(SimpleLanguage.MAR, LocaleLanguage.MR_IN);
+
+        // Africa
+        addMapping(SimpleLanguage.SWA, LocaleLanguage.SW_KE);
+        addMapping(SimpleLanguage.AMH, LocaleLanguage.AM_ET);
     }
-}
+}
\ No newline at end of file