add exceptions handling readme

2025-11-17 04:20:13 +00:00 · 2022-01-11 21:21:31 +06:00
1106 changed files with 10254 additions and 71004 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 # These are supported funding model platforms

-custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472', 'https://boosty.to/insanusmokrassar']
+custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472']
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -5,9 +5,6 @@ on: [pull_request, issues]
 jobs:
  greeting:
    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
    steps:
    - uses: actions/first-interaction@v1
      with:
--- a/.github/workflows/kdocs.yml
+++ b/.github/workflows/kdocs.yml
@@ -10,12 +10,12 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 17
+          java-version: 1.8
      - name: Build
-        run: ./gradlew dokkaHtmlMultiModule
+        run: ./gradlew dokkaHtml
      - name: Publish KDocs
        uses: peaceiris/actions-gh-pages@v3
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./build/dokka/htmlMultiModule
+          publish_dir: ./docs/build/dokka/html
          publish_branch: kdocs
--- a/.github/workflows/packages_publishing.yml
+++ b/.github/workflows/packages_publishing.yml
@@ -7,30 +7,21 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 17
-      - name: Setup LibCurl
-        run: sudo apt update && sudo apt install -y libcurl4-openssl-dev
+          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 "[^/]*$"`"
          cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
          rm gradle.properties
          mv gradle.properties.tmp gradle.properties
-      - name: KotlinSymbolProcessing execution
-        run: ./gradlew ksp
      - name: Build
        run: ./gradlew build
-      - name: API compatibility check
-        run: ./gradlew apiCheck
-      - name: Publish to Gitea
+      - name: Publish
        continue-on-error: true
-        run: ./gradlew publishAllPublicationsToInmoNexusRepository
-        env:
-          INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }}
-          INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }}
-      - name: Publish to GithubPackages
-        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
--- a/README.md
+++ b/README.md
@@ -1,19 +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-7.2-blue)](https://core.telegram.org/bots/api-changelog#march-31-2024)
+# 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)

-|          Docs          |                                   [![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=Mk&message=Docs&color=blue&logo=mkdocs)](https://docs.inmo.dev/tgbotapi/index.html)                                    |
-|:----------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-|      Useful repos      |                           [![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/)                           |
-|          Misc          |                              [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![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)                               |
-|       Platforms        |                                                                                                      ![JVM](https://img.shields.io/badge/JVM-red?style=plastic&logo=openjdk&logoColor=white) ![Js](https://img.shields.io/badge/JavaScript-323330?style=plastic&logo=javascript&logoColor=F7DF1E)                                                                                                       |
-| Experimental Platforms |                                                                                                [![Linux x64](https://img.shields.io/badge/LinuxX64-FCC624?style=plastic&logo=linux&logoColor=black)](https://kotlinlang.org/docs/native-target-support.html#tier-1) [![MinGW x64](https://img.shields.io/badge/MinGWX64-black?style=plastic&logo=windows&logoColor=green)](https://kotlinlang.org/docs/native-target-support.html#tier-1)                                                                                                 |
-
-<!--- [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/ktgbotapi) --->
-
-<p align="center">
-  <a href="https://t.me/ktgbotapi">
-    <img src="./resources/tg_channel_qr.jpg">
-  </a>
-</p>
+| [![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)](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.

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

-  bot.buildBehaviourWithLongPolling {
+  bot.buildBehaviour {
    println(getMe())
  
    onCommand("start") {
@@ -80,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(
@@ -118,5 +107,5 @@ suspend fun main() {
 ### More examples

 You may find examples in [this project](https://github.com/InsanusMokrassar/TelegramBotAPI-examples). Besides, you are
-always welcome in our [docs](https://docs.inmo.dev/tgbotapi/index.html) and
+always welcome in our [wiki](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/About-this-project) and
 [chat](https://t.me/InMoTelegramBotAPIChat).
--- a/build.gradle
+++ b/build.gradle
@@ -6,28 +6,19 @@ buildscript {
    }

    dependencies {
-        classpath libs.kotlin.gradle.plugin
-        classpath libs.kotlin.ksp.plugin
-        classpath libs.kotlin.serialization.plugin
-        classpath libs.kotlin.dokka.plugin
-        classpath libs.github.release.plugin
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
    }
 }

 plugins {
-    alias(libs.plugins.kotlin.dokka)
-    alias(libs.plugins.versions)
-    alias(libs.plugins.validator)
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version" apply false
+    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" apply false
 }

 // temporal crutch until legacy tests will be stabled or legacy target will be removed
 allprojects {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        google()
-        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
-    }
    if (it != rootProject.findProject("docs")) {
        tasks.whenTaskAdded { task ->
            if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") {
@@ -36,7 +27,6 @@ allprojects {
        }
    }
 }
-apply from: "./extensions.gradle"

 private String getCurrentVersionChangelog() {
    OutputStream changelogDataOS = new ByteArrayOutputStream()
@@ -55,13 +45,13 @@ if (new File(projectDir, "secret.gradle").exists()) {
    githubRelease {
        token "${project.property('GITHUB_RELEASE_TOKEN')}"

-        owner = "InsanusMokrassar"
-        repo = "TelegramBotAPI"
+        owner "InsanusMokrassar"
+        repo "TelegramBotAPI"

-        tagName = "v$library_version"
-        releaseName = "$library_version"
-        targetCommitish = "$library_version"
+        tagName "$library_version"
+        releaseName "$library_version"
+        targetCommitish "$library_version"

-        body = getCurrentVersionChangelog()
+        body getCurrentVersionChangelog()
    }
 }
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -1,28 +1,50 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+    }
+}
+
 plugins {
    id "org.jetbrains.kotlin.multiplatform"
    id "org.jetbrains.kotlin.plugin.serialization"
-    id "org.jetbrains.dokka"
+    id "org.jetbrains.dokka" version "$dokka_version"
 }

-project.description = "Full collection of all built-in tgbotapi tools"
-
-apply from: "$mppProjectWithSerializationPresetPath"
+repositories {
+    mavenLocal()
+    mavenCentral()
+}

 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
    sourceSets {
        commonMain {
            dependencies {
-                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")
+                implementation kotlin('stdlib')
+
+                rootProject.subprojects.forEach {
+                    if (it != project) {
+                        api it
+                    }
+                }
            }
        }
    }
@@ -30,13 +52,12 @@ kotlin {

 private List<SourceDirectorySet> findSourcesWithName(String... approximateNames) {
    return parent.subprojects
-            .findAll { it != project && it.hasProperty("kotlin") }
-            .collectMany { it.kotlin.sourceSets }
-            .findAll { sourceSet ->
-                approximateNames.any { nameToFilter ->
-                    sourceSet.name.contains(nameToFilter)
-                }
-            }.collect { it.kotlin }
+        .findAll { it != project }
+        .collectMany { it.kotlin.sourceSets }
+        .findAll { sourceSet -> approximateNames.any {
+            nameToFilter -> sourceSet.name.contains(nameToFilter)
+            }
+        }.collect { it.kotlin }
 }

 Object callback = {
@@ -54,8 +75,8 @@ Object callback = {
            skipDeprecated.set(true)

            sourceLink {
-                localDirectory.set(file("../"))
-                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/ktgbotapi/tree/master"))
+                localDirectory.set(file("./"))
+                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"))
                remoteLineSuffix.set("#L")
            }
        }
@@ -76,3 +97,8 @@ Object callback = {

 tasks.dokkaGfm(callback)
 tasks.dokkaHtml(callback)
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
--- a/docs/gradle.properties
+++ b/docs/gradle.properties
@@ -1 +1,3 @@
+dokka_version=1.6.0
+
 org.gradle.jvmargs=-Xmx1024m
--- a/extensions.gradle
+++ b/extensions.gradle
@@ -1,8 +0,0 @@
-allprojects {
-    ext {
-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
-        mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"
-
-        publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
-    }
-}
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,5 +5,19 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true

+kotlin_version=1.6.10
+kotlin_coroutines_version=1.6.0
+kotlin_serialisation_runtime_version=1.3.2
+klock_version=2.4.10
+uuid_version=0.3.1
+ktor_version=1.6.7
+
+
+micro_utils_version=0.9.1
+
+javax_activation_version=1.1.1
+
 library_group=dev.inmo
-library_version=12.0.1
+library_version=0.38.2
+
+github_release_plugin_version=2.2.12
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,83 +0,0 @@
-[versions]
-
-kotlin = "1.9.23"
-kotlin-serialization = "1.6.3"
-kotlin-coroutines = "1.8.0"
-
-javax-activation = "1.1.1"
-
-korlibs = "5.4.0"
-uuid = "0.8.4"
-ktor = "2.3.10"
-
-ksp = "1.9.23-1.0.20"
-kotlin-poet = "1.16.0"
-
-microutils = "0.20.45"
-kslog = "1.3.3"
-
-versions = "0.51.0"
-
-github-release-plugin = "2.5.2"
-dokka = "1.9.20"
-
-validator = "0.14.0"
-
-[libraries]
-
-kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
-kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
-kotlin-serialization-properties = { module = "org.jetbrains.kotlinx:kotlinx-serialization-properties", version.ref = "kotlin-serialization" }
-kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
-kotlin-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
-kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kotlin" }
-
-ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
-ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" }
-ktor-client-winhttp = { module = "io.ktor:ktor-client-winhttp", version.ref = "ktor" }
-ktor-server = { module = "io.ktor:ktor-server", version.ref = "ktor" }
-ktor-server-host-common = { module = "io.ktor:ktor-server-host-common", version.ref = "ktor" }
-
-javax-activation = { module = "javax.activation:activation", version.ref = "javax-activation" }
-
-korlibs-klock =  { module = "com.soywiz.korge:korlibs-time", version.ref = "korlibs" }
-korlibs-krypto =  { module = "com.soywiz.korge:korlibs-crypto", version.ref = "korlibs" }
-
-uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
-
-microutils-colors-common = { module = "dev.inmo:micro_utils.colors.common", version.ref = "microutils" }
-microutils-coroutines = { module = "dev.inmo:micro_utils.coroutines", version.ref = "microutils" }
-microutils-serialization-base64 = { module = "dev.inmo:micro_utils.serialization.base64", version.ref = "microutils" }
-microutils-serialization-encapsulator = { module = "dev.inmo:micro_utils.serialization.encapsulator", version.ref = "microutils" }
-microutils-serialization-typedSerializer = { module = "dev.inmo:micro_utils.serialization.typed_serializer", version.ref = "microutils" }
-microutils-serialization-mapper = { module = "dev.inmo:micro_utils.serialization.mapper", version.ref = "microutils" }
-microutils-languageCodes = { module = "dev.inmo:micro_utils.language_codes", version.ref = "microutils" }
-microutils-ktor-common = { module = "dev.inmo:micro_utils.ktor.common", version.ref = "microutils" }
-microutils-fsm-common = { module = "dev.inmo:micro_utils.fsm.common", version.ref = "microutils" }
-
-kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
-
-# ksp dependencies
-
-kotlin-poet = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin-poet" }
-ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
-
-# buildscript classpaths
-
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlin-ksp-plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
-kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
-kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
-github-release-plugin = { module = "com.github.breadmoirai:github-release", version.ref = "github-release-plugin" }
-
-[plugins]
-
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "validator" }
--- 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-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
--- a/mppJsProject.gradle
+++ b/mppJsProject.gradle
@@ -1,32 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-apply from: "$publishGradlePath"
-
-kotlin {
-    js (IR) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
-            }
-        }
-    }
-}
--- a/mppProjectWithSerialization.gradle
+++ b/mppProjectWithSerialization.gradle
@@ -1,58 +0,0 @@
-project.version = "$library_version"
-project.group = "$library_group"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-    js (IR) {
-        browser()
-        nodejs()
-    }
-    linuxX64()
-    mingwX64()
-    linuxArm64()
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation libs.kotlin
-                api libs.kotlin.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation libs.kotlin.test.common
-                implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation libs.kotlin.test.junit
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
-            }
-        }
-        all {
-            languageSettings {
-                optIn('dev.inmo.tgbotapi.utils.RiskFeature')
-                optIn('dev.inmo.tgbotapi.utils.PreviewFeature')
-                optIn('dev.inmo.micro_utils.common.Warning')
-                optIn('dev.inmo.micro_utils.common.PreviewFeature')
-            }
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
--- 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":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
--- a/resources/tg_channel_qr.jpg
+++ b/resources/tg_channel_qr.jpg
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,10 +12,13 @@ pluginManagement {
 }

 include ":tgbotapi.core"
-include ":tgbotapi.ksp"
 include ":tgbotapi.api"
 include ":tgbotapi.utils"
 include ":tgbotapi.behaviour_builder"
 include ":tgbotapi.behaviour_builder.fsm"
+include ":tgbotapi.extensions.api"
+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/api/tgbotapi.api.api
+++ b/tgbotapi.api/api/tgbotapi.api.api
--- a/tgbotapi.api/build.gradle
+++ b/tgbotapi.api/build.gradle
@@ -1,24 +1,55 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    }
+}
+
 plugins {
    id "org.jetbrains.kotlin.multiplatform"
    id "org.jetbrains.kotlin.plugin.serialization"
-    id "org.jetbrains.dokka"
 }

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

-apply from: "$mppProjectWithSerializationPresetPath"
-apply from: "$publishGradlePath"
+apply from: "publish.gradle"
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}

 kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
    sourceSets {
        commonMain {
            dependencies {
+                implementation kotlin('stdlib')
                api project(":tgbotapi.core")
            }
        }
-        configureEach {
-            languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
-        }
    }
 }

+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
--- 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
@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api

-import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
@@ -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/DeleteMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessage.kt
@@ -3,51 +3,26 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.DeleteMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.message.content.MediaGroupCollectionContent
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.Message

 suspend fun TelegramBot.deleteMessage(
    chatId: ChatIdentifier,
-    messageId: MessageId
+    messageId: MessageIdentifier
 ) = execute(
    DeleteMessage(chatId, messageId)
 )

 suspend fun TelegramBot.deleteMessage(
    chat: Chat,
-    messageId: MessageId
+    messageId: MessageIdentifier
 ) = deleteMessage(chat.id, messageId)

 suspend fun TelegramBot.deleteMessage(
-    message: AccessibleMessage
-): Boolean {
-    val mediaGroupContent = ((message as? ContentMessage<*>) ?.content as? MediaGroupCollectionContent<*>)
-    if (mediaGroupContent == null) {
-        return deleteMessage(message.chat, message.messageId)
-    } else {
-        return mediaGroupContent.group.map {
-            deleteMessage(it.sourceMessage)
-        }.all { it }
-    }
-}
+    message: Message
+) = deleteMessage(message.chat, message.messageId)

-suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageId: MessageId
-) = deleteMessage(chatId, messageId)
-
-suspend fun TelegramBot.delete(
-    chat: Chat,
-    messageId: MessageId
-) = deleteMessage(chat, messageId)
-
-suspend fun TelegramBot.delete(
-    message: AccessibleMessage
-) = deleteMessage(message)
-
-suspend fun AccessibleMessage.delete(
+suspend fun Message.delete(
    requestsExecutor: TelegramBot
 ) = requestsExecutor.deleteMessage(this)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/DeleteMessages.kt
@@ -1,61 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.DeleteMessages
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import kotlin.jvm.JvmName
-
-suspend fun TelegramBot.deleteMessages(
-    chatId: ChatIdentifier,
-    messageIds: List<MessageId>
-) = messageIds.chunked(deleteMessagesLimit.last).map {
-    execute(
-        DeleteMessages(
-            chatId = chatId,
-            messageIds = it
-        )
-    )
-}.all { it }
-
-suspend fun TelegramBot.deleteMessages(
-    chatId: ChatIdentifier,
-    messageIds: Array<MessageId>
-) = deleteMessages(
-    chatId = chatId,
-    messageIds = messageIds.toList()
-)
-
-suspend fun TelegramBot.deleteMessages(
-    messagesMetas: List<Message.MetaInfo>
-) = messagesMetas.groupBy { it.chatId }.map { (chatId, messages) ->
-    deleteMessages(
-        chatId = chatId,
-        messageIds = messages.map { it.messageId }
-    )
-}.all { it }
-
-@JvmName("deleteMessagesWithMessages")
-suspend fun TelegramBot.deleteMessages(
-    messages: List<AccessibleMessage>
-) = deleteMessages(messages.map { it.metaInfo })
-
-suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageIds: List<MessageId>
-) = deleteMessages(chatId = chatId, messageIds = messageIds)
-
-suspend fun TelegramBot.delete(
-    chatId: ChatIdentifier,
-    messageIds: Array<MessageId>
-) = deleteMessages(chatId = chatId, messageIds = messageIds)
-
-suspend fun TelegramBot.delete(
-    messagesMetas: List<Message.MetaInfo>
-) = deleteMessages(messagesMetas)
-
-@JvmName("deleteWithMessages")
-suspend fun TelegramBot.delete(
-    messages: List<AccessibleMessage>
-) = deleteMessages(messages)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessage.kt
@@ -3,62 +3,54 @@ package dev.inmo.tgbotapi.extensions.api
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.ForwardMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.threadId
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.Message

 suspend fun TelegramBot.forwardMessage(
    fromChatId: ChatIdentifier,
    toChatId: ChatIdentifier,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
 ) = execute(
-    ForwardMessage(fromChatId, toChatId, messageId, threadId, disableNotification, protectContent)
+    ForwardMessage(fromChatId, toChatId, messageId, disableNotification, protectContent)
 )

 suspend fun TelegramBot.forwardMessage(
    fromChat: Chat,
    toChatId: ChatIdentifier,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChatId.threadId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(fromChat.id, toChatId, messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(fromChat.id, toChatId, messageId, disableNotification, protectContent)

 suspend fun TelegramBot.forwardMessage(
    fromChatId: ChatIdentifier,
    toChat: Chat,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChat.id.threadId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(fromChatId, toChat.id, messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(fromChatId, toChat.id, messageId, disableNotification, protectContent)

 suspend fun TelegramBot.forwardMessage(
    fromChat: Chat,
    toChat: Chat,
-    messageId: MessageId,
-    threadId: MessageThreadId? = toChat.id.threadId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(fromChat.id, toChat.id, messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(fromChat.id, toChat.id, messageId, disableNotification, protectContent)

 suspend fun TelegramBot.forwardMessage(
    toChatId: ChatIdentifier,
-    message: AccessibleMessage,
-    threadId: MessageThreadId? = toChatId.threadId,
+    message: Message,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(message.chat, toChatId, message.messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(message.chat, toChatId, message.messageId, disableNotification, protectContent)

 suspend fun TelegramBot.forwardMessage(
    toChat: Chat,
-    message: AccessibleMessage,
-    threadId: MessageThreadId? = toChat.id.threadId,
+    message: Message,
    disableNotification: Boolean = false,
    protectContent: Boolean = false
-) = forwardMessage(message.chat, toChat, message.messageId, threadId, disableNotification, protectContent)
+) = forwardMessage(message.chat, toChat, message.messageId, disableNotification, protectContent)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/ForwardMessages.kt
@@ -1,154 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.send.copyMessages
-import dev.inmo.tgbotapi.requests.ForwardMessages
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import kotlin.jvm.JvmName
-
-suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: List<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = messageIds.chunked(forwardMessagesLimit.last).flatMap {
-    execute(
-        ForwardMessages(
-            toChatId = toChatId,
-            fromChatId = fromChatId,
-            messageIds = it,
-            threadId = threadId,
-            disableNotification = disableNotification,
-            protectContent = protectContent,
-            removeCaption = removeCaption
-        )
-    )
-}
-
-suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: Array<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds.toList(),
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    messagesMetas: List<Message.MetaInfo>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = messagesMetas.groupBy { it.chatId }.flatMap { (chatId, messages) ->
-    forwardMessages(
-        toChatId = toChatId,
-        fromChatId = chatId,
-        messageIds = messages.map { it.messageId },
-        threadId = threadId,
-        disableNotification = disableNotification,
-        protectContent = protectContent,
-        removeCaption = removeCaption
-    )
-}
-
-@JvmName("forwardMessagesWithMessages")
-suspend fun TelegramBot.forwardMessages(
-    toChatId: ChatIdentifier,
-    messages: List<AccessibleMessage>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    messagesMetas = messages.map { it.metaInfo },
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: List<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds,
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    fromChatId: ChatIdentifier,
-    messageIds: Array<MessageId>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    fromChatId = fromChatId,
-    messageIds = messageIds,
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    messagesMetas: List<Message.MetaInfo>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    messagesMetas = messagesMetas,
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
-
-@JvmName("forwardWithMessages")
-suspend fun TelegramBot.forward(
-    toChatId: ChatIdentifier,
-    messages: List<AccessibleMessage>,
-    threadId: MessageThreadId? = toChatId.threadId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    removeCaption: Boolean = false
-) = forwardMessages(
-    toChatId = toChatId,
-    messages = messages,
-    threadId = threadId,
-    disableNotification = disableNotification,
-    protectContent = protectContent,
-    removeCaption = removeCaption
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdates.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdates.kt
@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update

 suspend fun TelegramBot.getUpdates(
-    offset: UpdateId? = null,
+    offset: UpdateIdentifier? = null,
    limit: Int = getUpdatesLimit.last,
    timeout: Seconds? = null,
    allowed_updates: List<String>? = ALL_UPDATES_LIST
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdatesRaw.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdatesRaw.kt
@@ -1,26 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.GetUpdatesRaw
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-suspend fun TelegramBot.getRawUpdates(
-    offset: UpdateId? = null,
-    limit: Int = getUpdatesLimit.last,
-    timeout: Seconds? = null,
-    allowed_updates: List<String>? = ALL_UPDATES_LIST
-) = execute(
-    GetUpdatesRaw(
-        offset, limit, timeout, allowed_updates
-    )
-)
-
-suspend fun TelegramBot.getRawUpdates(
-    lastUpdate: Update,
-    limit: Int = getUpdatesLimit.last,
-    timeout: Seconds? = null,
-    allowed_updates: List<String>? = ALL_UPDATES_LIST
-) = getRawUpdates(
-    lastUpdate.updateId + 1, limit, timeout, allowed_updates
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
@@ -1,57 +1,70 @@
 package dev.inmo.tgbotapi.extensions.api.InternalUtils

-import dev.inmo.tgbotapi.types.MediaGroupId
-import dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBotCommonMessage
-import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
+import dev.inmo.tgbotapi.types.MediaGroupIdentifier
+import dev.inmo.tgbotapi.types.UpdateIdentifier
+import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.update.*
+import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.*
 import dev.inmo.tgbotapi.types.update.abstracts.*
-import dev.inmo.tgbotapi.utils.extensions.asMediaGroupMessage

-/**
- * Will convert incoming list of updates to list with [MediaGroupUpdate]s
- */
+internal fun Update.lastUpdateIdentifier(): UpdateIdentifier {
+    return if (this is SentMediaGroupUpdate) {
+        origins.last().updateId
+    } else {
+        updateId
+    }
+}
+
+internal fun List<Update>.lastUpdateIdentifier(): UpdateIdentifier? {
+    return maxByOrNull { it.updateId } ?.lastUpdateIdentifier()
+}
+
 internal fun List<Update>.convertWithMediaGroupUpdates(): List<Update> {
    val resultUpdates = mutableListOf<Update>()
-    val mediaGroups = mutableMapOf<MediaGroupId, MutableList<Pair<BaseSentMessageUpdate, PossiblySentViaBotCommonMessage<MediaGroupPartContent>>>>()
-
+    val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<BaseSentMessageUpdate>>()
    for (update in this) {
-        val message = (update.data as? PossiblySentViaBotCommonMessage<*>) ?.let {
-            if (it.content is MediaGroupPartContent) {
-                it as PossiblySentViaBotCommonMessage<MediaGroupPartContent>
-            } else {
-                null
-            }
-        }
-        val mediaGroupId = message ?.mediaGroupId
-        if (message == null || mediaGroupId == null) {
+        val data = (update.data as? MediaGroupMessage<*>)
+        if (data == null) {
            resultUpdates.add(update)
            continue
        }
        when (update) {
+            is BaseEditMessageUpdate -> resultUpdates.add(
+                update.toEditMediaGroupUpdate()
+            )
            is BaseSentMessageUpdate -> {
-                mediaGroups.getOrPut(mediaGroupId) {
+                mediaGroups.getOrPut(data.mediaGroupId) {
                    mutableListOf()
-                }.add(update to message)
+                }.add(update)
            }
            else -> resultUpdates.add(update)
        }
    }
-
-    mediaGroups.map { (_, updatesWithMessages) ->
-        val update = updatesWithMessages.maxBy { it.first.updateId }.first
-        resultUpdates.add(
-            update.copy(updatesWithMessages.map { it.second }.asMediaGroupMessage())
-        )
+    mediaGroups.values.map {
+        it.toSentMediaGroupUpdate() ?.let { mediaGroupUpdate ->
+            resultUpdates.add(mediaGroupUpdate)
+        }
    }
-
    resultUpdates.sortBy { it.updateId }
    return resultUpdates
 }

-/**
- * @return [EditMessageMediaGroupUpdate] in case if [this] is [EditMessageUpdate]. When [this] object is
- * [EditChannelPostUpdate] instance - will return [EditChannelPostMediaGroupUpdate]
- *
- * @throws IllegalStateException
- */
-internal fun BaseEditMessageUpdate.toEditMediaGroupUpdate() = this
+internal fun List<BaseSentMessageUpdate>.toSentMediaGroupUpdate(): SentMediaGroupUpdate? = (this as? SentMediaGroupUpdate) ?: let {
+    if (isEmpty()) {
+        return@let null
+    }
+    val resultList = sortedBy { it.updateId }
+    when (first()) {
+        is MessageUpdate -> MessageMediaGroupUpdate(resultList)
+        is ChannelPostUpdate -> ChannelPostMediaGroupUpdate(resultList)
+        else -> null
+    }
+}
+
+internal fun BaseEditMessageUpdate.toEditMediaGroupUpdate(): EditMediaGroupUpdate = (this as? EditMediaGroupUpdate) ?: let {
+    when (this) {
+        is EditMessageUpdate -> EditMessageMediaGroupUpdate(this)
+        is EditChannelPostUpdate -> EditChannelPostMediaGroupUpdate(this)
+        else -> error("Unsupported type of ${BaseEditMessageUpdate::class.simpleName}")
+    }
+}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveFlowLocation.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveFlowLocation.kt
@@ -1,169 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api
-
-import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
-import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
-import dev.inmo.tgbotapi.abstracts.*
-import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.edit
-import dev.inmo.tgbotapi.extensions.api.send.send
-import dev.inmo.tgbotapi.extensions.api.send.sendLiveLocation
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.location.Location
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.content.LocationContent
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.map
-import kotlinx.serialization.Serializable
-import kotlin.js.JsName
-import kotlin.jvm.JvmName
-import kotlin.math.ceil
-
-@Serializable
-data class EditLiveLocationInfo(
-    override val latitude: Double,
-    override val longitude: Double,
-    override val horizontalAccuracy: Meters? = null,
-    override val heading: Degrees? = null,
-    override val proximityAlertRadius: Meters? = null,
-    override val replyMarkup: InlineKeyboardMarkup? = null
-) : Locationed, HorizontallyAccured, ProximityAlertable, Headed, WithReplyMarkup
-
-/**
- * Will [sendLiveLocation] with the first [EditLiveLocationInfo] data and update than. Each [liveTimeMillis] passing,
- * the message will be sent again and new edits will be applied to the new message
- */
-suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<EditLiveLocationInfo>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyParameters: ReplyParameters? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
-) {
-    var currentLiveLocationMessage: ContentMessage<LocationContent>? = null
-    val updateMessageJob = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()).launchSafelyWithoutExceptions(start = CoroutineStart.LAZY) {
-        while (isActive) {
-            delay(liveTimeMillis)
-            // Remove previous location message info to resend live location message
-            currentLiveLocationMessage = null
-        }
-    }
-    locationsFlow.collect {
-        val capturedLiveLocationMessage = currentLiveLocationMessage
-        if (capturedLiveLocationMessage == null) {
-            updateMessageJob.start()
-            currentLiveLocationMessage = send(
-                chatId,
-                it.latitude,
-                it.longitude,
-                ceil(liveTimeMillis.toDouble() / 1000).toInt(),
-                it.horizontalAccuracy,
-                it.heading,
-                it.proximityAlertRadius,
-                threadId,
-                businessConnectionId,
-                disableNotification,
-                protectContent,
-                replyParameters,
-                it.replyMarkup
-            ).also {
-                sentMessageFlow ?.emit(it)
-            }
-        } else {
-            edit(
-                capturedLiveLocationMessage,
-                it.latitude,
-                it.longitude,
-                it.horizontalAccuracy,
-                it.heading,
-                it.proximityAlertRadius,
-                it.replyMarkup
-            ).also {
-                sentMessageFlow ?.emit(it)
-            }
-        }
-    }
-}
-
-/**
- * Will apply [Flow.map] to the [locationsFlow] to create [EditLiveLocationInfo] and pass the result flow to the
- * [handleLiveLocation] with [Flow] typed by [EditLiveLocationInfo]
- */
-@JvmName("handleLiveLocationWithLocation")
-@JsName("handleLiveLocationWithLocation")
-suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<Location>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyParameters: ReplyParameters? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
-) {
-    handleLiveLocation(
-        chatId,
-        locationsFlow.map {
-            EditLiveLocationInfo(
-                it.latitude,
-                it.longitude,
-                it.horizontalAccuracy,
-                (it as? LiveLocation) ?.heading,
-                (it as? LiveLocation) ?.proximityAlertRadius,
-                (it as? WithReplyMarkup) ?.replyMarkup as? InlineKeyboardMarkup
-            )
-        },
-        liveTimeMillis,
-        threadId,
-        businessConnectionId,
-        disableNotification,
-        protectContent,
-        replyParameters,
-        sentMessageFlow
-    )
-}
-
-/**
- * Will apply [Flow.map] to the [locationsFlow] to create [EditLiveLocationInfo] and pass the result flow to the
- * [handleLiveLocation] with [Flow] typed by [EditLiveLocationInfo]
- */
-@JvmName("handleLiveLocationWithLatLong")
-@JsName("handleLiveLocationWithLatLong")
-suspend fun TelegramBot.handleLiveLocation(
-    chatId: ChatIdentifier,
-    locationsFlow: Flow<Pair<Double, Double>>,
-    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
-    threadId: MessageThreadId? = chatId.threadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyParameters: ReplyParameters? = null,
-    sentMessageFlow: FlowCollector<ContentMessage<LocationContent>>? = null
-) {
-    handleLiveLocation(
-        chatId,
-        locationsFlow.map { (lat, long) ->
-            EditLiveLocationInfo(
-                lat,
-                long
-            )
-        },
-        liveTimeMillis,
-        threadId,
-        businessConnectionId,
-        disableNotification,
-        protectContent,
-        replyParameters,
-        sentMessageFlow
-    )
-}
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/LiveLocationProvider.kt
@@ -1,24 +1,21 @@
 package dev.inmo.tgbotapi.extensions.api

-import korlibs.time.DateTime
-import korlibs.time.TimeSpan
+import com.soywiz.klock.DateTime
+import com.soywiz.klock.TimeSpan
 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.stopLiveLocation
+import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.editLiveLocation
+import dev.inmo.tgbotapi.extensions.api.edit.LiveLocation.stopLiveLocation
 import dev.inmo.tgbotapi.requests.send.SendLiveLocation
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.location.LiveLocation
 import dev.inmo.tgbotapi.types.location.StaticLocation
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.LocationContent
-import dev.inmo.tgbotapi.utils.extensions.threadIdOrNull
 import io.ktor.utils.io.core.Closeable
-import korlibs.time.millisecondsLong
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlin.math.ceil
@@ -47,8 +44,7 @@ class LiveLocationProvider internal constructor(
        private set
        get() = field || leftUntilCloseMillis.millisecondsLong < 0L

-    var message: ContentMessage<LocationContent> = initMessage
-        private set
+    private var message: ContentMessage<LocationContent> = initMessage
    val lastLocation: LiveLocation
        get() = message.content.location as LiveLocation

@@ -94,11 +90,10 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chatId.threadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyParameters: ReplyParameters? = null,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider {
    val liveTimeAsDouble = liveTimeMillis.toDouble()
@@ -111,11 +106,10 @@ suspend fun TelegramBot.startLiveLocation(
            initHorizontalAccuracy,
            initHeading,
            initProximityAlertRadius,
-            threadId,
-            businessConnectionId,
            disableNotification,
            protectContent,
-            replyParameters,
+            replyToMessageId,
+            allowSendingWithoutReply,
            replyMarkup
        )
    )
@@ -141,11 +135,10 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chat.id.threadId,
-    businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyParameters: ReplyParameters? = null,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
    scope,
@@ -156,11 +149,10 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
-    businessConnectionId,
    disableNotification,
    protectContent,
-    replyParameters,
+    replyToMessageId,
+    allowSendingWithoutReply,
    replyMarkup
 )

@@ -170,17 +162,16 @@ suspend fun TelegramBot.startLiveLocation(
 */
 suspend fun TelegramBot.startLiveLocation(
    scope: CoroutineScope,
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    location: StaticLocation,
    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chatId.threadId,
-    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyParameters: ReplyParameters? = null,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
    scope,
@@ -191,11 +182,10 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
-    businessConnectionId,
    disableNotification,
    protectContent,
-    replyParameters,
+    replyToMessageId,
+    allowSendingWithoutReply,
    replyMarkup
 )

@@ -211,11 +201,10 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = chat.id.threadId,
-    businessConnectionId: BusinessConnectionId? = chat.id.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
-    replyParameters: ReplyParameters? = null,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ): LiveLocationProvider = startLiveLocation(
    scope,
@@ -226,11 +215,10 @@ suspend fun TelegramBot.startLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
-    businessConnectionId,
    disableNotification,
    protectContent,
-    replyParameters,
+    replyToMessageId,
+    allowSendingWithoutReply,
    replyMarkup
 )

@@ -239,7 +227,7 @@ suspend fun TelegramBot.startLiveLocation(
 * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
 */
 suspend inline fun TelegramBot.replyWithLiveLocation(
-    to: AccessibleMessage,
+    to: Message,
    scope: CoroutineScope,
    latitude: Double,
    longitude: Double,
@@ -247,8 +235,6 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = to.threadIdOrNull,
-    businessConnectionId: BusinessConnectionId? = to.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    allowSendingWithoutReply: Boolean? = null,
@@ -262,11 +248,10 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
-    businessConnectionId,
    disableNotification,
    protectContent,
-    ReplyParameters(to.metaInfo, allowSendingWithoutReply = allowSendingWithoutReply),
+    to.messageId,
+    allowSendingWithoutReply,
    replyMarkup
 )

@@ -275,15 +260,13 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
 * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
 */
 suspend inline fun TelegramBot.replyWithLiveLocation(
-    to: AccessibleMessage,
+    to: Message,
    scope: CoroutineScope,
    location: StaticLocation,
    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
    initHorizontalAccuracy: Meters? = null,
    initHeading: Degrees? = null,
    initProximityAlertRadius: Meters? = null,
-    threadId: MessageThreadId? = to.threadIdOrNull,
-    businessConnectionId: BusinessConnectionId? = to.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    allowSendingWithoutReply: Boolean? = null,
@@ -296,10 +279,9 @@ suspend inline fun TelegramBot.replyWithLiveLocation(
    initHorizontalAccuracy,
    initHeading,
    initProximityAlertRadius,
-    threadId,
-    businessConnectionId,
    disableNotification,
    protectContent,
-    ReplyParameters(to.metaInfo, allowSendingWithoutReply = allowSendingWithoutReply),
+    to.messageId,
+    allowSendingWithoutReply,
    replyMarkup
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/StopPoll.kt
@@ -4,8 +4,8 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.StopPoll
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.Message

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -13,7 +13,7 @@ import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
 */
 suspend fun TelegramBot.stopPoll(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(
    StopPoll(chatId, messageId, replyMarkup)
@@ -25,7 +25,7 @@ suspend fun TelegramBot.stopPoll(
 */
 suspend fun TelegramBot.stopPoll(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chat.id, messageId, replyMarkup)

@@ -34,8 +34,8 @@ suspend fun TelegramBot.stopPoll(
 * as a builder for that
 */
 suspend fun TelegramBot.stopPoll(
-    chatId: IdChatIdentifier,
-    message: AccessibleMessage,
+    chatId: ChatId,
+    message: Message,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chatId, message.messageId, replyMarkup)

@@ -45,6 +45,6 @@ suspend fun TelegramBot.stopPoll(
 */
 suspend fun TelegramBot.stopPoll(
    chat: Chat,
-    message: AccessibleMessage,
+    message: Message,
    replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chat.id, message.messageId, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerCallbackQuery.kt
@@ -2,11 +2,11 @@ package dev.inmo.tgbotapi.extensions.api.answers

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.AnswerCallbackQuery
-import dev.inmo.tgbotapi.types.queries.callback.CallbackQuery
-import dev.inmo.tgbotapi.types.CallbackQueryId
+import dev.inmo.tgbotapi.types.CallbackQuery.CallbackQuery
+import dev.inmo.tgbotapi.types.CallbackQueryIdentifier

 suspend fun TelegramBot.answerCallbackQuery(
-    callbackQueryId: CallbackQueryId,
+    callbackQueryId: CallbackQueryIdentifier,
    text: String? = null,
    showAlert: Boolean? = null,
    url: String? = null,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerInlineQuery.kt
@@ -2,48 +2,18 @@ package dev.inmo.tgbotapi.extensions.api.answers

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.AnswerInlineQuery
-import dev.inmo.tgbotapi.requests.answers.InlineQueryResultsButton
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
 import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
-import dev.inmo.tgbotapi.types.InlineQueryId
+import dev.inmo.tgbotapi.types.InlineQueryIdentifier

 suspend fun TelegramBot.answerInlineQuery(
-    inlineQueryID: InlineQueryId,
+    inlineQueryID: InlineQueryIdentifier,
    results: List<InlineQueryResult> = emptyList(),
    cachedTime: Int? = null,
    isPersonal: Boolean? = null,
    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = execute(
-    AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, button)
-)
-
-suspend fun TelegramBot.answerInlineQuery(
-    inlineQuery: InlineQuery,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, button)
-
-suspend fun TelegramBot.answer(
-    inlineQuery: InlineQuery,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    button: InlineQueryResultsButton? = null
-) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, button)
-
-suspend fun TelegramBot.answerInlineQuery(
-    inlineQueryID: InlineQueryId,
-    results: List<InlineQueryResult> = emptyList(),
-    cachedTime: Int? = null,
-    isPersonal: Boolean? = null,
-    nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = execute(
    AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
 )
@@ -54,8 +24,8 @@ suspend fun TelegramBot.answerInlineQuery(
    cachedTime: Int? = null,
    isPersonal: Boolean? = null,
    nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)

 suspend fun TelegramBot.answer(
@@ -64,6 +34,6 @@ suspend fun TelegramBot.answer(
    cachedTime: Int? = null,
    isPersonal: Boolean? = null,
    nextOffset: String? = null,
-    switchPmText: String?,
-    switchPmParameter: String?
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
 ) = answerInlineQuery(inlineQuery.id, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
--- 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/answers/payments/AnswerShippingQuery.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/payments/AnswerShippingQuery.kt
@@ -3,12 +3,12 @@ package dev.inmo.tgbotapi.extensions.api.answers.payments
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.answers.payments.AnswerShippingQueryError
 import dev.inmo.tgbotapi.requests.answers.payments.AnswerShippingQueryOk
-import dev.inmo.tgbotapi.types.ShippingQueryId
+import dev.inmo.tgbotapi.types.ShippingQueryIdentifier
 import dev.inmo.tgbotapi.types.payments.ShippingOption
 import dev.inmo.tgbotapi.types.payments.ShippingQuery

 suspend fun TelegramBot.answerShippingQueryOk(
-    id: ShippingQueryId,
+    id: ShippingQueryIdentifier,
    shippingOptions: List<ShippingOption>
 ) = execute(AnswerShippingQueryOk(id, shippingOptions))
 suspend fun TelegramBot.answerShippingQueryOk(
@@ -17,7 +17,7 @@ suspend fun TelegramBot.answerShippingQueryOk(
 ) = answerShippingQueryOk(shippingQuery.id, shippingOptions)

 suspend fun TelegramBot.answerShippingQueryError(
-    id: ShippingQueryId,
+    id: ShippingQueryIdentifier,
    error: String
 ) = execute(AnswerShippingQueryError(id, error))
 suspend fun TelegramBot.answerShippingQueryError(
--- 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,12 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.ClearMyDefaultAdministratorRights
-
-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/DeleteMyCommands.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/DeleteMyCommands.kt
@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot

-import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.DeleteMyCommands
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
@@ -8,10 +8,10 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault

 suspend fun TelegramBot.deleteMyCommands(
    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
+    languageCode: IetfLanguageCode?
 ) = execute(DeleteMyCommands(scope, languageCode))

 suspend fun TelegramBot.deleteMyCommands(
    scope: BotCommandScope = BotCommandScopeDefault,
    languageCode: String? = null
-) = deleteMyCommands(scope, languageCode ?.let(::IetfLang))
+) = deleteMyCommands(scope, languageCode ?.let(::IetfLanguageCode))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyCommands.kt
@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot

-import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.GetMyCommands
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
@@ -8,10 +8,10 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault

 suspend fun TelegramBot.getMyCommands(
    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang? = null
+    languageCode: IetfLanguageCode? = null
 ) = execute(GetMyCommands(scope, languageCode))

 suspend fun TelegramBot.getMyCommands(
    scope: BotCommandScope = BotCommandScopeDefault,
    languageCode: String?
-) = getMyCommands(scope, languageCode ?.let(::IetfLang))
+) = getMyCommands(scope, languageCode ?.let(::IetfLanguageCode))
--- 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/GetMyDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyDescription.kt
@@ -1,13 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyDescription
-
-suspend fun TelegramBot.getMyDescription(
-    languageCode: IetfLang? = null
-) = execute(GetMyDescription(languageCode))
-
-suspend fun TelegramBot.getMyDescription(
-    languageCode: String?
-) = getMyDescription(languageCode ?.let(::IetfLang))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyName.kt
@@ -1,13 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyName
-
-suspend fun TelegramBot.getMyName(
-    languageCode: IetfLang? = null
-) = execute(GetMyName(languageCode))
-
-suspend fun TelegramBot.getMyName(
-    languageCode: String?
-) = getMyName(languageCode ?.let(::IetfLang))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/GetMyShortDescription.kt
@@ -1,16 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyShortDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.getMyShortDescription(
-    languageCode: IetfLang? = null
-) = execute(GetMyShortDescription(languageCode))
-
-suspend fun TelegramBot.getMyShortDescription(
-    languageCode: String?
-) = getMyShortDescription(languageCode ?.let(::IetfLang))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyCommands.kt
@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.extensions.api.bot

-import dev.inmo.micro_utils.language_codes.IetfLang
+import dev.inmo.micro_utils.language_codes.IetfLanguageCode
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.SetMyCommands
 import dev.inmo.tgbotapi.types.BotCommand
@@ -10,20 +10,20 @@ import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
 suspend fun TelegramBot.setMyCommands(
    commands: List<BotCommand>,
    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
+    languageCode: IetfLanguageCode?
 ) = execute(SetMyCommands(commands, scope, languageCode))

 suspend fun TelegramBot.setMyCommands(
    vararg commands: BotCommand,
    scope: BotCommandScope = BotCommandScopeDefault,
-    languageCode: IetfLang?
+    languageCode: IetfLanguageCode?
 ) = setMyCommands(commands.toList(), scope, languageCode)

 suspend fun TelegramBot.setMyCommands(
    commands: List<BotCommand>,
    scope: BotCommandScope = BotCommandScopeDefault,
    languageCode: String? = null
-) = setMyCommands(commands, scope, languageCode ?.let(::IetfLang))
+) = setMyCommands(commands, scope, languageCode ?.let(::IetfLanguageCode))

 suspend fun TelegramBot.setMyCommands(
    vararg commands: BotCommand,
--- 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.chat.member.ChatCommonAdministratorRights
-
-suspend fun TelegramBot.setMyDefaultAdministratorRights(
-    rights: ChatCommonAdministratorRights,
-    forChannels: Boolean? = null
-) = execute(SetMyDefaultAdministratorRights(rights, forChannels))
-
-suspend fun TelegramBot.setMyDefaultAdministratorRightsForChannels(
-    rights: ChatCommonAdministratorRights
-) = setMyDefaultAdministratorRights(rights, forChannels = true)
-
-suspend fun TelegramBot.setMyDefaultAdministratorRightsForGroupsAndSupergroups(
-    rights: ChatCommonAdministratorRights
-) = setMyDefaultAdministratorRights(rights, forChannels = false)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDescription.kt
@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyDescription
-import dev.inmo.tgbotapi.requests.bot.SetMyDescription
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.setMyDescription(
-    description: String? = null,
-    languageCode: IetfLang? = null
-) = execute(SetMyDescription(description, languageCode))
-
-suspend fun TelegramBot.setMyDescription(
-    description: String?,
-    languageCode: String?
-) = setMyDescription(description, languageCode ?.let(::IetfLang))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyName.kt
@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.GetMyCommands
-import dev.inmo.tgbotapi.requests.bot.GetMyName
-import dev.inmo.tgbotapi.requests.bot.SetMyName
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import dev.inmo.tgbotapi.types.commands.BotCommandScopeDefault
-
-suspend fun TelegramBot.setMyName(
-    name: String? = null,
-    languageCode: IetfLang? = null
-) = execute(SetMyName(name, languageCode))
-
-suspend fun TelegramBot.setMyName(
-    name: String?,
-    languageCode: String?
-) = setMyName(name, languageCode ?.let(::IetfLang))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyShortDescription.kt
@@ -1,15 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.bot
-
-import dev.inmo.micro_utils.language_codes.IetfLang
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.bot.SetMyShortDescription
-
-suspend fun TelegramBot.setMyShortDescription(
-    shortDescription: String? = null,
-    languageCode: IetfLang? = null
-) = execute(SetMyShortDescription(shortDescription, languageCode))
-
-suspend fun TelegramBot.setMyShortDescription(
-    shortDescription: String?,
-    languageCode: String?
-) = setMyShortDescription(shortDescription, languageCode ?.let(::IetfLang))
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/ExportChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/ExportChatInviteLink.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.ExportChatInviteLink
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.exportChatInviteLink(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/LeaveChat.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/LeaveChat.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.LeaveChat
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.leaveChat(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseForumTopic.kt
@@ -1,28 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.closeForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-) = execute(
-    CloseForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-suspend fun TelegramBot.closeForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-) = closeForumTopic(chat.id, messageThreadId)
-
-suspend fun TelegramBot.closeForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-) = closeForumTopic(chat.id, forumTopic.messageThreadId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CloseGeneralForumTopic.kt
@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.closeGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    CloseGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.closeGeneralForumTopic(
-    chat: Chat
-) = closeGeneralForumTopic(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CreateForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/CreateForumTopic.kt
@@ -1,29 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CreateForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.utils.RGBColor
-
-suspend fun TelegramBot.createForumTopic(
-    chatId: ChatIdentifier,
-    name: String,
-    color: RGBColor,
-    iconEmojiId: CustomEmojiId? = null
-) = execute(
-    CreateForumTopic(
-        chatId,
-        name,
-        color,
-        iconEmojiId
-    )
-)
-
-suspend fun TelegramBot.createForumTopic(
-    chat: Chat,
-    name: String,
-    color: RGBColor,
-    iconEmojiId: CustomEmojiId? = null
-) = createForumTopic(chat.id, name, color, iconEmojiId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/DeleteForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/DeleteForumTopic.kt
@@ -1,33 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.DeleteForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.deleteForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-) = execute(
-    DeleteForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-suspend fun TelegramBot.deleteForumTopic(
-    chatId: ChatIdentifier,
-    forumTopic: ForumTopic
-) = deleteForumTopic(chatId, forumTopic.messageThreadId)
-
-suspend fun TelegramBot.deleteForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-) = deleteForumTopic(chat.id, messageThreadId)
-
-suspend fun TelegramBot.deleteForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-) = deleteForumTopic(chat.id, forumTopic.messageThreadId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditForumTopic.kt
@@ -1,36 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.EditForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.editForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId,
-    name: String? = null,
-    iconEmojiId: CustomEmojiId? = null
-) = execute(
-    EditForumTopic(
-        chatId,
-        messageThreadId,
-        name,
-        iconEmojiId
-    )
-)
-
-suspend fun TelegramBot.editForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId,
-    name: String? = null,
-    iconEmojiId: CustomEmojiId? = null
-) = editForumTopic(chat.id, messageThreadId, name, iconEmojiId)
-
-suspend fun TelegramBot.editForumTopic(
-    chatIdentifier: ChatIdentifier,
-    forumTopic: ForumTopic,
-    iconEmojiId: CustomEmojiId? = forumTopic.iconEmojiId
-) = editForumTopic(chatIdentifier, forumTopic.messageThreadId, forumTopic.name, iconEmojiId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/EditGeneralForumTopic.kt
@@ -1,30 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.EditForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.EditGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.CustomEmojiId
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chatId: ChatIdentifier,
-    name: String
-) = execute(
-    EditGeneralForumTopic(
-        chatId,
-        name
-    )
-)
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chat: Chat,
-    name: String
-) = editGeneralForumTopic(chat.id, name)
-
-suspend fun TelegramBot.editGeneralForumTopic(
-    chatIdentifier: ChatIdentifier,
-    forumTopic: ForumTopic,
-) = editGeneralForumTopic(chatIdentifier, forumTopic.name)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/HideGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/HideGeneralForumTopic.kt
@@ -1,20 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.HideGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.hideGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    HideGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.hideGeneralForumTopic(
-    chat: Chat
-) = hideGeneralForumTopic(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenForumTopic.kt
@@ -1,28 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.ReopenForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.reopenForumTopic(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-) = execute(
-    ReopenForumTopic(
-        chatId,
-        messageThreadId
-    )
-)
-
-suspend fun TelegramBot.reopenForumTopic(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-) = reopenForumTopic(chat.id, messageThreadId)
-
-suspend fun TelegramBot.reopenForumTopic(
-    chat: Chat,
-    forumTopic: ForumTopic
-) = reopenForumTopic(chat.id, forumTopic.messageThreadId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/ReopenGeneralForumTopic.kt
@@ -1,19 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.ReopenForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.ReopenGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.reopenGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    ReopenGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.reopenGeneralForumTopic(
-    chat: Chat
-) = reopenGeneralForumTopic(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnhideGeneralForumTopic.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnhideGeneralForumTopic.kt
@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.CloseForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.CloseGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.HideGeneralForumTopic
-import dev.inmo.tgbotapi.requests.chat.forum.UnhideGeneralForumTopic
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.unhideGeneralForumTopic(
-    chatId: ChatIdentifier
-) = execute(
-    UnhideGeneralForumTopic(chatId)
-)
-
-suspend fun TelegramBot.unhideGeneralForumTopic(
-    chat: Chat
-) = unhideGeneralForumTopic(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnpinAllForumTopicMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnpinAllForumTopicMessages.kt
@@ -1,28 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.UnpinAllForumTopicMessages
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chatId: ChatIdentifier,
-    messageThreadId: MessageThreadId
-) = execute(
-    UnpinAllForumTopicMessages(
-        chatId,
-        messageThreadId
-    )
-)
-
-suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chat: Chat,
-    messageThreadId: MessageThreadId
-) = unpinAllForumTopicMessages(chat.id, messageThreadId)
-
-suspend fun TelegramBot.unpinAllForumTopicMessages(
-    chat: Chat,
-    forumTopic: ForumTopic
-) = unpinAllForumTopicMessages(chat.id, forumTopic.messageThreadId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnpinAllGeneralForumTopicMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnpinAllGeneralForumTopicMessages.kt
@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.forum
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.forum.UnpinAllForumTopicMessages
-import dev.inmo.tgbotapi.requests.chat.forum.UnpinAllGeneralForumTopicMessages
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.Chat
-
-suspend fun TelegramBot.unpinAllGeneralForumTopicMessages(
-    chatId: ChatIdentifier
-) = execute(
-    UnpinAllGeneralForumTopicMessages(
-        chatId
-    )
-)
-
-suspend fun TelegramBot.unpinAllGeneralForumTopicMessages(
-    chat: Chat
-) = unpinAllGeneralForumTopicMessages(chat.id)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChat.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChat.kt
@@ -2,28 +2,11 @@ package dev.inmo.tgbotapi.extensions.api.chat.get

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChat
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.ChannelChat
-import dev.inmo.tgbotapi.types.chat.ChannelChatImpl
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.ExtendedChannelChat
-import dev.inmo.tgbotapi.types.chat.ExtendedChannelChatImpl
-import dev.inmo.tgbotapi.types.chat.ExtendedGroupChat
-import dev.inmo.tgbotapi.types.chat.ExtendedGroupChatImpl
-import dev.inmo.tgbotapi.types.chat.ExtendedPrivateChat
-import dev.inmo.tgbotapi.types.chat.ExtendedPrivateChatImpl
-import dev.inmo.tgbotapi.types.chat.ExtendedPublicChat
-import dev.inmo.tgbotapi.types.chat.ExtendedSupergroupChat
-import dev.inmo.tgbotapi.types.chat.ExtendedSupergroupChatImpl
-import dev.inmo.tgbotapi.types.chat.ExtendedUser
-import dev.inmo.tgbotapi.types.chat.GroupChat
-import dev.inmo.tgbotapi.types.chat.GroupChatImpl
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-import dev.inmo.tgbotapi.types.chat.PrivateChatImpl
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.SupergroupChat
-import dev.inmo.tgbotapi.types.chat.SupergroupChatImpl
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.*
+import dev.inmo.tgbotapi.types.chat.abstracts.*
+import dev.inmo.tgbotapi.types.chat.abstracts.extended.*
+import dev.inmo.tgbotapi.types.chat.extended.*
 import dev.inmo.tgbotapi.utils.PreviewFeature

 suspend fun TelegramBot.getChat(
@@ -35,7 +18,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id)

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedPublicChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -47,7 +30,7 @@ suspend fun TelegramBot.getChat(


 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedChannelChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -58,7 +41,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedChannelChat

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedChannelChatImpl] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -70,7 +53,7 @@ suspend fun TelegramBot.getChat(


 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedGroupChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -81,7 +64,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedGroupChat

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedGroupChatImpl] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -93,7 +76,7 @@ suspend fun TelegramBot.getChat(


 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedSupergroupChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -104,7 +87,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedSupergroupChat

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedSupergroupChatImpl] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -116,7 +99,7 @@ suspend fun TelegramBot.getChat(


 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedPrivateChat] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -127,7 +110,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedPrivateChat

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedPrivateChatImpl] with unsafe operator "as"
 *
 * @throws ClassCastException
@@ -138,7 +121,7 @@ suspend fun TelegramBot.getChat(
 ) = getChat(chat.id) as ExtendedPrivateChatImpl

 /**
- * Will cast incoming [dev.inmo.tgbotapi.types.chat.ExtendedChat] to a
+ * Will cast incoming [dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat] to a
 * [ExtendedUser] with unsafe operator "as"
 *
 * @throws ClassCastException
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatAdministrators.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatAdministrators.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.get
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChatAdministrators
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.getChatAdministrators(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMemberCount.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMemberCount.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.get
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.get.GetChatMemberCount
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.getChatMemberCount(
    chatId: ChatIdentifier
--- 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,14 +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.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-
-suspend fun TelegramBot.getChatMenuButton(
-    chatId: IdChatIdentifier
-) = 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,6 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetDefaultChatMenuButton
-
-suspend fun TelegramBot.getDefaultChatMenuButton() = execute(GetDefaultChatMenuButton)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetForumTopicIconStickers.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetForumTopicIconStickers.kt
@@ -1,6 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.get
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.get.GetForumTopicIconStickers
-
-suspend fun TelegramBot.getForumTopicIconStickers() = execute(GetForumTopicIconStickers)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/ApproveChatJoinRequest.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/ApproveChatJoinRequest.kt
@@ -2,11 +2,8 @@ package dev.inmo.tgbotapi.extensions.api.chat.invite_links

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.ApproveChatJoinRequest
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.ChatJoinRequest
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate

 suspend fun TelegramBot.approveChatJoinRequest(
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt
@@ -1,13 +1,10 @@
 package dev.inmo.tgbotapi.extensions.api.chat.invite_links

-import korlibs.time.DateTime
+import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.CreateChatInviteLink
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MembersLimit
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.toTelegramDate
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.createChatInviteLinkUnlimited(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/DeclineChatJoinRequest.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/DeclineChatJoinRequest.kt
@@ -1,12 +1,10 @@
 package dev.inmo.tgbotapi.extensions.api.chat.invite_links

 import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.ApproveChatJoinRequest
 import dev.inmo.tgbotapi.requests.chat.invite_links.DeclineChatJoinRequest
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.ChatJoinRequest
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate

 suspend fun TelegramBot.declineChatJoinRequest(
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt
@@ -1,14 +1,10 @@
 package dev.inmo.tgbotapi.extensions.api.chat.invite_links

-import korlibs.time.DateTime
+import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.EditChatInviteLink
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.ChatInviteLink
-import dev.inmo.tgbotapi.types.MembersLimit
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.toTelegramDate
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.editChatInviteLinkUnlimited(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.invite_links.RevokeChatInviteLink
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.ChatInviteLink
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.revokeChatInviteLink(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatMember.kt
@@ -2,12 +2,8 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.BanChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.banChatMember(
    chatId: ChatIdentifier,
@@ -24,7 +20,7 @@ suspend fun TelegramBot.banChatMember(
 ) = banChatMember(chat.id, userId, untilDate, revokeMessages)

 suspend fun TelegramBot.banChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    untilDate: TelegramDate? = null,
    revokeMessages: Boolean? = null
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatSenderChat.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/BanChatSenderChat.kt
@@ -1,23 +1,23 @@
 package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.members.BanChatMember
 import dev.inmo.tgbotapi.requests.chat.members.BanChatSenderChat
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.banChatSenderChat(
    chatId: ChatIdentifier,
-    senderChatId: IdChatIdentifier
+    senderChatId: ChatId
 ) = execute(BanChatSenderChat(chatId, senderChatId))

 suspend fun TelegramBot.banChatSenderChat(
    chat: PublicChat,
-    senderChatId: IdChatIdentifier
+    senderChatId: ChatId
 ) = banChatSenderChat(chat.id, senderChatId)

 suspend fun TelegramBot.banChatSenderChat(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    senderChat: PublicChat
 ) = banChatSenderChat(chatId, senderChat.id)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/GetChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/GetChatMember.kt
@@ -2,11 +2,8 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.GetChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.getChatMember(
    chatId: ChatIdentifier,
@@ -19,7 +16,7 @@ suspend fun TelegramBot.getChatMember(
 ) = getChatMember(chat.id, userId)

 suspend fun TelegramBot.getChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User
 ) = getChatMember(chatId, user.id)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChannelAdministrator.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChannelAdministrator.kt
@@ -1,157 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.members
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.PromoteChannelAdministrator
-import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
-
-suspend fun TelegramBot.promoteChannelAdministrator(
-    chatId: ChatIdentifier,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canPostMessages: Boolean? = null,
-    canEditMessages: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
-) = execute(
-    PromoteChannelAdministrator(
-        chatId = chatId,
-        userId = userId,
-        untilDate = untilDate,
-        isAnonymous = isAnonymous,
-        canChangeInfo = canChangeInfo,
-        canPostMessages = canPostMessages,
-        canEditMessages = canEditMessages,
-        canDeleteMessages = canDeleteMessages,
-        canInviteUsers = canInviteUsers,
-        canRestrictMembers = canRestrictMembers,
-        canPromoteMembers = canPromoteMembers,
-        canManageVideoChats = canManageVideoChats,
-        canManageChat = canManageChat,
-        canPostStories = canPostStories,
-        canEditStories = canEditStories,
-        canDeleteStories = canDeleteStories
-    )
-)
-
-suspend fun TelegramBot.promoteChannelAdministrator(
-    chat: PublicChat,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canPostMessages: Boolean? = null,
-    canEditMessages: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
-) = promoteChannelAdministrator(
-    chat.id,
-    userId,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
-)
-
-suspend fun TelegramBot.promoteChannelAdministrator(
-    chatId: IdChatIdentifier,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canPostMessages: Boolean? = null,
-    canEditMessages: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
-) = promoteChannelAdministrator(
-    chatId,
-    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
-)
-
-suspend fun TelegramBot.promoteChannelAdministrator(
-    chat: PublicChat,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canPostMessages: Boolean? = null,
-    canEditMessages: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
-) = promoteChannelAdministrator(
-    chat.id,
-    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatAdministrator.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatAdministrator.kt
@@ -1,116 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.members
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
-
-suspend fun TelegramBot.promoteChatAdministrator(
-    chatId: ChatIdentifier,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-) = execute(
-    PromoteChatMember(
-        chatId,
-        userId,
-        untilDate,
-        isAnonymous,
-        canChangeInfo,
-        canDeleteMessages,
-        canInviteUsers,
-        canRestrictMembers,
-        canPromoteMembers,
-        canManageVideoChats,
-        canManageChat
-    )
-)
-
-suspend fun TelegramBot.promoteChatAdministrator(
-    chat: PublicChat,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-) = promoteChatAdministrator(
-    chat.id,
-    userId,
-    untilDate,
-    isAnonymous,
-    canChangeInfo,
-    canDeleteMessages,
-    canInviteUsers,
-    canRestrictMembers,
-    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat
-)
-
-suspend fun TelegramBot.promoteChatAdministrator(
-    chatId: IdChatIdentifier,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-) = promoteChatAdministrator(
-    chatId,
-    user.id,
-    untilDate,
-    isAnonymous,
-    canChangeInfo,
-    canDeleteMessages,
-    canInviteUsers,
-    canRestrictMembers,
-    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat
-)
-
-suspend fun TelegramBot.promoteChatAdministrator(
-    chat: PublicChat,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-) = promoteChatAdministrator(
-    chat.id,
-    user.id,
-    untilDate,
-    isAnonymous,
-    canChangeInfo,
-    canDeleteMessages,
-    canInviteUsers,
-    canRestrictMembers,
-    canPromoteMembers,
-    canManageVideoChats,
-    canManageChat
-)
--- 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
@@ -1,13 +1,10 @@
 package dev.inmo.tgbotapi.extensions.api.chat.members

-import dev.inmo.micro_utils.common.Warning
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

-@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
    chatId: ChatIdentifier,
    userId: UserId,
@@ -21,36 +18,27 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean?
 ) = execute(
    PromoteChatMember(
-        chatId = chatId,
-        userId = userId,
-        untilDate = untilDate,
-        isAnonymous = isAnonymous,
-        canChangeInfo = canChangeInfo,
-        canPostMessages = canPostMessages,
-        canEditMessages = canEditMessages,
-        canDeleteMessages = canDeleteMessages,
-        canInviteUsers = canInviteUsers,
-        canRestrictMembers = canRestrictMembers,
-        canPinMessages = canPinMessages,
-        canPromoteMembers = canPromoteMembers,
-        canManageVideoChats = canManageVideoChats,
-        canManageChat = canManageChat,
-        canManageTopics = canManageTopics,
-        canPostStories = canPostStories,
-        canEditStories = canEditStories,
-        canDeleteStories = canDeleteStories
+        chatId,
+        userId,
+        untilDate,
+        isAnonymous,
+        canChangeInfo,
+        canPostMessages,
+        canEditMessages,
+        canDeleteMessages,
+        canInviteUsers,
+        canRestrictMembers,
+        canPinMessages,
+        canPromoteMembers,
+        canManageVoiceChats,
+        canManageChat
    )
 )

-@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
    chat: PublicChat,
    userId: UserId,
@@ -64,36 +52,27 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chat.id,
    userId,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers,
+    canManageVoiceChats,
+    canManageChat
 )

-@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    untilDate: TelegramDate? = null,
    isAnonymous: Boolean? = null,
@@ -105,34 +84,25 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chatId,
    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers,
+    canManageVoiceChats,
+    canManageChat
 )

-@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
    chat: PublicChat,
    user: User,
@@ -146,29 +116,21 @@ suspend fun TelegramBot.promoteChatMember(
    canRestrictMembers: Boolean? = null,
    canPinMessages: Boolean? = null,
    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-    canPostStories: Boolean? = null,
-    canEditStories: Boolean? = null,
-    canDeleteStories: Boolean? = null
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
    chat.id,
    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canPostMessages = canPostMessages,
-    canEditMessages = canEditMessages,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics,
-    canPostStories = canPostStories,
-    canEditStories = canEditStories,
-    canDeleteStories = canDeleteStories
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canPostMessages,
+    canEditMessages,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPinMessages,
+    canPromoteMembers,
+    canManageVoiceChats,
+    canManageChat
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteSupergroupAdministrator.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteSupergroupAdministrator.kt
@@ -1,133 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.members
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.requests.chat.members.PromoteSupergroupAdministrator
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
-
-suspend fun TelegramBot.promoteSupergroupAdministrator(
-    chatId: ChatIdentifier,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-) = execute(
-    PromoteSupergroupAdministrator(
-        chatId = chatId,
-        userId = userId,
-        untilDate = untilDate,
-        isAnonymous = isAnonymous,
-        canChangeInfo = canChangeInfo,
-        canDeleteMessages = canDeleteMessages,
-        canInviteUsers = canInviteUsers,
-        canRestrictMembers = canRestrictMembers,
-        canPinMessages = canPinMessages,
-        canPromoteMembers = canPromoteMembers,
-        canManageVideoChats = canManageVideoChats,
-        canManageChat = canManageChat,
-        canManageTopics = canManageTopics
-    )
-)
-
-suspend fun TelegramBot.promoteSupergroupAdministrator(
-    chat: PublicChat,
-    userId: UserId,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-) = promoteSupergroupAdministrator(
-    chat.id,
-    userId,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics
-)
-
-suspend fun TelegramBot.promoteSupergroupAdministrator(
-    chatId: IdChatIdentifier,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-) = promoteSupergroupAdministrator(
-    chatId,
-    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics
-)
-
-suspend fun TelegramBot.promoteSupergroupAdministrator(
-    chat: PublicChat,
-    user: User,
-    untilDate: TelegramDate? = null,
-    isAnonymous: Boolean? = null,
-    canChangeInfo: Boolean? = null,
-    canDeleteMessages: Boolean? = null,
-    canInviteUsers: Boolean? = null,
-    canRestrictMembers: Boolean? = null,
-    canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null,
-    canManageVideoChats: Boolean? = null,
-    canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null,
-) = promoteSupergroupAdministrator(
-    chat.id,
-    user.id,
-    untilDate = untilDate,
-    isAnonymous = isAnonymous,
-    canChangeInfo = canChangeInfo,
-    canDeleteMessages = canDeleteMessages,
-    canInviteUsers = canInviteUsers,
-    canRestrictMembers = canRestrictMembers,
-    canPinMessages = canPinMessages,
-    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats = canManageVideoChats,
-    canManageChat = canManageChat,
-    canManageTopics = canManageTopics
-)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/RestrictChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/RestrictChatMember.kt
@@ -2,43 +2,35 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.RestrictChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.ChatPermissions
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.restrictChatMember(
    chatId: ChatIdentifier,
    userId: UserId,
    untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = execute(RestrictChatMember(chatId, userId, untilDate, permissions, useIndependentChatPermissions))
+    permissions: ChatPermissions = ChatPermissions()
+) = execute(RestrictChatMember(chatId, userId, untilDate, permissions))

 suspend fun TelegramBot.restrictChatMember(
    chat: PublicChat,
    userId: UserId,
    untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chat.id, userId, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chat.id, userId, untilDate, permissions)

 suspend fun TelegramBot.restrictChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chatId, user.id, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chatId, user.id, untilDate, permissions)

 suspend fun TelegramBot.restrictChatMember(
    chat: PublicChat,
    user: User,
    untilDate: TelegramDate? = null,
-    permissions: ChatPermissions = ChatPermissions(),
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = restrictChatMember(chat.id, user.id, untilDate, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions = ChatPermissions()
+) = restrictChatMember(chat.id, user.id, untilDate, permissions)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt
@@ -2,13 +2,11 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.SetChatAdministratorCustomTitle
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setChatAdministratorCustomTitle(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    userId: UserId,
    customTitle: String
 ) = execute(SetChatAdministratorCustomTitle(chatId, userId, customTitle))
@@ -20,7 +18,7 @@ suspend fun TelegramBot.setChatAdministratorCustomTitle(
 ) = setChatAdministratorCustomTitle(chat.id, userId, customTitle)

 suspend fun TelegramBot.setChatAdministratorCustomTitle(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    customTitle: String
 ) = setChatAdministratorCustomTitle(chatId, user.id, customTitle)
@@ -29,4 +27,4 @@ suspend fun TelegramBot.setChatAdministratorCustomTitle(
    chat: PublicChat,
    user: User,
    customTitle: String
-) = setChatAdministratorCustomTitle(chat.id, user.id, customTitle)
+) = setChatAdministratorCustomTitle(chat.id, user.id, customTitle)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatMember.kt
@@ -2,11 +2,8 @@ package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.UnbanChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.chat.PublicChat
-import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.unbanChatMember(
    chatId: ChatIdentifier,
@@ -21,7 +18,7 @@ suspend fun TelegramBot.unbanChatMember(
 ) = unbanChatMember(chat.id, userId, onlyIfBanned)

 suspend fun TelegramBot.unbanChatMember(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    user: User,
    onlyIfBanned: Boolean? = null
 ) = unbanChatMember(chatId, user.id, onlyIfBanned)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatSenderChat.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/UnbanChatSenderChat.kt
@@ -1,23 +1,22 @@
 package dev.inmo.tgbotapi.extensions.api.chat.members

 import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.members.UnbanChatSenderChat
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.requests.chat.members.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.unbanChatSenderChat(
    chatId: ChatIdentifier,
-    senderChatId: IdChatIdentifier
+    senderChatId: ChatId
 ) = execute(UnbanChatSenderChat(chatId, senderChatId))

 suspend fun TelegramBot.unbanChatSenderChat(
    chat: PublicChat,
-    senderChatId: IdChatIdentifier
+    senderChatId: ChatId
 ) = unbanChatSenderChat(chat.id, senderChatId)

 suspend fun TelegramBot.unbanChatSenderChat(
-    chatId: IdChatIdentifier,
+    chatId: ChatId,
    senderChat: PublicChat
 ) = unbanChatSenderChat(chatId, senderChat.id)

--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/DeleteChatPhoto.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/DeleteChatPhoto.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.DeleteChatPhoto
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.deleteChatPhoto(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/PinChatMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/PinChatMessage.kt
@@ -3,23 +3,23 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.PinChatMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.Message

 suspend fun TelegramBot.pinChatMessage(
    chatId: ChatIdentifier,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false
 ) = execute(PinChatMessage(chatId, messageId, disableNotification))

 suspend fun TelegramBot.pinChatMessage(
    chat: Chat,
-    messageId: MessageId,
+    messageId: MessageIdentifier,
    disableNotification: Boolean = false
 ) = pinChatMessage(chat.id, messageId, disableNotification)

 suspend fun TelegramBot.pinChatMessage(
-    message: AccessibleMessage,
+    message: Message,
    disableNotification: Boolean = false
 ) = pinChatMessage(message.chat.id, message.messageId, disableNotification)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatDescription.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatDescription.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.SetChatDescription
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setChatDescription(
    chatId: ChatIdentifier,
--- 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,17 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.chat.modify
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.chat.modify.SetChatMenuButton
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.MenuButton
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-
-suspend fun TelegramBot.setChatMenuButton(
-    chatId: IdChatIdentifier,
-    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/SetChatPermissions.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPermissions.kt
@@ -4,16 +4,14 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.SetChatPermissions
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.chat.ChatPermissions
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setDefaultChatMembersPermissions(
    chatId: ChatIdentifier,
-    permissions: ChatPermissions,
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = execute(SetChatPermissions(chatId, permissions, useIndependentChatPermissions))
+    permissions: ChatPermissions
+) = execute(SetChatPermissions(chatId, permissions))

 suspend fun TelegramBot.setDefaultChatMembersPermissions(
    chat: PublicChat,
-    permissions: ChatPermissions,
-    useIndependentChatPermissions: Boolean? = permissions.isGranular.takeIf { it }
-) = setDefaultChatMembersPermissions(chat.id, permissions, useIndependentChatPermissions)
+    permissions: ChatPermissions
+) = setDefaultChatMembersPermissions(chat.id, permissions)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPhoto.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatPhoto.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import dev.inmo.tgbotapi.requests.chat.modify.SetChatPhoto
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setChatPhoto(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatTitle.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatTitle.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.SetChatTitle
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat

 suspend fun TelegramBot.setChatTitle(
    chatId: ChatIdentifier,
--- 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/chat/modify/UnpinAllChatMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinAllChatMessages.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.UnpinAllChatMessages
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat

 suspend fun TelegramBot.unpinAllChatMessages(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
@@ -3,20 +3,20 @@ package dev.inmo.tgbotapi.extensions.api.chat.modify
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.modify.UnpinChatMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.Message

 suspend fun TelegramBot.unpinChatMessage(
    chatId: ChatIdentifier,
-    messageId: MessageId? = null
+    messageId: MessageIdentifier? = null
 ) = execute(UnpinChatMessage(chatId, messageId))

 suspend fun TelegramBot.unpinChatMessage(
    chat: Chat,
-    messageId: MessageId? = null
+    messageId: MessageIdentifier? = null
 ) = unpinChatMessage(chat.id, messageId)

 suspend fun TelegramBot.unpinChatMessage(
-    message: AccessibleMessage
+    message: Message
 ) = unpinChatMessage(message.chat.id, message.messageId)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/DeleteChatStickerSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/DeleteChatStickerSet.kt
@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.chat.stickers
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.stickers.DeleteChatStickerSet
 import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.chat.SupergroupChat
+import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat

 suspend fun TelegramBot.deleteChatStickerSet(
    chatId: ChatIdentifier
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/SetChatStickerSet.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/stickers/SetChatStickerSet.kt
@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.stickers.SetChatStickerSet
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.StickerSetName
-import dev.inmo.tgbotapi.types.chat.SupergroupChat
+import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat

 suspend fun TelegramBot.setChatStickerSet(
    chatId: ChatIdentifier,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/Edits.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/Edits.kt
@@ -1,308 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit
-
-import dev.inmo.tgbotapi.abstracts.TextedWithTextSources
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.caption.editMessageCaption
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.media.editMessageMedia
-import dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup
-import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.media.TelegramMedia
-import dev.inmo.tgbotapi.types.message.ParseMode
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
-import dev.inmo.tgbotapi.types.message.content.*
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
-import dev.inmo.tgbotapi.utils.buildEntities
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun <T> TelegramBot.edit(
-    message: ContentMessage<T>,
-    text: String,
-    parseMode: ParseMode? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-): ContentMessage<T> where T : TextedWithTextSources, T : MediaContent {
-    return editMessageCaption(message, text, parseMode, replyMarkup)
-}
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun <T> TelegramBot.edit(
-    message: ContentMessage<T>,
-    entities: List<TextSource>,
-    replyMarkup: InlineKeyboardMarkup? = null
-): ContentMessage<T> where T : TextedWithTextSources, T : MediaContent {
-    return editMessageCaption(message, entities, replyMarkup)
-}
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chatId, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chat: Chat,
-    messageId: MessageId,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat, messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<LocationContent>,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(
-    chatId, messageId, location, replyMarkup
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chat: Chat,
-    messageId: MessageId,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(chat, messageId, location, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<LocationContent>,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(message, location, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(chatId, messageId, media, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chat: Chat,
-    messageId: MessageId,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(chat, messageId, media, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<MediaContent>,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(message, media, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(chatId, messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chat: Chat,
-    messageId: MessageId,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(chat, messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: AccessibleMessage,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(message, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    text: String,
-    parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(chatId, messageId, text, parseMode, linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(chatId, messageId, entities, linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(chatId, messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    chatId: ChatIdentifier,
-    messageId: MessageId,
-    separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(chatId, messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<TextContent>,
-    text: String,
-    parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = edit(message.chat.id, message.messageId, text, parseMode, linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<TextContent>,
-    entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = edit(message.chat.id, message.messageId, entities, linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<TextContent>,
-    separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    message: ContentMessage<TextContent>,
-    separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    message: ContentMessage<TextContent>,
-    separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.editMessageText(
-    message: ContentMessage<TextContent>,
-    separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(message, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/InlineEdits.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/InlineEdits.kt
@@ -1,108 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.edit
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
-import dev.inmo.tgbotapi.extensions.api.edit.media.editMessageMedia
-import dev.inmo.tgbotapi.extensions.api.edit.reply_markup.editMessageReplyMarkup
-import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.location.LiveLocation
-import dev.inmo.tgbotapi.types.media.TelegramMedia
-import dev.inmo.tgbotapi.types.message.ParseMode
-import dev.inmo.tgbotapi.types.message.textsources.TextSource
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
-import dev.inmo.tgbotapi.utils.buildEntities
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageId,
-    latitude: Double,
-    longitude: Double,
-    horizontalAccuracy: Meters? = null,
-    heading: Degrees? = null,
-    proximityAlertRadius: Meters? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(messageId, latitude, longitude, horizontalAccuracy, heading, proximityAlertRadius, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageId,
-    location: LiveLocation,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editLiveLocation(
-    messageId, location, replyMarkup
-)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageId,
-    media: TelegramMedia,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageMedia(messageId, media, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageId,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageReplyMarkup(messageId, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageId,
-    text: String,
-    parseMode: ParseMode? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(messageId, text, parseMode, linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageId,
-    entities: TextSourcesList,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null
-) = editMessageText(messageId, entities, linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageId,
-    separator: TextSource? = null,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
-
-/**
- * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
- * as a builder for that
- */
-suspend fun TelegramBot.edit(
-    messageId: InlineMessageId,
-    separator: String,
-    linkPreviewOptions: LinkPreviewOptions? = null,
-    replyMarkup: InlineKeyboardMarkup? = null,
-    builderBody: EntitiesBuilderBody
-) = edit(messageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
--- 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":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"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"}}}