diff --git a/docs/build.gradle b/docs/build.gradle
index babb90dfde..5359641bba 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -77,17 +77,17 @@ Object callback = {
             }
         }
 
-        named("commonMain") {
-            sourceRoots.setFrom(findSourcesWithName("commonMain"))
-        }
-
-        named("jsMain") {
-            sourceRoots.setFrom(findSourcesWithName("jsMain"))
-        }
-
-        named("jvmMain") {
-            sourceRoots.setFrom(findSourcesWithName("jvmMain"))
-        }
+//        named("commonMain") {
+//            sourceRoots.setFrom(findSourcesWithName("commonMain"))
+//        }
+//
+//        named("jsMain") {
+//            sourceRoots.setFrom(findSourcesWithName("jsMain"))
+//        }
+//
+//        named("jvmMain") {
+//            sourceRoots.setFrom(findSourcesWithName("jvmMain"))
+//        }
     }
 }
 
diff --git a/tgbotapi.core/build.gradle b/tgbotapi.core/build.gradle
index 6a8a112d06..4ba8e29f59 100644
--- a/tgbotapi.core/build.gradle
+++ b/tgbotapi.core/build.gradle
@@ -112,7 +112,7 @@ kapt {
 //            "dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChatEvent",
 //            "dev.inmo.tgbotapi.types.passport.decrypted.abstracts.SecureValue",
 //            "dev.inmo.tgbotapi.types.message.content.abstracts.ResendableContent",
-            "dev.inmo.tgbotapi.types.message.abstracts.Message",
+            "dev.inmo.tgbotapi.CommonAbstracts.WithOptionalLanguageCode",
 //            "dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.EncryptedPassportElement",
 //            "dev.inmo.tgbotapi.types.passport.PassportElementError",
 //            "dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery",
diff --git a/tgbotapi.core/src/jvmTest/kotlin/Temporal.kt b/tgbotapi.core/src/jvmTest/kotlin/Temporal.kt
index 7fff96de03..7b6c37f04d 100644
--- a/tgbotapi.core/src/jvmTest/kotlin/Temporal.kt
+++ b/tgbotapi.core/src/jvmTest/kotlin/Temporal.kt
@@ -43,7 +43,7 @@ val result = mutableMapOf<KClass<*>, Set<KClass<*>>>()
 
 
 fun main() {
-    result[Message::class] = KlassIndex.getSubclasses(Message::class).toSet()
+    result[Message::class] = KlassIndex.getSubclasses(dev.inmo.tgbotapi.CommonAbstracts.WithOptionalLanguageCode::class).toSet()
     println("import dev.inmo.tgbotapi.utils.PreviewFeature")
     val importsToFuns = result.keys.flatMap {
         println("import ${it.qualifiedName}")