diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Email.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Email.kt
index 4770506f5d..c5e83c94d8 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Email.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Email.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.types.passport.encrypted_data
 
 import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.emailField
+import dev.inmo.tgbotapi.types.hashField
 import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithEmail
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedAddress.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedAddress.kt
index e4db912d94..b63f1865bf 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedAddress.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedAddress.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.passport.encrypted_data
 
 import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
 import dev.inmo.tgbotapi.types.dataField
-import dev.inmo.tgbotapi.types.passport.*
+import dev.inmo.tgbotapi.types.passport.EncryptedData
 import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedElementSerializer.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedElementSerializer.kt
index c753cd3024..b149eba867 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedElementSerializer.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedElementSerializer.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.types.passport.encrypted_data
 
 import dev.inmo.tgbotapi.types.hashField
-import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.*
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.EncryptedPassportElement
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.UnknownEncryptedPassportElement
 import dev.inmo.tgbotapi.types.typeField
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import kotlinx.serialization.KSerializer
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedPersonalDetails.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedPersonalDetails.kt
index 0c5e0cf191..90149a261e 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedPersonalDetails.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedPersonalDetails.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.passport.encrypted_data
 
 import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
 import dev.inmo.tgbotapi.types.dataField
-import dev.inmo.tgbotapi.types.passport.*
+import dev.inmo.tgbotapi.types.passport.EncryptedData
 import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Passport.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Passport.kt
index fc856e0303..882c91c895 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Passport.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Passport.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.passport.encrypted_data
 
 import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.passport.*
+import dev.inmo.tgbotapi.types.passport.EncryptedData
 import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PassportFile.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PassportFile.kt
index 5fdbd8a5c9..cf00e2fc2a 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PassportFile.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PassportFile.kt
@@ -3,8 +3,6 @@ package dev.inmo.tgbotapi.types.passport.encrypted_data
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.files.abstracts.*
-import dev.inmo.tgbotapi.types.files.abstracts.fileIdField
-import dev.inmo.tgbotapi.types.files.abstracts.fileSizeField
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithData.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithData.kt
index ba72eca9e4..163b9d43b6 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithData.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithData.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
 
-import dev.inmo.tgbotapi.types.passport.EncryptedAndBase64EncodedData
 import dev.inmo.tgbotapi.types.passport.EncryptedData
 import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
 import kotlinx.serialization.Serializable
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
index 143dd51d53..c5347a12ad 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
@@ -1,9 +1,10 @@
 package dev.inmo.tgbotapi.utils.internal
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ParseMode.*
+import dev.inmo.tgbotapi.types.captionLength
 import dev.inmo.tgbotapi.types.message.content.TextContent
+import dev.inmo.tgbotapi.types.textLength
 
 internal fun createFormattedText(
     entities: TextSourcesList,