Merge pull request #395 from InsanusMokrassar/0.35.0

0.35.0
2024-11-22 08:13:47 +00:00 · 2021-06-06 09:05:09 +06:00 · 2021-06-06 09:05:09 +06:00 · 18e6b9e471
commit 18e6b9e471
parent eedb36ede7 f5b248f534
181 changed files with 2146 additions and 1107 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,12 @@
+name: Build
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build
+        run: ./gradlew build
--- a/.github/workflows/packages_publishing.yml
+++ b/.github/workflows/packages_publishing.yml
@ -14,10 +14,8 @@ jobs:
          cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
          rm gradle.properties
          mv gradle.properties.tmp gradle.properties
-      - name: Build
-        run: ./gradlew build
      - name: Publish
-        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
        env:
          GITHUBPACKAGES_USER: ${{ github.actor }}
          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/write-good.yml
+++ b/.github/write-good.yml
@ -1 +0,0 @@
-spellchecker: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,34 @@
 # TelegramBotAPI changelog

+## 0.35.0
+
+**ALL PREVIOUS DEPRECATIONS HAVE BEEN REMOVED**
+**JS PART NOW USE IR COMPILER ONLY**
+
+* `Common`:
+    * `Version`:
+        * `Kotlin`: `1.4.72` -> `1.5.10`
+        * `MicroUtils`: `0.4.36` -> `0.5.6`
+        * `Coroutines`: `1.4.3` -> `1.5.0`
+        * `Serialization`: `1.1.0` -> `1.2.1`
+        * `Klock`: `2.0.7` -> `2.1.2`
+        * `UUID`: `0.2.3` -> `0.3.0`
+        * `Ktor`: `1.5.4` -> `1.6.0`
+* `Core`:
+    * `ForceReply` has been renamed to `ReplyForce`
+    * `Captioned` and `Explained` interfaces have been removed
+    * `RecordAudioAction` and `UploadAudioAction` (and all related to these actions functionality) have been removed
+    * `TextSource` interface and all related things have been replaced
+    * `CallbackQuery` interface and all its extenders/implementers become `sealed`
+    * `InputMedia` interface and all its extenders/implementers become `sealed`
+    * `ParseMode` interface and all its extenders/implementers become `sealed`
+    * `ChatMember` becomes `sealed`
+    * `KeyboardMarkup` becomes `sealed`
+    * `LeftChatMember` and `MemberChatMember` become interfaces. All their code were replaced to the `*Impl` classes
+    * Most of `sealed` classes have been modified to be interfaces
+    * Most serializers becomes public, but they are still `RistFeature`
+    * For `EntitiesBuilder` multilevel text sources builders with callback have been added
+
 ## 0.34.1

 * `Common`:
--- a/docs/build.gradle
+++ b/docs/build.gradle
@ -26,7 +26,7 @@ repositories {

 kotlin {
    jvm()
-    js(BOTH) {
+    js(IR) {
        browser()
        nodejs()
    }
--- a/gradle.properties
+++ b/gradle.properties
@ -5,18 +5,18 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true

-kotlin_version=1.4.32
-kotlin_coroutines_version=1.4.3
-kotlin_serialisation_runtime_version=1.1.0
-klock_version=2.0.7
-uuid_version=0.2.4
-ktor_version=1.5.4
+kotlin_version=1.5.10
+kotlin_coroutines_version=1.5.0
+kotlin_serialisation_runtime_version=1.2.1
+klock_version=2.1.2
+uuid_version=0.3.0
+ktor_version=1.6.0

-micro_utils_version=0.4.36
+micro_utils_version=0.5.6

 javax_activation_version=1.1.1

 library_group=dev.inmo
-library_version=0.34.1
+library_version=0.35.0

 github_release_plugin_version=2.2.12
--- a/tgbotapi.core/build.gradle
+++ b/tgbotapi.core/build.gradle
@ -29,10 +29,8 @@ repositories {
 }

 kotlin {
-    jvm {
-        compilations.main.kotlinOptions.useIR = true
-    }
-    js(BOTH) {
+    jvm()
+    js(IR) {
        browser()
        nodejs()
    }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
@ -1,20 +0,0 @@
-package dev.inmo.tgbotapi.CommonAbstracts
-
-const val CaptionDeprecation = "Captioned interface and others will be removed soon and not recommended to use"
-
-@Deprecated(CaptionDeprecation)
-interface Captioned : Texted {
-    @Deprecated(CaptionDeprecation)
-    val caption: String?
-        get() = text
-}
-
-@Deprecated(CaptionDeprecation)
-interface CaptionedInput : Captioned, TextedInput {
-    /**
-     * Full list of entities. This list WILL contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     */
-    @Deprecated(CaptionDeprecation)
-    val captionEntities: List<TextPart>
-        get() = textEntities
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
@ -1,26 +0,0 @@
-package dev.inmo.tgbotapi.CommonAbstracts
-
-@Deprecated("Will be removed soon")
-interface Explained : Texted {
-    val explanation: String?
-        get() = text
-}
-
-@Deprecated("Will be removed soon")
-interface ParsableExplainedOutput : Explained, TextedOutput
-
-@Deprecated("Will be removed soon")
-interface EntitiesExplainedOutput : Explained, EntitiesOutput
-
-@Deprecated("Will be removed soon")
-interface ExplainedOutput : ParsableExplainedOutput, EntitiesExplainedOutput
-
-@Deprecated("Will be removed soon")
-interface ExplainedInput : Explained {
-    val textSources: TextSourcesList
-    /**
-     * Full list of entities. This list WILL contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     */
-    val explanationEntities: List<TextPart>
-        get() = textSources.toTextParts()
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
@ -1,110 +1,79 @@
 package dev.inmo.tgbotapi.CommonAbstracts

-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourceSerializer
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.regular
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.MultilevelTextSource
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.separateForCaption
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.separateForMessage
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.separateForText
 import dev.inmo.tgbotapi.types.captionLength
 import dev.inmo.tgbotapi.types.textLength
-import kotlinx.serialization.Serializable

-const val DirectInvocationOfTextSourceConstructor = "It is strongly not recommended to use constructors directly instead of factory methods"
+const val DirectInvocationOfTextSourceConstructor =
+    "It is strongly not recommended to use constructors directly instead of factory methods"

-typealias TextSourcesList = List<TextSource>
+@Deprecated(
+    "Replaced",
+    ReplaceWith("TextSourcesList", "dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList")
+)
+typealias TextSourcesList = TextSourcesList

-@Serializable(TextSourceSerializer::class)
-interface TextSource {
-    val markdown: String
-    val markdownV2: String
-    val html: String
-    val source: String
-
-    val asText: String
-        get() = source
-
-    companion object {
-        fun serializer() = TextSourceSerializer
-    }
-}
+@Deprecated("Replaced", ReplaceWith("TextSource", "dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource"))
+typealias TextSource = TextSource

@Suppress("NOTHING_TO_INLINE")
-inline operator fun TextSource.plus(other: TextSource) = listOf(this, other)
+@Deprecated("Replaced", ReplaceWith("plus", "dev.inmo.tgbotapi.types.MessageEntity.textsources.plus"))
+inline operator fun TextSource.plus(other: TextSource) =
+    listOf(this, other)
+
@Suppress("NOTHING_TO_INLINE")
-inline operator fun TextSource.plus(other: List<TextSource>) = listOf(this) + other
+@Deprecated("Replaced", ReplaceWith("plus", "dev.inmo.tgbotapi.types.MessageEntity.textsources.plus"))
+inline operator fun TextSource.plus(other: List<TextSource>) =
+    listOf(this) + other
+
@Suppress("NOTHING_TO_INLINE")
-inline operator fun TextSource.plus(text: String) = listOf(this, regular(text))
+@Deprecated("Replaced", ReplaceWith("plus", "dev.inmo.tgbotapi.types.MessageEntity.textsources.plus"))
+inline operator fun TextSource.plus(text: String) =
+    listOf(this, regular(text))
+
@Suppress("NOTHING_TO_INLINE")
+@Deprecated("Replaced", ReplaceWith("plus", "dev.inmo.tgbotapi.types.MessageEntity.textsources.plus"))
 inline operator fun List<TextSource>.plus(text: String) = this + regular(text)

-@Serializable(TextSourceSerializer::class)
-interface MultilevelTextSource : TextSource {
-    val subsources: List<TextSource>
-
-    companion object {
-        fun serializer() = TextSourceSerializer
-    }
-}
-
-@Deprecated("This class will be removed soon. Use TextSources instead")
-data class TextPart(
-    val range: IntRange,
-    val source: TextSource
+@Deprecated(
+    "Replaced",
+    ReplaceWith("MultilevelTextSource", "dev.inmo.tgbotapi.types.MessageEntity.textsources.MultilevelTextSource")
 )
+typealias MultilevelTextSource = MultilevelTextSource

-@Deprecated("This method is no longer required to work with TextSources")
-fun List<TextPart>.justTextSources() = map { it.source }
-internal fun List<TextSource>.toTextParts(preOffset: Int = 0): List<TextPart> {
-    var i = preOffset
-    return map {
-        TextPart(
-            i until (i + it.source.length),
-            it
-        ).also {
-            i = it.range.last + 1
-        }
-    }
-}
+@Deprecated("Replaced", ReplaceWith("makeString()", "dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString"))
+fun List<TextSource>.makeString() = makeString()

-fun List<TextSource>.makeString() = joinToString("") { it.source }
-fun List<TextSource>.separateForMessage(limit: IntRange, numberOfParts: Int? = null): List<List<TextSource>> {
-    if (isEmpty()) {
-        return emptyList()
-    }
-
-    val resultList = mutableListOf<MutableList<TextSource>>(mutableListOf())
-    var currentPartLength = 0
-    val maxSize = limit.last + 1
-
-    for (current in this) {
-        if (current.source.length > maxSize) {
-            error("Currently unsupported parts with size more than target one-message parts (${current.source.length} > ${maxSize})")
-        }
-
-        if (currentPartLength + current.source.length > maxSize) {
-            if (numberOfParts == null || numberOfParts < resultList.size) {
-                resultList.add(mutableListOf())
-                currentPartLength = 0
-            } else {
-                break
-            }
-        }
-
-        resultList.last().add(current)
-        currentPartLength += current.source.length
-    }
-
-    return resultList
-}
+@Deprecated(
+    "Replaced",
+    ReplaceWith("separateForMessage", "dev.inmo.tgbotapi.types.MessageEntity.textsources.separateForMessage")
+)
+fun List<TextSource>.separateForMessage(limit: IntRange, numberOfParts: Int? = null) =
+    separateForMessage(limit, numberOfParts)

 /**
 * This method will prepare [TextSource]s list for messages. Remember, that first part will be separated with
 * [captionLength] and all others with
 */
-fun List<TextSource>.separateForCaption(): List<List<TextSource>> {
-    val captionPart = separateForMessage(captionLength, 1).first()
-    return listOf(captionPart) + minus(captionPart).separateForMessage(textLength)
-}
+@Deprecated(
+    "Replaced",
+    ReplaceWith("separateForCaption", "dev.inmo.tgbotapi.types.MessageEntity.textsources.separateForCaption")
+)
+fun List<TextSource>.separateForCaption() = separateForCaption()

 /**
 * This method will prepare [TextSource]s list for messages with [textLength]
 */
@Suppress("NOTHING_TO_INLINE")
-inline fun List<TextSource>.separateForText(): List<List<TextSource>> = separateForMessage(textLength)
+@Deprecated(
+    "Replaced",
+    ReplaceWith("separateForText", "dev.inmo.tgbotapi.types.MessageEntity.textsources.separateForText")
+)
+inline fun List<TextSource>.separateForText() = separateForText()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt
@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.CommonAbstracts

+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode

 interface Texted {
@ -7,7 +8,7 @@ interface Texted {
 }
 interface TextedWithTextSources : Texted {
    /**
-     * Full list of [TextSource] built from source[TextedInput.textEntities]
+     * Full list of [TextSource]s
     */
    val textSources: List<TextSource>?
 }
@ -25,11 +26,4 @@ interface TextedOutput : ParsableOutput, EntitiesOutput

 interface TextedInput : TextedWithTextSources {
    override val textSources: List<TextSource>
-    /**
-     * Here must be full list of entities. This list must contains [TextPart]s with
-     * [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource] in case if source text contains parts of
-     * regular text
-     */
-    val textEntities: List<TextPart>
-        get() = textSources.toTextParts()
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/StopPoll.kt
@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.polls.Poll
+import dev.inmo.tgbotapi.types.polls.PollSerializer
 import kotlinx.serialization.*

@Serializable
@ -19,7 +20,7 @@ data class StopPoll(
 ) : MessageAction, SimpleRequest<Poll>, ReplyMarkup {
    override fun method(): String = "stopPoll"
    override val resultDeserializer: DeserializationStrategy<Poll>
-        get() = Poll.serializer()
+        get() = PollSerializer
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFile.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFile.kt
@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.requests.abstracts

+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.StorageFile
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
@ -30,8 +31,8 @@ data class FileId(

 fun String.toInputFile() = FileId(this)

-@Serializer(InputFile::class)
-internal object InputFileSerializer : KSerializer<InputFile> {
+@RiskFeature
+object InputFileSerializer : KSerializer<InputFile> {
    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor(FileId::class.toString(), PrimitiveKind.STRING)
    override fun serialize(encoder: Encoder, value: InputFile) = encoder.encodeString(value.fileId)
    override fun deserialize(decoder: Decoder): FileId = FileId(decoder.decodeString())
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerInlineQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerInlineQuery.kt
@ -4,7 +4,8 @@ import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
+import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
@ -26,7 +27,7 @@ data class AnswerInlineQuery(
    val switchPmText: String? = null,
    @SerialName(switchPmParameterField)
    val switchPmParameter: String? = null
-): SimpleRequest<Boolean> {
+) : SimpleRequest<Boolean> {
    override fun method(): String = "answerInlineQuery"
    override val resultDeserializer: DeserializationStrategy<Boolean>
        get() = Boolean.serializer()
@ -51,6 +52,7 @@ fun InlineQuery.createAnswer(
    switchPmParameter
 )

-internal object InlineQueryAnswersResultsSerializer: KSerializer<List<InlineQueryResult>> by ListSerializer(
+@RiskFeature
+object InlineQueryAnswersResultsSerializer : KSerializer<List<InlineQueryResult>> by ListSerializer(
    InlineQueryResultSerializer
 )
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/AnswerShippingQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/payments/AnswerShippingQuery.kt
@ -4,6 +4,7 @@ import dev.inmo.tgbotapi.requests.answers.payments.abstracts.AnswerShippingQuery
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.payments.ShippingOption
 import dev.inmo.tgbotapi.types.payments.ShippingQuery
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer

@ -21,7 +22,8 @@ data class AnswerShippingQueryOk(
        get() = serializer()
 }

-internal object ShippingOptionsSerializer : KSerializer<List<ShippingOption>> by ListSerializer(
+@RiskFeature
+object ShippingOptionsSerializer : KSerializer<List<ShippingOption>> by ListSerializer(
    ShippingOption.serializer()
 )

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditChatMessageCaption.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditChatMessageCaption.kt
@ -1,11 +1,11 @@
 package dev.inmo.tgbotapi.requests.edit.caption

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.requests.edit.media.MediaContentMessageResultDeserializer
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -33,7 +33,7 @@ fun EditChatMessageCaption(
 fun EditChatMessageCaption(
    chatId: ChatIdentifier,
    messageId: MessageIdentifier,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = EditChatMessageCaption(
    chatId,
@ -59,7 +59,7 @@ data class EditChatMessageCaption internal constructor(
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage<MediaContent>, EditTextChatMessage, EditReplyMessage {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditInlineMessageCaption.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/caption/EditInlineMessageCaption.kt
@ -1,10 +1,10 @@
 package dev.inmo.tgbotapi.requests.edit.caption

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -25,7 +25,7 @@ fun EditInlineMessageCaption(

 fun EditInlineMessageCaption(
    inlineMessageId: InlineMessageIdentifier,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = EditInlineMessageCaption(
    inlineMessageId,
@ -48,7 +48,7 @@ data class EditInlineMessageCaption internal constructor(
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditChatMessageText.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditChatMessageText.kt
@ -1,11 +1,11 @@
 package dev.inmo.tgbotapi.requests.edit.text

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.requests.send.TextContentMessageResultDeserializer
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -35,7 +35,7 @@ fun EditChatMessageText(
 fun EditChatMessageText(
    chatId: ChatIdentifier,
    messageId: MessageIdentifier,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    disableWebPagePreview: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = EditChatMessageText(
@ -65,7 +65,7 @@ data class EditChatMessageText internal constructor(
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage<TextContent>, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt
@ -1,10 +1,10 @@
 package dev.inmo.tgbotapi.requests.edit.text

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -27,7 +27,7 @@ fun EditInlineMessageText(

 fun EditInlineMessageText(
    inlineMessageId: InlineMessageIdentifier,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    disableWebPagePreview: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = EditInlineMessageText(
@ -54,7 +54,7 @@ data class EditInlineMessageText internal constructor(
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/abstracts/GetGameHighScores.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/games/abstracts/GetGameHighScores.kt
@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.requests.games.abstracts
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.games.GameHighScore
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
@ -15,4 +16,5 @@ interface GetGameHighScores : SimpleRequest<List<GameHighScore>> {
        get() = GameHighScoresSerializer
 }

-internal object GameHighScoresSerializer : KSerializer<List<GameHighScore>> by ListSerializer(GameHighScore.serializer())
+@RiskFeature
+object GameHighScoresSerializer : KSerializer<List<GameHighScore>> by ListSerializer(GameHighScore.serializer())
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
@ -1,11 +1,13 @@
 package dev.inmo.tgbotapi.requests.send

-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.types.MessageAction
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@ -32,7 +34,18 @@ fun CopyMessage(
    replyToMessageId: MessageIdentifier? = null,
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
-) = CopyMessage(fromChatId, toChatId, messageId, entities.makeString(), null, entities.toRawMessageEntities(), disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+) = CopyMessage(
+    fromChatId,
+    toChatId,
+    messageId,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)

@Serializable
 data class CopyMessage internal constructor(
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt
@ -1,11 +1,11 @@
 package dev.inmo.tgbotapi.requests.send

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.CommonAbstracts.types.DisableWebPagePreview
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@ -41,7 +41,7 @@ fun SendTextMessage(

 fun SendTextMessage(
    chatId: ChatIdentifier,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    disableWebPagePreview: Boolean? = null,
    disableNotification: Boolean = false,
    replyToMessageId: MessageIdentifier? = null,
@ -84,7 +84,7 @@ data class SendTextMessage internal constructor(
    TextableSendMessageRequest<ContentMessage<TextContent>>,
    DisableWebPagePreview
 {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.requests.send.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@ -66,7 +66,7 @@ fun SendAnimation(
    chatId: ChatIdentifier,
    animation: InputFile,
    thumb: InputFile? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    duration: Long? = null,
    width: Int? = null,
    height: Int? = null,
@ -145,7 +145,7 @@ data class SendAnimationData internal constructor(
    DuratedSendMessageRequest<ContentMessage<AnimationContent>>,
    SizedSendMessageRequest<ContentMessage<AnimationContent>>
 {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt
@ -1,11 +1,13 @@
 package dev.inmo.tgbotapi.requests.send.media

-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.Performerable
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.requests.send.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@ -80,7 +80,7 @@ fun SendDocument(
    chatId: ChatIdentifier,
    document: InputFile,
    thumb: InputFile? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    disableNotification: Boolean = false,
    replyToMessageId: MessageIdentifier? = null,
    allowSendingWithoutReply: Boolean? = null,
@ -158,7 +158,7 @@ data class SendDocumentData internal constructor(
    TextableSendMessageRequest<ContentMessage<DocumentContent>>,
    ThumbedSendMessageRequest<ContentMessage<DocumentContent>>
 {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.requests.send.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@ -48,7 +48,7 @@ fun SendPhoto(
 fun SendPhoto(
    chatId: ChatIdentifier,
    photo: InputFile,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    disableNotification: Boolean = false,
    replyToMessageId: MessageIdentifier? = null,
    allowSendingWithoutReply: Boolean? = null,
@ -56,7 +56,7 @@ fun SendPhoto(
 ): Request<ContentMessage<PhotoContent>> {
    val data = SendPhotoData(
        chatId,
-        (photo as? FileId) ?.fileId,
+        (photo as? FileId)?.fileId,
        entities.makeString(),
        null,
        entities.toRawMessageEntities(),
@ -101,7 +101,7 @@ data class SendPhotoData internal constructor(
    ReplyingMarkupSendMessageRequest<ContentMessage<PhotoContent>>,
    TextableSendMessageRequest<ContentMessage<PhotoContent>>
 {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.requests.send.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@ -68,7 +68,7 @@ fun SendVideo(
    chatId: ChatIdentifier,
    video: InputFile,
    thumb: InputFile? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    duration: Long? = null,
    width: Int? = null,
    height: Int? = null,
@ -151,7 +151,7 @@ data class SendVideoData internal constructor(
    DuratedSendMessageRequest<ContentMessage<VideoContent>>,
    SizedSendMessageRequest<ContentMessage<VideoContent>>
 {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.requests.send.media

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.*
 import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@ -57,7 +57,7 @@ fun SendVoice(
 fun SendVoice(
    chatId: ChatIdentifier,
    voice: InputFile,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    duration: Long? = null,
    disableNotification: Boolean = false,
    replyToMessageId: MessageIdentifier? = null,
@ -121,7 +121,7 @@ data class SendVoiceData internal constructor(
    TextableSendMessageRequest<ContentMessage<VoiceContent>>,
    DuratedSendMessageRequest<ContentMessage<VoiceContent>>
 {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
@ -1,11 +1,13 @@
 package dev.inmo.tgbotapi.requests.send.polls

 import com.soywiz.klock.DateTime
-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
@ -355,7 +357,7 @@ data class SendQuizPoll internal constructor(
    override val allowSendingWithoutReply: Boolean? = null,
    @SerialName(replyMarkupField)
    override val replyMarkup: KeyboardMarkup? = null
-) : SendPoll(), ExplainedOutput, TextedOutput {
+) : SendPoll(), TextedOutput {
    override val type: String = quizPollType
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/CallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/CallbackQuery.kt
@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.types.CallbackQuery
 import dev.inmo.tgbotapi.types.CallbackQueryIdentifier
 import dev.inmo.tgbotapi.types.User

-interface CallbackQuery {
+sealed interface CallbackQuery {
    val id: CallbackQueryIdentifier
    val user: User
    val chatInstance: String
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/DataCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/DataCallbackQuery.kt
@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.types.CallbackQuery

-interface DataCallbackQuery : CallbackQuery {
+sealed interface DataCallbackQuery : CallbackQuery {
    val data: String
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/GameShortNameCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/GameShortNameCallbackQuery.kt
@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.types.CallbackQuery

-interface GameShortNameCallbackQuery : CallbackQuery {
+sealed interface GameShortNameCallbackQuery : CallbackQuery {
    val gameShortName: String
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/InlineMessageIdCallbackQuery.kt
@ -2,6 +2,6 @@ package dev.inmo.tgbotapi.types.CallbackQuery

 import dev.inmo.tgbotapi.types.InlineMessageIdentifier

-interface InlineMessageIdCallbackQuery : CallbackQuery {
+sealed interface InlineMessageIdCallbackQuery : CallbackQuery {
    val inlineMessageId: InlineMessageIdentifier
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/CallbackQuery/MessageCallbackQuery.kt
@ -2,6 +2,6 @@ package dev.inmo.tgbotapi.types.CallbackQuery

 import dev.inmo.tgbotapi.types.message.abstracts.Message

-interface MessageCallbackQuery : CallbackQuery {
+sealed interface MessageCallbackQuery : CallbackQuery {
    val message: Message
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt
@ -1,7 +1,9 @@
 package dev.inmo.tgbotapi.types

 import dev.inmo.micro_utils.common.Warning
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.JsonPrimitive
@ -52,10 +54,12 @@ data class Username(

 fun String.toUsername(): Username = Username(this)

-@Serializer(ChatIdentifier::class)
-internal object ChatIdentifierSerializer : KSerializer<ChatIdentifier> {
+@RiskFeature
+object ChatIdentifierSerializer : KSerializer<ChatIdentifier> {
+    private val internalSerializer = JsonPrimitive.serializer()
+    override val descriptor: SerialDescriptor = internalSerializer.descriptor
    override fun deserialize(decoder: Decoder): ChatIdentifier {
-        val id = JsonPrimitive.serializer().deserialize(decoder)
+        val id = internalSerializer.deserialize(decoder)
        return id.longOrNull ?.let {
            ChatId(it)
        } ?: id.content.let {
@ -73,4 +77,4 @@ internal object ChatIdentifierSerializer : KSerializer<ChatIdentifier> {
            is Username -> encoder.encodeString(value.username)
        }
    }
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatInviteLink.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatInviteLink.kt
@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types

 import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
@ -79,7 +80,7 @@ data class CommonInviteLink(
        get() = expireDate ?.asDate
 }

-@Serializer(ChatInviteLink::class)
+@RiskFeature
 object ChatInviteLinkSerializer : KSerializer<ChatInviteLink> {
    override val descriptor: SerialDescriptor
        get() = RawChatInviteLink.serializer().descriptor
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMember.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMember.kt
@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.types.ChatMember
-
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import kotlinx.serialization.*
-
-@Serializable
-data class LeftChatMember(@SerialName(userField) override val user: User) : ChatMember {
-    @SerialName(statusField)
-    @Required
-    private val type: String = "left"
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMemberImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/LeftChatMemberImpl.kt
@ -0,0 +1,15 @@
+package dev.inmo.tgbotapi.types.ChatMember
+
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.ChatMember.abstracts.LeftChatMember
+import kotlinx.serialization.*
+
+@Serializable
+data class LeftChatMemberImpl(@SerialName(userField) override val user: User) : LeftChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "left"
+}
+
+@Deprecated("Renamed", ReplaceWith("LeftChatMemberImpl", "dev.inmo.tgbotapi.types.ChatMember.LeftChatMemberImpl"))
+typealias LeftChatMember = LeftChatMemberImpl
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/MemberChatMember.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/MemberChatMember.kt
@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.types.ChatMember
-
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import kotlinx.serialization.*
-
-@Serializable
-data class MemberChatMember(@SerialName(userField) override val user: User) : ChatMember {
-    @SerialName(statusField)
-    @Required
-    private val type: String = "member"
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/MemberChatMemberImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/MemberChatMemberImpl.kt
@ -0,0 +1,15 @@
+package dev.inmo.tgbotapi.types.ChatMember
+
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.ChatMember.abstracts.MemberChatMember
+import kotlinx.serialization.*
+
+@Serializable
+data class MemberChatMemberImpl(@SerialName(userField) override val user: User) : MemberChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "member"
+}
+
+@Deprecated("Renamed", ReplaceWith("MemberChatMember", "dev.inmo.tgbotapi.types.ChatMember.MemberChatMemberImpl"))
+typealias MemberChatMember = MemberChatMemberImpl
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/AdministratorChatMember.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/AdministratorChatMember.kt
@ -20,7 +20,6 @@ interface AdministratorChatMember : SpecialRightsChatMember {
    val customTitle: String?
 }

-@Serializer(AdministratorChatMember::class)
@RiskFeature
 object AdministratorChatMemberSerializer : KSerializer<AdministratorChatMember> {
    override val descriptor: SerialDescriptor = ChatMemberSerializer.descriptor
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/ChatMember.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/ChatMember.kt
@ -13,11 +13,10 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive

@Serializable(ChatMemberSerializer::class)
-interface ChatMember {
+sealed interface ChatMember {
    val user: User
 }

-@Serializer(ChatMember::class)
@RiskFeature
 object ChatMemberSerializer : KSerializer<ChatMember> {
    override val descriptor: SerialDescriptor = JsonObject.serializer().descriptor
@ -27,9 +26,9 @@ object ChatMemberSerializer : KSerializer<ChatMember> {
        return when (json[statusField] ?.jsonPrimitive ?.content ?: error("Status field of chat member must be specified, but incoming json contains next: $json")) {
            "creator" -> nonstrictJsonFormat.decodeFromJsonElement(CreatorChatMember.serializer(), json)
            "administrator" -> nonstrictJsonFormat.decodeFromJsonElement(AdministratorChatMemberImpl.serializer(), json)
-            "member" -> nonstrictJsonFormat.decodeFromJsonElement(MemberChatMember.serializer(), json)
+            "member" -> nonstrictJsonFormat.decodeFromJsonElement(MemberChatMemberImpl.serializer(), json)
            "restricted" -> nonstrictJsonFormat.decodeFromJsonElement(RestrictedChatMember.serializer(), json)
-            "left" -> nonstrictJsonFormat.decodeFromJsonElement(LeftChatMember.serializer(), json)
+            "left" -> nonstrictJsonFormat.decodeFromJsonElement(LeftChatMemberImpl.serializer(), json)
            "kicked" -> nonstrictJsonFormat.decodeFromJsonElement(KickedChatMember.serializer(), json)
            else -> error("Unknown type of chat member in json: $json")
        }
@ -39,9 +38,9 @@ object ChatMemberSerializer : KSerializer<ChatMember> {
        when (value) {
            is CreatorChatMember -> CreatorChatMember.serializer()
            is AdministratorChatMemberImpl -> AdministratorChatMemberImpl.serializer()
-            is MemberChatMember -> MemberChatMember.serializer()
+            is MemberChatMember -> MemberChatMemberImpl.serializer()
            is RestrictedChatMember -> RestrictedChatMember.serializer()
-            is LeftChatMember -> LeftChatMember.serializer()
+            is LeftChatMember -> LeftChatMemberImpl.serializer()
            is KickedChatMember -> KickedChatMember.serializer()
        }
    }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/LeftChatMember.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/LeftChatMember.kt
@ -0,0 +1,3 @@
+package dev.inmo.tgbotapi.types.ChatMember.abstracts
+
+interface LeftChatMember : ChatMember
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/MemberChatMember.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/MemberChatMember.kt
@ -0,0 +1,3 @@
+package dev.inmo.tgbotapi.types.ChatMember.abstracts
+
+interface MemberChatMember : ChatMember
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt
@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@ -36,4 +36,4 @@ class InlineQueryResultArticle(
    WithInputMessageContentInlineQueryResult,
    UrlInlineQueryResult {
    override val type: String = "article"
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt
@ -1,13 +1,13 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudioCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -26,10 +26,18 @@ fun InlineQueryResultAudioCachedImpl(
 fun InlineQueryResultAudioCachedImpl(
    id: InlineQueryIdentifier,
    fileId: FileId,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultAudioCachedImpl(id, fileId, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultAudioCachedImpl(
+    id,
+    fileId,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultAudioCachedImpl internal constructor(
@ -49,7 +57,7 @@ data class InlineQueryResultAudioCachedImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultAudioCached {
    override val type: String = inlineQueryResultAudioType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudio
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -31,10 +31,21 @@ fun InlineQueryResultAudioImpl(
    title: String,
    performer: String? = null,
    duration: Int? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultAudioImpl(id, url, title, performer, duration, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultAudioImpl(
+    id,
+    url,
+    title,
+    performer,
+    duration,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultAudioImpl internal constructor(
@ -60,7 +71,7 @@ data class InlineQueryResultAudioImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultAudio {
    override val type: String = inlineQueryResultAudioType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt
@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 import dev.inmo.tgbotapi.CommonAbstracts.CommonContactData
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt
@ -1,13 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocumentCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -30,10 +29,20 @@ fun InlineQueryResultDocumentCachedImpl(
    fileId: FileId,
    title: String,
    description: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultDocumentCachedImpl(id, fileId, title, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultDocumentCachedImpl(
+    id,
+    fileId,
+    title,
+    description,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultDocumentCachedImpl internal constructor(
@ -57,7 +66,7 @@ data class InlineQueryResultDocumentCachedImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultDocumentCached {
    override val type: String = inlineQueryResultDocumentType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocument
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -39,10 +39,24 @@ fun InlineQueryResultDocumentImpl(
    thumbWidth: Int? = null,
    thumbHeight: Int? = null,
    description: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultDocumentImpl(id, url, title, mimeType, thumbUrl, thumbWidth, thumbHeight, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultDocumentImpl(
+    id,
+    url,
+    title,
+    mimeType,
+    thumbUrl,
+    thumbWidth,
+    thumbHeight,
+    description,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultDocumentImpl internal constructor(
@ -74,7 +88,7 @@ data class InlineQueryResultDocumentImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultDocument {
    override val type: String = inlineQueryResultDocumentType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt
@ -1,13 +1,13 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGifCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -28,10 +28,19 @@ fun InlineQueryResultGifCachedImpl(
    id: InlineQueryIdentifier,
    fileId: FileId,
    title: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultGifCachedImpl(id, fileId, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultGifCachedImpl(
+    id,
+    fileId,
+    title,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultGifCachedImpl internal constructor(
@ -53,7 +62,7 @@ data class InlineQueryResultGifCachedImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultGifCached {
    override val type: String = inlineQueryResultGifType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGif
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -38,10 +38,24 @@ fun InlineQueryResultGifImpl(
    height: Int? = null,
    duration: Int? = null,
    title: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultGifImpl(id, url, thumbUrl, thumbMimeType, width, height, duration, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultGifImpl(
+    id,
+    url,
+    thumbUrl,
+    thumbMimeType,
+    width,
+    height,
+    duration,
+    title,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultGifImpl internal constructor(
@ -73,7 +87,7 @@ data class InlineQueryResultGifImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultGif {
    override val type: String = inlineQueryResultGifType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt
@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt
@ -1,13 +1,13 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4GifCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -28,10 +28,19 @@ fun InlineQueryResultMpeg4GifCachedImpl(
    id: InlineQueryIdentifier,
    fileId: FileId,
    title: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultMpeg4GifCachedImpl(id, fileId, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultMpeg4GifCachedImpl(
+    id,
+    fileId,
+    title,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultMpeg4GifCachedImpl internal constructor(
@ -53,7 +62,7 @@ data class InlineQueryResultMpeg4GifCachedImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultMpeg4GifCached {
    override val type: String = inlineQueryResultMpeg4GifType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4Gif
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -38,10 +38,24 @@ fun InlineQueryResultMpeg4GifImpl(
    height: Int? = null,
    duration: Int? = null,
    title: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultMpeg4GifImpl(id, url, thumbUrl, thumbMimeType, width, height, duration, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultMpeg4GifImpl(
+    id,
+    url,
+    thumbUrl,
+    thumbMimeType,
+    width,
+    height,
+    duration,
+    title,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultMpeg4GifImpl internal constructor(
@ -73,7 +87,7 @@ data class InlineQueryResultMpeg4GifImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultMpeg4Gif {
    override val type: String = inlineQueryResultMpeg4GifType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt
@ -1,13 +1,13 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhotoCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -30,10 +30,20 @@ fun InlineQueryResultPhotoCachedImpl(
    fileId: FileId,
    title: String? = null,
    description: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultPhotoCachedImpl(id, fileId, title, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultPhotoCachedImpl(
+    id,
+    fileId,
+    title,
+    description,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultPhotoCachedImpl internal constructor(
@ -57,7 +67,7 @@ data class InlineQueryResultPhotoCachedImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultPhotoCached {
    override val type: String = inlineQueryResultPhotoType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhoto
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -35,10 +35,23 @@ fun InlineQueryResultPhotoImpl(
    height: Int? = null,
    title: String? = null,
    description: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultPhotoImpl(id, url, thumbUrl, width, height, title, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultPhotoImpl(
+    id,
+    url,
+    thumbUrl,
+    width,
+    height,
+    title,
+    description,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultPhotoImpl internal constructor(
@ -68,7 +81,7 @@ data class InlineQueryResultPhotoImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultPhoto {
    override val type: String = inlineQueryResultPhotoType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt
@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt
@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.CommonAbstracts.CommonVenueData
 import dev.inmo.tgbotapi.CommonAbstracts.Locationed
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt
@ -1,13 +1,13 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.InlineQueryResultVideoCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -30,10 +30,20 @@ fun InlineQueryResultVideoCachedImpl(
    fileId: FileId,
    title: String,
    description: String? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVideoCachedImpl(id, fileId, title, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultVideoCachedImpl(
+    id,
+    fileId,
+    title,
+    description,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultVideoCachedImpl internal constructor(
@ -57,7 +67,7 @@ data class InlineQueryResultVideoCachedImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultVideoCached {
    override val type: String = inlineQueryResultVideoType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt
@ -1,12 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.InlineQueryResultVideo
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -44,7 +44,22 @@ fun InlineQueryResultVideoImpl(
    entities: List<TextSource>,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVideoImpl(id, url, thumbUrl, mimeType, title, width, height, duration, description, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultVideoImpl(
+    id,
+    url,
+    thumbUrl,
+    mimeType,
+    title,
+    width,
+    height,
+    duration,
+    description,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultVideoImpl internal constructor(
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt
@ -1,13 +1,12 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.InlineQueryResultVoiceCached
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -28,10 +27,19 @@ fun InlineQueryResultVoiceCachedImpl(
    id: InlineQueryIdentifier,
    fileId: FileId,
    title: String,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVoiceCachedImpl(id, fileId, title, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultVoiceCachedImpl(
+    id,
+    fileId,
+    title,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultVoiceCachedImpl internal constructor(
@ -53,7 +61,7 @@ data class InlineQueryResultVoiceCachedImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultVoiceCached {
    override val type: String = inlineQueryResultVoiceType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt
@ -1,12 +1,11 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.InlineQueryResultVoice
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -39,10 +38,20 @@ fun InlineQueryResultVoiceImpl(
    url: String,
    title: String,
    duration: Int? = null,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    replyMarkup: InlineKeyboardMarkup? = null,
    inputMessageContent: InputMessageContent? = null
-) = InlineQueryResultVoiceImpl(id, url, title, duration, entities.makeString(), null, entities.toRawMessageEntities(), replyMarkup, inputMessageContent)
+) = InlineQueryResultVoiceImpl(
+    id,
+    url,
+    title,
+    duration,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    replyMarkup,
+    inputMessageContent
+)

@Serializable
 data class InlineQueryResultVoiceImpl internal constructor(
@ -66,7 +75,7 @@ data class InlineQueryResultVoiceImpl internal constructor(
    override val inputMessageContent: InputMessageContent? = null
 ) : InlineQueryResultVoice {
    override val type: String = inlineQueryResultVoiceType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt
@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts

-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent

 interface WithInputMessageContentInlineQueryResult : InlineQueryResult {
    val inputMessageContent: InputMessageContent?
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/serializers/InlineQueryResultSerializer.kt
@ -2,13 +2,14 @@ package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.serializers

 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder

-@Serializer(InlineQueryResult::class)
-internal object InlineQueryResultSerializer : KSerializer<InlineQueryResult> {
+@RiskFeature
+object InlineQueryResultSerializer : KSerializer<InlineQueryResult> {
    @InternalSerializationApi
    override val descriptor: SerialDescriptor = buildSerialDescriptor(InlineQueryResult::class.toString(), PolymorphicKind.OPEN)
    override fun serialize(encoder: Encoder, value: InlineQueryResult) {
@ -39,4 +40,4 @@ internal object InlineQueryResultSerializer : KSerializer<InlineQueryResult> {
    override fun deserialize(decoder: Decoder): InlineQueryResult {
        throw TODO()
    }
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputContactMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputContactMessageContent.kt
@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent

 import dev.inmo.tgbotapi.CommonAbstracts.CommonContactData
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

@ -16,4 +15,4 @@ data class InputContactMessageContent(
    override val lastName: String? = null,
    @SerialName(vcardField)
    override val vcard: String? = null
-) : CommonContactData, InputMessageContent
+) : CommonContactData, InputMessageContent
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputInvoiceMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputInvoiceMessageContent.kt
@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent

 import dev.inmo.tgbotapi.CommonAbstracts.CommonSendInvoiceData
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
 import dev.inmo.tgbotapi.types.payments.LabeledPrice
 import dev.inmo.tgbotapi.types.payments.LabeledPricesSerializer
 import dev.inmo.tgbotapi.types.payments.abstracts.Currency
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputLocationMessageContent.kt
@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

@ -20,4 +19,4 @@ data class InputLocationMessageContent(
    override val heading: Degrees? = null,
    @SerialName(proximityAlertRadiusField)
    override val proximityAlertRadius: Meters? = null
-) : Locationed, HorizontallyAccured, ProximityAlertable, Livable, Headed, InputMessageContent
+) : Locationed, HorizontallyAccured, ProximityAlertable, Livable, Headed, InputMessageContent
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputMessageContent.kt
@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent
+
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContentSerializer
+import kotlinx.serialization.Serializable
+
+@Serializable(InputMessageContentSerializer::class)
+sealed interface InputMessageContent
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt
@ -1,10 +1,11 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent

-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.types.DisableWebPagePreview
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import kotlinx.serialization.SerialName
@ -23,7 +24,7 @@ fun InputTextMessageContent(
 * Represents the [InputMessageContent] of a text message to be sent as the result of an inline query.
 */
 fun InputTextMessageContent(
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    disableWebPagePreview: Boolean? = null
 ) = InputTextMessageContent(entities.makeString(), null, entities.toRawMessageEntities(), disableWebPagePreview)

@ -38,7 +39,7 @@ data class InputTextMessageContent internal constructor(
    @SerialName(disableWebPagePreviewField)
    override val disableWebPagePreview: Boolean? = null
 ) : TextedOutput, DisableWebPagePreview, InputMessageContent {
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text)
    }
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputVenueMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputVenueMessageContent.kt
@ -3,7 +3,6 @@ package dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent
 import dev.inmo.tgbotapi.CommonAbstracts.CommonVenueData
 import dev.inmo.tgbotapi.CommonAbstracts.Locationed
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContentSerializer.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContentSerializer.kt
@ -1,14 +1,14 @@
 package dev.inmo.tgbotapi.types.InlineQueries

 import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.*
-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder

-@Serializer(InputMessageContent::class)
-internal object InputMessageContentSerializer : KSerializer<InputMessageContent> {
+@RiskFeature
+object InputMessageContentSerializer : KSerializer<InputMessageContent> {
    @InternalSerializationApi
    override val descriptor: SerialDescriptor = buildSerialDescriptor(InputMessageContent::class.toString(), PolymorphicKind.OPEN)
    override fun serialize(encoder: Encoder, value: InputMessageContent) {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InlineQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InlineQuery.kt
@ -1,13 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.abstracts

-import dev.inmo.tgbotapi.types.InlineQueryIdentifier
-import dev.inmo.tgbotapi.types.User
-import dev.inmo.tgbotapi.types.chat.ChatType
+import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery

-interface InlineQuery {
-    val id: InlineQueryIdentifier
-    val from: User
-    val query: String
-    val offset: String
-    val chatType: ChatType?
-}
+@Deprecated("Replaced", ReplaceWith("InlineQuery", "dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery"))
+typealias InlineQuery = InlineQuery
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InputMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/abstracts/InputMessageContent.kt
@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.InlineQueries.abstracts

-import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContentSerializer
-import kotlinx.serialization.Serializable
+import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent

-@Serializable(InputMessageContentSerializer::class)
-interface InputMessageContent
+@Deprecated("Replaced", ReplaceWith("InputMessageContent", "dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputMessageContent"))
+typealias InputMessageContent = InputMessageContent
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/BaseInlineQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/BaseInlineQuery.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InlineQueries.query

-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier
 import dev.inmo.tgbotapi.types.User
 import dev.inmo.tgbotapi.types.chat.ChatType
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/InlineQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/InlineQuery.kt
@ -0,0 +1,13 @@
+package dev.inmo.tgbotapi.types.InlineQueries.query
+
+import dev.inmo.tgbotapi.types.InlineQueryIdentifier
+import dev.inmo.tgbotapi.types.User
+import dev.inmo.tgbotapi.types.chat.ChatType
+
+sealed interface InlineQuery {
+    val id: InlineQueryIdentifier
+    val from: User
+    val query: String
+    val offset: String
+    val chatType: ChatType?
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/LocationInlineQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/query/LocationInlineQuery.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InlineQueries.query

-import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueryIdentifier
 import dev.inmo.tgbotapi.types.User
 import dev.inmo.tgbotapi.types.chat.ChatType
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/DuratedInputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/DuratedInputMedia.kt
@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.types.InputMedia

-interface DuratedInputMedia : InputMedia {
+sealed interface DuratedInputMedia : InputMedia {
    val duration: Long?
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt
@ -4,8 +4,8 @@ import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import kotlinx.serialization.Serializable

@Serializable(InputMediaSerializer::class)
-interface InputMedia {
+sealed interface InputMedia {
    val type: String
    val file: InputFile
    val media: String
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt
@ -1,10 +1,11 @@
 package dev.inmo.tgbotapi.types.InputMedia

-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.abstracts.fileIdToSend
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import kotlinx.serialization.SerialName
@ -22,12 +23,21 @@ fun InputMediaAnimation(

 fun InputMediaAnimation(
    file: InputFile,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    width: Int? = null,
    height: Int? = null,
    duration: Long? = null,
    thumb: InputFile? = null
-) = InputMediaAnimation(file, entities.makeString(), null, entities.toRawMessageEntities(), width, height, duration, thumb)
+) = InputMediaAnimation(
+    file,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    width,
+    height,
+    duration,
+    thumb
+)

@Serializable
 data class InputMediaAnimation internal constructor(
@ -44,7 +54,7 @@ data class InputMediaAnimation internal constructor(
    override val thumb: InputFile? = null
 ) : InputMedia, SizedInputMedia, DuratedInputMedia, ThumbedInputMedia, TextedOutput {
    override val type: String = "animation"
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAudio.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAudio.kt
@ -5,6 +5,8 @@ import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.abstracts.fileIdToSend
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.makeString
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.files.AudioFile
@ -14,7 +16,7 @@ internal const val audioInputMediaType = "audio"

 fun InputMediaAudio(
    file: InputFile,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    duration: Long? = null,
    performer: String? = null,
    title: String? = null,
@ -50,7 +52,7 @@ data class InputMediaAudio internal constructor(
    override val thumb: InputFile? = null
 ) : InputMedia, AudioMediaGroupMemberInputMedia, DuratedInputMedia, ThumbedInputMedia, TitledInputMedia, Performerable {
    override val type: String = audioInputMediaType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaDocument.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaDocument.kt
@ -1,9 +1,9 @@
 package dev.inmo.tgbotapi.types.InputMedia

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.files.DocumentFile
@ -21,10 +21,17 @@ fun InputMediaDocument(

 fun InputMediaDocument(
    file: InputFile,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    thumb: InputFile? = null,
    disableContentTypeDetection: Boolean? = null
-) = InputMediaDocument(file, entities.makeString(), null, entities.toRawMessageEntities(), thumb, disableContentTypeDetection)
+) = InputMediaDocument(
+    file,
+    entities.makeString(),
+    null,
+    entities.toRawMessageEntities(),
+    thumb,
+    disableContentTypeDetection
+)

 /**
 * Represents a general file to be sent. See https://core.telegram.org/bots/api#inputmediadocument
@ -50,7 +57,7 @@ data class InputMediaDocument internal constructor(
    val disableContentTypeDetection: Boolean? = null
 ) : InputMedia, DocumentMediaGroupMemberInputMedia, ThumbedInputMedia {
    override val type: String = documentInputMediaType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaPhoto.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaPhoto.kt
@ -1,10 +1,10 @@
 package dev.inmo.tgbotapi.types.InputMedia

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.abstracts.fileIdToSend
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.files.PhotoSize
@ -20,7 +20,7 @@ fun InputMediaPhoto(

 fun InputMediaPhoto(
    file: InputFile,
-    entities: List<TextSource>
+    entities: TextSourcesList
 ) = InputMediaPhoto(file, entities.makeString(), null, entities.toRawMessageEntities())

@Serializable
@ -34,7 +34,7 @@ data class InputMediaPhoto internal constructor(
    private val rawEntities: List<RawMessageEntity>? = null
 ) : InputMedia, VisualMediaGroupMemberInputMedia {
    override val type: String = photoInputMediaType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaSerializer.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaSerializer.kt
@ -1,12 +1,13 @@
 package dev.inmo.tgbotapi.types.InputMedia

+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder

-@Serializer(InputMedia::class)
-internal object InputMediaSerializer : KSerializer<InputMedia> {
+@RiskFeature
+object InputMediaSerializer : KSerializer<InputMedia> {
    @InternalSerializationApi
    override val descriptor: SerialDescriptor = buildSerialDescriptor(InputMedia::class.toString(), PolymorphicKind.OPEN)
    override fun serialize(encoder: Encoder, value: InputMedia) {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaVideo.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaVideo.kt
@ -1,11 +1,10 @@
 package dev.inmo.tgbotapi.types.InputMedia

-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.CommonAbstracts.makeString
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.abstracts.fileIdToSend
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import kotlinx.serialization.*
@ -24,7 +23,7 @@ fun InputMediaVideo(

 fun InputMediaVideo(
    file: InputFile,
-    entities: List<TextSource>,
+    entities: TextSourcesList,
    width: Int? = null,
    height: Int? = null,
    duration: Long? = null,
@ -46,7 +45,7 @@ data class InputMediaVideo internal constructor (
    override val thumb: InputFile? = null
 ) : InputMedia, SizedInputMedia, DuratedInputMedia, ThumbedInputMedia, VisualMediaGroupMemberInputMedia {
    override val type: String = videoInputMediaType
-    override val textSources: List<TextSource>? by lazy {
+    override val textSources: TextSourcesList? by lazy {
        rawEntities ?.asTextSources(text ?: return@lazy null)
    }

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt
@ -15,12 +15,12 @@ internal fun <T> T.buildArguments(withSerializer: SerializationStrategy<T>) = ar
 )

@Serializable(MediaGroupMemberInputMediaSerializer::class)
-interface MediaGroupMemberInputMedia : InputMedia, TextedOutput {
+sealed interface MediaGroupMemberInputMedia : InputMedia, TextedOutput {
    fun serialize(format: StringFormat): String
 }

-interface AudioMediaGroupMemberInputMedia: MediaGroupMemberInputMedia
-interface DocumentMediaGroupMemberInputMedia: MediaGroupMemberInputMedia
+sealed interface AudioMediaGroupMemberInputMedia: MediaGroupMemberInputMedia
+sealed interface DocumentMediaGroupMemberInputMedia: MediaGroupMemberInputMedia

@Serializable(MediaGroupMemberInputMediaSerializer::class)
-interface VisualMediaGroupMemberInputMedia : MediaGroupMemberInputMedia
+sealed interface VisualMediaGroupMemberInputMedia : MediaGroupMemberInputMedia
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt
@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types.InputMedia

 import dev.inmo.tgbotapi.types.typeField
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
@ -8,8 +9,8 @@ import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.*

-@Serializer(MediaGroupMemberInputMedia::class)
-internal object MediaGroupMemberInputMediaSerializer : KSerializer<MediaGroupMemberInputMedia> {
+@RiskFeature
+object MediaGroupMemberInputMediaSerializer : KSerializer<MediaGroupMemberInputMedia> {
    @InternalSerializationApi
    override val descriptor: SerialDescriptor = buildSerialDescriptor(MediaGroupMemberInputMedia::class.toString(), PolymorphicKind.OPEN)
    override fun serialize(encoder: Encoder, value: MediaGroupMemberInputMedia) {
@ -32,4 +33,4 @@ internal object MediaGroupMemberInputMediaSerializer : KSerializer<MediaGroupMem
            else -> error("Illegal type of incoming MediaGroupMemberInputMedia")
        }
    }
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/SizedInputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/SizedInputMedia.kt
@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.types.InputMedia

-interface SizedInputMedia : InputMedia {
+sealed interface SizedInputMedia : InputMedia {
    val width: Int?
    val height: Int?
-}
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt
@ -2,6 +2,6 @@ package dev.inmo.tgbotapi.types.InputMedia

 import dev.inmo.tgbotapi.requests.abstracts.InputFile

-interface ThumbedInputMedia : InputMedia {
+sealed interface ThumbedInputMedia : InputMedia {
    val thumb: InputFile?
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/TitledInputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/TitledInputMedia.kt
@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.types.InputMedia

-interface TitledInputMedia : InputMedia {
+sealed interface TitledInputMedia : InputMedia {
    val title: String?
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/RawMessageEntity.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/RawMessageEntity.kt
@ -1,7 +1,5 @@
 package dev.inmo.tgbotapi.types.MessageEntity

-import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource
-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.User
 import kotlinx.serialization.Serializable
@ -22,7 +20,7 @@ internal data class RawMessageEntity(

 internal fun RawMessageEntity.asTextSource(
    source: String,
-    subParts: List<TextSource>
+    subParts: TextSourcesList
 ): TextSource {
    val sourceSubstring: String = source.substring(range)
    val subPartsWithRegulars by lazy {
@ -40,8 +38,15 @@ internal fun RawMessageEntity.asTextSource(
        "italic" -> ItalicTextSource(sourceSubstring, subPartsWithRegulars)
        "code" -> CodeTextSource(sourceSubstring)
        "pre" -> PreTextSource(sourceSubstring, language)
-        "text_link" -> TextLinkTextSource(sourceSubstring, url ?: throw IllegalStateException("URL must not be null for text link"))
-        "text_mention" -> TextMentionTextSource(sourceSubstring, user ?: throw IllegalStateException("User must not be null for text mention"), subPartsWithRegulars)
+        "text_link" -> TextLinkTextSource(
+            sourceSubstring,
+            url ?: throw IllegalStateException("URL must not be null for text link")
+        )
+        "text_mention" -> TextMentionTextSource(
+            sourceSubstring,
+            user ?: throw IllegalStateException("User must not be null for text mention"),
+            subPartsWithRegulars
+        )
        "underline" -> UnderlineTextSource(sourceSubstring, subPartsWithRegulars)
        "strikethrough" -> StrikethroughTextSource(sourceSubstring, subPartsWithRegulars)
        else -> RegularTextSource(sourceSubstring)
@ -52,7 +57,7 @@ private inline operator fun <T : Comparable<T>> ClosedRange<T>.contains(other: C
    return start <= other.start && endInclusive >= other.endInclusive
 }

-internal fun List<TextSource>.fillWithRegulars(source: String): List<TextSource> {
+internal fun TextSourcesList.fillWithRegulars(source: String): TextSourcesList {
    var index = 0
    val result = mutableListOf<TextSource>()
    for (i in 0 until size) {
@ -74,7 +79,10 @@ internal fun List<TextSource>.fillWithRegulars(source: String): List<TextSource>
    return result
 }

-private fun createTextSources(originalFullString: String, entities: RawMessageEntities): List<TextSource> {
+private fun createTextSources(
+    originalFullString: String,
+    entities: RawMessageEntities
+): TextSourcesList {
    val mutableEntities = entities.toMutableList().apply { sortBy { it.offset } }
    val resultList = mutableListOf<TextSource>()

@ -160,23 +168,24 @@ internal fun TextSource.toRawMessageEntities(offset: Int = 0): List<RawMessageEn
 }


-internal fun List<TextSource>.toRawMessageEntities(preOffset: Int = 0): List<RawMessageEntity> {
+internal fun TextSourcesList.toRawMessageEntities(preOffset: Int = 0): List<RawMessageEntity> {
    var i = preOffset
    return flatMap { textSource ->
        textSource.toRawMessageEntities(i).also {
-            i += it.maxByOrNull { it.length } ?.length ?: textSource.source.length
+            i += it.maxByOrNull { it.length }?.length ?: textSource.source.length
        }
    }
 }

-fun String.removeLeading(word: String) = if (startsWith(word)){
+fun String.removeLeading(word: String) = if (startsWith(word)) {
    substring(word.length)
 } else {
    this
 }

-internal fun List<TextSource>.toRawMessageEntities(): List<RawMessageEntity> = toRawMessageEntities(0)
+internal fun TextSourcesList.toRawMessageEntities(): List<RawMessageEntity> = toRawMessageEntities(0)

-internal fun RawMessageEntities.asTextSources(sourceString: String): List<TextSource> = createTextSources(sourceString, this).fillWithRegulars(sourceString)
+internal fun RawMessageEntities.asTextSources(sourceString: String): TextSourcesList =
+    createTextSources(sourceString, this).fillWithRegulars(sourceString)

 internal typealias RawMessageEntities = List<RawMessageEntity>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
@ -11,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable
 data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
-    override val subsources: List<TextSource>
+    override val subsources: TextSourcesList
 ) : MultilevelTextSource {
    override val markdown: String by lazy { source.boldMarkdown() }
    override val markdownV2: String by lazy { boldMarkdownV2() }
@ -19,7 +18,7 @@ data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor)
 }

@Suppress("NOTHING_TO_INLINE")
-inline fun bold(parts: List<TextSource>) = BoldTextSource(parts.makeString(), parts)
+inline fun bold(parts: TextSourcesList) = BoldTextSource(parts.makeString(), parts)
@Suppress("NOTHING_TO_INLINE")
 inline fun bold(vararg parts: TextSource) = bold(parts.toList())
@Suppress("NOTHING_TO_INLINE")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
@ -11,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable
 data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
-    override val subsources: List<TextSource>
+    override val subsources: TextSourcesList
 ) : MultilevelTextSource {
    override val markdown: String by lazy { source.cashTagMarkdown() }
    override val markdownV2: String by lazy { cashTagMarkdownV2() }
@ -19,7 +18,7 @@ data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
 }

@Suppress("NOTHING_TO_INLINE")
-inline fun cashTag(parts: List<TextSource>) = CashTagTextSource(parts.makeString(), parts)
+inline fun cashTag(parts: TextSourcesList) = CashTagTextSource(parts.makeString(), parts)
@Suppress("NOTHING_TO_INLINE")
 inline fun cashTag(vararg parts: TextSource) = cashTag(parts.toList())
@Suppress("NOTHING_TO_INLINE")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
-import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
@ -11,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable
 data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
-    override val subsources: List<TextSource>
+    override val subsources: TextSourcesList
 ) : MultilevelTextSource {
    override val markdown: String by lazy { source.emailMarkdown() }
    override val markdownV2: String by lazy { emailMarkdownV2(source) }
@ -19,7 +18,7 @@ data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor)
 }

@Suppress("NOTHING_TO_INLINE")
-inline fun email(parts: List<TextSource>) = EMailTextSource(parts.makeString(), parts)
+inline fun email(parts: TextSourcesList) = EMailTextSource(parts.makeString(), parts)
@Suppress("NOTHING_TO_INLINE")
 inline fun email(vararg parts: TextSource) = email(parts.toList())
@Suppress("NOTHING_TO_INLINE")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
@ -11,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable
 data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
-    override val subsources: List<TextSource>
+    override val subsources: TextSourcesList
 ) : MultilevelTextSource {
    override val markdown: String by lazy { source.hashTagMarkdown() }
    override val markdownV2: String by lazy { hashTagMarkdownV2() }
@ -25,7 +24,7 @@ data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
 }

@Suppress("NOTHING_TO_INLINE", "EXPERIMENTAL_API_USAGE")
-inline fun hashtag(parts: List<TextSource>) = (regular("#") + parts).let { HashTagTextSource(it.makeString(), it) }
+inline fun hashtag(parts: TextSourcesList) = (regular("#") + parts).let { HashTagTextSource(it.makeString(), it) }
@Suppress("NOTHING_TO_INLINE")
 inline fun hashtag(vararg parts: TextSource) = hashtag(parts.toList())
 /**
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
@ -11,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable
 data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
-    override val subsources: List<TextSource>
+    override val subsources: TextSourcesList
 ) : MultilevelTextSource {
    override val markdown: String by lazy { source.italicMarkdown() }
    override val markdownV2: String by lazy { italicMarkdownV2() }
@ -19,7 +18,7 @@ data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor
 }

@Suppress("NOTHING_TO_INLINE")
-inline fun italic(parts: List<TextSource>) = ItalicTextSource(parts.makeString(), parts)
+inline fun italic(parts: TextSourcesList) = ItalicTextSource(parts.makeString(), parts)
@Suppress("NOTHING_TO_INLINE")
 inline fun italic(vararg parts: TextSource) = italic(parts.toList())
@Suppress("NOTHING_TO_INLINE")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
@ -18,7 +17,7 @@ private val String.withoutCommercialAt
@Serializable
 data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
-    override val subsources: List<TextSource>
+    override val subsources: TextSourcesList
 ) : MultilevelTextSource {
    override val markdown: String by lazy { source.mentionMarkdown() }
    override val markdownV2: String by lazy { mentionMarkdownV2() }
@ -32,7 +31,7 @@ data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
 }

@Suppress("NOTHING_TO_INLINE")
-inline fun mention(parts: List<TextSource>) = (regular("@") + parts).let { MentionTextSource(it.makeString(), it) }
+inline fun mention(parts: TextSourcesList) = (regular("@") + parts).let { MentionTextSource(it.makeString(), it) }
@Suppress("NOTHING_TO_INLINE")
 inline fun mention(vararg parts: TextSource) = mention(parts.toList())

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

-import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
@ -11,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable
 data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
    override val source: String,
-    override val subsources: List<TextSource>
+    override val subsources: TextSourcesList
 ) : MultilevelTextSource {
    override val markdown: String by lazy { source.phoneMarkdown() }
    override val markdownV2: String by lazy { phoneMarkdownV2() }
@ -19,7 +18,7 @@ data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstr
 }

@Suppress("NOTHING_TO_INLINE")
-inline fun phone(parts: List<TextSource>) = PhoneNumberTextSource(parts.makeString(), parts)
+inline fun phone(parts: TextSourcesList) = PhoneNumberTextSource(parts.makeString(), parts)
@Suppress("NOTHING_TO_INLINE")
 inline fun phone(vararg parts: TextSource) = phone(parts.toList())
@Suppress("NOTHING_TO_INLINE")
--- a/Show More
+++ b/Show More