add exceptions handling readme

2025-12-09 15:55:51 +00:00 · 2022-01-11 21:21:31 +06:00
220 changed files with 1358 additions and 4736 deletions
--- a/.github/workflows/kdocs.yml
+++ b/.github/workflows/kdocs.yml
@@ -10,7 +10,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 11
+          java-version: 1.8
      - name: Build
        run: ./gradlew dokkaHtml
      - name: Publish KDocs
--- a/.github/workflows/packages_publishing.yml
+++ b/.github/workflows/packages_publishing.yml
@@ -7,7 +7,10 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 11
+          java-version: 1.8
+      - name: Fix android 31.0.0 dx
+        continue-on-error: true
+        run: cd /usr/local/lib/android/sdk/build-tools/31.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
      - name: Rewrite version
        run: |
          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
@@ -18,7 +21,7 @@ jobs:
        run: ./gradlew build
      - name: Publish
        continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
        env:
          GITHUBPACKAGES_USER: ${{ github.actor }}
          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,194 +1,5 @@
 # TelegramBotAPI changelog

-## 0.38.23
-
-* `BehaviourHandler`:
-    * Add support of fallback triggers (fix of [#560](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/560))
-
-## 0.38.22
-
-* `Core`:
-    * New constant `tgWebAppStartParamField`
-    * All keyboards builders and rows blocks becomes not crossinline
-
-## 0.38.21
-
-* `WebApps`:
-    * `WebAppInitData#queryId` now have correct js name of field
-    * New function `sendDataOrWorkWithQueryId`
-
-## 0.38.20
-
-* `BehaviourBuilder FSM`:
-    * Hotfixes
-* `WebApps`:
-    * New extension `TelegramBot#answerWebAppQuery`
-    * New function `handleResult`
-
-## 0.38.19
-
-* `BehaviourBuilder`:
-    * Hotfixes
-* `BehaviourBuilder FSM`:
-    * `BehaviourContextWithFSMBuilder` deprecated in favor to `BehaviourContextWithFSM`
-    * Now it is possible to define additional handlers in subcontexts of `BehaviourBuilderWithFSM`
-
-## 0.38.18
-
-* `Core`:
-    * Add support of test servers (fix of [#577](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/577))
-* `BehaviourBuilder`:
-    * Fixes in extension `BehaviourContext#doInSubContextWithUpdatesFilter` (thanks to [xzima](https://github.com/xzima))
-
-## 0.38.17
-
-* `Core`:
-    * Add `BotCommandScopeChat` as new `BotCommandScope` (fix of [#574](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/574))
-    * `BotCommandScope` companion got several properties and functions for more useful scope creation
-
-## 0.38.16
-
-* `Core`:
-    * `TelegramAPIUrlsKeeper` now have two new things: properties `webAppDataSecretKey` and fun `checkWebAppLink`
-
-## 0.38.15
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.9.20` -> `0.9.24`
-* `Core`:
-    * Fixes in `MessageContent#serializationModule`
-* `BehaviourBuilder`:
-    * Add triggers for `DataCallbackQuery` and subtypes with regex checking of data
-
-## 0.38.14
-
-__This update contains including of [Telegram Bot API 6.0](https://core.telegram.org/bots/api-changelog#april-16-2022)__
-
-* `Core`:
-    * Constructor of `UnknownInlineKeyboardButton` is not internal and can be created with any `json`
-* `WebApps`:
-    * Created 🎉
-
-## 0.38.13
-
-* `Core`:
-    * Fixes in `mention` creation
-    * Deprecate `StorageFileInfo`
-* `BehaviourBuilder`:
-    * In the expectations a lot of `on*Message` extensions have been added (like `onContentMessage`). These extensions could be useful when with the `Content` its message info is important
-
-## 0.38.12
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.9.17` -> `0.9.19`
-        * `Coroutines`: `1.6.0` -> `1.6.1`
-* `Core`:
-    * New type `TextedMediaContent` which will unite `TextedInput` and `MediaContent`
-    * `MediaGroupContent` and all subsequent inheritors have been replaced to the package `dev.inmo.tgbotapi.types.message.content.media`
-    * `MediaGroupContent` Now extends `TextedMediaContent` instead of `MediaContent`
-    * Add `reply` functions with the texted content with including of text
-* `Utils`:
-    * Improve work with retrieving of accumulated updates
-
-## 0.38.11
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.9.16` -> `0.9.17`
-        * `Klock`: `2.6.3` -> `2.7.0`
-* `Core`:
-    * Fixes in `TextSourcesList` creating in from `RawMessageEntities`
-    * Old ways to create keyboards (`matrix` and `row`) have been deprecated
-* `API`:
-    * Add ability to `reply` with `Poll`
-    * Add ability to `reply` with any `MessageContent`
-    * Add ability to `reply` with any `TelegramMediaFile`
-
-## 0.38.10
-
-* `API`:
-    * All `with*Action` extensions got a contracts which declare that `block` will be called once
-    * Add several extensions `TelegramBot#sendPhoto` with `PhotoSize`
-    * Add several extensions `TelegramBot#reply` with `PhotoSize`
-
-## 0.38.9
-
-* `Core`:
-    * New function `MessageContent.Companion#serializationModule`
-    * Now it is possible to create `TelegramBot` (`RequestsExecutor`) with several bots under the hood and opportunity
-      for bots requests load balancing or fault-fix via sending of the requests via another bot
-* `API`:
-    * Add replies which will use another message as a source for reply (`copyMessage`)
-
-## 0.38.8
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.9.12` -> `0.9.16`
-        * `Klock`: `2.6.2` -> `2.6.3`
-        * `Ktor`: `1.6.7` -> `1.6.8`
-* `BehaviourBuilder`:
-    * Fixes in `onMediaGroup` and dependent functions
-    * Add several new extensions for `SimpleFilter`:
-        * `SimpleFilter#listAll`
-        * `SimpleFilter#listAny`
-        * `SimpleFilter#listNone`
-
-## 0.38.7
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.9.9` -> `0.9.12`
-        * `Klock`: `2.5.2` -> `2.6.2`
-* `Core`:
-    * `SimplePollOption#votes` now is `0` by default
-    * New function `PollOption.Companion#simple`
-
-## 0.38.6
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.9.6` -> `0.9.9`
-        * `Klock`: `2.4.13` -> `2.5.2`
-* `Core`:
-    * New member of `MentionTextSource` - `username`
-
-## 0.38.5
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.9.5` -> `0.9.6`
-* `Core`:
-    * `Username` got new property `usernameWithoutAt` which will return `username` without leading `@`
-* `Utils`:
-    * Several new functions for working with deep links:
-        * `makeUsernameDeepLinkPrefix`
-        * `makeTelegramDeepLink`
-        * `makeDeepLink`
-
-## 0.38.4
-
-__This update contains including of [Telegram Bot API 5.7](https://core.telegram.org/bots/api-changelog#january-31-2022)__
-
-* `Core`:
-    * Support of new fields `Sticker`
-    * Support of new fields `StickerSet`
-    * Support of new fields in creating of sticker set and sticker
-* `Utils`:
-    * Rename `PathedFile` to avoid clash with core file (fix of [#529](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/529))
-
-## 0.38.3
-
-* `Common`:
-    * `Version`:
-        * `MicroUtils`: `0.9.1` -> `0.9.2`
-        * `Klock`: `2.4.10` -> `2.4.12`
-        * `UUID`: `0.3.1` -> `0.4.0`
-* `API`
-    * New extensions `TelegramBot#send*` for media groups with contents
-
 ## 0.38.2

 * `Common`:
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-6.0-blue)](https://core.telegram.org/bots/api-changelog#april-16-2022)
+# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-5.6-blue)](https://core.telegram.org/bots/api-changelog#december-30-2021)

-| [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue&logo=telegram)](https://t.me/InMoTelegramBotAPI) |
+| [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue)](https://forms.gle/2Hex2ynbHWHhi1KY7) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue)](https://t.me/InMoTelegramBotAPI) |
 |:---:|
-| [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue&logo=bookstack)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
+| [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |

 Hello! This is a set of libraries for working with Telegram Bot API.

@@ -28,7 +28,7 @@ Other configuration examples:
 suspend fun main() {
  val bot = telegramBot(TOKEN)

-  bot.buildBehaviourWithLongPolling {
+  bot.buildBehaviour {
    println(getMe())
  
    onCommand("start") {
@@ -69,7 +69,7 @@ and maybe some updates it got after launch)
 suspend fun main() {
  val bot = telegramBot(TOKEN)

-  bot.buildBehaviourWithLongPolling {
+  bot.buildBehaviour {
    println(getMe())

    val nameReplyMarkup = ReplyKeyboardMarkup(
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -40,17 +40,11 @@ kotlin {
            dependencies {
                implementation kotlin('stdlib')

-                api project(":tgbotapi.core")
-                api project(":tgbotapi.api")
-                api project(":tgbotapi.utils")
-                api project(":tgbotapi.behaviour_builder")
-                api project(":tgbotapi.behaviour_builder.fsm")
-                api project(":tgbotapi")
-            }
-        }
-        jsMain {
-            dependencies {
-                api project(":tgbotapi.webapps")
+                rootProject.subprojects.forEach {
+                    if (it != project) {
+                        api it
+                    }
+                }
            }
        }
    }
--- a/docs/gradle.properties
+++ b/docs/gradle.properties
@@ -1 +1,3 @@
+dokka_version=1.6.0
+
 org.gradle.jvmargs=-Xmx1024m
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,20 +6,18 @@ kotlin.incremental=true
 kotlin.incremental.js=true

 kotlin_version=1.6.10
-kotlin_coroutines_version=1.6.1
+kotlin_coroutines_version=1.6.0
 kotlin_serialisation_runtime_version=1.3.2
-klock_version=2.7.0
-uuid_version=0.4.0
-ktor_version=1.6.8
+klock_version=2.4.10
+uuid_version=0.3.1
+ktor_version=1.6.7

-micro_utils_version=0.9.24
+
+micro_utils_version=0.9.1

 javax_activation_version=1.1.1

-
-dokka_version=1.6.10
-
 library_group=dev.inmo
-library_version=0.38.23
+library_version=0.38.2

-github_release_plugin_version=2.3.7
+github_release_plugin_version=2.2.12
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
--- a/publish.kpsb
+++ b/publish.kpsb
@@ -1 +0,0 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,5 +21,4 @@ include ":tgbotapi.extensions.utils"
 include ":tgbotapi.extensions.behaviour_builder"
 include ":tgbotapi.extensions.behaviour_builder.fsm"
 include ":tgbotapi"
-include ":tgbotapi.webapps"
 include ":docs"
--- a/tgbotapi.api/build.gradle
+++ b/tgbotapi.api/build.gradle
@@ -17,9 +17,8 @@ plugins {

 project.version = "$library_version"
 project.group = "$library_group"
-project.description = "API extensions with \"Telegram Bot API\"-like extensions for TelegramBot and RequestsExecutor"

-apply from: "../publish.gradle"
+apply from: "publish.gradle"

 repositories {
    mavenLocal()
--- a/tgbotapi.api/publish.gradle
+++ b/tgbotapi.api/publish.gradle
@@ -0,0 +1,79 @@
+apply plugin: 'maven-publish'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference"
+            name = "Telegram Bot API Extensions for API"
+            url = "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+        repositories {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
+                }
+            }
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
+                }
+            }
+        }
+    }
+}
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}
--- a/tgbotapi.api/publish.kpsb
+++ b/tgbotapi.api/publish.kpsb
@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt
@@ -40,9 +40,8 @@ data class BotBuilder internal constructor(
 fun buildBot(
    token: String,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
    block: BotBuilder.() -> Unit
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
+    TelegramAPIUrlsKeeper(token, apiUrl),
    BotBuilder().apply(block).createHttpClient()
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt
@@ -13,7 +13,7 @@ import io.ktor.client.engine.*
 */
 fun telegramBot(
    urlsKeeper: TelegramAPIUrlsKeeper,
-    client: HttpClient = HttpClient()
+    client: HttpClient
 ): TelegramBot = telegramBot(urlsKeeper) {
    this.client = client
 }
@@ -66,19 +66,17 @@ inline fun telegramBot(
 inline fun telegramBot(
    token: String,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
-    client: HttpClient = HttpClient()
-): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, testServer, apiUrl), client)
+    client: HttpClient
+): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, apiUrl), client)

@Suppress("NOTHING_TO_INLINE")
 inline fun <T: HttpClientEngineConfig> telegramBot(
    token: String,
    clientFactory: HttpClientEngineFactory<T>,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
    noinline clientConfig: HttpClientConfig<T>.() -> Unit = {}
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
+    TelegramAPIUrlsKeeper(token, apiUrl),
    clientFactory,
    clientConfig
 )
@@ -92,10 +90,9 @@ inline fun telegramBot(
    token: String,
    clientEngine: HttpClientEngine,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
    noinline clientConfig: HttpClientConfig<*>.() -> Unit = {}
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
+    TelegramAPIUrlsKeeper(token, apiUrl),
    clientEngine,
    clientConfig
 )
@@ -108,9 +105,8 @@ inline fun telegramBot(
 inline fun telegramBot(
    token: String,
    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
    noinline clientConfig: HttpClientConfig<*>.() -> Unit
 ) = telegramBot(
-    TelegramAPIUrlsKeeper(token, testServer, apiUrl),
+    TelegramAPIUrlsKeeper(token, apiUrl),
    clientConfig
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerWebAppQuery.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerWebAppQuery.kt
@@ -1,16 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.answers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.answers.AnswerWebAppQuery
-import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
-import dev.inmo.tgbotapi.types.WebAppQueryId
-
-suspend fun TelegramBot.answerWebAppQuery(
-    webAppQueryId: WebAppQueryId,
-    result: InlineQueryResult
-) = execute(AnswerWebAppQuery(webAppQueryId, result))
-
-suspend fun TelegramBot.answer(
-    webAppQueryId: WebAppQueryId,
-    result: InlineQueryResult
-) = execute(AnswerWebAppQuery(webAppQueryId, result))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/ClearMyDefaultAdministratorRights.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/ClearMyDefaultAdministratorRights.kt
@@ -1,13 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.ClearMyDefaultAdministratorRights
-import dev.inmo.tgbotapi.types.ChatAdministratorRightsImpl
-
-suspend fun TelegramBot.clearMyDefaultAdministratorRights(
-    forChannels: Boolean? = null
-) = execute(ClearMyDefaultAdministratorRights(forChannels))
-
-suspend fun TelegramBot.clearMyDefaultAdministratorRightsForChannels() = clearMyDefaultAdministratorRights(forChannels = true)
-
-suspend fun TelegramBot.clearMyDefaultAdministratorRightsForGroupsAndSupergroups() = clearMyDefaultAdministratorRights(forChannels = false)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDefaultAdministratorRights.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDefaultAdministratorRights.kt
@@ -1,12 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyDefaultAdministratorRights
-
-suspend fun TelegramBot.getMyDefaultAdministratorRights(
-    forChannels: Boolean? = null
-) = execute(GetMyDefaultAdministratorRights(forChannels))
-
-suspend fun TelegramBot.getMyDefaultAdministratorRightsForChannels() = getMyDefaultAdministratorRights(forChannels = true)
-
-suspend fun TelegramBot.getMyDefaultAdministratorRightsForGroupsAndSupergroups() = getMyDefaultAdministratorRights(forChannels = false)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDefaultAdministratorRights.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDefaultAdministratorRights.kt
@@ -1,18 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.SetMyDefaultAdministratorRights
-import dev.inmo.tgbotapi.types.ChatAdministratorRightsImpl
-
-suspend fun TelegramBot.setMyDefaultAdministratorRights(
-    rights: ChatAdministratorRightsImpl,
-    forChannels: Boolean? = null
-) = execute(SetMyDefaultAdministratorRights(rights, forChannels))
-
-suspend fun TelegramBot.setMyDefaultAdministratorRightsForChannels(
-    rights: ChatAdministratorRightsImpl
-) = setMyDefaultAdministratorRights(rights, forChannels = true)
-
-suspend fun TelegramBot.setMyDefaultAdministratorRightsForGroupsAndSupergroups(
-    rights: ChatAdministratorRightsImpl
-) = setMyDefaultAdministratorRights(rights, forChannels = false)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMenuButton.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMenuButton.kt
@@ -1,15 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetChatMenuButton
-import dev.inmo.tgbotapi.requests.chat.modify.*
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat
-
-suspend fun TelegramBot.getChatMenuButton(
-    chatId: ChatId
-) = execute(GetChatMenuButton(chatId))
-
-suspend fun TelegramBot.getChatMenuButton(
-    chat: PrivateChat
-) = getChatMenuButton(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetDefaultChatMenuButton.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetDefaultChatMenuButton.kt
@@ -1,8 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetDefaultChatMenuButton
-import dev.inmo.tgbotapi.requests.chat.modify.SetDefaultChatMenuButton
-import dev.inmo.tgbotapi.types.MenuButton
-
-suspend fun TelegramBot.getDefaultChatMenuButton() = execute(GetDefaultChatMenuButton)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt
@@ -18,7 +18,7 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
    canManageChat: Boolean?
 ) = execute(
    PromoteChatMember(
@@ -34,7 +34,7 @@ suspend fun TelegramBot.promoteChatMember(
        canRestrictMembers,
        canPinMessages,
        canPromoteMembers,
-        canManageVideoChats,
+        canManageVoiceChats,
        canManageChat
    )
 )
@@ -52,7 +52,7 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chat.id,
@@ -67,7 +67,7 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers,
    canPinMessages,
    canPromoteMembers,
-    canManageVideoChats,
+    canManageVoiceChats,
    canManageChat
 )

@@ -84,7 +84,7 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chatId,
@@ -99,7 +99,7 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers,
    canPinMessages,
    canPromoteMembers,
-    canManageVideoChats,
+    canManageVoiceChats,
    canManageChat
 )

@@ -116,7 +116,7 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chat.id,
@@ -131,6 +131,6 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers,
    canPinMessages,
    canPromoteMembers,
-    canManageVideoChats,
+    canManageVoiceChats,
    canManageChat
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatMenuButton.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatMenuButton.kt
@@ -1,16 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.modify
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.modify.*
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat
-
-suspend fun TelegramBot.setChatMenuButton(
-    chatId: ChatId,
-    menuButton: MenuButton
-) = execute(SetChatMenuButton(chatId, menuButton))
-
-suspend fun TelegramBot.setChatMenuButton(
-    chat: PrivateChat,
-    menuButton: MenuButton
-) = setChatMenuButton(chat.id, menuButton)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetDefaultChatMenuButton.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetDefaultChatMenuButton.kt
@@ -1,9 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.modify
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.modify.SetDefaultChatMenuButton
-import dev.inmo.tgbotapi.types.MenuButton
-
-suspend fun TelegramBot.setDefaultChatMenuButton(
-    menuButton: MenuButton
-) = execute(SetDefaultChatMenuButton(menuButton))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetStickerSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetStickerSet.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.get

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.get.GetStickerSet
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.Sticker

 suspend fun TelegramBot.getStickerSet(
    name: String
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/CopyMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/CopyMessages.kt
@@ -2,14 +2,18 @@ package dev.inmo.tgbotapi.extensions.api.send

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.send.media.sendMediaGroup
+import dev.inmo.tgbotapi.requests.send.CopyMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.*
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
+import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.media.MediaGroupContent
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
+import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.MediaGroupUpdate
 import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate

 /**
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt
@@ -10,22 +10,15 @@ import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import dev.inmo.tgbotapi.requests.send.media.rawSendingMediaGroupsWarning
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InputMedia.*
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.dice.DiceAnimationType
 import dev.inmo.tgbotapi.types.files.*
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
 import dev.inmo.tgbotapi.types.games.Game
-import dev.inmo.tgbotapi.types.location.*
+import dev.inmo.tgbotapi.types.location.StaticLocation
 import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-import dev.inmo.tgbotapi.types.message.content.media.*
 import dev.inmo.tgbotapi.types.payments.LabeledPrice
 import dev.inmo.tgbotapi.types.payments.abstracts.Currency
 import dev.inmo.tgbotapi.types.polls.*
@@ -123,7 +116,6 @@ suspend inline fun TelegramBot.reply(
    longitude: Double,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
    to.chat,
@@ -131,7 +123,6 @@ suspend inline fun TelegramBot.reply(
    longitude,
    disableNotification,
    protectContent,
-    allowSendingWithoutReply,
    to.messageId,
    replyMarkup
 )
@@ -145,14 +136,12 @@ suspend inline fun TelegramBot.reply(
    location: StaticLocation,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
    to.chat,
    location,
    disableNotification,
    protectContent,
-    allowSendingWithoutReply,
    to.messageId,
    replyMarkup
 )
@@ -580,17 +569,6 @@ suspend inline fun TelegramBot.reply(
    replyMarkup: KeyboardMarkup? = null
 ) = sendPhoto(to.chat, photo, text, parseMode, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)

-suspend inline fun TelegramBot.reply(
-    to: Message,
-    photoSize: PhotoSize,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photoSize, text, parseMode, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
-

 suspend inline fun TelegramBot.replyWithPhoto(
    to: Message,
@@ -612,16 +590,6 @@ suspend inline fun TelegramBot.reply(
    replyMarkup: KeyboardMarkup? = null
 ) = sendPhoto(to.chat, photo, entities, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)

-suspend inline fun TelegramBot.reply(
-    to: Message,
-    photoSize: PhotoSize,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(to.chat, photoSize, entities, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
-

 // Sticker

@@ -895,329 +863,3 @@ suspend inline fun TelegramBot.reply(
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = sendQuizPoll(to.chat, isClosed, quizPoll, question, options, correctOptionId, isAnonymous, entities, closeInfo, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    poll: Poll,
-    isClosed: Boolean = false,
-    question: String = poll.question,
-    options: List<String> = poll.options.map { it.text },
-    isAnonymous: Boolean = poll.isAnonymous,
-    closeInfo: ScheduledCloseInfo? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = when (poll) {
-    is RegularPoll -> reply(
-        to = to,
-        poll = poll,
-        isClosed = isClosed,
-        question = question,
-        options = options,
-        isAnonymous = isAnonymous,
-        allowMultipleAnswers = isAnonymous,
-        closeInfo = closeInfo,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        allowSendingWithoutReply = allowSendingWithoutReply,
-        replyMarkup = replyMarkup
-    )
-    is UnknownPollType -> error("Unable to send poll with unknown type ($poll)")
-    is QuizPoll -> reply(
-        to = to,
-        quizPoll = poll,
-        entities = poll.textSources,
-        isClosed = isClosed,
-        question = question,
-        options = options,
-        isAnonymous = isAnonymous,
-        closeInfo = closeInfo,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        allowSendingWithoutReply = allowSendingWithoutReply,
-        replyMarkup = replyMarkup
-    )
-}
-
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    fromChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChatId, to.chat.id, messageId, text, parseMode, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    fromChat: Chat,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = reply(to, fromChat.id, messageId, text, parseMode, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
-
-suspend inline fun TelegramBot.reply(
-    to: Message,
-    copy: Message,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = reply(to, copy.chat.id, copy.messageId, text, parseMode, disableNotification, protectContent, allowSendingWithoutReply, replyMarkup)
-
-suspend fun TelegramBot.reply(
-    to: Message,
-    content: MessageContent,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) {
-    execute(
-        content.createResend(
-            to.chat.id,
-            disableNotification,
-            protectContent,
-            to.messageId,
-            allowSendingWithoutReply,
-            replyMarkup
-        )
-    )
-}
-
-suspend fun TelegramBot.reply(
-    to: Message,
-    mediaFile: TelegramMediaFile,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) {
-    when (mediaFile) {
-        is AudioFile -> reply(
-            to = to,
-            audio = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AnimationFile -> reply(
-            to = to,
-            animation = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VoiceFile -> reply(
-            to = to,
-            voice = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VideoFile -> reply(
-            to = to,
-            video = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VideoNoteFile -> reply(
-            to = to,
-            videoNote = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is DocumentFile -> reply(
-            to = to,
-            document = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is Sticker -> reply(
-            to = to,
-            sticker = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is PhotoSize -> reply(
-            to = to,
-            photoSize = mediaFile,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        else -> reply(
-            to = to,
-            document = mediaFile.asDocumentFile(),
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-    }
-}
-
-suspend fun TelegramBot.reply(
-    to: Message,
-    content: TextedMediaContent,
-    text: String?,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) {
-    when (content) {
-        is VoiceContent -> reply(
-            to = to,
-            voice = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AudioMediaGroupContent -> reply(
-            to = to,
-            audio = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is PhotoContent -> reply(
-            to = to,
-            photoSize = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VideoContent -> reply(
-            to = to,
-            video = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AnimationContent -> reply(
-            to = to,
-            animation = content.media,
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        else -> reply(
-            to = to,
-            document = content.media.asDocumentFile(),
-            text = text,
-            parseMode = parseMode,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-    }
-}
-
-suspend fun TelegramBot.reply(
-    to: Message,
-    content: TextedMediaContent,
-    entities: List<TextSource>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) {
-    when (content) {
-        is VoiceContent -> reply(
-            to = to,
-            voice = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AudioMediaGroupContent -> reply(
-            to = to,
-            audio = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is PhotoContent -> reply(
-            to = to,
-            photoSize = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is VideoContent -> reply(
-            to = to,
-            video = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        is AnimationContent -> reply(
-            to = to,
-            animation = content.media,
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-        else -> reply(
-            to = to,
-            document = content.media.asDocumentFile(),
-            entities = entities,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            allowSendingWithoutReply = allowSendingWithoutReply,
-            replyMarkup = replyMarkup
-        )
-    }
-}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendActionDSL.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendActionDSL.kt
@@ -8,20 +8,15 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.actions.*
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import kotlinx.coroutines.*
-import kotlin.contracts.*
 import kotlin.coroutines.coroutineContext

 private const val refreshTime: MilliSeconds = (botActionActualityTime - 1) * 1000L
 typealias TelegramBotActionCallback<T> = suspend TelegramBot.() -> T

-@OptIn(ExperimentalContracts::class)
 suspend fun <T> TelegramBot.withAction(
    actionRequest: SendAction,
    block: TelegramBotActionCallback<T>
 ): T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
    val botActionJob = CoroutineScope(coroutineContext).launch {
        while (isActive) {
            delay(refreshTime)
@@ -35,190 +30,46 @@ suspend fun <T> TelegramBot.withAction(
    return result.getOrThrow()
 }

-@OptIn(ExperimentalContracts::class)
 suspend fun <T> TelegramBot.withAction(
    chatId: ChatId,
    action: BotAction,
    block: TelegramBotActionCallback<T>
-): T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(
-        SendAction(chatId, action),
-        block
-    )
-}
+) = withAction(
+    SendAction(chatId, action),
+    block
+)

-@OptIn(ExperimentalContracts::class)
 suspend fun <T> TelegramBot.withAction(
    chat: Chat,
    action: BotAction,
    block: TelegramBotActionCallback<T>
-): T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(
-        chat.id,
-        action,
-        block
-    )
-}
+) = withAction(
+    chat.id,
+    action,
+    block
+)

-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withTypingAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, TypingAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadPhotoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadPhotoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, RecordVideoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadVideoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, RecordVoiceAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadVoiceAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadDocumentAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadDocumentAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withFindLocationAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, FindLocationAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, RecordVideoNoteAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, UploadVideoNoteAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withChooseStickerAction(chatId: ChatId, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chatId, ChooseStickerAction, block)
-}
+suspend fun <T> TelegramBot.withTypingAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, TypingAction, block)
+suspend fun <T> TelegramBot.withUploadPhotoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadPhotoAction, block)
+suspend fun <T> TelegramBot.withRecordVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVideoAction, block)
+suspend fun <T> TelegramBot.withUploadVideoAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVideoAction, block)
+suspend fun <T> TelegramBot.withRecordVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVoiceAction, block)
+suspend fun <T> TelegramBot.withUploadVoiceAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVoiceAction, block)
+suspend fun <T> TelegramBot.withUploadDocumentAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadDocumentAction, block)
+suspend fun <T> TelegramBot.withFindLocationAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, FindLocationAction, block)
+suspend fun <T> TelegramBot.withRecordVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, RecordVideoNoteAction, block)
+suspend fun <T> TelegramBot.withUploadVideoNoteAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, UploadVideoNoteAction, block)
+suspend fun <T> TelegramBot.withChooseStickerAction(chatId: ChatId, block: TelegramBotActionCallback<T>) = withAction(chatId, ChooseStickerAction, block)


-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withTypingAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, TypingAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadPhotoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadPhotoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, RecordVideoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadVideoAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, RecordVoiceAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadVoiceAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadDocumentAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadDocumentAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withFindLocationAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, FindLocationAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withRecordVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, RecordVideoNoteAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withUploadVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, UploadVideoNoteAction, block)
-}
-@OptIn(ExperimentalContracts::class)
-suspend fun <T> TelegramBot.withChooseStickerAction(chat: Chat, block: TelegramBotActionCallback<T>) : T {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return withAction(chat, ChooseStickerAction, block)
-}
+suspend fun <T> TelegramBot.withTypingAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, TypingAction, block)
+suspend fun <T> TelegramBot.withUploadPhotoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadPhotoAction, block)
+suspend fun <T> TelegramBot.withRecordVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVideoAction, block)
+suspend fun <T> TelegramBot.withUploadVideoAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVideoAction, block)
+suspend fun <T> TelegramBot.withRecordVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVoiceAction, block)
+suspend fun <T> TelegramBot.withUploadVoiceAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVoiceAction, block)
+suspend fun <T> TelegramBot.withUploadDocumentAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadDocumentAction, block)
+suspend fun <T> TelegramBot.withFindLocationAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, FindLocationAction, block)
+suspend fun <T> TelegramBot.withRecordVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, RecordVideoNoteAction, block)
+suspend fun <T> TelegramBot.withUploadVideoNoteAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, UploadVideoNoteAction, block)
+suspend fun <T> TelegramBot.withChooseStickerAction(chat: Chat, block: TelegramBotActionCallback<T>) = withAction(chat, ChooseStickerAction, block)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendLocation.kt
@@ -18,7 +18,6 @@ suspend fun TelegramBot.sendLocation(
    longitude: Double,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyToMessageId: MessageIdentifier? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = execute(
@@ -28,7 +27,6 @@ suspend fun TelegramBot.sendLocation(
        longitude,
        disableNotification = disableNotification,
        protectContent = protectContent,
-        allowSendingWithoutReply = allowSendingWithoutReply,
        replyToMessageId = replyToMessageId,
        replyMarkup = replyMarkup
    )
@@ -43,7 +41,6 @@ suspend fun TelegramBot.sendLocation(
    location: StaticLocation,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyToMessageId: MessageIdentifier? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
@@ -52,7 +49,6 @@ suspend fun TelegramBot.sendLocation(
    location.longitude,
    disableNotification,
    protectContent,
-    allowSendingWithoutReply,
    replyToMessageId,
    replyMarkup
 )
@@ -67,7 +63,6 @@ suspend fun TelegramBot.sendLocation(
    longitude: Double,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyToMessageId: MessageIdentifier? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
@@ -76,7 +71,6 @@ suspend fun TelegramBot.sendLocation(
    longitude,
    disableNotification,
    protectContent,
-    allowSendingWithoutReply,
    replyToMessageId,
    replyMarkup
 )
@@ -90,7 +84,6 @@ suspend fun TelegramBot.sendLocation(
    location: StaticLocation,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyToMessageId: MessageIdentifier? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = sendLocation(
@@ -99,7 +92,6 @@ suspend fun TelegramBot.sendLocation(
    location.longitude,
    disableNotification,
    protectContent,
-    allowSendingWithoutReply,
    replyToMessageId,
    replyMarkup
 )
@@ -114,10 +106,9 @@ suspend fun TelegramBot.sendStaticLocation(
    longitude: Double,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyToMessageId: MessageIdentifier? = null,
    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chatId, latitude, longitude, disableNotification, protectContent, allowSendingWithoutReply, replyToMessageId, replyMarkup)
+) = sendLocation(chatId, latitude, longitude, disableNotification, protectContent, replyToMessageId, replyMarkup)

 /**
 * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -128,10 +119,9 @@ suspend fun TelegramBot.sendStaticLocation(
    location: StaticLocation,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyToMessageId: MessageIdentifier? = null,
    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chatId, location.latitude, location.longitude, disableNotification, protectContent, allowSendingWithoutReply, replyToMessageId, replyMarkup)
+) = sendLocation(chatId, location.latitude, location.longitude, disableNotification, protectContent, replyToMessageId, replyMarkup)

 /**
 * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -143,10 +133,9 @@ suspend fun TelegramBot.sendStaticLocation(
    longitude: Double,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyToMessageId: MessageIdentifier? = null,
    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chat.id, latitude, longitude, disableNotification, protectContent, allowSendingWithoutReply, replyToMessageId, replyMarkup)
+) = sendLocation(chat.id, latitude, longitude, disableNotification, protectContent, replyToMessageId, replyMarkup)

 /**
 * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -157,7 +146,6 @@ suspend fun TelegramBot.sendStaticLocation(
    location: StaticLocation,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    allowSendingWithoutReply: Boolean? = null,
    replyToMessageId: MessageIdentifier? = null,
    replyMarkup: KeyboardMarkup? = null
-) = sendLocation(chat.id, location.latitude, location.longitude, disableNotification, protectContent, allowSendingWithoutReply, replyToMessageId, replyMarkup)
+) = sendLocation(chat.id, location.latitude, location.longitude, disableNotification, protectContent, replyToMessageId, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
@@ -6,12 +6,8 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.*
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.content.media.MediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.media.VisualMediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.media.AudioContent
-import dev.inmo.tgbotapi.types.message.content.media.DocumentContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.utils.RiskFeature
-import kotlin.jvm.JvmName

 /**
 * @see SendMediaGroup
@@ -45,38 +41,6 @@ suspend fun TelegramBot.sendMediaGroup(
    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
 )

-/**
- * @see SendMediaGroup
- */
-@RiskFeature(rawSendingMediaGroupsWarning)
-@JvmName("sendMedaGroupByContent")
-suspend fun TelegramBot.sendMediaGroup(
-    chatId: ChatIdentifier,
-    media: List<MediaGroupContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendMediaGroup(
-    chatId, media.map { it.toMediaGroupMemberInputMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendMediaGroup
- */
-@RiskFeature(rawSendingMediaGroupsWarning)
-@JvmName("sendMedaGroupByContent")
-suspend fun TelegramBot.sendMediaGroup(
-    chat: Chat,
-    media: List<MediaGroupContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendMediaGroup(
-    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
 /**
 * @see SendPlaylist
 */
@@ -107,36 +71,6 @@ suspend fun TelegramBot.sendPlaylist(
    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
 )

-/**
- * @see SendPlaylist
- */
-@JvmName("sendPlaylistByContent")
-suspend fun TelegramBot.sendPlaylist(
-    chatId: ChatIdentifier,
-    media: List<AudioContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendPlaylist(
-    chatId, media.map { it.toMediaGroupMemberInputMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendPlaylist
- */
-@JvmName("sendPlaylistByContent")
-suspend fun TelegramBot.sendPlaylist(
-    chat: Chat,
-    media: List<AudioContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendPlaylist(
-    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
 /**
 * @see SendDocumentsGroup
 */
@@ -167,36 +101,6 @@ suspend fun TelegramBot.sendDocumentsGroup(
    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
 )

-/**
- * @see SendDocumentsGroup
- */
-@JvmName("sendDocumentsByContent")
-suspend fun TelegramBot.sendDocumentsGroup(
-    chatId: ChatIdentifier,
-    media: List<DocumentContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendDocumentsGroup(
-    chatId, media.map { it.toMediaGroupMemberInputMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendDocumentsGroup
- */
-@JvmName("sendDocumentsByContent")
-suspend fun TelegramBot.sendDocumentsGroup(
-    chat: Chat,
-    media: List<DocumentContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendDocumentsGroup(
-    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
 /**
 * @see SendVisualMediaGroup
 */
@@ -226,33 +130,3 @@ suspend fun TelegramBot.sendVisualMediaGroup(
 ) = sendVisualMediaGroup(
    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
 )
-
-/**
- * @see SendVisualMediaGroup
- */
-@JvmName("sendVisualMediaGroupByContent")
-suspend fun TelegramBot.sendVisualMediaGroup(
-    chatId: ChatIdentifier,
-    media: List<VisualMediaGroupContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendVisualMediaGroup(
-    chatId, media.map { it.toMediaGroupMemberInputMedia() }, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
-
-/**
- * @see SendVisualMediaGroup
- */
-@JvmName("sendVisualMediaGroupByContent")
-suspend fun TelegramBot.sendVisualMediaGroup(
-    chat: Chat,
-    media: List<VisualMediaGroupContent>,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null
-) = sendVisualMediaGroup(
-    chat.id, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendPhoto.kt
@@ -9,7 +9,8 @@ import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.*
+import dev.inmo.tgbotapi.types.files.Photo
+import dev.inmo.tgbotapi.types.files.biggest

 /**
 * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -87,38 +88,6 @@ suspend fun TelegramBot.sendPhoto(
    replyMarkup: KeyboardMarkup? = null
 ) = sendPhoto(chat.id, photo, text, parseMode, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)

-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendPhoto(
-    chatId: ChatIdentifier,
-    photoSize: PhotoSize,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photoSize.fileId, text, parseMode, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend fun TelegramBot.sendPhoto(
-    chat: Chat,
-    photoSize: PhotoSize,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, photoSize, text, parseMode, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-

 /**
 * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
@@ -190,33 +159,3 @@ suspend inline fun TelegramBot.sendPhoto(
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = sendPhoto(chat.id, photo, entities, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendPhoto(
-    chatId: ChatIdentifier,
-    photoSize: PhotoSize,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chatId, photoSize.fileId, entities, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-suspend inline fun TelegramBot.sendPhoto(
-    chat: Chat,
-    photoSize: PhotoSize,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = sendPhoto(chat.id, photoSize, entities, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt
@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.Sticker

 /**
 * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddVideoStickerToSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/AddVideoStickerToSet.kt
@@ -1,90 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.requests.stickers.AddVideoStickerToSet
-import dev.inmo.tgbotapi.types.CommonUser
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.stickers.MaskPosition
-import dev.inmo.tgbotapi.types.stickers.StickerSet
-
-suspend fun TelegramBot.addVideoStickerToSet(
-    userId: UserId,
-    stickerSetName: String,
-    sticker: FileId,
-    emojis: String,
-    maskPosition: MaskPosition? = null
-) = execute(
-    AddVideoStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
-)
-
-suspend fun TelegramBot.addVideoStickerToSet(
-    userId: UserId,
-    stickerSetName: String,
-    sticker: MultipartFile,
-    emojis: String,
-    maskPosition: MaskPosition? = null
-) = execute(
-    AddVideoStickerToSet(userId, stickerSetName, sticker, emojis, maskPosition)
-)
-
-suspend fun TelegramBot.addVideoStickerToSet(
-    user: CommonUser,
-    stickerSetName: String,
-    sticker: FileId,
-    emojis: String,
-    maskPosition: MaskPosition? = null
-) = addVideoStickerToSet(
-    user.id, stickerSetName, sticker, emojis, maskPosition
-)
-
-suspend fun TelegramBot.addVideoStickerToSet(
-    user: CommonUser,
-    stickerSetName: String,
-    sticker: MultipartFile,
-    emojis: String,
-    maskPosition: MaskPosition? = null
-) = addVideoStickerToSet(
-    user.id, stickerSetName, sticker, emojis, maskPosition
-)
-
-suspend fun TelegramBot.addVideoStickerToSet(
-    userId: UserId,
-    stickerSet: StickerSet,
-    sticker: FileId,
-    emojis: String,
-    maskPosition: MaskPosition? = null
-) = addVideoStickerToSet(
-    userId, stickerSet.name, sticker, emojis, maskPosition
-)
-
-suspend fun TelegramBot.addVideoStickerToSet(
-    userId: UserId,
-    stickerSet: StickerSet,
-    sticker: MultipartFile,
-    emojis: String,
-    maskPosition: MaskPosition? = null
-) = addVideoStickerToSet(
-    userId, stickerSet.name, sticker, emojis, maskPosition
-)
-
-suspend fun TelegramBot.addVideoStickerToSet(
-    user: CommonUser,
-    stickerSet: StickerSet,
-    sticker: FileId,
-    emojis: String,
-    maskPosition: MaskPosition? = null
-) = addVideoStickerToSet(
-    user.id, stickerSet.name, sticker, emojis, maskPosition
-)
-
-suspend fun TelegramBot.addVideoStickerToSet(
-    user: CommonUser,
-    stickerSet: StickerSet,
-    sticker: MultipartFile,
-    emojis: String,
-    maskPosition: MaskPosition? = null
-) = addVideoStickerToSet(
-    user.id, stickerSet.name, sticker, emojis, maskPosition
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewAnimatedStickerSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewAnimatedStickerSet.kt
@@ -11,48 +11,44 @@ import dev.inmo.tgbotapi.types.stickers.MaskPosition
 suspend fun TelegramBot.createNewAnimatedStickerSet(
    userId: UserId,
    name: String,
-    title: String,
    sticker: FileId,
    emojis: String,
    containsMasks: Boolean? = null,
    maskPosition: MaskPosition? = null
 ) = execute(
-    CreateNewAnimatedStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+    CreateNewAnimatedStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
 )

 suspend fun TelegramBot.createNewAnimatedStickerSet(
    userId: UserId,
    name: String,
-    title: String,
    sticker: MultipartFile,
    emojis: String,
    containsMasks: Boolean? = null,
    maskPosition: MaskPosition? = null
 ) = execute(
-    CreateNewAnimatedStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+    CreateNewAnimatedStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
 )


 suspend fun TelegramBot.createNewAnimatedStickerSet(
    user: CommonUser,
    name: String,
-    title: String,
    sticker: FileId,
    emojis: String,
    containsMasks: Boolean? = null,
    maskPosition: MaskPosition? = null
 ) = createNewAnimatedStickerSet(
-    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+    user.id, name, sticker, emojis, containsMasks, maskPosition
 )

 suspend fun TelegramBot.createNewAnimatedStickerSet(
    user: CommonUser,
    name: String,
-    title: String,
    sticker: MultipartFile,
    emojis: String,
    containsMasks: Boolean? = null,
    maskPosition: MaskPosition? = null
 ) = createNewAnimatedStickerSet(
-    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+    user.id, name, sticker, emojis, containsMasks, maskPosition
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStaticStickerSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewStaticStickerSet.kt
@@ -11,48 +11,44 @@ import dev.inmo.tgbotapi.types.stickers.MaskPosition
 suspend fun TelegramBot.createNewStaticStickerSet(
    userId: UserId,
    name: String,
-    title: String,
    sticker: FileId,
    emojis: String,
    containsMasks: Boolean? = null,
    maskPosition: MaskPosition? = null
 ) = execute(
-    CreateNewStaticStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+    CreateNewStaticStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
 )

 suspend fun TelegramBot.createNewStaticStickerSet(
    userId: UserId,
    name: String,
-    title: String,
    sticker: MultipartFile,
    emojis: String,
    containsMasks: Boolean? = null,
    maskPosition: MaskPosition? = null
 ) = execute(
-    CreateNewStaticStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
+    CreateNewStaticStickerSet(userId, name, sticker, emojis, containsMasks, maskPosition)
 )


 suspend fun TelegramBot.createNewStaticStickerSet(
    user: CommonUser,
    name: String,
-    title: String,
    sticker: FileId,
    emojis: String,
    containsMasks: Boolean? = null,
    maskPosition: MaskPosition? = null
 ) = createNewStaticStickerSet(
-    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+    user.id, name, sticker, emojis, containsMasks, maskPosition
 )

 suspend fun TelegramBot.createNewStaticStickerSet(
    user: CommonUser,
    name: String,
-    title: String,
    sticker: MultipartFile,
    emojis: String,
    containsMasks: Boolean? = null,
    maskPosition: MaskPosition? = null
 ) = createNewStaticStickerSet(
-    user.id, name, title, sticker, emojis, containsMasks, maskPosition
+    user.id, name, sticker, emojis, containsMasks, maskPosition
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewVideoStickerSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/CreateNewVideoStickerSet.kt
@@ -1,58 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.stickers
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.requests.stickers.CreateNewVideoStickerSet
-import dev.inmo.tgbotapi.types.CommonUser
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.stickers.MaskPosition
-
-suspend fun TelegramBot.createNewVideoStickerSet(
-    userId: UserId,
-    name: String,
-    title: String,
-    sticker: FileId,
-    emojis: String,
-    containsMasks: Boolean? = null,
-    maskPosition: MaskPosition? = null
-) = execute(
-    CreateNewVideoStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
-)
-
-suspend fun TelegramBot.createNewVideoStickerSet(
-    userId: UserId,
-    name: String,
-    title: String,
-    sticker: MultipartFile,
-    emojis: String,
-    containsMasks: Boolean? = null,
-    maskPosition: MaskPosition? = null
-) = execute(
-    CreateNewVideoStickerSet(userId, name, title, sticker, emojis, containsMasks, maskPosition)
-)
-
-
-suspend fun TelegramBot.createNewVideoStickerSet(
-    user: CommonUser,
-    name: String,
-    title: String,
-    sticker: FileId,
-    emojis: String,
-    containsMasks: Boolean? = null,
-    maskPosition: MaskPosition? = null
-) = createNewVideoStickerSet(
-    user.id, name, title, sticker, emojis, containsMasks, maskPosition
-)
-
-suspend fun TelegramBot.createNewVideoStickerSet(
-    user: CommonUser,
-    name: String,
-    title: String,
-    sticker: MultipartFile,
-    emojis: String,
-    containsMasks: Boolean? = null,
-    maskPosition: MaskPosition? = null
-) = createNewVideoStickerSet(
-    user.id, name, title, sticker, emojis, containsMasks, maskPosition
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerFromSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerFromSet.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.stickers
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.stickers.DeleteStickerFromSet
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.Sticker

 suspend fun TelegramBot.deleteStickerFromSet(
    sticker: FileId
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerPositionInSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerPositionInSet.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.stickers
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.stickers.SetStickerPositionInSet
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.Sticker

 suspend fun TelegramBot.setStickerPositionInSet(
    sticker: FileId,
--- a/tgbotapi.behaviour_builder.fsm/build.gradle
+++ b/tgbotapi.behaviour_builder.fsm/build.gradle
@@ -17,9 +17,8 @@ plugins {

 project.version = "$library_version"
 project.group = "$library_group"
-project.description = "Behaviour Builder extension with built-in FSM"

-apply from: "../publish.gradle"
+apply from: "publish.gradle"

 repositories {
    mavenLocal()
--- a/tgbotapi.behaviour_builder.fsm/publish.gradle
+++ b/tgbotapi.behaviour_builder.fsm/publish.gradle
@@ -0,0 +1,79 @@
+apply plugin: 'maven-publish'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "FSM extension for dev.inmo:tgbotapi.extensions.behaviour_builder.fsm"
+            name = "Telegram Bot Behaviour Builder FSM Extensions"
+            url = "https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.behaviour_builder"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+        repositories {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
+                }
+            }
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
+                }
+            }
+        }
+    }
+}
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}
--- a/tgbotapi.behaviour_builder.fsm/publish.kpsb
+++ b/tgbotapi.behaviour_builder.fsm/publish.kpsb
@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot Behaviour Builder FSM Extensions","description":"FSM extension for dev.inmo:tgbotapi.extensions.behaviour_builder.fsm","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.behaviour_builder","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM.kt
@@ -6,12 +6,9 @@ import dev.inmo.micro_utils.fsm.common.*
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.micro_utils.coroutines.accumulatorFlow
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.handlers_registrar.TriggersHolder
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.*
-import kotlin.jvm.JvmName
-import kotlin.reflect.KClass

 /**
 * Interface which combine [BehaviourContext] and [StatesMachine]. Subcontext of triggers and states contexts must have
@@ -29,38 +26,16 @@ interface BehaviourContextWithFSM<T : State> : BehaviourContext, StatesMachine<T
        handlers: List<BehaviourWithFSMStateHandlerHolder<*, T>>
    ): T? {
        return handlers.firstOrNull { it.checkHandleable(state) } ?.run {
-            doInSubContext(updatesUpstreamFlow = contextUpdatesFlow) {
-                handleState(state)
-            }
+            handleState(contextUpdatesFlow, state)
        }
    }

-    /**
-     * Add NON STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Non strict means that
-     * for input [State] will be used [KClass.isInstance] and any inheritor of [kClass] will pass this requirement
-     *
-     * @see BehaviourWithFSMStateHandlerHolder
-     * @see onStateOrSubstate
-     */
-    fun <I : T> add(kClass: KClass<I>, strict: Boolean = false, handler: BehaviourWithFSMStateHandler<I, T>)
-
-    /**
-     * Add STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Strict means that
-     * for input [State] will be used [State]::class == [kClass] and any [State] with exactly the same type will pass
-     * requirements
-     *
-     * @see BehaviourWithFSMStateHandlerHolder
-     * @see strictlyOn
-     */
-    fun <I : T> addStrict(kClass: KClass<I>, handler: BehaviourWithFSMStateHandler<I, T>) = add(kClass, strict = true, handler)
-
    override fun copy(
        bot: TelegramBot,
        scope: CoroutineScope,
        broadcastChannelsSize: Int,
        onBufferOverflow: BufferOverflow,
        upstreamUpdatesFlow: Flow<Update>?,
-        triggersHolder: TriggersHolder,
        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?
    ): BehaviourContextWithFSM<T>

@@ -73,28 +48,6 @@ interface BehaviourContextWithFSM<T : State> : BehaviourContext, StatesMachine<T
    }
 }

-
-/**
- * Add NON STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Non strict means that
- * for input [State] will be used [KClass.isInstance] and any inheritor of [kClass] will pass this requirement
- *
- * @see BehaviourWithFSMStateHandlerHolder
- * @see BehaviourContextWithFSM.add
- */
-@Suppress("MemberVisibilityCanBePrivate")
-inline fun <reified I : O, O: State> BehaviourContextWithFSM<O>.onStateOrSubstate(handler: BehaviourWithFSMStateHandler<I, O>) = add(I::class, strict = false, handler)
-
-/**
- * Add STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Strict means that
- * for input [State] will be used [State]::class == [kClass] and any [State] with exactly the same type will pass
- * requirements
- *
- * @see BehaviourWithFSMStateHandlerHolder
- * @see BehaviourContextWithFSM.addStrict
- */
-@Suppress("MemberVisibilityCanBePrivate")
-inline fun <reified I : O, O: State> BehaviourContextWithFSM<O>.strictlyOn(handler: BehaviourWithFSMStateHandler<I, O>) = addStrict(I::class, handler)
-
 /**
 * Default realization of [BehaviourContextWithFSM]. It uses [behaviourContext] as a base for this object as
 * [BehaviourContext], but managing substates contexts updates for avoiding of updates lost between states
@@ -105,9 +58,6 @@ class DefaultBehaviourContextWithFSM<T : State>(
    private val handlers: List<BehaviourWithFSMStateHandlerHolder<*, T>>
 ) : BehaviourContext by behaviourContext, BehaviourContextWithFSM<T> {
    private val updatesFlows = mutableMapOf<Any, Flow<Update>>()
-    private val additionalHandlers = mutableListOf<BehaviourWithFSMStateHandlerHolder<*, T>>()
-    private var actualHandlersList = additionalHandlers + handlers
-
    private fun getContextUpdatesFlow(context: Any) = updatesFlows.getOrPut(context) {
        allUpdatesFlow.accumulatorFlow(scope)
    }
@@ -115,17 +65,12 @@ class DefaultBehaviourContextWithFSM<T : State>(
    override suspend fun StatesMachine<in T>.handleState(state: T): T? = launchStateHandling(
        state,
        allUpdatesFlow,
-        actualHandlersList
+        handlers
    )

-    override fun <I : T> add(kClass: KClass<I>, strict: Boolean, handler: BehaviourWithFSMStateHandler<I, T>) {
-        additionalHandlers.add(BehaviourWithFSMStateHandlerHolder(kClass, strict, handler))
-        actualHandlersList = additionalHandlers + handlers
-    }
-
    override fun start(scope: CoroutineScope): Job = scope.launchSafelyWithoutExceptions {
        val statePerformer: suspend (T) -> Unit = { state: T ->
-            val newState = launchStateHandling(state, getContextUpdatesFlow(state.context), actualHandlersList)
+            val newState = launchStateHandling(state, getContextUpdatesFlow(state.context), handlers)
            if (newState != null) {
                statesManager.update(state, newState)
            } else {
@@ -149,26 +94,6 @@ class DefaultBehaviourContextWithFSM<T : State>(
            launch { statePerformer(it) }
        }
    }
-    /**
-     * Add NON STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Non strict means that
-     * for input [State] will be used [KClass.isInstance] and any inheritor of [kClass] will pass this requirement
-     *
-     * @see BehaviourWithFSMStateHandlerHolder
-     * @see BehaviourContextWithFSM.add
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    inline fun <reified I : T> onStateOrSubstate(handler: BehaviourWithFSMStateHandler<I, T>) = add(I::class, strict = false, handler)
-
-    /**
-     * Add STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Strict means that
-     * for input [State] will be used [State]::class == [kClass] and any [State] with exactly the same type will pass
-     * requirements
-     *
-     * @see BehaviourWithFSMStateHandlerHolder
-     * @see BehaviourContextWithFSM.addStrict
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    inline fun <reified I : T> strictlyOn(handler: BehaviourWithFSMStateHandler<I, T>) = addStrict(I::class, handler)

    override suspend fun startChain(state: T) {
        statesManager.startChain(state)
@@ -180,10 +105,9 @@ class DefaultBehaviourContextWithFSM<T : State>(
        broadcastChannelsSize: Int,
        onBufferOverflow: BufferOverflow,
        upstreamUpdatesFlow: Flow<Update>?,
-        triggersHolder: TriggersHolder,
        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?
-    ): DefaultBehaviourContextWithFSM<T> = BehaviourContextWithFSM(
-        behaviourContext.copy(bot, scope, broadcastChannelsSize, onBufferOverflow, upstreamUpdatesFlow, triggersHolder, updatesFilter),
+    ): BehaviourContextWithFSM<T> = BehaviourContextWithFSM(
+        behaviourContext.copy(bot, scope, broadcastChannelsSize, onBufferOverflow, upstreamUpdatesFlow, updatesFilter),
        handlers,
        statesManager
    )
--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSMBuilder.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSMBuilder.kt
@@ -14,8 +14,70 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlin.reflect.KClass

-@Deprecated("Will be removed soon")
-typealias BehaviourContextWithFSMBuilder<T> = BehaviourContextWithFSM<T>
+class BehaviourContextWithFSMBuilder<T : State> internal constructor(
+    private val resultBehaviourContext: BehaviourContextWithFSM<T>,
+    private val handlers: MutableList<BehaviourWithFSMStateHandlerHolder<*, T>>
+) : BehaviourContextWithFSM<T> by resultBehaviourContext {
+    internal constructor(
+        baseBehaviourContext: BehaviourContext,
+        statesManager: StatesManager<T> = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
+        handlers: MutableList<BehaviourWithFSMStateHandlerHolder<*, T>> = mutableListOf()
+    ) : this(DefaultBehaviourContextWithFSM(baseBehaviourContext, statesManager, handlers), handlers)
+
+    /**
+     * Add NON STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Non strict means that
+     * for input [State] will be used [KClass.isInstance] and any inheritor of [kClass] will pass this requirement
+     *
+     * @see BehaviourWithFSMStateHandlerHolder
+     * @see onStateOrSubstate
+     */
+    fun <I : T> add(kClass: KClass<I>, handler: BehaviourWithFSMStateHandler<I, T>) {
+        handlers.add(BehaviourWithFSMStateHandlerHolder(kClass, false, handler))
+    }
+
+    /**
+     * Add STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Strict means that
+     * for input [State] will be used [State]::class == [kClass] and any [State] with exactly the same type will pass
+     * requirements
+     *
+     * @see BehaviourWithFSMStateHandlerHolder
+     * @see strictlyOn
+     */
+    fun <I : T> addStrict(kClass: KClass<I>, handler: BehaviourWithFSMStateHandler<I, T>) {
+        handlers.add(BehaviourWithFSMStateHandlerHolder(kClass, true, handler))
+    }
+
+
+    /**
+     * Add NON STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Non strict means that
+     * for input [State] will be used [KClass.isInstance] and any inheritor of [kClass] will pass this requirement
+     *
+     * @see BehaviourWithFSMStateHandlerHolder
+     * @see BehaviourContextWithFSMBuilder.add
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    inline fun <reified I : T> onStateOrSubstate(handler: BehaviourWithFSMStateHandler<I, T>) {
+        add(I::class, handler)
+    }
+
+    /**
+     * Add STRICT [handler] to list of available in future [BehaviourContextWithFSM]. Strict means that
+     * for input [State] will be used [State]::class == [kClass] and any [State] with exactly the same type will pass
+     * requirements
+     *
+     * @see BehaviourWithFSMStateHandlerHolder
+     * @see BehaviourContextWithFSMBuilder.addStrict
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    inline fun <reified I : T> strictlyOn(handler: BehaviourWithFSMStateHandler<I, T>) {
+        addStrict(I::class, handler)
+    }
+
+    /**
+     * Returns completed [resultBehaviourContext], [handlers] and [statesManager]
+     */
+    internal fun build() = resultBehaviourContext
+}

 /**
 * Creates [BehaviourContextWithFSM] via creating of [DefaultBehaviourContext] with [this] as [TelegramBot],
@@ -32,17 +94,17 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSM(
    scope: CoroutineScope = defaultCoroutineScopeProvider(),
    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
    statesManager: StatesManager<T> = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: List<BehaviourWithFSMStateHandlerHolder<*, T>> = listOf(),
-    block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
-): DefaultBehaviourContextWithFSM<T> = BehaviourContextWithFSM(
+    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*, T>> = mutableListOf(),
+    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder<T>, Unit>
+): BehaviourContextWithFSM<T> = BehaviourContextWithFSMBuilder(
    DefaultBehaviourContext(
        this,
        defaultExceptionsHandler ?.let { scope + ContextSafelyExceptionHandler(it) } ?: scope,
        upstreamUpdatesFlow = upstreamUpdatesFlow
    ),
-    presetHandlers,
-    statesManager
-).apply { block() }
+    statesManager,
+    presetHandlers
+).apply { block() }.build()

 /**
 * Use [buildBehaviourWithFSM] to create [BehaviourContextWithFSM] and launch getting of updates
@@ -54,9 +116,9 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
    scope: CoroutineScope = defaultCoroutineScopeProvider(),
    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
    statesManager: StatesManager<T> = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: List<BehaviourWithFSMStateHandlerHolder<*, T>> = listOf(),
-    block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
-): Pair<DefaultBehaviourContextWithFSM<T>, Job> = buildBehaviourWithFSM(
+    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*, T>> = mutableListOf(),
+    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder<T>, Unit>
+): Pair<BehaviourContextWithFSM<T>, Job> = buildBehaviourWithFSM(
    upstreamUpdatesFlow,
    scope,
    defaultExceptionsHandler,
@@ -85,8 +147,8 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
 * @see BehaviourContext
 * @see BehaviourContextWithFSM
 * @see longPolling
- * @see BehaviourContextWithFSM.strictlyOn
- * @see BehaviourContextWithFSM.onStateOrSubstate
+ * @see BehaviourContextWithFSMBuilder.strictlyOn
+ * @see BehaviourContextWithFSMBuilder.onStateOrSubstate
 */
@PreviewFeature
 suspend fun <T : State> TelegramBot.buildBehaviourWithFSM(
@@ -94,17 +156,17 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSM(
    scope: CoroutineScope = defaultCoroutineScopeProvider(),
    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
    statesManager: StatesManager<T> = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: List<BehaviourWithFSMStateHandlerHolder<*, T>> = listOf(),
-    block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
-): DefaultBehaviourContextWithFSM<T> = BehaviourContextWithFSM(
+    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*, T>> = mutableListOf(),
+    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder<T>, Unit>
+): BehaviourContextWithFSM<T> = BehaviourContextWithFSMBuilder(
    DefaultBehaviourContext(
        this,
        defaultExceptionsHandler ?.let { scope + ContextSafelyExceptionHandler(it) } ?: scope,
        upstreamUpdatesFlow = flowUpdatesFilter.allUpdatesFlow
    ),
-    presetHandlers,
-    statesManager
-).apply { block() }
+    statesManager,
+    presetHandlers
+).apply { block() }.build()

 /**
 * Use [buildBehaviourWithFSM] to create [BehaviourContextWithFSM] and launch getting of updates
@@ -114,16 +176,16 @@ suspend fun <T : State> TelegramBot.buildBehaviourWithFSM(
 * @see buildBehaviourWithFSMAndStartLongPolling
 * @see BehaviourContext
 * @see longPolling
- * @see BehaviourContextWithFSM.strictlyOn
- * @see BehaviourContextWithFSM.onStateOrSubstate
+ * @see BehaviourContextWithFSMBuilder.strictlyOn
+ * @see BehaviourContextWithFSMBuilder.onStateOrSubstate
 */
@PreviewFeature
 suspend fun <T : State> TelegramBot.buildBehaviourWithFSMAndStartLongPolling(
    scope: CoroutineScope = defaultCoroutineScopeProvider(),
    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
    statesManager: StatesManager<T> = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: List<BehaviourWithFSMStateHandlerHolder<*, T>> = listOf(),
-    block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
+    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*, T>> = mutableListOf(),
+    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder<T>, Unit>
 ) = FlowsUpdatesFilter().let {
    buildBehaviourWithFSM(
        it,
--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandlerHolder.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandlerHolder.kt
@@ -34,11 +34,20 @@ class BehaviourWithFSMStateHandlerHolder<I : O, O : State>(

    /**
     * Handling of state :)
+     *
+     * @param contextUpdatesFlow This [Flow] will be used as source of updates. By contract, this [Flow] must be common
+     * for all [State]s of incoming [state] [State.context] and for the whole chain inside of [BehaviourContextWithFSM]
     */
    suspend fun BehaviourContextWithFSM<in O>.handleState(
+        contextUpdatesFlow: Flow<Update>,
        state: O
-    ): O? = with(delegateTo) {
-        handleState(state as I)
+    ): O? {
+        val subscope = scope.LinkedSupervisorScope()
+        return with(copy(scope = subscope, upstreamUpdatesFlow = contextUpdatesFlow)) {
+            with(delegateTo) {
+                handleState(state as I)
+            }
+        }
    }
 }

--- a/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBotWithFSM.kt
+++ b/tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBotWithFSM.kt
@@ -37,13 +37,11 @@ suspend fun <T : State> telegramBotWithBehaviourAndFSM(
    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
    statesManager: StatesManager<T> = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: List<BehaviourWithFSMStateHandlerHolder<*, T>> = listOf(),
-    testServer: Boolean = false,
-    block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
+    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*, T>> = mutableListOf(),
+    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder<T>, Unit>
 ): TelegramBot = telegramBot(
    token,
    apiUrl,
-    testServer,
    builder
 ).apply {
    buildBehaviourWithFSMAndStartLongPolling(
@@ -74,14 +72,12 @@ suspend fun <T : State> telegramBotWithBehaviourAndFSMAndStartLongPolling(
    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
    statesManager: StatesManager<T> = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
-    presetHandlers: List<BehaviourWithFSMStateHandlerHolder<*, T>> = listOf(),
-    testServer: Boolean = false,
-    block: CustomBehaviourContextReceiver<DefaultBehaviourContextWithFSM<T>, Unit>
+    presetHandlers: MutableList<BehaviourWithFSMStateHandlerHolder<*, T>> = mutableListOf(),
+    block: CustomBehaviourContextReceiver<BehaviourContextWithFSMBuilder<T>, Unit>
 ): Pair<TelegramBot, Job> {
    return telegramBot(
        token,
        apiUrl,
-        testServer,
        builder
    ).let {
        it to it.buildBehaviourWithFSMAndStartLongPolling (
--- a/tgbotapi.behaviour_builder/build.gradle
+++ b/tgbotapi.behaviour_builder/build.gradle
@@ -17,9 +17,8 @@ plugins {

 project.version = "$library_version"
 project.group = "$library_group"
-project.description = "Behaviour Builder DSL"

-apply from: "../publish.gradle"
+apply from: "publish.gradle"

 repositories {
    mavenLocal()
--- a/tgbotapi.behaviour_builder/mpp_publish_template.kpsb
+++ b/tgbotapi.behaviour_builder/mpp_publish_template.kpsb
@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}
--- a/tgbotapi.behaviour_builder/publish.gradle
+++ b/tgbotapi.behaviour_builder/publish.gradle
@@ -0,0 +1,79 @@
+apply plugin: 'maven-publish'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "This extensions project contains tools for simple interaction with chats"
+            name = "Telegram Bot API Steps Extensions"
+            url = "https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+        repositories {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
+                }
+            }
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
+                }
+            }
+        }
+    }
+}
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}
--- a/tgbotapi.behaviour_builder/publish.kpsb
+++ b/tgbotapi.behaviour_builder/publish.kpsb
@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
@@ -4,9 +4,9 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder

 import dev.inmo.micro_utils.coroutines.*
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.handlers_registrar.TriggersHolder
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.*
@@ -26,7 +26,7 @@ internal inline fun <BC, T, I1, I2> CustomBehaviourContextAndTwoTypesReceiver<BC
 ): CustomBehaviourContextAndTypeReceiver<BC, T, I2> = { invoke(this, i1, it) }

 /**
- * This class contains all necessary tools for work with bots and especially [buildBehaviour]
+ * This class contains all necessary tools for work with bots and especially for [buildBehaviour]
 *
 * @see DefaultBehaviourContext
 */
@@ -47,15 +47,12 @@ interface BehaviourContext : FlowsUpdatesFilter, TelegramBot, CoroutineScope {
    val flowsUpdatesFilter: FlowsUpdatesFilter
        get() = this

-    val triggersHolder: TriggersHolder
-
    fun copy(
        bot: TelegramBot = this.bot,
        scope: CoroutineScope = this.scope,
        broadcastChannelsSize: Int = 100,
        onBufferOverflow: BufferOverflow = BufferOverflow.SUSPEND,
        upstreamUpdatesFlow: Flow<Update>? = null,
-        triggersHolder: TriggersHolder = TriggersHolder(),
        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>? = null
    ): BehaviourContext
 }
@@ -66,7 +63,6 @@ class DefaultBehaviourContext(
    broadcastChannelsSize: Int = 100,
    onBufferOverflow: BufferOverflow = BufferOverflow.SUSPEND,
    private val upstreamUpdatesFlow: Flow<Update>? = null,
-    override val triggersHolder: TriggersHolder = TriggersHolder(),
    private val updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>? = null
 ) : AbstractFlowsUpdatesFilter(), TelegramBot by bot, CoroutineScope by scope, BehaviourContext {

@@ -93,25 +89,22 @@ class DefaultBehaviourContext(
        broadcastChannelsSize: Int,
        onBufferOverflow: BufferOverflow,
        upstreamUpdatesFlow: Flow<Update>?,
-        triggersHolder: TriggersHolder,
        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?
-    ): DefaultBehaviourContext = DefaultBehaviourContext(bot, scope, broadcastChannelsSize, onBufferOverflow, upstreamUpdatesFlow, triggersHolder, updatesFilter)
+    ): BehaviourContext = DefaultBehaviourContext(bot, scope, broadcastChannelsSize, onBufferOverflow, upstreamUpdatesFlow, updatesFilter)
 }

 fun BehaviourContext(
    bot: TelegramBot,
    scope: CoroutineScope,
-    flowsUpdatesFilter: FlowsUpdatesFilter = FlowsUpdatesFilter(),
-    triggersHolder: TriggersHolder = TriggersHolder(),
-) = DefaultBehaviourContext(bot, scope, upstreamUpdatesFlow = flowsUpdatesFilter.allUpdatesFlow, triggersHolder = triggersHolder)
+    flowsUpdatesFilter: FlowsUpdatesFilter = FlowsUpdatesFilter()
+) = DefaultBehaviourContext(bot, scope, upstreamUpdatesFlow = flowsUpdatesFilter.allUpdatesFlow)

 inline fun <T> BehaviourContext(
    bot: TelegramBot,
    scope: CoroutineScope,
    flowsUpdatesFilter: FlowsUpdatesFilter = FlowsUpdatesFilter(),
-    triggersHolder: TriggersHolder = TriggersHolder(),
    crossinline block: BehaviourContext.() -> T
-) = DefaultBehaviourContext(bot, scope, upstreamUpdatesFlow = flowsUpdatesFilter.allUpdatesFlow, triggersHolder = triggersHolder).run(block)
+) = DefaultBehaviourContext(bot, scope, upstreamUpdatesFlow = flowsUpdatesFilter.allUpdatesFlow).run(block)

 /**
 * Creates new one [BehaviourContext], adding subsequent [FlowsUpdatesFilter] in case [updatesFilter] is provided and
@@ -122,23 +115,20 @@ suspend fun <T, BC : BehaviourContext> BC.doInSubContextWithUpdatesFilter(
    stopOnCompletion: Boolean = true,
    updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
    scope: CoroutineScope = LinkedSupervisorScope(),
-    triggersHolder: TriggersHolder = this.triggersHolder,
    behaviourContextReceiver: CustomBehaviourContextReceiver<BC, T>
-): T {
-    val newContext = copy(
-        scope = scope,
-        updatesFilter = updatesFilter ?.let { _ ->
-            {
-                (this as? BC) ?.run {
-                    updatesFilter(it)
-                } ?: true
-            }
-        },
-        upstreamUpdatesFlow = updatesUpstreamFlow,
-        triggersHolder = triggersHolder
-    ) as BC
-    return withContext(currentCoroutineContext()) {
-        newContext.behaviourContextReceiver().also { if (stopOnCompletion) newContext.stop() }
+): T = copy(
+    scope = scope,
+    updatesFilter = updatesFilter ?.let { _ ->
+        {
+            (this as? BC) ?.run {
+                updatesFilter(it)
+            } ?: true
+        }
+    },
+    upstreamUpdatesFlow = updatesUpstreamFlow
+).run {
+    withContext(coroutineContext) {
+        behaviourContextReceiver().also { if (stopOnCompletion) stop() }
    }
 }

@@ -146,9 +136,8 @@ suspend fun <T> BehaviourContext.doInSubContext(
    stopOnCompletion: Boolean = true,
    updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
    scope: CoroutineScope = LinkedSupervisorScope(),
-    triggersHolder: TriggersHolder = this.triggersHolder,
    behaviourContextReceiver: BehaviourContextReceiver<T>
-) = doInSubContextWithUpdatesFilter(updatesFilter = null, stopOnCompletion, updatesUpstreamFlow, scope, triggersHolder, behaviourContextReceiver)
+) = doInSubContextWithUpdatesFilter(updatesFilter = null, stopOnCompletion, updatesUpstreamFlow, scope, behaviourContextReceiver)

 /**
 * This method will cancel ALL subsequent contexts, expectations and waiters
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBot.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/TelegramBot.kt
@@ -30,12 +30,10 @@ suspend fun telegramBotWithBehaviour(
    apiUrl: String = telegramBotAPIDefaultUrl,
    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    testServer: Boolean = false,
    block: BehaviourContextReceiver<Unit>
 ): TelegramBot = telegramBot(
    token,
    apiUrl,
-    testServer,
    builder
 ).apply {
    buildBehaviour(
@@ -65,13 +63,11 @@ suspend fun telegramBotWithBehaviourAndLongPolling(
    apiUrl: String = telegramBotAPIDefaultUrl,
    builder: KtorRequestsExecutorBuilder.() -> Unit = {},
    defaultExceptionsHandler: ExceptionHandler<Unit>? = null,
-    testServer: Boolean = false,
    block: BehaviourContextReceiver<Unit>
 ): Pair<TelegramBot, Job> {
    return telegramBot(
        token,
        apiUrl,
-        testServer,
        builder
    ).let {
        it to it.buildBehaviourWithLongPolling(
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatJoinRequest.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChatJoinRequest.kt
@@ -2,9 +2,11 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations

 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asChatJoinRequestUpdate
+import dev.inmo.tgbotapi.extensions.utils.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.ChatJoinRequest
+import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery
+import dev.inmo.tgbotapi.types.payments.ShippingQuery
 import kotlinx.coroutines.flow.toList

 typealias ChatJoinRequestsMapper = suspend ChatJoinRequest.() -> ChatJoinRequest?
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChosenInlineResult.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitChosenInlineResult.kt
@@ -2,9 +2,10 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations

 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asChosenInlineResultUpdate
+import dev.inmo.tgbotapi.extensions.utils.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.*
+import dev.inmo.tgbotapi.types.polls.*
 import kotlinx.coroutines.flow.toList

 typealias ChosenInlineResultMapper<T> = suspend T.() -> T?
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
@@ -9,18 +9,18 @@ import dev.inmo.tgbotapi.extensions.utils.withContent
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.media.*
 import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
 import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.toList
+import kotlin.reflect.KClass

 typealias CommonMessageToContentMapper<T> = suspend CommonMessage<T>.() -> T?

-private suspend fun <O> BehaviourContext.waitCommonContent(
+private suspend fun <O> BehaviourContext.waitCommonMessage(
    count: Int = 1,
    initRequest: Request<*>? = null,
    includeMediaGroups: Boolean = true,
@@ -74,7 +74,7 @@ private suspend inline fun <reified T : MessageContent> BehaviourContext.waitCon
    noinline errorFactory: NullableRequestBuilder<*> = { null },
    noinline filter: SimpleFilter<CommonMessage<T>>? = null,
    noinline mapper: CommonMessageToContentMapper<T>? = null
-) : List<T> = waitCommonContent<T>(
+) : List<T> = waitCommonMessage<T>(
    count,
    initRequest,
    includeMediaGroups,
@@ -87,8 +87,7 @@ private suspend inline fun <reified T : MessageContent> BehaviourContext.waitCon
    contentConverter(mapper)
 ).toList()

-
-suspend fun BehaviourContext.waitContent(
+suspend fun BehaviourContext.waitContentMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
@@ -199,14 +198,6 @@ suspend fun BehaviourContext.waitVisualMediaGroupContent(
    filter: SimpleFilter<CommonMessage<VisualMediaGroupContent>>? = null,
    mapper: CommonMessageToContentMapper<VisualMediaGroupContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitTextedMediaContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<TextedMediaContent>>? = null,
-    mapper: CommonMessageToContentMapper<TextedMediaContent>? = null
-) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
 suspend fun BehaviourContext.waitAnimation(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContentMessage.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContentMessage.kt
@@ -1,278 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
-
-import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
-import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.withContent
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-import dev.inmo.tgbotapi.types.message.content.media.*
-import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
-import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.toList
-
-typealias CommonMessageToCommonMessageMapper<T> = suspend CommonMessage<T>.() -> CommonMessage<T>?
-
-internal suspend fun <O : MessageContent> BehaviourContext.waitCommonMessage(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    includeMediaGroups: Boolean = true,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    filter: SimpleFilter<CommonMessage<MessageContent>>? = null,
-    mapper: suspend CommonMessage<MessageContent>.() -> CommonMessage<O>?
-): Flow<CommonMessage<O>> = expectFlow(
-    initRequest,
-    count,
-    errorFactory
-) {
-    val messages = when (it) {
-        is SentMediaGroupUpdate -> {
-            if (includeMediaGroups) {
-                it.data.map { it as CommonMessage<MessageContent> }
-            } else {
-                emptyList()
-            }
-        }
-        is BaseSentMessageUpdate -> listOf(it.data)
-        else -> return@expectFlow emptyList()
-    }
-    messages.mapNotNull { message ->
-        val asCommonMessage = message as CommonMessage<MessageContent>
-        if (filter == null || filter(asCommonMessage)) {
-            asCommonMessage.mapper()
-        } else {
-            null
-        }
-    }
-}
-
-internal inline fun <reified T : MessageContent> contentMessageConverter(
-    noinline mapper: CommonMessageToCommonMessageMapper<T>? = null
-): suspend CommonMessage<MessageContent>.() -> CommonMessage<T>? = mapper ?.let {
-    {
-        if (content is T) {
-            @Suppress("UNCHECKED_CAST")
-            val message = (this as CommonMessage<T>)
-            safelyWithoutExceptions { mapper(message) }
-        } else {
-            null
-        }
-    }
-} ?: {
-    @Suppress("UNCHECKED_CAST")
-    if (content is T) this as CommonMessage<T> else null
-}
-
-private suspend inline fun <reified T : MessageContent> BehaviourContext.waitContentMessage(
-    count: Int = 1,
-    initRequest: Request<*>? = null,
-    includeMediaGroups: Boolean = true,
-    noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<CommonMessage<T>>? = null,
-    noinline mapper: CommonMessageToCommonMessageMapper<T>? = null
-) : List<CommonMessage<T>> = waitCommonMessage<T>(
-    count,
-    initRequest,
-    includeMediaGroups,
-    errorFactory,
-    filter ?.let {
-        {
-            it.withContent<T>() ?.let { filter(it) } == true
-        }
-    },
-    contentMessageConverter(mapper)
-).toList()
-
-suspend fun BehaviourContext.waitContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<MessageContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<MessageContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitContactMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<ContactContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<ContactContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitDiceMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<DiceContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<DiceContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitGameMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<GameContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<GameContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitLocationMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<LocationContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<LocationContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitLiveLocationMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<LiveLocationContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<LiveLocationContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitStaticLocationMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<StaticLocationContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<StaticLocationContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitPollMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<PollContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<PollContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitTextMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<TextContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<TextContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVenueMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VenueContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<VenueContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitAudioMediaGroupContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<AudioMediaGroupContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<AudioMediaGroupContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitDocumentMediaGroupContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<DocumentMediaGroupContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<DocumentMediaGroupContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitMediaMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<MediaContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<MediaContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitAnyMediaGroupContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<MediaGroupContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<MediaGroupContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVisualMediaGroupContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<VisualMediaGroupContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<VisualMediaGroupContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitTextedMediaContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<TextedMediaContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<TextedMediaContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitAnimationMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<AnimationContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<AnimationContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitAudioMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<AudioContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<AudioContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitDocumentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<DocumentContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<DocumentContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitPhotoMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<PhotoContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<PhotoContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitStickerMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<StickerContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<StickerContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVideoMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = false,
-    filter: SimpleFilter<CommonMessage<VideoContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<VideoContent>? = null
-) = waitContentMessage(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVideoNoteMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VideoNoteContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<VideoNoteContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVoiceMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<VoiceContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<VoiceContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitInvoiceMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<CommonMessage<InvoiceContent>>? = null,
-    mapper: CommonMessageToCommonMessageMapper<InvoiceContent>? = null
-) = waitContentMessage(count, initRequest, false, errorFactory, filter, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEditedContent.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEditedContent.kt
@@ -10,8 +10,7 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.media.*
 import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
 import dev.inmo.tgbotapi.types.update.abstracts.BaseEditMessageUpdate
@@ -174,14 +173,6 @@ suspend fun BehaviourContext.waitEditedVisualMediaGroupContent(
    filter: SimpleFilter<CommonMessage<VisualMediaGroupContent>>? = null,
    mapper: CommonMessageToContentMapper<VisualMediaGroupContent>? = null
 ) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitEditedTextedMediaContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    includeMediaGroups: Boolean = true,
-    filter: SimpleFilter<CommonMessage<TextedMediaContent>>? = null,
-    mapper: CommonMessageToContentMapper<TextedMediaContent>? = null
-) = waitEditedContent(count, initRequest, includeMediaGroups, errorFactory, filter, mapper)
 suspend fun BehaviourContext.waitEditedAnimation(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
@@ -10,7 +10,6 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
-import dev.inmo.tgbotapi.types.message.PrivateEventMessage
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentEvent
 import kotlinx.coroutines.flow.toList
@@ -90,66 +89,33 @@ suspend fun BehaviourContext.waitChatEvents(
    mapper: EventMessageToEventMapper<ChatEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)

-@Deprecated("Renamed as Video instead of Voice")
 suspend fun BehaviourContext.waitVoiceChatEvents(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
-    mapper: EventMessageToEventMapper<VideoChatEvent>? = null
+    filter: SimpleFilter<ChatEventMessage<VoiceChatEvent>>? = null,
+    mapper: EventMessageToEventMapper<VoiceChatEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-@Deprecated("Renamed as Video instead of Voice")
 suspend fun BehaviourContext.waitVoiceChatStartedEvents(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
-    mapper: EventMessageToEventMapper<VideoChatStarted>? = null
+    filter: SimpleFilter<ChatEventMessage<VoiceChatStarted>>? = null,
+    mapper: EventMessageToEventMapper<VoiceChatStarted>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-@Deprecated("Renamed as Video instead of Voice")
 suspend fun BehaviourContext.waitVoiceChatEndedEvents(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
-    mapper: EventMessageToEventMapper<VideoChatEnded>? = null
+    filter: SimpleFilter<ChatEventMessage<VoiceChatEnded>>? = null,
+    mapper: EventMessageToEventMapper<VoiceChatEnded>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-@Deprecated("Renamed as Video instead of Voice")
 suspend fun BehaviourContext.waitVoiceChatParticipantsInvitedEvents(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
-    mapper: EventMessageToEventMapper<VideoChatParticipantsInvited>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-
-suspend fun BehaviourContext.waitVideoChatEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
-    mapper: EventMessageToEventMapper<VideoChatEvent>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVideoChatStartedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
-    mapper: EventMessageToEventMapper<VideoChatStarted>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVideoChatEndedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
-    mapper: EventMessageToEventMapper<VideoChatEnded>? = null
-) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitVideoChatParticipantsInvitedEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
-    mapper: EventMessageToEventMapper<VideoChatParticipantsInvited>? = null
+    filter: SimpleFilter<ChatEventMessage<VoiceChatParticipantsInvited>>? = null,
+    mapper: EventMessageToEventMapper<VoiceChatParticipantsInvited>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)

 suspend fun BehaviourContext.waitMessageAutoDeleteTimerChangedEvents(
@@ -275,10 +241,3 @@ suspend fun BehaviourContext.waitUserLoggedInEvents(
    filter: SimpleFilter<ChatEventMessage<UserLoggedIn>>? = null,
    mapper: EventMessageToEventMapper<UserLoggedIn>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
-suspend fun BehaviourContext.waitWebAppDataEvents(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    count: Int = 1,
-    filter: SimpleFilter<PrivateEventMessage<WebAppData>>? = null,
-    mapper: EventMessageToEventMapper<WebAppData>? = null
-) = waitEvents(count, initRequest, errorFactory, filter ?.let { { it is PrivateEventMessage && filter(it) } }, mapper)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt
@@ -4,7 +4,9 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.utils.asSentMediaGroupUpdate
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.media.PhotoContent
+import dev.inmo.tgbotapi.types.message.content.media.VideoContent
 import dev.inmo.tgbotapi.utils.PreviewFeature
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.toList
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollAnswers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollAnswers.kt
@@ -2,9 +2,9 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations

 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asPollAnswerUpdate
+import dev.inmo.tgbotapi.extensions.utils.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.polls.PollAnswer
+import dev.inmo.tgbotapi.types.polls.*
 import kotlinx.coroutines.flow.toList

 typealias PollAnswerMapper = suspend PollAnswer.() -> PollAnswer?
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollUpdates.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPollUpdates.kt
@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations

 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.utils.asPollUpdate
+import dev.inmo.tgbotapi.extensions.utils.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.polls.*
 import kotlinx.coroutines.flow.toList
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPreCheckoutQuery.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPreCheckoutQuery.kt
@@ -3,8 +3,10 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 import dev.inmo.tgbotapi.extensions.utils.asPreCheckoutQueryUpdate
+import dev.inmo.tgbotapi.extensions.utils.asShippingQueryUpdate
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery
+import dev.inmo.tgbotapi.types.payments.ShippingQuery
 import kotlinx.coroutines.flow.toList

 typealias PreCheckoutQueryMapper = suspend PreCheckoutQuery.() -> PreCheckoutQuery?
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt
@@ -2,18 +2,14 @@

 package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling

-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CallbackQueryFilterByUser
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByUserCallbackQueryMarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus
 import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
 import dev.inmo.tgbotapi.types.CallbackQuery.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
-import kotlinx.coroutines.Job

 internal suspend inline fun <BC : BehaviourContext, reified T : CallbackQuery> BC.onCallbackQuery(
    noinline initialFilter: SimpleFilter<T>? = null,
@@ -24,48 +20,6 @@ internal suspend inline fun <BC : BehaviourContext, reified T : CallbackQuery> B
    (it.asCallbackQueryUpdate() ?.data as? T) ?.let(::listOfNotNull)
 }

-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-internal suspend inline fun <BC : BehaviourContext, reified T : DataCallbackQuery> BC.onDataCallbackQueryCounted(
-    noinline initialFilter: SimpleFilter<T>? = null,
-    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in T, Any> = ByUserCallbackQueryMarkerFactory,
-    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>
-): Job {
-    val newInitialFilter = SimpleFilter<DataCallbackQuery> {
-        it is T && initialFilter ?.invoke(it) ?: true
-    }
-    return runCatchingSafely {
-        onCallbackQuery (
-            initialFilter,
-            subcontextUpdatesFilter,
-            markerFactory,
-            scenarioReceiver
-        )
-    }.onFailure {
-        triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilter)
-    }.onSuccess {
-        triggersHolder.handleableCallbackQueriesDataHolder.registerHandleable(newInitialFilter)
-        it.invokeOnCompletion {
-            runCatching {
-                launchSafelyWithoutExceptions {
-                    triggersHolder.handleableCallbackQueriesDataHolder.unregisterHandleable(newInitialFilter)
-                }
-            }
-        }
-    }.getOrThrow()
-}
-
 /**
 * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
 * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
@@ -83,63 +37,7 @@ suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
    markerFactory: MarkerFactory<in DataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
-) = onDataCallbackQueryCounted(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param dataRegex Will be used with [initialFilter] as [initialFilter] for upstream [onDataCallbackQuery] to filter
- * [DataCallbackQuery] with [DataCallbackQuery.data] [String.matches] to [dataRegex]
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
-    dataRegex: Regex,
-    initialFilter: SimpleFilter<DataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in DataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
-) = onDataCallbackQuery(
-    initialFilter = initialFilter + {
-        it.data.matches(dataRegex)
-    },
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param data Will be converted to [Regex] via its constructor and pass it to upstream [onDataCallbackQuery]
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
-    data: String,
-    initialFilter: SimpleFilter<DataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in DataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
-) = onDataCallbackQuery(
-    Regex(data),
+) = onCallbackQuery(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -211,63 +109,7 @@ suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
    markerFactory: MarkerFactory<in InlineMessageIdDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineMessageIdDataCallbackQuery>
-) = onDataCallbackQueryCounted(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param dataRegex Will be used with [initialFilter] as [initialFilter] for upstream [onInlineMessageIdDataCallbackQuery]
- * to filter [InlineMessageIdDataCallbackQuery] with [InlineMessageIdDataCallbackQuery.data] [String.matches] to [dataRegex]
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
-    dataRegex: Regex,
-    initialFilter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in InlineMessageIdDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineMessageIdDataCallbackQuery>
-) = onInlineMessageIdDataCallbackQuery(
-    initialFilter = initialFilter + {
-        it.data.matches(dataRegex)
-    },
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param data Will be converted to [Regex] via its constructor and pass it to upstream [onInlineMessageIdDataCallbackQuery]
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
-    data: String,
-    initialFilter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in InlineMessageIdDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineMessageIdDataCallbackQuery>
-) = onInlineMessageIdDataCallbackQuery(
-    Regex(data),
+) = onCallbackQuery(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -339,63 +181,7 @@ suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
    markerFactory: MarkerFactory<in MessageDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MessageDataCallbackQuery>
-) = onDataCallbackQueryCounted(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param dataRegex Will be used with [initialFilter] as [initialFilter] for upstream [onMessageDataCallbackQuery] to filter
- * [MessageDataCallbackQuery] with [MessageDataCallbackQuery.data] [String.matches] to [dataRegex]
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
-    dataRegex: Regex,
-    initialFilter: SimpleFilter<MessageDataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in MessageDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MessageDataCallbackQuery>
-) = onMessageDataCallbackQuery(
-    initialFilter = initialFilter + {
-        it.data.matches(dataRegex)
-    },
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param data Will be converted to [Regex] via its constructor and pass it to upstream [onMessageDataCallbackQuery]
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
-    data: String,
-    initialFilter: SimpleFilter<MessageDataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in MessageDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MessageDataCallbackQuery>
-) = onMessageDataCallbackQuery(
-    Regex(data),
+) = onCallbackQuery(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggersUnhandled.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggersUnhandled.kt
@@ -1,83 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CallbackQueryFilterByUser
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByUserCallbackQueryMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.types.CallbackQuery.*
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onUnhandledDataCallbackQuery(
-    initialFilter: SimpleFilter<DataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in DataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
-) = onCallbackQuery (
-    initialFilter * !SimpleFilter<MessageDataCallbackQuery> { triggersHolder.handleableCallbackQueriesDataHolder.isHandled(it) },
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onUnhandledInlineMessageIdDataCallbackQuery(
-    initialFilter: SimpleFilter<InlineMessageIdDataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InlineMessageIdDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in InlineMessageIdDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineMessageIdDataCallbackQuery>
-) = onCallbackQuery (
-    initialFilter * !SimpleFilter<MessageDataCallbackQuery> { triggersHolder.handleableCallbackQueriesDataHolder.isHandled(it) },
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onUnhandledMessageDataCallbackQuery(
-    initialFilter: SimpleFilter<MessageDataCallbackQuery>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MessageDataCallbackQuery, Update>? = CallbackQueryFilterByUser,
-    markerFactory: MarkerFactory<in MessageDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MessageDataCallbackQuery>
-) = onCallbackQuery(
-    initialFilter * !SimpleFilter<MessageDataCallbackQuery> { triggersHolder.handleableCallbackQueriesDataHolder.isHandled(it) },
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatJoinRequestTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatJoinRequestTriggers.kt
@@ -1,12 +1,13 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling

 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.ChatJoinRequestFilterByChat
+import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatChatJoinRequestMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
+import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.*
 import dev.inmo.tgbotapi.extensions.utils.asChatJoinRequestUpdate
+import dev.inmo.tgbotapi.extensions.utils.asShippingQueryUpdate
 import dev.inmo.tgbotapi.types.ChatJoinRequest
+import dev.inmo.tgbotapi.types.payments.ShippingQuery
 import dev.inmo.tgbotapi.types.update.abstracts.Update

 /**
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChosenInlineResultTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChosenInlineResultTriggers.kt
@@ -4,10 +4,11 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling

 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByUserIdChosenInlineResultMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
+import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.*
 import dev.inmo.tgbotapi.extensions.utils.asChosenInlineResultUpdate
+import dev.inmo.tgbotapi.extensions.utils.asPollUpdate
 import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.*
+import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update

 internal suspend inline fun <BC : BehaviourContext, reified T : ChosenInlineResult> BC.onChosenInlineResultBase(
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt
@@ -2,8 +2,6 @@

 package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling

-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
@@ -17,7 +15,8 @@ import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import kotlinx.coroutines.Job

-internal suspend fun <BC : BehaviourContext> BC.commandUncounted(
+
+suspend fun <BC : BehaviourContext> BC.command(
    commandRegex: Regex,
    requireOnlyCommandInMessage: Boolean = true,
    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
@@ -44,35 +43,6 @@ internal suspend fun <BC : BehaviourContext> BC.commandUncounted(
    scenarioReceiver
 )

-suspend fun <BC : BehaviourContext> BC.command(
-    commandRegex: Regex,
-    requireOnlyCommandInMessage: Boolean = true,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-): Job = runCatchingSafely {
-    commandUncounted(
-        commandRegex,
-        requireOnlyCommandInMessage,
-        initialFilter,
-        subcontextUpdatesFilter,
-        markerFactory,
-        scenarioReceiver
-    )
-}.onFailure {
-    triggersHolder.handleableCommandsHolder.unregisterHandleable(commandRegex)
-}.onSuccess {
-    triggersHolder.handleableCommandsHolder.registerHandleable(commandRegex)
-    it.invokeOnCompletion {
-        runCatching {
-            launchSafelyWithoutExceptions {
-                triggersHolder.handleableCommandsHolder.unregisterHandleable(commandRegex)
-            }
-        }
-    }
-}.getOrThrow()
-
 suspend fun <BC : BehaviourContext> BC.command(
    command: String,
    requireOnlyCommandInMessage: Boolean = true,
@@ -82,22 +52,22 @@ suspend fun <BC : BehaviourContext> BC.command(
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
 ) = command(command.toRegex(), requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

-suspend fun <BC : BehaviourContext> BC.onCommand(
+suspend inline fun <BC : BehaviourContext> BC.onCommand(
    commandRegex: Regex,
    requireOnlyCommandInMessage: Boolean = true,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
+    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
+    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
 ): Job = command(commandRegex, requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

-suspend fun <BC : BehaviourContext> BC.onCommand(
+suspend inline fun <BC : BehaviourContext> BC.onCommand(
    command: String,
    requireOnlyCommandInMessage: Boolean = true,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
+    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
+    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
 ): Job = onCommand(command.toRegex(), requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

 suspend fun <BC : BehaviourContext> BC.commandWithArgs(
@@ -134,18 +104,18 @@ suspend fun <BC : BehaviourContext> BC.commandWithArgs(
    scenarioReceiver = scenarioReceiver
 )

-suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
+suspend inline fun <BC : BehaviourContext> BC.onCommandWithArgs(
    commandRegex: Regex,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
+    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
+    noinline scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
 ): Job = commandWithArgs(commandRegex, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

-suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
+suspend inline fun <BC : BehaviourContext> BC.onCommandWithArgs(
    command: String,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
+    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
+    noinline scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
 ): Job = onCommandWithArgs(command.toRegex(), initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandlingUnhandled.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandlingUnhandled.kt
@@ -1,76 +0,0 @@
-@file:Suppress("unused")
-
-package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
-
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatMessageMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times
-import dev.inmo.tgbotapi.extensions.utils.asBotCommandTextSource
-import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithParams
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-import kotlinx.coroutines.Job
-
-
-suspend fun <BC : BehaviourContext> BC.unhandledCommand(
-    requireOnlyCommandInMessage: Boolean = true,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-): Job = onText(
-    CommonMessageFilter<TextContent> { message ->
-        val content = message.content
-        val textSources = content.textSources
-        val sizeRequirement = if (requireOnlyCommandInMessage) {
-            textSources.size == 1
-        } else {
-            true
-        }
-        sizeRequirement && textSources.any {
-            val command = it.asBotCommandTextSource() ?.command ?: return@any false
-            !triggersHolder.handleableCommandsHolder.isHandled(command)
-        }
-    }.let {
-        initialFilter ?.times(it) ?: it
-    },
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-suspend fun <BC : BehaviourContext> BC.onUnhandledCommand(
-    requireOnlyCommandInMessage: Boolean = true,
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-): Job = unhandledCommand(requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-suspend fun <BC : BehaviourContext> BC.unhandledCommandWithArgs(
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Map<String, Array<String>>>
-) = onUnhandledCommand(
-    requireOnlyCommandInMessage = false,
-    initialFilter = initialFilter,
-    subcontextUpdatesFilter = subcontextUpdatesFilter,
-    markerFactory = markerFactory
-) {
-    val args = it.parseCommandsWithParams().let { commandsWithArgs ->
-        commandsWithArgs
-    }
-    scenarioReceiver(it, args)
-}
-
-suspend fun <BC : BehaviourContext> BC.onUnhandledCommandWithArgs(
-    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Map<String, Array<String>>>
-): Job = unhandledCommandWithArgs(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt
@@ -14,8 +14,6 @@ import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.media.*
-import dev.inmo.tgbotapi.types.message.content.media.AudioMediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.media.DocumentMediaGroupContent
 import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
 import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
@@ -24,7 +22,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 typealias CommonMessageFilter<T> = SimpleFilter<CommonMessage<T>>
 inline fun <T : MessageContent> CommonMessageFilter(noinline block: CommonMessageFilter<T>) = block

-internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onContentMessageWithType(
+internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onContent(
    noinline initialFilter: CommonMessageFilter<T>? = null,
    noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<T>, Any> = ByChatMessageMarkerFactory,
@@ -57,7 +55,7 @@ suspend fun <BC : BehaviourContext> BC.onContentMessage(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<MessageContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MessageContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -81,7 +79,7 @@ suspend fun <BC : BehaviourContext> BC.onContact(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<ContactContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<ContactContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<ContactContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -105,7 +103,7 @@ suspend fun <BC : BehaviourContext> BC.onDice(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DiceContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<DiceContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DiceContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -129,7 +127,7 @@ suspend fun <BC : BehaviourContext> BC.onGame(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<GameContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<GameContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<GameContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -153,7 +151,7 @@ suspend fun <BC : BehaviourContext> BC.onLocation(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<LocationContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<LocationContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<LocationContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -177,7 +175,7 @@ suspend fun <BC : BehaviourContext> BC.onLiveLocation(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<LiveLocationContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<LiveLocationContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<LiveLocationContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -201,7 +199,7 @@ suspend fun <BC : BehaviourContext> BC.onStaticLocation(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<StaticLocationContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<StaticLocationContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<StaticLocationContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -225,7 +223,7 @@ suspend fun <BC : BehaviourContext> BC.onPoll(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PollContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<PollContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<PollContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -249,7 +247,7 @@ suspend fun <BC : BehaviourContext> BC.onText(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -273,7 +271,7 @@ suspend fun <BC : BehaviourContext> BC.onVenue(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VenueContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<VenueContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VenueContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -297,7 +295,7 @@ suspend fun <BC : BehaviourContext> BC.onAudioMediaGroup(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioMediaGroupContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<AudioMediaGroupContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AudioMediaGroupContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -321,31 +319,7 @@ suspend fun <BC : BehaviourContext> BC.onDocumentMediaGroupContent(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentMediaGroupContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<DocumentMediaGroupContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DocumentMediaGroupContent>>
-) = onContentMessageWithType(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onTextedMediaContent(
-    initialFilter: CommonMessageFilter<TextedMediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextedMediaContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextedMediaContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextedMediaContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -369,7 +343,7 @@ suspend fun <BC : BehaviourContext> BC.onMediaCollection(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaCollectionContent<TelegramMediaFile>>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<MediaCollectionContent<TelegramMediaFile>>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MediaCollectionContent<TelegramMediaFile>>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -393,7 +367,7 @@ suspend fun <BC : BehaviourContext> BC.onMedia(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MediaContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<MediaContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MediaContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -417,7 +391,7 @@ suspend fun <BC : BehaviourContext> BC.onAnimation(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AnimationContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<AnimationContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AnimationContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -441,7 +415,7 @@ suspend fun <BC : BehaviourContext> BC.onAudio(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<AudioContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<AudioContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<AudioContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -465,7 +439,7 @@ suspend fun <BC : BehaviourContext> BC.onDocument(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<DocumentContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<DocumentContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<DocumentContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -489,7 +463,7 @@ suspend fun <BC : BehaviourContext> BC.onPhoto(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<PhotoContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<PhotoContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<PhotoContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -513,7 +487,7 @@ suspend fun <BC : BehaviourContext> BC.onSticker(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<StickerContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<StickerContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<StickerContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -537,7 +511,7 @@ suspend fun <BC : BehaviourContext> BC.onVideo(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<VideoContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VideoContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -561,7 +535,7 @@ suspend fun <BC : BehaviourContext> BC.onVideoNote(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VideoNoteContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<VideoNoteContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VideoNoteContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -585,7 +559,7 @@ suspend fun <BC : BehaviourContext> BC.onVoice(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<VoiceContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<VoiceContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<VoiceContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
@@ -609,7 +583,7 @@ suspend fun <BC : BehaviourContext> BC.onInvoice(
    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<InvoiceContent>, Update> = MessageFilterByChat,
    markerFactory: MarkerFactory<in CommonMessage<InvoiceContent>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<InvoiceContent>>
-) = onContentMessageWithType(
+) = onContent(
    initialFilter,
    subcontextUpdatesFilter,
    markerFactory,
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt
@@ -27,8 +27,6 @@ import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.media.*
-import dev.inmo.tgbotapi.types.message.content.media.AudioMediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.media.DocumentMediaGroupContent
 import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
 import dev.inmo.tgbotapi.types.update.abstracts.BaseEditMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
@@ -264,30 +262,6 @@ suspend fun <BC : BehaviourContext> BC.onEditedDocumentMediaGroupContent(
    scenarioReceiver
 )

-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onEditedTextedMediaContent(
-    initialFilter: CommonMessageFilter<TextedMediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextedMediaContent>, Update> = MessageFilterByChat,
-    markerFactory: MarkerFactory<in CommonMessage<TextedMediaContent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextedMediaContent>>
-)= onEditedContent(
-    initialFilter,
-    subcontextUpdatesFilter,
-    markerFactory,
-    scenarioReceiver
-)
-
 /**
 * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
 * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
@@ -12,7 +12,6 @@ import dev.inmo.tgbotapi.extensions.utils.asChatEventMessage
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
-import dev.inmo.tgbotapi.types.message.PrivateEventMessage
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentEvent
 import dev.inmo.tgbotapi.types.update.abstracts.Update
@@ -95,12 +94,11 @@ suspend fun <BC : BehaviourContext> BC.onChatEvent(
 * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
 * data
 */
-@Deprecated("Renamed as Video instead of Voice")
 suspend fun <BC : BehaviourContext> BC.onVoiceChatEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatEvent>>
+    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatEvent>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatEvent>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatEvent>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatEvent>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

 /**
@@ -115,12 +113,11 @@ suspend fun <BC : BehaviourContext> BC.onVoiceChatEvent(
 * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
 * data
 */
-@Deprecated("Renamed as Video instead of Voice")
 suspend fun <BC : BehaviourContext> BC.onVoiceChatStartedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatStarted>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatStarted>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatStarted>>
+    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatStarted>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatStarted>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatStarted>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatStarted>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

 /**
@@ -135,12 +132,11 @@ suspend fun <BC : BehaviourContext> BC.onVoiceChatStartedEvent(
 * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
 * data
 */
-@Deprecated("Renamed as Video instead of Voice")
 suspend fun <BC : BehaviourContext> BC.onVoiceChatEndedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEnded>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEnded>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatEnded>>
+    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatEnded>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatEnded>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatEnded>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatEnded>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

 /**
@@ -155,88 +151,11 @@ suspend fun <BC : BehaviourContext> BC.onVoiceChatEndedEvent(
 * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
 * data
 */
-@Deprecated("Renamed as Video instead of Voice")
 suspend fun <BC : BehaviourContext> BC.onVoiceChatParticipantsInvitedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatParticipantsInvited>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatParticipantsInvited>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatParticipantsInvited>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVideoChatEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatEvent>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVideoChatStartedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatStarted>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatStarted>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatStarted>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVideoChatEndedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEnded>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEnded>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatEnded>>
-) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onVideoChatParticipantsInvitedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatParticipantsInvited>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatParticipantsInvited>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatParticipantsInvited>>
+    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatParticipantsInvited>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatParticipantsInvited>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatParticipantsInvited>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatParticipantsInvited>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

 /**
@@ -564,30 +483,3 @@ suspend fun <BC : BehaviourContext> BC.onUserLoggedIn(
    markerFactory: MarkerFactory<in ChatEventMessage<UserLoggedIn>, Any> = ByChatMessageMarkerFactory,
    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<UserLoggedIn>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
-
-/**
- * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
- * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
- * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
- * to combinate several filters
- * @param markerFactory Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
- * in one "stream". Output of [markerFactory] will be used as a key for "stream"
- * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
- * data
- */
-suspend fun <BC : BehaviourContext> BC.onWebAppData(
-    initialFilter: SimpleFilter<PrivateEventMessage<WebAppData>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PrivateEventMessage<WebAppData>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<WebAppData>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, PrivateEventMessage<WebAppData>>
-) = onEvent(
-    initialFilter ?.let { { it is PrivateEventMessage<WebAppData> && initialFilter(it) } },
-    subcontextUpdatesFilter ?.let { { it: ChatEventMessage<WebAppData>, update: Update -> it is PrivateEventMessage<WebAppData> && subcontextUpdatesFilter(it, update) } },
-    markerFactory
-) {
-    if (it is PrivateEventMessage<WebAppData>) {
-        scenarioReceiver(it)
-    }
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt
@@ -9,7 +9,9 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByC
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
 import dev.inmo.tgbotapi.extensions.utils.asSentMediaGroupUpdate
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.media.PhotoContent
+import dev.inmo.tgbotapi.types.message.content.media.VideoContent
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.utils.PreviewFeature

@@ -20,11 +22,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MediaGroupConten
    markerFactory: MarkerFactory<in List<MediaGroupMessage<T>>, Any> = ByChatMediaGroupMarkerFactory,
    noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, List<MediaGroupMessage<T>>>
 ) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    (it.asSentMediaGroupUpdate() ?.data ?.takeIf { messages ->
-        messages.all { message ->
-            message.content is T
-        }
-    } as? List<MediaGroupMessage<T>>) ?.let(::listOfNotNull)
+    (it.asSentMediaGroupUpdate() ?.data ?.takeIf { it.all { it is T } } as? List<MediaGroupMessage<T>>) ?.let(::listOfNotNull)
 }

 /**
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PollAnswersTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PollAnswersTriggers.kt
@@ -4,10 +4,10 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling

 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByIdPollAnswerMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
+import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.*
 import dev.inmo.tgbotapi.extensions.utils.asPollAnswerUpdate
-import dev.inmo.tgbotapi.types.polls.PollAnswer
+import dev.inmo.tgbotapi.extensions.utils.asPollUpdate
+import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update

 internal suspend inline fun <BC : BehaviourContext> BC.onPollAnswered(
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PollUpdatesTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PollUpdatesTriggers.kt
@@ -4,8 +4,7 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling

 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByIdPollMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
+import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.*
 import dev.inmo.tgbotapi.extensions.utils.asPollUpdate
 import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PreCheckoutQueryTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PreCheckoutQueryTriggers.kt
@@ -1,12 +1,13 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling

 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.PreCheckoutQueryFilterByUser
+import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByUserPreCheckoutQueryMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
+import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.*
 import dev.inmo.tgbotapi.extensions.utils.asPreCheckoutQueryUpdate
+import dev.inmo.tgbotapi.extensions.utils.asShippingQueryUpdate
 import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery
+import dev.inmo.tgbotapi.types.payments.ShippingQuery
 import dev.inmo.tgbotapi.types.update.abstracts.Update

 /**
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ShippingQueryTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ShippingQueryTriggers.kt
@@ -1,10 +1,10 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling

 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CallbackQueryFilterByUser
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.ShippingQueryFilterByUser
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByUserShippingQueryMarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
+import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.*
 import dev.inmo.tgbotapi.extensions.utils.asShippingQueryUpdate
 import dev.inmo.tgbotapi.types.payments.ShippingQuery
 import dev.inmo.tgbotapi.types.update.abstracts.Update
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/SimpleFilter.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/SimpleFilter.kt
@@ -3,46 +3,20 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.utils
 typealias SimpleFilter<T> = suspend (T) -> Boolean

 inline fun <T> SimpleFilter(noinline block: SimpleFilter<T>) = block
-val TrueSimpleFilter = SimpleFilter<Any?> { true }
-
-/**
- * @return [SimpleFilter] which will return true in case when all the items in incoming data passed [this] filter
- */
-fun <T> SimpleFilter<T>.listAll() = SimpleFilter<Iterable<T>> {
-    it.all { this@listAll(it) }
-}
-
-/**
- * @return [SimpleFilter] which will return true in case when there is any item in incoming data passed [this] filter
- */
-fun <T> SimpleFilter<T>.listAny() = SimpleFilter<Iterable<T>> {
-    it.any { this@listAny(it) }
-}
-
-/**
- * @return [SimpleFilter] which will return true in case when there is no any item in incoming data passed [this] filter
- */
-fun <T> SimpleFilter<T>.listNone() = SimpleFilter<Iterable<T>> {
-    it.none { this@listNone(it) }
-}

 /**
 * Makes an AND (&&) operation between [this] and [other]
 */
-operator fun <T> SimpleFilter<T>?.times(other: SimpleFilter<T>): SimpleFilter<T> = this ?.let {
-    {
-        this(it) && other(it)
-    }
-} ?: other
+operator fun <T> SimpleFilter<T>.times(other: SimpleFilter<T>): SimpleFilter<T> = {
+    this(it) && other(it)
+}

 /**
 * Makes an OR (||) operation between [this] and [other]
 */
-operator fun <T> SimpleFilter<T>?.plus(other: SimpleFilter<T>): SimpleFilter<T> = this ?.let {
-    {
-        this(it) || other(it)
-    }
-} ?: other
+operator fun <T> SimpleFilter<T>.plus(other: SimpleFilter<T>): SimpleFilter<T> = {
+    this(it) || other(it)
+}

 /**
 * Reverse results of [this]
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/HandleableCallbackBasedHolder.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/HandleableCallbackBasedHolder.kt
@@ -1,5 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.utils.handlers_registrar
-
-class HandleableCallbackBasedHolder<T> : HandleableTriggersHolder<suspend (T) -> Boolean>() {
-    suspend fun isHandled(data: T) = handleable.any { it(data) }
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/HandleableRegexesHolder.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/HandleableRegexesHolder.kt
@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.utils.handlers_registrar
-
-class HandleableRegexesHolder : HandleableTriggersHolder<Regex>() {
-    fun isHandled(command: String) = handleable.any {
-        it.matches(command)
-    }
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/HandleableTriggersHolder.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/HandleableTriggersHolder.kt
@@ -1,27 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.utils.handlers_registrar
-
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-
-open class HandleableTriggersHolder<T>(
-    preset: List<T> = emptyList()
-) {
-    protected val commandsMutex = Mutex()
-    protected val _handleable = mutableListOf<T>().also {
-        it.addAll(preset)
-    }
-    val handleable: List<T>
-        get() = _handleable.toList()
-
-    suspend fun registerHandleable(data: T) {
-        commandsMutex.withLock {
-            _handleable.add(data)
-        }
-    }
-
-    suspend fun unregisterHandleable(data: T) {
-        commandsMutex.withLock {
-            _handleable.remove(data)
-        }
-    }
-}
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/TriggersRegistrar.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/TriggersRegistrar.kt
@@ -1,8 +0,0 @@
-package dev.inmo.tgbotapi.extensions.behaviour_builder.utils.handlers_registrar
-
-import dev.inmo.tgbotapi.types.CallbackQuery.DataCallbackQuery
-
-class TriggersHolder {
-    val handleableCommandsHolder = HandleableRegexesHolder()
-    val handleableCallbackQueriesDataHolder = HandleableCallbackBasedHolder<DataCallbackQuery>()
-}
--- a/tgbotapi.core/build.gradle
+++ b/tgbotapi.core/build.gradle
@@ -17,9 +17,8 @@ plugins {

 project.version = "$library_version"
 project.group = "$library_group"
-project.description = "Core part of tgbotapi with all (and only) required functionality for working with Telegram Bot API"

-apply from: "../publish.gradle"
+apply from: "publish.gradle"

 repositories {
    mavenLocal()
--- a/tgbotapi.core/publish.gradle
+++ b/tgbotapi.core/publish.gradle
@@ -0,0 +1,79 @@
+apply plugin: 'maven-publish'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "Library for Object-Oriented and type-safe work with Telegram Bot API"
+            name = "Telegram Bot API Core"
+            url = "https://insanusmokrassar.github.io/TelegramBotAPI"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+        repositories {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
+                }
+            }
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
+                }
+            }
+        }
+    }
+}
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}
--- a/tgbotapi.core/publish.kpsb
+++ b/tgbotapi.core/publish.kpsb
@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ChatRequest.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ChatRequest.kt
@@ -2,6 +2,6 @@ package dev.inmo.tgbotapi.CommonAbstracts.types

 import dev.inmo.tgbotapi.types.ChatIdentifier

-interface ChatRequest : OptionalChatRequest {
-    override val chatId: ChatIdentifier
-}
+interface ChatRequest {
+    val chatId: ChatIdentifier
+}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/OptionalChatRequest.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/OptionalChatRequest.kt
@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.CommonAbstracts.types
-
-import dev.inmo.tgbotapi.types.ChatIdentifier
-
-interface OptionalChatRequest {
-    val chatId: ChatIdentifier?
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorCallFactory.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorCallFactory.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.bot.Ktor

-import dev.inmo.micro_utils.common.Optional
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt
@@ -5,7 +5,6 @@ import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.Ktor.base.*
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
-import dev.inmo.tgbotapi.bot.ktor.KtorPipelineStepsHolder
 import dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter
 import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter
 import dev.inmo.tgbotapi.requests.abstracts.Request
@@ -16,6 +15,33 @@ import io.ktor.client.features.*
 import io.ktor.client.statement.readText
 import kotlinx.serialization.json.Json

+class KtorRequestsExecutorBuilder(
+    var telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper
+) {
+    var client: HttpClient = HttpClient()
+    var callsFactories: List<KtorCallFactory> = emptyList()
+    var excludeDefaultFactories: Boolean = false
+    var requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter()
+    var jsonFormatter: Json = nonstrictJsonFormat
+
+    fun build() = KtorRequestsExecutor(telegramAPIUrlsKeeper, client, callsFactories, excludeDefaultFactories, requestsLimiter, jsonFormatter)
+}
+
+inline fun telegramBot(
+    telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,
+    crossinline builder: KtorRequestsExecutorBuilder.() -> Unit = {}
+): TelegramBot = KtorRequestsExecutorBuilder(telegramAPIUrlsKeeper).apply(builder).build()
+
+/**
+ * Shortcut for [telegramBot]
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun telegramBot(
+    token: String,
+    apiUrl: String = telegramBotAPIDefaultUrl,
+    crossinline builder: KtorRequestsExecutorBuilder.() -> Unit = {}
+): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, apiUrl), builder)
+
@RiskFeature
 fun createTelegramBotDefaultKtorCallRequestsFactories() = listOf(
    SimpleRequestCallFactory(),
@@ -30,8 +56,7 @@ class KtorRequestsExecutor(
    callsFactories: List<KtorCallFactory> = emptyList(),
    excludeDefaultFactories: Boolean = false,
    private val requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter(),
-    private val jsonFormatter: Json = nonstrictJsonFormat,
-    private val pipelineStepsHolder: KtorPipelineStepsHolder = KtorPipelineStepsHolder
+    private val jsonFormatter: Json = nonstrictJsonFormat
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
    private val callsFactories: List<KtorCallFactory> = callsFactories.run {
        if (!excludeDefaultFactories) {
@@ -48,51 +73,37 @@ class KtorRequestsExecutor(
    }

    override suspend fun <T : Any> execute(request: Request<T>): T {
-        return runCatching {
-            safely(
-                { e ->
-                    pipelineStepsHolder.onRequestException(request, e) ?.let { return@safely it }
-
-                    throw if (e is ClientRequestException) {
-                        val content = e.response.readText()
-                        val responseObject = jsonFormatter.decodeFromString(Response.serializer(), content)
-                        newRequestException(
-                            responseObject,
-                            content,
-                            "Can't get result object from $content"
-                        )
-                    } else {
-                        e
-                    }
-
-                }
-            ) {
-                pipelineStepsHolder.onBeforeSearchCallFactory(request, callsFactories)
-                requestsLimiter.limit {
-                    var result: T? = null
-                    lateinit var factoryHandledRequest: KtorCallFactory
-                    for (potentialFactory in callsFactories) {
-                        pipelineStepsHolder.onBeforeCallFactoryMakeCall(request, potentialFactory)
-                        result = potentialFactory.makeCall(
-                            client,
-                            telegramAPIUrlsKeeper,
-                            request,
-                            jsonFormatter
-                        )
-                        result = pipelineStepsHolder.onAfterCallFactoryMakeCall(result, request, potentialFactory)
-                        if (result != null) {
-                            factoryHandledRequest = potentialFactory
-                            break
-                        }
-                    }
-
-                    result ?.let {
-                        pipelineStepsHolder.onRequestResultPresented(it, request, factoryHandledRequest, callsFactories)
-                    } ?: pipelineStepsHolder.onRequestResultAbsent(request, callsFactories) ?: error("Can't execute request: $request")
+        return safely(
+            { e ->
+                throw if (e is ClientRequestException) {
+                    val content = e.response.readText()
+                    val responseObject = jsonFormatter.decodeFromString(Response.serializer(), content)
+                    newRequestException(
+                        responseObject,
+                        content,
+                        "Can't get result object from $content"
+                    )
+                } else {
+                    e
                }
            }
-        }.let {
-            pipelineStepsHolder.onRequestReturnResult(it, request, callsFactories)
+        ) {
+            requestsLimiter.limit {
+                var result: T? = null
+                for (potentialFactory in callsFactories) {
+                    result = potentialFactory.makeCall(
+                        client,
+                        telegramAPIUrlsKeeper,
+                        request,
+                        jsonFormatter
+                    )
+                    if (result != null) {
+                        break
+                    }
+                }
+
+                result ?: error("Can't execute request: $request")
+            }
        }
    }

@@ -100,31 +111,3 @@ class KtorRequestsExecutor(
        client.close()
    }
 }
-
-class KtorRequestsExecutorBuilder(
-    var telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper
-) {
-    var client: HttpClient = HttpClient()
-    var callsFactories: List<KtorCallFactory> = emptyList()
-    var excludeDefaultFactories: Boolean = false
-    var requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter()
-    var jsonFormatter: Json = nonstrictJsonFormat
-
-    fun build() = KtorRequestsExecutor(telegramAPIUrlsKeeper, client, callsFactories, excludeDefaultFactories, requestsLimiter, jsonFormatter)
-}
-
-inline fun telegramBot(
-    telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,
-    builder: KtorRequestsExecutorBuilder.() -> Unit = {}
-): TelegramBot = KtorRequestsExecutorBuilder(telegramAPIUrlsKeeper).apply(builder).build()
-
-/**
- * Shortcut for [telegramBot]
- */
-@Suppress("NOTHING_TO_INLINE")
-inline fun telegramBot(
-    token: String,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    testServer: Boolean = false,
-    builder: KtorRequestsExecutorBuilder.() -> Unit = {}
-): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token, testServer, apiUrl), builder)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileChannelRequestCallFactory.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileChannelRequestCallFactory.kt
@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.bot.Ktor.base

-import dev.inmo.micro_utils.coroutines.*
+import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.tgbotapi.bot.Ktor.KtorCallFactory
 import dev.inmo.tgbotapi.requests.DownloadFileStream
 import dev.inmo.tgbotapi.requests.abstracts.Request
@@ -25,16 +25,13 @@ object DownloadFileChannelRequestCallFactory : KtorCallFactory {
        val fullUrl = urlsKeeper.createFileLinkUrl(it.filePath)

        ByteReadChannelAllocator {
-            val scope = CoroutineScope(currentCoroutineContext() + SupervisorJob())
+            val scope = CoroutineScope(coroutineContext)
            val outChannel = ByteChannel()
-            scope.launch {
-                runCatchingSafely {
-                    client.get<HttpStatement>(fullUrl).execute { httpResponse ->
-                        val channel: ByteReadChannel = httpResponse.receive()
-                        channel.copyAndClose(outChannel)
-                    }
+            scope.launchSafelyWithoutExceptions {
+                client.get<HttpStatement>(fullUrl).execute { httpResponse ->
+                    val channel: ByteReadChannel = httpResponse.receive()
+                    channel.copyAndClose(outChannel)
                }
-                scope.cancel()
            }
            outChannel
        } as T
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorPipelineStepsHolder.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorPipelineStepsHolder.kt
@@ -1,75 +0,0 @@
-package dev.inmo.tgbotapi.bot.ktor
-
-import dev.inmo.tgbotapi.bot.Ktor.KtorCallFactory
-import dev.inmo.tgbotapi.requests.abstracts.Request
-
-interface KtorPipelineStepsHolder {
-    /**
-     * Will be called when any exception will happen due to the [request] handling. If returns value - that value
-     * will be returned from [dev.inmo.tgbotapi.bot.RequestsExecutor.execute] instead
-     */
-    suspend fun <T: Any> onRequestException(
-        request: Request<T>,
-        t: Throwable
-    ): T? = null
-
-    /**
-     * Will always be called before requests executor will check all [callsFactories] for an opportunity to make call of
-     * [request]
-     */
-    suspend fun onBeforeSearchCallFactory(
-        request: Request<*>,
-        callsFactories: List<KtorCallFactory>
-    ) {}
-
-    /**
-     * Will always be called before [potentialFactory] will try to make [request]
-     */
-    suspend fun onBeforeCallFactoryMakeCall(
-        request: Request<*>,
-        potentialFactory: KtorCallFactory
-    ) {}
-
-    /**
-     * Will always be called after [potentialFactory] has tried to make [request] and got some [result]. If returns
-     * value - that value will be returned from [dev.inmo.tgbotapi.bot.RequestsExecutor.execute] instead
-     */
-    suspend fun <T: Any> onAfterCallFactoryMakeCall(
-        result: T?,
-        request: Request<T>,
-        potentialFactory: KtorCallFactory
-    ): T? = result
-
-    /**
-     * Will be called when [resultCallFactory] is the [KtorCallFactory] from [callsFactories] which has successfully
-     * handled [request] and returned [result]. If returns value - that value will be returned from
-     * [dev.inmo.tgbotapi.bot.RequestsExecutor.execute] instead
-     */
-    suspend fun <T: Any> onRequestResultPresented(
-        result: T,
-        request: Request<T>,
-        resultCallFactory: KtorCallFactory,
-        callsFactories: List<KtorCallFactory>
-    ): T? = result
-
-    /**
-     * Will be called when there is no [KtorCallFactory] from [callsFactories] which may handle [request]. If returns
-     * value - that value will be returned from [dev.inmo.tgbotapi.bot.RequestsExecutor.execute] instead
-     */
-    suspend fun <T: Any> onRequestResultAbsent(
-        request: Request<T>,
-        callsFactories: List<KtorCallFactory>
-    ): T? = null
-
-    /**
-     * This step will be called when the [result] has been retrieved (or exception has happened). If returns value -
-     * that value will be returned from [dev.inmo.tgbotapi.bot.RequestsExecutor.execute] instead
-     */
-    suspend fun <T: Any> onRequestReturnResult(
-        result: Result<T>,
-        request: Request<T>,
-        callsFactories: List<KtorCallFactory>
-    ): T = result.getOrThrow()
-
-    companion object : KtorPipelineStepsHolder
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/multiserver/SimpleMultiServerRequestsExecutor.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/multiserver/SimpleMultiServerRequestsExecutor.kt
@@ -1,224 +0,0 @@
-package dev.inmo.tgbotapi.bot.multiserver
-
-import dev.inmo.tgbotapi.bot.Ktor.KtorRequestsExecutorBuilder
-import dev.inmo.tgbotapi.bot.Ktor.telegramBot
-import dev.inmo.tgbotapi.bot.RequestsExecutor
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
-import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
-import kotlinx.coroutines.*
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-
-/**
- * This type of [RequestsExecutor] (aka [TelegramBot]) has been created to aggregate several bots under the hood and make
- * requests, for example, with changing of api url
- *
- * @param bots Bots which will be used to [execute] [Request]s
- * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
- * when request execution just started and this call is first in context of one [execute]. By default, will select next
- * [TelegramBot] when called (or first when current index is last or -1)
- * @param onClose This method will be called inside of [close] method. By default, will close all [bots]
- */
-class SimpleMultiServerRequestsExecutor(
-    private val bots: List<TelegramBot>,
-    private val botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
-        getOrElse(i + 1) { first() }
-    },
-    private val onClose: () -> Unit = {
-        bots.forEach(TelegramBot::close)
-    }
-) : RequestsExecutor {
-    override suspend fun <T : Any> execute(request: Request<T>): T {
-        var currentBot = bots.botSelector(-1, null)
-        while (currentCoroutineContext().isActive) {
-            val i = bots.indexOf(currentBot)
-            runCatching {
-                currentBot.execute(request)
-            }.onSuccess {
-                return it
-            }.onFailure {
-                currentBot = bots.botSelector(i, it)
-            }
-        }
-        error("Coroutine has been terminated")
-    }
-
-    override fun close() {
-        onClose()
-    }
-
-    companion object {
-        /**
-         * @param keepers Will be used to create result [bots]
-         * @param builder Will be called with each item from [keepers] in process of bots creation
-         * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
-         * when request execution just started and this call is first in context of one [execute]. By default, will select next
-         * [TelegramBot] when called (or first when current index is last or -1)
-         * @param onClose This method will be called inside of [close] method. By default, will close all [bots]
-         */
-        @JvmName("createByUrlsKeepers")
-        @JsName("createByUrlsKeepers")
-        inline operator fun invoke(
-            keepers: Iterable<TelegramAPIUrlsKeeper>,
-            crossinline builder: KtorRequestsExecutorBuilder.(TelegramAPIUrlsKeeper) -> Unit = {},
-            noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
-                getOrElse(i + 1) { first() }
-            },
-            noinline onClose: ((List<TelegramBot>) -> Unit)? = null
-        ): SimpleMultiServerRequestsExecutor {
-            val bots = keepers.map { telegramBot(it) { builder(it) } }
-            return if (onClose == null) {
-                SimpleMultiServerRequestsExecutor(bots, botSelector)
-            } else {
-                SimpleMultiServerRequestsExecutor(bots, botSelector) {
-                    onClose(bots)
-                }
-            }
-        }
-
-        /**
-         * @param tokens Will be used to create result [bots]
-         * @param builder Will be called with each item from [tokens] in process of bots creation
-         * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
-         * when request execution just started and this call is first in context of one [execute]. By default, will select next
-         * [TelegramBot] when called (or first when current index is last or -1)
-         * @param onClose This method will be called inside of [close] method. By default, will close all [bots]
-         */
-        @JvmName("createByTokens")
-        @JsName("createByTokens")
-        inline operator fun invoke(
-            tokens: Iterable<String>,
-            crossinline builder: KtorRequestsExecutorBuilder.(String) -> Unit = {},
-            noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
-                getOrElse(i + 1) { first() }
-            },
-            noinline onClose: ((List<TelegramBot>) -> Unit)? = null
-        ): SimpleMultiServerRequestsExecutor {
-            val bots = tokens.map { telegramBot(it) { builder(it) } }
-            return if (onClose == null) {
-                SimpleMultiServerRequestsExecutor(bots, botSelector)
-            } else {
-                SimpleMultiServerRequestsExecutor(bots, botSelector) {
-                    onClose(bots)
-                }
-            }
-        }
-
-        /**
-         * @param tokens [Pair]s with first parameter as a token and second parameter api url. Will be used to create
-         * result [bots]
-         * @param builder Will be called with each item from [tokens] in process of bots creation
-         * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
-         * when request execution just started and this call is first in context of one [execute]. By default, will select next
-         * [TelegramBot] when called (or first when current index is last or -1)
-         * @param onClose This method will be called inside of [close] method. By default, will close all [bots]
-         */
-        @JvmName("createByTokensAndApiUrls")
-        @JsName("createByTokensAndApiUrls")
-        inline operator fun invoke(
-            tokens: Iterable<Pair<String, String>>,
-            crossinline builder: KtorRequestsExecutorBuilder.(Pair<String, String>) -> Unit = {},
-            noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
-                getOrElse(i + 1) { first() }
-            },
-            noinline onClose: ((List<TelegramBot>) -> Unit)? = null
-        ): SimpleMultiServerRequestsExecutor {
-            val bots = tokens.map { telegramBot(it.first, it.second) { builder(it) } }
-            return if (onClose == null) {
-                SimpleMultiServerRequestsExecutor(bots, botSelector)
-            } else {
-                SimpleMultiServerRequestsExecutor(bots, botSelector) {
-                    onClose(bots)
-                }
-            }
-        }
-    }
-}
-
-
-/**
- * Creates [SimpleMultiServerRequestsExecutor]
- *
- * @param bots Bots which will be used to [SimpleMultiServerRequestsExecutor.execute] [Request]s
- * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
- * when request execution just started and this call is first in context of one
- * [SimpleMultiServerRequestsExecutor.execute]. By default, will select next [TelegramBot] when called (or first when
- * current index is last or -1)
- * @param onClose This method will be called inside of [SimpleMultiServerRequestsExecutor.close] method. By default, will close all [bots]
- */
-@Suppress("NOTHING_TO_INLINE")
-inline fun telegramBot(
-    bots: List<TelegramBot>,
-    noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
-        getOrElse(i + 1) { first() }
-    },
-    noinline onClose: () -> Unit = {
-        bots.forEach(TelegramBot::close)
-    }
-): TelegramBot = SimpleMultiServerRequestsExecutor(bots, botSelector, onClose)
-
-/**
- * @param keepers Will be used to create result [SimpleMultiServerRequestsExecutor.bots]
- * @param builder Will be called with each item from [keepers] in process of bots creation
- * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
- * when request execution just started and this call is first in context of one
- * [SimpleMultiServerRequestsExecutor.execute]. By default, will select next [TelegramBot] when called (or first when
- * current index is last or -1)
- * @param onClose This method will be called inside of [SimpleMultiServerRequestsExecutor.close] method. By default,
- * will close all [SimpleMultiServerRequestsExecutor.bots]
- */
-@JvmName("telegramBotByApiUrlsKeepers")
-@JsName("telegramBotByApiUrlsKeepers")
-inline fun telegramBot(
-    keepers: Iterable<TelegramAPIUrlsKeeper>,
-    crossinline builder: KtorRequestsExecutorBuilder.(TelegramAPIUrlsKeeper) -> Unit = {},
-    noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
-        getOrElse(i + 1) { first() }
-    },
-    noinline onClose: ((List<TelegramBot>) -> Unit)? = null
-): TelegramBot = SimpleMultiServerRequestsExecutor(keepers, builder, botSelector, onClose)
-
-/**
- * @param tokens Will be used to create result [SimpleMultiServerRequestsExecutor.bots]
- * @param builder Will be called with each item from [tokens] in process of bots creation
- * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
- * when request execution just started and this call is first in context of one
- * [SimpleMultiServerRequestsExecutor.execute]. By default, will select next [TelegramBot] when called (or first when
- * current index is last or -1)
- * @param onClose This method will be called inside of [SimpleMultiServerRequestsExecutor.close] method. By default,
- * will close all [SimpleMultiServerRequestsExecutor.bots]
- */
-@JvmName("telegramBotByTokens")
-@JsName("telegramBotByTokens")
-inline fun telegramBot(
-    tokens: Iterable<String>,
-    crossinline builder: KtorRequestsExecutorBuilder.(String) -> Unit = {},
-    noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
-        getOrElse(i + 1) { first() }
-    },
-    noinline onClose: ((List<TelegramBot>) -> Unit)? = null
-): TelegramBot = SimpleMultiServerRequestsExecutor(tokens, builder, botSelector, onClose)
-
-/**
- * @param tokens [Pair]s with first parameter as a token and second parameter api url. Will be used to create
- * result [SimpleMultiServerRequestsExecutor.bots]
- * @param builder Will be called with each item from [tokens] in process of bots creation
- * @param botSelector It is strategy by which the bot is selected for the execution. This lambda will receive **-1**
- * when request execution just started and this call is first in context of one
- * [SimpleMultiServerRequestsExecutor.execute]. By default, will select next
- * [TelegramBot] when called (or first when current index is last or -1)
- * @param onClose This method will be called inside of [SimpleMultiServerRequestsExecutor.close] method. By default,
- * will close all [SimpleMultiServerRequestsExecutor.bots]
- */
-@JvmName("telegramBotByTokensAndApiUrls")
-@JsName("telegramBotByTokensAndApiUrls")
-inline fun telegramBot(
-    tokens: Iterable<Pair<String, String>>,
-    crossinline builder: KtorRequestsExecutorBuilder.(Pair<String, String>) -> Unit = {},
-    noinline botSelector: suspend List<TelegramBot>.(currentBotIndex: Int, t: Throwable?) -> TelegramBot = { i, _ ->
-        getOrElse(i + 1) { first() }
-    },
-    noinline onClose: ((List<TelegramBot>) -> Unit)? = null
-): TelegramBot = SimpleMultiServerRequestsExecutor(tokens, builder, botSelector, onClose)
--- 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
@@ -61,9 +61,9 @@ object InputFileSerializer : KSerializer<InputFile> {
@Serializable(InputFileSerializer::class)
 data class MultipartFile (
    val file: StorageFile,
-    val filename: String = file.fileName
+    val filename: String = file.storageFileInfo.fileName
 ) : InputFile() {
-    override val fileId: String = file.generateCustomName()
+    override val fileId: String = file.storageFileInfo.generateCustomName()
 }

@Suppress("NOTHING_TO_INLINE", "unused")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerWebAppQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerWebAppQuery.kt
@@ -1,24 +0,0 @@
-package dev.inmo.tgbotapi.requests.answers
-
-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.webapps.query.SentWebAppMessage
-import kotlinx.serialization.*
-
-/**
- * @param webAppQueryId [dev.inmo.tgbotapi.webapps.WebAppInitData.queryId]
- */
-@Serializable
-data class AnswerWebAppQuery(
-    @SerialName(webAppQueryIdField)
-    val webAppQueryId: WebAppQueryId,
-    @SerialName(resultField)
-    val result: InlineQueryResult
-) : SimpleRequest<SentWebAppMessage> {
-    override fun method(): String = "answerWebAppQuery"
-    override val resultDeserializer: DeserializationStrategy<SentWebAppMessage>
-        get() = SentWebAppMessage.serializer()
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/ClearMyDefaultAdministratorRights.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/ClearMyDefaultAdministratorRights.kt
@@ -1,18 +0,0 @@
-package dev.inmo.tgbotapi.requests.bot
-
-import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.*
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.serializer
-
-@Serializable
-class ClearMyDefaultAdministratorRights(
-    @SerialName(forChannelsField)
-    val forChannels: Boolean? = null
-) : SimpleRequest<Boolean> {
-    override fun method(): String = "setMyDefaultAdministratorRights"
-    override val resultDeserializer: DeserializationStrategy<Boolean>
-        get() = Boolean.serializer()
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyDefaultAdministratorRights.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/GetMyDefaultAdministratorRights.kt
@@ -1,23 +0,0 @@
-package dev.inmo.tgbotapi.requests.bot
-
-import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.AdministratorChatMemberImpl
-import kotlinx.serialization.*
-
-@Serializable
-data class GetMyDefaultAdministratorRights(
-    @SerialName(forChannelsField)
-    val forChannels: Boolean? = null
-) : SimpleRequest<AdministratorChatMemberImpl> {
-    override fun method(): String = "getMyDefaultAdministratorRights"
-    override val resultDeserializer: DeserializationStrategy<AdministratorChatMemberImpl>
-        get() = AdministratorChatMemberImpl.serializer()
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-
-    companion object {
-        val ForChannels = GetMyDefaultAdministratorRights(true)
-        val ForGroups = GetMyDefaultAdministratorRights(false)
-    }
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyDefaultAdministratorRights.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyDefaultAdministratorRights.kt
@@ -1,20 +0,0 @@
-package dev.inmo.tgbotapi.requests.bot
-
-import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.*
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.serializer
-
-@Serializable
-class SetMyDefaultAdministratorRights(
-    @SerialName(rightsField)
-    val rights: ChatAdministratorRightsImpl,
-    @SerialName(forChannelsField)
-    val forChannels: Boolean? = null
-) : SimpleRequest<Boolean> {
-    override fun method(): String = "setMyDefaultAdministratorRights"
-    override val resultDeserializer: DeserializationStrategy<Boolean>
-        get() = Boolean.serializer()
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMenuButton.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMenuButton.kt
@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.requests.chat.get
-
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
-import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.*
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.serializer
-
-@Serializable
-data class GetChatMenuButton(
-    @SerialName(chatIdField)
-    override val chatId: ChatIdentifier
-) : ChatRequest, SimpleRequest<MenuButton> {
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-
-    override fun method(): String = GetDefaultChatMenuButton.method()
-
-    override val resultDeserializer: DeserializationStrategy<MenuButton>
-        get() = MenuButtonSerializer
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetDefaultChatMenuButton.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetDefaultChatMenuButton.kt
@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.requests.chat.get
-
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
-import dev.inmo.tgbotapi.CommonAbstracts.types.OptionalChatRequest
-import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.*
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.serializer
-
-@Serializable
-object GetDefaultChatMenuButton : OptionalChatRequest, SimpleRequest<MenuButton> {
-    override val chatId: ChatIdentifier?
-        get() = null
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-
-    override fun method(): String = "getChatMenuButton"
-
-    override val resultDeserializer: DeserializationStrategy<MenuButton>
-        get() = MenuButtonSerializer
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt
@@ -32,8 +32,8 @@ data class PromoteChatMember(
    private val canPinMessages: Boolean? = null,
    @SerialName(canPromoteMembersField)
    private val canPromoteMembers: Boolean? = null,
-    @SerialName(canManageVideoChatsField)
-    private val canManageVideoChats: Boolean? = null,
+    @SerialName(canManageVoiceChatsField)
+    private val canManageVoiceChats: Boolean? = null,
    @SerialName(canManageChatField)
    private val canManageChat: Boolean? = null
 ) : ChatMemberRequest<Boolean>, UntilDate {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatMenuButton.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatMenuButton.kt
@@ -1,24 +0,0 @@
-package dev.inmo.tgbotapi.requests.chat.modify
-
-import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
-import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.*
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.serializer
-
-@Serializable
-data class SetChatMenuButton(
-    @SerialName(chatIdField)
-    override val chatId: ChatIdentifier,
-    @Serializable(MenuButtonSerializer::class)
-    @SerialName(menuButtonField)
-    val menuButton: MenuButton
-) : ChatRequest, SimpleRequest<Boolean> {
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-
-    override fun method(): String = SetDefaultChatMenuButton.method()
-
-    override val resultDeserializer: DeserializationStrategy<Boolean>
-        get() = Boolean.serializer()
-}
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetDefaultChatMenuButton.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetDefaultChatMenuButton.kt
@@ -1,25 +0,0 @@
-package dev.inmo.tgbotapi.requests.chat.modify
-
-import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.*
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.serializer
-
-@Serializable
-data class SetDefaultChatMenuButton(
-    @Serializable(MenuButtonSerializer::class)
-    @SerialName(menuButtonField)
-    val menuButton: MenuButton
-) : SimpleRequest<Boolean> {
-    override val requestSerializer: SerializationStrategy<*>
-        get() = serializer()
-
-    override fun method(): String = Companion.method()
-
-    override val resultDeserializer: DeserializationStrategy<Boolean>
-        get() = Boolean.serializer()
-
-    companion object {
-        fun method() = "setChatMenuButton"
-    }
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
				`@@ -0,0 +1 @@`
				{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}