diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7077cac42..0bbbc0ccb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,53 @@
 # TelegramBotAPI changelog
 
+## 0.32.0
+
+**THIS UPDATE CONTAINS BREAKING CHANGES**
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.4.16` -> `0.4.21`
+* `Core`:
+    * **BREAKING CHANGE** Now `MediaGroupMessage` have a generic type related to `MediaGroupContent`
+        * Methods and types related to `MediaGroupMessage` have been modified according to their meanings
+    * **Important Change** `FlowsUpdatesFilter` now is an interface. Old class has been renamed to
+      `DefaultFlowsUpdatesFilter` and factory method `FlowsUpdatesFilter` has been added
+* `Behaviour Builder`:
+    * Trigger and expectation extensions for `MessageContent` (`onContentMessage` and `waitContentMessage`)
+    * `onMediaGroup` has been replaced
+    * `waitMediaGroup` has been added
+    * `onVisualMediaGroup` now is just an alternative to `onVisualGallery`
+    * `command` and `onCommand` expectations has been added for commands `String` variant
+    * New extensions `BehaviourContext#oneOf`, `BehaviourContext#parallel` and `Deferred<T>#withAction`
+
+## 0.31.0
+
+**THIS UPDATE CONTAINS BREAKING CHANGES**
+
+* `Common`:
+    * **ALL DEPRECATIONS CREATED SINCE 0.30.0 WERE REMOVED**
+* `Behaviour Builder`:
+    * Extension `TelegramBot#buildBehaviour` have changed its return value: now it is `Job` instead of
+      `FlowsUpdatesFilter`
+* `Utils`
+    * New extensions `TelegramBot#longPolling` were added as new recommended way to start getting updates via long
+      polling
+        * Old extensions `RequestsExecutor#startGettingFlowsUpdatesByLongPolling` has been deprecated
+
+## 0.30.13
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.4.15` -> `0.4.16`
+* `Core`:
+    * New variable `FlowsUpdatesFilter#allUpdatesWithoutMediaGroupsGroupingFlow` which will contains updates without
+      `SentMediaGroupUpdate`
+* `Utils`:
+    * Extensions for `ResendableContent` has been added
+    * Extensions for `TextSource` has been added
+* `Behaviour Builder`:
+    * Project has been created :)
+
 ## 0.30.12
 
 * `Utils`:
diff --git a/README.md b/README.md
index fdbb16dd0e..27e43c2c08 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,9 @@ You can simply use <a href="https://github.com/InsanusMokrassar/TelegramBotAPI-b
 | -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![Create bot](badges/template.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
 | TelegramBotAPI Core status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.core/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.core/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) |
-| TelegramBotAPI Extensions status      | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
+| TelegramBotAPI API Extensions status      | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
 | TelegramBotAPI Util Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils) |
+| TelegramBotAPI Behaviour Builder Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.behaviour_builder/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.behaviour_builder/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.behaviour_builder/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.behaviour_builder) |
 | TelegramBotAPI All status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi)                                                             |
 
 **At the time of publication of version `0.28.0` there are errors in serialization plugins like
@@ -34,6 +35,8 @@ the list of this complex currently next projects:
   `RequestsExecutor`), which allows to use the core library in more pleasant way
 * [TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) - contains extensions for more comfortable
 work with commands, updates and other different things
+* [TelegramBotAPI Behaviour  Builder Extensions](tgbotapi.extensions.behaviour_builder/README.md) - builder for
+  step-by-step handling of bot behaviour in more comfortable manner
 * [TelegramBotAPI](tgbotapi/README.md) - concentration of all previously mentioned libraries
 
 Most part of some specific solves or unuseful
@@ -88,6 +91,7 @@ kotlin {
 
 In most cases, the most simple way will be to implement [TelegramBotAPI](tgbotapi/README.md) - it contains
 all necessary tools for comfort usage of this library. If you want to exclude some libraries, you can implement just
+[TelegramBotAPI BehaviourBuilder Extensions](tgbotapi.extensions.behaviour_builder/README.md),
 [TelegramBotAPI API Extensions](tgbotapi.extensions.api/README.md),
 [TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) or even
 [TelegramBotAPI Core](tgbotapi.core/README.md).
diff --git a/TelegramBotAPI.minder b/TelegramBotAPI.minder
index fc9d92ae8b..8128899caf 100644
--- a/TelegramBotAPI.minder
+++ b/TelegramBotAPI.minder
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<minder version="1.11.1">
+<minder version="1.11.3">
   <theme name="default" label="Default" index="-1"/>
   <styles>
     <style level="0" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
@@ -14,45 +14,54 @@
     <style level="9" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
     <style level="10" isset="true" branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="200" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true" connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
   </styles>
-  <drawarea x="-320.56697591145837" y="-10.028254191080691" scale="0.75"/>
+  <drawarea x="-950.47548925255796" y="-49.650554065281653" scale="0.5"/>
   <images/>
   <nodes>
-    <node id="0" posx="748.88964843749955" posy="119.42341613769531" width="472" height="168" side="top" fold="false" treesize="603" layout="Downwards" group="false">
+    <node id="0" posx="1378.798161778599" posy="159.04571601189673" width="472" height="168" side="top" fold="false" treesize="743" layout="Downwards" group="false">
       <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="439" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
-      <nodename posx="764.88964843749955" posy="135.42341613769531" maxwidth="488.96484375">
+      <nodename posx="1394.798161778599" posy="175.04571601189673" maxwidth="488.96484375">
         <text data="tgbotapi.core&#10;&#10;Root project with API. It is not recommended to use its requests directly and better to use at least tgbotapi.extensions.api"/>
       </nodename>
       <nodenote></nodenote>
       <nodes>
-        <node id="1" posx="781.88964843749955" posy="387.42341613769531" width="406" height="145" side="bottom" fold="false" treesize="603" color="#68b723" colorroot="true" layout="Downwards" group="false">
+        <node id="1" posx="1411.798161778599" posy="427.04571601189673" width="406" height="145" side="bottom" fold="false" treesize="743" color="#68b723" colorroot="true" layout="Downwards" group="false">
           <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="none" nodewidth="394" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
-          <nodename posx="797.88964843749955" posy="403.42341613769531" maxwidth="419.451171875">
+          <nodename posx="1427.798161778599" posy="443.04571601189673" maxwidth="419.451171875">
             <text data="TelegramBotAPI extensions&#10;&#10;Family of projects which are fully based on TelegramBotAPI and extend its functionality"/>
           </nodename>
           <nodenote></nodenote>
           <nodes>
-            <node id="2" posx="683.38964843749955" posy="632.42341613769531" width="296" height="191" side="bottom" fold="false" treesize="296" color="#68b723" colorroot="true" layout="Downwards" group="false">
+            <node id="2" posx="1247.298161778599" posy="672.04571601189673" width="296" height="191" side="bottom" fold="false" treesize="296" color="#68b723" colorroot="true" layout="Downwards" group="false">
               <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="203" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
-              <nodename posx="699.38964843749955" posy="648.42341613769531" maxwidth="295.90315755208337">
+              <nodename posx="1263.298161778599" posy="688.04571601189673" maxwidth="295.90315755208337">
                 <text data="tgbotapi.extensions.api&#10;&#10;Extensions project for make requests more look like in the Telegram Bot API and give opportunity to use it's easier"/>
               </nodename>
               <nodenote></nodenote>
             </node>
-            <node id="3" posx="979.38964843749955" posy="632.42341613769531" width="307" height="168" side="bottom" fold="false" treesize="307" color="#68b723" colorroot="true" layout="Downwards" group="false">
+            <node id="3" posx="1609.298161778599" posy="672.04571601189673" width="307" height="168" side="bottom" fold="false" treesize="439" color="#68b723" colorroot="true" layout="Downwards" group="false">
               <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="286" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
-              <nodename posx="995.38964843749955" posy="648.42341613769531" maxwidth="299.252197265625">
+              <nodename posx="1625.298161778599" posy="688.04571601189673" maxwidth="299.252197265625">
                 <text data="tgbotapi.extensions.utils&#10;&#10;Extensions project with utils things which will make easier different operations"/>
               </nodename>
               <nodenote></nodenote>
+              <nodes>
+                <node id="4" posx="1543.298161778599" posy="940.04571601189673" width="439" height="122" side="bottom" fold="false" treesize="439" color="#68b723" colorroot="false" layout="Downwards" group="false">
+                  <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="387" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
+                  <nodename posx="1559.298161778599" posy="956.04571601189673" maxwidth="408.97932942708348">
+                    <text data="tgbotapi.extensions.behaviour_builder&#10;&#10;Extension project for building bot behaviour via special dsl"/>
+                  </nodename>
+                  <nodenote></nodenote>
+                </node>
+              </nodes>
             </node>
           </nodes>
         </node>
       </nodes>
     </node>
-    <node id="4" posx="815.52319335937455" posy="948.04447937011719" width="329" height="213" side="top" fold="false" treesize="329" layout="Downwards" group="false">
-      <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="388" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
-      <nodename posx="831.52319335937455" posy="964.04447937011719" maxwidth="394.3671875">
-        <text data="tgbotapi&#10;&#10;Here included all available TelegramBotAPI libraries:&#13;&#10;&#13;&#10;* tgbotapi.core&#13;&#10;* tgbotapi.extensions.api&#13;&#10;* tgbotapi.extensions.utils">
+    <node id="5" posx="1391.8445078072455" posy="1155.6062730594231" width="461" height="236" side="bottom" fold="false" treesize="461" layout="Downwards" group="false">
+      <style branchmargin="100" linktype="curved" linkwidth="5" linkarrow="true" linkdash="solid" nodeborder="bracket" nodewidth="430" nodeborderwidth="3" nodefill="false" nodemargin="11" nodepadding="5" nodefont="Roboto Mono 14" nodemarkup="true"/>
+      <nodename posx="1407.8445078072455" posy="1171.6062730594231" maxwidth="453.885498046875">
+        <text data="tgbotapi&#10;&#10;Here included all available TelegramBotAPI libraries:&#13;&#10;&#13;&#10;* tgbotapi.core&#13;&#10;* tgbotapi.extensions.api&#13;&#10;* tgbotapi.extensions.utils&#10;* tgbotapi.extensions.behaviour_builder">
           <color>
             <range start="67" end="68" extra="rgb(255,0,0)"/>
             <range start="67" end="68" extra="rgb(255,0,0)"/>
@@ -70,6 +79,94 @@
             <range start="67" end="68" extra="rgb(255,0,0)"/>
             <range start="67" end="68" extra="rgb(255,0,0)"/>
             <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="67" end="68" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
+            <range start="84" end="85" extra="rgb(255,0,0)"/>
             <range start="84" end="85" extra="rgb(255,0,0)"/>
             <range start="84" end="85" extra="rgb(255,0,0)"/>
             <range start="84" end="85" extra="rgb(255,0,0)"/>
@@ -102,6 +199,90 @@
             <range start="111" end="112" extra="rgb(255,0,0)"/>
             <range start="111" end="112" extra="rgb(255,0,0)"/>
             <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="111" end="112" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
+            <range start="139" end="140" extra="rgb(255,0,0)"/>
           </color>
         </text>
       </nodename>
@@ -110,12 +291,17 @@
   </nodes>
   <groups/>
   <connections>
-    <connection from_id="2" to_id="4" drag_x="905.70642089843705" drag_y="891.23394775390625" color="#777777">
+    <connection from_id="2" to_id="5" drag_x="1475.8213347929195" drag_y="1014.8259945356604" color="#777777">
       <style connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
       <title></title>
       <note></note>
     </connection>
-    <connection from_id="3" to_id="4" drag_x="1056.456420898437" drag_y="885.48394775390625" color="#777777">
+    <connection from_id="4" to_id="5" drag_x="1691.5447998046875" drag_y="1107.00439453125" color="#777777">
+      <style connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
+      <title></title>
+      <note></note>
+    </connection>
+    <connection from_id="3" to_id="5" drag_x="1483.48876953125" drag_y="896.18115234375">
       <style connectiondash="dotted" connectionlwidth="2" connectionarrow="fromto" connectionpadding="3" connectionfont="Sans 10" connectiontwidth="100"/>
       <title></title>
       <note></note>
diff --git a/gradle.properties b/gradle.properties
index cba108e2dc..5017be276e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,11 +12,11 @@ klock_version=2.0.3
 uuid_version=0.2.3
 ktor_version=1.5.0
 
-micro_utils_version=0.4.15
+micro_utils_version=0.4.21
 
 javax_activation_version=1.1.1
 
 library_group=dev.inmo
-library_version=0.30.12
+library_version=0.32.0
 
 github_release_plugin_version=2.2.12
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 19869d6658..b9d52d8cb7 100644
--- 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-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
diff --git a/resources/TelegramBotAPI-libraries-hierarchy.svg b/resources/TelegramBotAPI-libraries-hierarchy.svg
index 724b67a1af..356ebc5a62 100644
--- a/resources/TelegramBotAPI-libraries-hierarchy.svg
+++ b/resources/TelegramBotAPI-libraries-hierarchy.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="623pt" height="1061pt" viewBox="0 0 623 1061" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="755pt" height="1252pt" viewBox="0 0 755 1252" version="1.1">
 <defs>
 <g>
 <symbol overflow="visible" id="glyph0-0">
@@ -105,32 +105,35 @@
 <path style="stroke:none;" d="M 5.953125 -13 L 5.765625 -9.65625 L 4.5 -9.65625 L 4.515625 -12.84375 L 4.515625 -14 L 5.953125 -14 Z M 5.953125 -13 "/>
 </symbol>
 <symbol overflow="visible" id="glyph0-34">
-<path style="stroke:none;" d="M 3.078125 -3.625 L 3.28125 -2.1875 L 3.53125 -3.625 L 5.109375 -10 L 6.1875 -10 L 7.765625 -3.625 L 8.015625 -2.046875 L 8.265625 -3.625 L 9.359375 -10 L 10.859375 -10 L 8.765625 0 L 7.4375 0 L 5.890625 -6.125 L 5.640625 -7.6875 L 5.390625 -6.125 L 3.859375 0 L 2.53125 0 L 0.4375 -10 L 1.9375 -10 Z M 3.078125 -3.625 "/>
+<path style="stroke:none;" d="M 9.78125 1.28125 L 1.40625 1.28125 L 1.40625 -0.09375 L 9.78125 -0.09375 Z M 9.78125 1.28125 "/>
 </symbol>
 <symbol overflow="visible" id="glyph0-35">
-<path style="stroke:none;" d="M 8.96875 -5.6875 L 3.453125 -5.6875 L 3.453125 0 L 1.734375 0 L 1.734375 -13 L 9.890625 -13 L 9.890625 -11.5625 L 3.453125 -11.5625 L 3.453125 -7.125 L 8.96875 -7.125 Z M 8.96875 -5.6875 "/>
+<path style="stroke:none;" d="M 3.078125 -3.625 L 3.28125 -2.1875 L 3.53125 -3.625 L 5.109375 -10 L 6.1875 -10 L 7.765625 -3.625 L 8.015625 -2.046875 L 8.265625 -3.625 L 9.359375 -10 L 10.859375 -10 L 8.765625 0 L 7.4375 0 L 5.890625 -6.125 L 5.640625 -7.6875 L 5.390625 -6.125 L 3.859375 0 L 2.53125 0 L 0.4375 -10 L 1.9375 -10 Z M 3.078125 -3.625 "/>
 </symbol>
 <symbol overflow="visible" id="glyph0-36">
-<path style="stroke:none;" d="M 5.984375 -5.71875 L 3.328125 -5.71875 L 3.328125 0 L 1.65625 0 L 1.65625 -13 L 5.546875 -13 C 6.160156 -13 6.738281 -12.921875 7.28125 -12.765625 C 7.832031 -12.617188 8.3125 -12.394531 8.71875 -12.09375 C 9.132812 -11.789062 9.457031 -11.410156 9.6875 -10.953125 C 9.925781 -10.492188 10.046875 -9.953125 10.046875 -9.328125 C 10.046875 -8.929688 9.984375 -8.566406 9.859375 -8.234375 C 9.734375 -7.898438 9.5625 -7.597656 9.34375 -7.328125 C 9.125 -7.054688 8.863281 -6.816406 8.5625 -6.609375 C 8.257812 -6.398438 7.925781 -6.222656 7.5625 -6.078125 L 10.375 0 L 8.59375 0 Z M 3.328125 -7.09375 L 5.59375 -7.09375 C 5.96875 -7.09375 6.320312 -7.140625 6.65625 -7.234375 C 6.988281 -7.335938 7.28125 -7.484375 7.53125 -7.671875 C 7.78125 -7.867188 7.976562 -8.101562 8.125 -8.375 C 8.269531 -8.65625 8.34375 -8.972656 8.34375 -9.328125 C 8.34375 -9.710938 8.273438 -10.046875 8.140625 -10.328125 C 8.003906 -10.609375 7.8125 -10.84375 7.5625 -11.03125 C 7.3125 -11.226562 7.015625 -11.375 6.671875 -11.46875 C 6.328125 -11.570312 5.953125 -11.625 5.546875 -11.625 L 3.328125 -11.625 Z M 3.328125 -7.09375 "/>
+<path style="stroke:none;" d="M 8.96875 -5.6875 L 3.453125 -5.6875 L 3.453125 0 L 1.734375 0 L 1.734375 -13 L 9.890625 -13 L 9.890625 -11.5625 L 3.453125 -11.5625 L 3.453125 -7.125 L 8.96875 -7.125 Z M 8.96875 -5.6875 "/>
 </symbol>
 <symbol overflow="visible" id="glyph0-37">
-<path style="stroke:none;" d="M 9.90625 0 L 8.3125 0 L 8.3125 -5.703125 L 2.875 -5.703125 L 2.875 0 L 1.28125 0 L 1.28125 -13 L 2.875 -13 L 2.875 -7.109375 L 8.3125 -7.109375 L 8.3125 -13 L 9.90625 -13 Z M 9.90625 0 "/>
+<path style="stroke:none;" d="M 5.984375 -5.71875 L 3.328125 -5.71875 L 3.328125 0 L 1.65625 0 L 1.65625 -13 L 5.546875 -13 C 6.160156 -13 6.738281 -12.921875 7.28125 -12.765625 C 7.832031 -12.617188 8.3125 -12.394531 8.71875 -12.09375 C 9.132812 -11.789062 9.457031 -11.410156 9.6875 -10.953125 C 9.925781 -10.492188 10.046875 -9.953125 10.046875 -9.328125 C 10.046875 -8.929688 9.984375 -8.566406 9.859375 -8.234375 C 9.734375 -7.898438 9.5625 -7.597656 9.34375 -7.328125 C 9.125 -7.054688 8.863281 -6.816406 8.5625 -6.609375 C 8.257812 -6.398438 7.925781 -6.222656 7.5625 -6.078125 L 10.375 0 L 8.59375 0 Z M 3.328125 -7.09375 L 5.59375 -7.09375 C 5.96875 -7.09375 6.320312 -7.140625 6.65625 -7.234375 C 6.988281 -7.335938 7.28125 -7.484375 7.53125 -7.671875 C 7.78125 -7.867188 7.976562 -8.101562 8.125 -8.375 C 8.269531 -8.65625 8.34375 -8.972656 8.34375 -9.328125 C 8.34375 -9.710938 8.273438 -10.046875 8.140625 -10.328125 C 8.003906 -10.609375 7.8125 -10.84375 7.5625 -11.03125 C 7.3125 -11.226562 7.015625 -11.375 6.671875 -11.46875 C 6.328125 -11.570312 5.953125 -11.625 5.546875 -11.625 L 3.328125 -11.625 Z M 3.328125 -7.09375 "/>
 </symbol>
 <symbol overflow="visible" id="glyph0-38">
-<path style="stroke:none;" d="M 4.984375 -1.265625 C 4.984375 -1.441406 5.007812 -1.609375 5.0625 -1.765625 C 5.125 -1.921875 5.207031 -2.054688 5.3125 -2.171875 C 5.425781 -2.296875 5.5625 -2.390625 5.71875 -2.453125 C 5.882812 -2.523438 6.078125 -2.5625 6.296875 -2.5625 C 6.515625 -2.5625 6.707031 -2.523438 6.875 -2.453125 C 7.039062 -2.390625 7.179688 -2.296875 7.296875 -2.171875 C 7.410156 -2.054688 7.492188 -1.921875 7.546875 -1.765625 C 7.609375 -1.609375 7.640625 -1.441406 7.640625 -1.265625 C 7.640625 -1.085938 7.609375 -0.921875 7.546875 -0.765625 C 7.492188 -0.609375 7.410156 -0.472656 7.296875 -0.359375 C 7.179688 -0.242188 7.039062 -0.15625 6.875 -0.09375 C 6.707031 -0.03125 6.515625 0 6.296875 0 C 6.078125 0 5.882812 -0.03125 5.71875 -0.09375 C 5.5625 -0.15625 5.425781 -0.242188 5.3125 -0.359375 C 5.207031 -0.472656 5.125 -0.609375 5.0625 -0.765625 C 5.007812 -0.921875 4.984375 -1.085938 4.984375 -1.265625 Z M 4.984375 -8.6875 C 4.984375 -8.875 5.007812 -9.046875 5.0625 -9.203125 C 5.125 -9.359375 5.207031 -9.492188 5.3125 -9.609375 C 5.425781 -9.734375 5.5625 -9.828125 5.71875 -9.890625 C 5.882812 -9.960938 6.078125 -10 6.296875 -10 C 6.515625 -10 6.707031 -9.960938 6.875 -9.890625 C 7.039062 -9.828125 7.179688 -9.734375 7.296875 -9.609375 C 7.410156 -9.492188 7.492188 -9.359375 7.546875 -9.203125 C 7.609375 -9.046875 7.640625 -8.875 7.640625 -8.6875 C 7.640625 -8.519531 7.609375 -8.359375 7.546875 -8.203125 C 7.492188 -8.046875 7.410156 -7.910156 7.296875 -7.796875 C 7.179688 -7.679688 7.039062 -7.59375 6.875 -7.53125 C 6.707031 -7.46875 6.515625 -7.4375 6.296875 -7.4375 C 6.078125 -7.4375 5.882812 -7.46875 5.71875 -7.53125 C 5.5625 -7.59375 5.425781 -7.679688 5.3125 -7.796875 C 5.207031 -7.910156 5.125 -8.046875 5.0625 -8.203125 C 5.007812 -8.359375 4.984375 -8.519531 4.984375 -8.6875 Z M 4.984375 -8.6875 "/>
+<path style="stroke:none;" d="M 9.90625 0 L 8.3125 0 L 8.3125 -5.703125 L 2.875 -5.703125 L 2.875 0 L 1.28125 0 L 1.28125 -13 L 2.875 -13 L 2.875 -7.109375 L 8.3125 -7.109375 L 8.3125 -13 L 9.90625 -13 Z M 9.90625 0 "/>
 </symbol>
 <symbol overflow="visible" id="glyph0-39">
+<path style="stroke:none;" d="M 4.984375 -1.265625 C 4.984375 -1.441406 5.007812 -1.609375 5.0625 -1.765625 C 5.125 -1.921875 5.207031 -2.054688 5.3125 -2.171875 C 5.425781 -2.296875 5.5625 -2.390625 5.71875 -2.453125 C 5.882812 -2.523438 6.078125 -2.5625 6.296875 -2.5625 C 6.515625 -2.5625 6.707031 -2.523438 6.875 -2.453125 C 7.039062 -2.390625 7.179688 -2.296875 7.296875 -2.171875 C 7.410156 -2.054688 7.492188 -1.921875 7.546875 -1.765625 C 7.609375 -1.609375 7.640625 -1.441406 7.640625 -1.265625 C 7.640625 -1.085938 7.609375 -0.921875 7.546875 -0.765625 C 7.492188 -0.609375 7.410156 -0.472656 7.296875 -0.359375 C 7.179688 -0.242188 7.039062 -0.15625 6.875 -0.09375 C 6.707031 -0.03125 6.515625 0 6.296875 0 C 6.078125 0 5.882812 -0.03125 5.71875 -0.09375 C 5.5625 -0.15625 5.425781 -0.242188 5.3125 -0.359375 C 5.207031 -0.472656 5.125 -0.609375 5.0625 -0.765625 C 5.007812 -0.921875 4.984375 -1.085938 4.984375 -1.265625 Z M 4.984375 -8.6875 C 4.984375 -8.875 5.007812 -9.046875 5.0625 -9.203125 C 5.125 -9.359375 5.207031 -9.492188 5.3125 -9.609375 C 5.425781 -9.734375 5.5625 -9.828125 5.71875 -9.890625 C 5.882812 -9.960938 6.078125 -10 6.296875 -10 C 6.515625 -10 6.707031 -9.960938 6.875 -9.890625 C 7.039062 -9.828125 7.179688 -9.734375 7.296875 -9.609375 C 7.410156 -9.492188 7.492188 -9.359375 7.546875 -9.203125 C 7.609375 -9.046875 7.640625 -8.875 7.640625 -8.6875 C 7.640625 -8.519531 7.609375 -8.359375 7.546875 -8.203125 C 7.492188 -8.046875 7.410156 -7.910156 7.296875 -7.796875 C 7.179688 -7.679688 7.039062 -7.59375 6.875 -7.53125 C 6.707031 -7.46875 6.515625 -7.4375 6.296875 -7.4375 C 6.078125 -7.4375 5.882812 -7.46875 5.71875 -7.53125 C 5.5625 -7.59375 5.425781 -7.679688 5.3125 -7.796875 C 5.207031 -7.910156 5.125 -8.046875 5.0625 -8.203125 C 5.007812 -8.359375 4.984375 -8.519531 4.984375 -8.6875 Z M 4.984375 -8.6875 "/>
+</symbol>
+<symbol overflow="visible" id="glyph0-40">
 <path style="stroke:none;" d="M 4.890625 -6.09375 L 1.453125 -6.953125 L 1.953125 -8.546875 L 5.28125 -7.171875 L 5.046875 -11 L 6.671875 -11 L 6.40625 -7.125 L 9.71875 -8.484375 L 10.21875 -6.875 L 6.734375 -6.015625 L 9.0625 -3.078125 L 7.734375 -2.078125 L 5.78125 -5.375 L 3.84375 -2.15625 L 2.515625 -3.125 Z M 4.890625 -6.09375 "/>
 </symbol>
 </g>
 </defs>
-<g id="surface46506">
-<path style="fill:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 984.889648 203.423416 C 984.889648 298.423416 984.889648 298.423416 984.889648 393.423416 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
-<path style="fill-rule:nonzero;fill:rgb(40.784314%,71.764706%,13.72549%);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 984.889648 396.423416 L 992.920898 384.954666 L 976.858398 384.954666 Z M 984.889648 396.423416 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
-<path style="fill:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 984.889648 521.423416 C 984.889648 579.923416 831.389648 579.923416 831.389648 638.423416 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
-<path style="fill-rule:nonzero;fill:rgb(40.784314%,71.764706%,13.72549%);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 831.389648 641.423416 L 840.776367 631.036697 L 824.842773 629.048416 Z M 831.389648 641.423416 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
+<g id="surface13039">
+<path style="fill:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1614.798162 243.045716 C 1614.798162 338.045716 1614.798162 338.045716 1614.798162 433.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style="fill-rule:nonzero;fill:rgb(40.784314%,71.764706%,13.72549%);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1614.798162 436.045716 L 1622.829412 424.576966 L 1606.766912 424.576966 Z M 1614.798162 436.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style="fill:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1614.798162 561.045716 C 1614.798162 619.545716 1395.298162 619.545716 1395.298162 678.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style="fill-rule:nonzero;fill:rgb(40.784314%,71.764706%,13.72549%);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1395.298162 681.045716 L 1405.216131 671.16681 L 1389.407537 668.346497 Z M 1395.298162 681.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21 534 L 295 534 L 295 703 L 21 703 Z M 21 534 "/>
-<path style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 694.389648 653.423416 L 694.389648 643.423416 L 968.389648 643.423416 L 968.389648 653.423416 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
+<path style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1258.298162 693.045716 L 1258.298162 683.045716 L 1532.298162 683.045716 L 1532.298162 693.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
   <use xlink:href="#glyph0-1" x="26" y="557"/>
   <use xlink:href="#glyph0-2" x="37" y="557"/>
@@ -277,535 +280,686 @@
   <use xlink:href="#glyph0-9" x="202" y="693.875977"/>
   <use xlink:href="#glyph0-15" x="213" y="693.875977"/>
 </g>
-<path style="fill:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 984.889648 521.423416 C 984.889648 579.923416 1132.889648 579.923416 1132.889648 638.423416 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
-<path style="fill-rule:nonzero;fill:rgb(40.784314%,71.764706%,13.72549%);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1132.889648 641.423416 L 1139.491211 629.079666 L 1123.545898 630.997635 Z M 1132.889648 641.423416 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 317 534 L 602 534 L 602 680 L 317 680 Z M 317 534 "/>
-<path style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 990.389648 653.423416 L 990.389648 643.423416 L 1275.389648 643.423416 L 1275.389648 653.423416 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
+<path style="fill:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1614.798162 561.045716 C 1614.798162 619.545716 1762.798162 619.545716 1762.798162 678.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style="fill-rule:nonzero;fill:rgb(40.784314%,71.764706%,13.72549%);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1762.798162 681.045716 L 1769.399724 668.701966 L 1753.454412 670.619935 Z M 1762.798162 681.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style="fill:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1762.798162 829.045716 C 1762.798162 887.545716 1762.798162 887.545716 1762.798162 946.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style="fill-rule:nonzero;fill:rgb(40.784314%,71.764706%,13.72549%);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1762.798162 949.045716 L 1770.829412 937.576966 L 1754.766912 937.576966 Z M 1762.798162 949.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 317 802 L 734 802 L 734 902 L 317 902 Z M 317 802 "/>
+<path style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1554.298162 961.045716 L 1554.298162 951.045716 L 1971.298162 951.045716 L 1971.298162 961.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-1" x="322" y="557"/>
-  <use xlink:href="#glyph0-2" x="333" y="557"/>
-  <use xlink:href="#glyph0-3" x="344" y="557"/>
-  <use xlink:href="#glyph0-4" x="355" y="557"/>
-  <use xlink:href="#glyph0-1" x="366" y="557"/>
-  <use xlink:href="#glyph0-5" x="377" y="557"/>
-  <use xlink:href="#glyph0-6" x="388" y="557"/>
-  <use xlink:href="#glyph0-7" x="399" y="557"/>
-  <use xlink:href="#glyph0-8" x="410" y="557"/>
-  <use xlink:href="#glyph0-9" x="421" y="557"/>
-  <use xlink:href="#glyph0-10" x="432" y="557"/>
-  <use xlink:href="#glyph0-1" x="443" y="557"/>
-  <use xlink:href="#glyph0-9" x="454" y="557"/>
-  <use xlink:href="#glyph0-11" x="465" y="557"/>
-  <use xlink:href="#glyph0-12" x="476" y="557"/>
-  <use xlink:href="#glyph0-7" x="487" y="557"/>
-  <use xlink:href="#glyph0-4" x="498" y="557"/>
-  <use xlink:href="#glyph0-11" x="509" y="557"/>
-  <use xlink:href="#glyph0-12" x="520" y="557"/>
-  <use xlink:href="#glyph0-8" x="531" y="557"/>
-  <use xlink:href="#glyph0-22" x="542" y="557"/>
-  <use xlink:href="#glyph0-1" x="553" y="557"/>
-  <use xlink:href="#glyph0-7" x="564" y="557"/>
-  <use xlink:href="#glyph0-23" x="575" y="557"/>
+  <use xlink:href="#glyph0-1" x="322" y="825"/>
+  <use xlink:href="#glyph0-2" x="333" y="825"/>
+  <use xlink:href="#glyph0-3" x="344" y="825"/>
+  <use xlink:href="#glyph0-4" x="355" y="825"/>
+  <use xlink:href="#glyph0-1" x="366" y="825"/>
+  <use xlink:href="#glyph0-5" x="377" y="825"/>
+  <use xlink:href="#glyph0-6" x="388" y="825"/>
+  <use xlink:href="#glyph0-7" x="399" y="825"/>
+  <use xlink:href="#glyph0-8" x="410" y="825"/>
+  <use xlink:href="#glyph0-9" x="421" y="825"/>
+  <use xlink:href="#glyph0-10" x="432" y="825"/>
+  <use xlink:href="#glyph0-1" x="443" y="825"/>
+  <use xlink:href="#glyph0-9" x="454" y="825"/>
+  <use xlink:href="#glyph0-11" x="465" y="825"/>
+  <use xlink:href="#glyph0-12" x="476" y="825"/>
+  <use xlink:href="#glyph0-7" x="487" y="825"/>
+  <use xlink:href="#glyph0-4" x="498" y="825"/>
+  <use xlink:href="#glyph0-11" x="509" y="825"/>
+  <use xlink:href="#glyph0-12" x="520" y="825"/>
+  <use xlink:href="#glyph0-8" x="531" y="825"/>
+  <use xlink:href="#glyph0-3" x="542" y="825"/>
+  <use xlink:href="#glyph0-9" x="553" y="825"/>
+  <use xlink:href="#glyph0-24" x="564" y="825"/>
+  <use xlink:href="#glyph0-5" x="575" y="825"/>
+  <use xlink:href="#glyph0-31" x="586" y="825"/>
+  <use xlink:href="#glyph0-7" x="597" y="825"/>
+  <use xlink:href="#glyph0-4" x="608" y="825"/>
+  <use xlink:href="#glyph0-22" x="619" y="825"/>
+  <use xlink:href="#glyph0-15" x="630" y="825"/>
+  <use xlink:href="#glyph0-34" x="641" y="825"/>
+  <use xlink:href="#glyph0-3" x="652" y="825"/>
+  <use xlink:href="#glyph0-22" x="663" y="825"/>
+  <use xlink:href="#glyph0-7" x="674" y="825"/>
+  <use xlink:href="#glyph0-23" x="685" y="825"/>
+  <use xlink:href="#glyph0-30" x="696" y="825"/>
+  <use xlink:href="#glyph0-9" x="707" y="825"/>
+  <use xlink:href="#glyph0-15" x="718" y="825"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-13" x="322" y="869.875977"/>
+  <use xlink:href="#glyph0-10" x="333" y="869.875977"/>
+  <use xlink:href="#glyph0-1" x="344" y="869.875977"/>
+  <use xlink:href="#glyph0-9" x="355" y="869.875977"/>
+  <use xlink:href="#glyph0-11" x="366" y="869.875977"/>
+  <use xlink:href="#glyph0-12" x="377" y="869.875977"/>
+  <use xlink:href="#glyph0-7" x="388" y="869.875977"/>
+  <use xlink:href="#glyph0-4" x="399" y="869.875977"/>
+  <use xlink:href="#glyph0-11" x="410" y="869.875977"/>
+  <use xlink:href="#glyph0-14" x="421" y="869.875977"/>
+  <use xlink:href="#glyph0-6" x="432" y="869.875977"/>
+  <use xlink:href="#glyph0-15" x="443" y="869.875977"/>
+  <use xlink:href="#glyph0-4" x="454" y="869.875977"/>
+  <use xlink:href="#glyph0-16" x="465" y="869.875977"/>
+  <use xlink:href="#glyph0-9" x="476" y="869.875977"/>
+  <use xlink:href="#glyph0-17" x="487" y="869.875977"/>
+  <use xlink:href="#glyph0-1" x="498" y="869.875977"/>
+  <use xlink:href="#glyph0-14" x="509" y="869.875977"/>
+  <use xlink:href="#glyph0-18" x="520" y="869.875977"/>
+  <use xlink:href="#glyph0-4" x="531" y="869.875977"/>
+  <use xlink:href="#glyph0-15" x="542" y="869.875977"/>
+  <use xlink:href="#glyph0-14" x="553" y="869.875977"/>
+  <use xlink:href="#glyph0-3" x="564" y="869.875977"/>
+  <use xlink:href="#glyph0-22" x="575" y="869.875977"/>
+  <use xlink:href="#glyph0-7" x="586" y="869.875977"/>
+  <use xlink:href="#glyph0-23" x="597" y="869.875977"/>
+  <use xlink:href="#glyph0-30" x="608" y="869.875977"/>
+  <use xlink:href="#glyph0-7" x="619" y="869.875977"/>
+  <use xlink:href="#glyph0-11" x="630" y="869.875977"/>
+  <use xlink:href="#glyph0-2" x="641" y="869.875977"/>
+  <use xlink:href="#glyph0-14" x="652" y="869.875977"/>
+  <use xlink:href="#glyph0-3" x="663" y="869.875977"/>
+  <use xlink:href="#glyph0-4" x="674" y="869.875977"/>
+  <use xlink:href="#glyph0-1" x="685" y="869.875977"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-3" x="322" y="892.875977"/>
+  <use xlink:href="#glyph0-9" x="333" y="892.875977"/>
+  <use xlink:href="#glyph0-24" x="344" y="892.875977"/>
+  <use xlink:href="#glyph0-5" x="355" y="892.875977"/>
+  <use xlink:href="#glyph0-31" x="366" y="892.875977"/>
+  <use xlink:href="#glyph0-7" x="377" y="892.875977"/>
+  <use xlink:href="#glyph0-4" x="388" y="892.875977"/>
+  <use xlink:href="#glyph0-22" x="399" y="892.875977"/>
+  <use xlink:href="#glyph0-15" x="410" y="892.875977"/>
+  <use xlink:href="#glyph0-14" x="421" y="892.875977"/>
+  <use xlink:href="#glyph0-31" x="432" y="892.875977"/>
+  <use xlink:href="#glyph0-7" x="443" y="892.875977"/>
+  <use xlink:href="#glyph0-5" x="454" y="892.875977"/>
+  <use xlink:href="#glyph0-14" x="465" y="892.875977"/>
+  <use xlink:href="#glyph0-12" x="476" y="892.875977"/>
+  <use xlink:href="#glyph0-6" x="487" y="892.875977"/>
+  <use xlink:href="#glyph0-9" x="498" y="892.875977"/>
+  <use xlink:href="#glyph0-17" x="509" y="892.875977"/>
+  <use xlink:href="#glyph0-7" x="520" y="892.875977"/>
+  <use xlink:href="#glyph0-5" x="531" y="892.875977"/>
+  <use xlink:href="#glyph0-23" x="542" y="892.875977"/>
+  <use xlink:href="#glyph0-14" x="553" y="892.875977"/>
+  <use xlink:href="#glyph0-30" x="564" y="892.875977"/>
+  <use xlink:href="#glyph0-12" x="575" y="892.875977"/>
+  <use xlink:href="#glyph0-23" x="586" y="892.875977"/>
+</g>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 383 534 L 668 534 L 668 680 L 383 680 Z M 383 534 "/>
+<path style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(40.784314%,71.764706%,13.72549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1620.298162 693.045716 L 1620.298162 683.045716 L 1905.298162 683.045716 L 1905.298162 693.045716 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-1" x="388" y="557"/>
+  <use xlink:href="#glyph0-2" x="399" y="557"/>
+  <use xlink:href="#glyph0-3" x="410" y="557"/>
+  <use xlink:href="#glyph0-4" x="421" y="557"/>
+  <use xlink:href="#glyph0-1" x="432" y="557"/>
+  <use xlink:href="#glyph0-5" x="443" y="557"/>
+  <use xlink:href="#glyph0-6" x="454" y="557"/>
+  <use xlink:href="#glyph0-7" x="465" y="557"/>
+  <use xlink:href="#glyph0-8" x="476" y="557"/>
+  <use xlink:href="#glyph0-9" x="487" y="557"/>
+  <use xlink:href="#glyph0-10" x="498" y="557"/>
+  <use xlink:href="#glyph0-1" x="509" y="557"/>
+  <use xlink:href="#glyph0-9" x="520" y="557"/>
+  <use xlink:href="#glyph0-11" x="531" y="557"/>
+  <use xlink:href="#glyph0-12" x="542" y="557"/>
+  <use xlink:href="#glyph0-7" x="553" y="557"/>
+  <use xlink:href="#glyph0-4" x="564" y="557"/>
+  <use xlink:href="#glyph0-11" x="575" y="557"/>
   <use xlink:href="#glyph0-12" x="586" y="557"/>
+  <use xlink:href="#glyph0-8" x="597" y="557"/>
+  <use xlink:href="#glyph0-22" x="608" y="557"/>
+  <use xlink:href="#glyph0-1" x="619" y="557"/>
+  <use xlink:href="#glyph0-7" x="630" y="557"/>
+  <use xlink:href="#glyph0-23" x="641" y="557"/>
+  <use xlink:href="#glyph0-12" x="652" y="557"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-13" x="322" y="601.875977"/>
-  <use xlink:href="#glyph0-10" x="333" y="601.875977"/>
-  <use xlink:href="#glyph0-1" x="344" y="601.875977"/>
-  <use xlink:href="#glyph0-9" x="355" y="601.875977"/>
-  <use xlink:href="#glyph0-11" x="366" y="601.875977"/>
-  <use xlink:href="#glyph0-12" x="377" y="601.875977"/>
-  <use xlink:href="#glyph0-7" x="388" y="601.875977"/>
-  <use xlink:href="#glyph0-4" x="399" y="601.875977"/>
-  <use xlink:href="#glyph0-11" x="410" y="601.875977"/>
-  <use xlink:href="#glyph0-12" x="421" y="601.875977"/>
-  <use xlink:href="#glyph0-14" x="432" y="601.875977"/>
-  <use xlink:href="#glyph0-6" x="443" y="601.875977"/>
-  <use xlink:href="#glyph0-15" x="454" y="601.875977"/>
+  <use xlink:href="#glyph0-13" x="388" y="601.875977"/>
+  <use xlink:href="#glyph0-10" x="399" y="601.875977"/>
+  <use xlink:href="#glyph0-1" x="410" y="601.875977"/>
+  <use xlink:href="#glyph0-9" x="421" y="601.875977"/>
+  <use xlink:href="#glyph0-11" x="432" y="601.875977"/>
+  <use xlink:href="#glyph0-12" x="443" y="601.875977"/>
+  <use xlink:href="#glyph0-7" x="454" y="601.875977"/>
   <use xlink:href="#glyph0-4" x="465" y="601.875977"/>
-  <use xlink:href="#glyph0-16" x="476" y="601.875977"/>
-  <use xlink:href="#glyph0-9" x="487" y="601.875977"/>
-  <use xlink:href="#glyph0-17" x="498" y="601.875977"/>
-  <use xlink:href="#glyph0-1" x="509" y="601.875977"/>
-  <use xlink:href="#glyph0-14" x="520" y="601.875977"/>
-  <use xlink:href="#glyph0-34" x="531" y="601.875977"/>
-  <use xlink:href="#glyph0-7" x="542" y="601.875977"/>
-  <use xlink:href="#glyph0-1" x="553" y="601.875977"/>
-  <use xlink:href="#glyph0-24" x="564" y="601.875977"/>
+  <use xlink:href="#glyph0-11" x="476" y="601.875977"/>
+  <use xlink:href="#glyph0-12" x="487" y="601.875977"/>
+  <use xlink:href="#glyph0-14" x="498" y="601.875977"/>
+  <use xlink:href="#glyph0-6" x="509" y="601.875977"/>
+  <use xlink:href="#glyph0-15" x="520" y="601.875977"/>
+  <use xlink:href="#glyph0-4" x="531" y="601.875977"/>
+  <use xlink:href="#glyph0-16" x="542" y="601.875977"/>
+  <use xlink:href="#glyph0-9" x="553" y="601.875977"/>
+  <use xlink:href="#glyph0-17" x="564" y="601.875977"/>
+  <use xlink:href="#glyph0-1" x="575" y="601.875977"/>
+  <use xlink:href="#glyph0-14" x="586" y="601.875977"/>
+  <use xlink:href="#glyph0-35" x="597" y="601.875977"/>
+  <use xlink:href="#glyph0-7" x="608" y="601.875977"/>
+  <use xlink:href="#glyph0-1" x="619" y="601.875977"/>
+  <use xlink:href="#glyph0-24" x="630" y="601.875977"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-22" x="322" y="624.875977"/>
-  <use xlink:href="#glyph0-1" x="333" y="624.875977"/>
-  <use xlink:href="#glyph0-7" x="344" y="624.875977"/>
-  <use xlink:href="#glyph0-23" x="355" y="624.875977"/>
-  <use xlink:href="#glyph0-12" x="366" y="624.875977"/>
-  <use xlink:href="#glyph0-14" x="377" y="624.875977"/>
-  <use xlink:href="#glyph0-1" x="388" y="624.875977"/>
-  <use xlink:href="#glyph0-24" x="399" y="624.875977"/>
+  <use xlink:href="#glyph0-22" x="388" y="624.875977"/>
+  <use xlink:href="#glyph0-1" x="399" y="624.875977"/>
   <use xlink:href="#glyph0-7" x="410" y="624.875977"/>
-  <use xlink:href="#glyph0-11" x="421" y="624.875977"/>
-  <use xlink:href="#glyph0-2" x="432" y="624.875977"/>
-  <use xlink:href="#glyph0-12" x="443" y="624.875977"/>
-  <use xlink:href="#glyph0-14" x="454" y="624.875977"/>
-  <use xlink:href="#glyph0-34" x="465" y="624.875977"/>
-  <use xlink:href="#glyph0-24" x="476" y="624.875977"/>
-  <use xlink:href="#glyph0-7" x="487" y="624.875977"/>
-  <use xlink:href="#glyph0-17" x="498" y="624.875977"/>
-  <use xlink:href="#glyph0-24" x="509" y="624.875977"/>
+  <use xlink:href="#glyph0-23" x="421" y="624.875977"/>
+  <use xlink:href="#glyph0-12" x="432" y="624.875977"/>
+  <use xlink:href="#glyph0-14" x="443" y="624.875977"/>
+  <use xlink:href="#glyph0-1" x="454" y="624.875977"/>
+  <use xlink:href="#glyph0-24" x="465" y="624.875977"/>
+  <use xlink:href="#glyph0-7" x="476" y="624.875977"/>
+  <use xlink:href="#glyph0-11" x="487" y="624.875977"/>
+  <use xlink:href="#glyph0-2" x="498" y="624.875977"/>
+  <use xlink:href="#glyph0-12" x="509" y="624.875977"/>
   <use xlink:href="#glyph0-14" x="520" y="624.875977"/>
-  <use xlink:href="#glyph0-34" x="531" y="624.875977"/>
-  <use xlink:href="#glyph0-7" x="542" y="624.875977"/>
-  <use xlink:href="#glyph0-23" x="553" y="624.875977"/>
-  <use xlink:href="#glyph0-23" x="564" y="624.875977"/>
+  <use xlink:href="#glyph0-35" x="531" y="624.875977"/>
+  <use xlink:href="#glyph0-24" x="542" y="624.875977"/>
+  <use xlink:href="#glyph0-7" x="553" y="624.875977"/>
+  <use xlink:href="#glyph0-17" x="564" y="624.875977"/>
+  <use xlink:href="#glyph0-24" x="575" y="624.875977"/>
+  <use xlink:href="#glyph0-14" x="586" y="624.875977"/>
+  <use xlink:href="#glyph0-35" x="597" y="624.875977"/>
+  <use xlink:href="#glyph0-7" x="608" y="624.875977"/>
+  <use xlink:href="#glyph0-23" x="619" y="624.875977"/>
+  <use xlink:href="#glyph0-23" x="630" y="624.875977"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-19" x="322" y="647.875977"/>
-  <use xlink:href="#glyph0-5" x="333" y="647.875977"/>
-  <use xlink:href="#glyph0-20" x="344" y="647.875977"/>
-  <use xlink:href="#glyph0-9" x="355" y="647.875977"/>
-  <use xlink:href="#glyph0-14" x="366" y="647.875977"/>
-  <use xlink:href="#glyph0-9" x="377" y="647.875977"/>
-  <use xlink:href="#glyph0-5" x="388" y="647.875977"/>
-  <use xlink:href="#glyph0-12" x="399" y="647.875977"/>
-  <use xlink:href="#glyph0-7" x="410" y="647.875977"/>
+  <use xlink:href="#glyph0-19" x="388" y="647.875977"/>
+  <use xlink:href="#glyph0-5" x="399" y="647.875977"/>
+  <use xlink:href="#glyph0-20" x="410" y="647.875977"/>
   <use xlink:href="#glyph0-9" x="421" y="647.875977"/>
-  <use xlink:href="#glyph0-15" x="432" y="647.875977"/>
-  <use xlink:href="#glyph0-14" x="443" y="647.875977"/>
-  <use xlink:href="#glyph0-30" x="454" y="647.875977"/>
-  <use xlink:href="#glyph0-7" x="465" y="647.875977"/>
-  <use xlink:href="#glyph0-18" x="476" y="647.875977"/>
-  <use xlink:href="#glyph0-18" x="487" y="647.875977"/>
-  <use xlink:href="#glyph0-9" x="498" y="647.875977"/>
-  <use xlink:href="#glyph0-15" x="509" y="647.875977"/>
-  <use xlink:href="#glyph0-9" x="520" y="647.875977"/>
-  <use xlink:href="#glyph0-11" x="531" y="647.875977"/>
-  <use xlink:href="#glyph0-1" x="542" y="647.875977"/>
+  <use xlink:href="#glyph0-14" x="432" y="647.875977"/>
+  <use xlink:href="#glyph0-9" x="443" y="647.875977"/>
+  <use xlink:href="#glyph0-5" x="454" y="647.875977"/>
+  <use xlink:href="#glyph0-12" x="465" y="647.875977"/>
+  <use xlink:href="#glyph0-7" x="476" y="647.875977"/>
+  <use xlink:href="#glyph0-9" x="487" y="647.875977"/>
+  <use xlink:href="#glyph0-15" x="498" y="647.875977"/>
+  <use xlink:href="#glyph0-14" x="509" y="647.875977"/>
+  <use xlink:href="#glyph0-30" x="520" y="647.875977"/>
+  <use xlink:href="#glyph0-7" x="531" y="647.875977"/>
+  <use xlink:href="#glyph0-18" x="542" y="647.875977"/>
+  <use xlink:href="#glyph0-18" x="553" y="647.875977"/>
+  <use xlink:href="#glyph0-9" x="564" y="647.875977"/>
+  <use xlink:href="#glyph0-15" x="575" y="647.875977"/>
+  <use xlink:href="#glyph0-9" x="586" y="647.875977"/>
+  <use xlink:href="#glyph0-11" x="597" y="647.875977"/>
+  <use xlink:href="#glyph0-1" x="608" y="647.875977"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-4" x="322" y="670.875977"/>
-  <use xlink:href="#glyph0-6" x="333" y="670.875977"/>
-  <use xlink:href="#glyph0-9" x="344" y="670.875977"/>
-  <use xlink:href="#glyph0-15" x="355" y="670.875977"/>
-  <use xlink:href="#glyph0-5" x="366" y="670.875977"/>
-  <use xlink:href="#glyph0-1" x="377" y="670.875977"/>
-  <use xlink:href="#glyph0-7" x="388" y="670.875977"/>
-  <use xlink:href="#glyph0-4" x="399" y="670.875977"/>
-  <use xlink:href="#glyph0-11" x="410" y="670.875977"/>
-  <use xlink:href="#glyph0-12" x="421" y="670.875977"/>
+  <use xlink:href="#glyph0-4" x="388" y="670.875977"/>
+  <use xlink:href="#glyph0-6" x="399" y="670.875977"/>
+  <use xlink:href="#glyph0-9" x="410" y="670.875977"/>
+  <use xlink:href="#glyph0-15" x="421" y="670.875977"/>
+  <use xlink:href="#glyph0-5" x="432" y="670.875977"/>
+  <use xlink:href="#glyph0-1" x="443" y="670.875977"/>
+  <use xlink:href="#glyph0-7" x="454" y="670.875977"/>
+  <use xlink:href="#glyph0-4" x="465" y="670.875977"/>
+  <use xlink:href="#glyph0-11" x="476" y="670.875977"/>
+  <use xlink:href="#glyph0-12" x="487" y="670.875977"/>
 </g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 119.5 289 L 503.5 289 L 503.5 412 L 119.5 412 Z M 119.5 289 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 185.5 289 L 569.5 289 L 569.5 412 L 185.5 412 Z M 185.5 289 "/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-25" x="124.5" y="312"/>
-  <use xlink:href="#glyph0-9" x="135.5" y="312"/>
-  <use xlink:href="#glyph0-23" x="146.5" y="312"/>
-  <use xlink:href="#glyph0-9" x="157.5" y="312"/>
-  <use xlink:href="#glyph0-2" x="168.5" y="312"/>
-  <use xlink:href="#glyph0-15" x="179.5" y="312"/>
-  <use xlink:href="#glyph0-5" x="190.5" y="312"/>
-  <use xlink:href="#glyph0-19" x="201.5" y="312"/>
-  <use xlink:href="#glyph0-26" x="212.5" y="312"/>
-  <use xlink:href="#glyph0-4" x="223.5" y="312"/>
-  <use xlink:href="#glyph0-1" x="234.5" y="312"/>
-  <use xlink:href="#glyph0-27" x="245.5" y="312"/>
-  <use xlink:href="#glyph0-28" x="256.5" y="312"/>
-  <use xlink:href="#glyph0-29" x="267.5" y="312"/>
-  <use xlink:href="#glyph0-14" x="278.5" y="312"/>
-  <use xlink:href="#glyph0-9" x="289.5" y="312"/>
-  <use xlink:href="#glyph0-10" x="300.5" y="312"/>
-  <use xlink:href="#glyph0-1" x="311.5" y="312"/>
-  <use xlink:href="#glyph0-9" x="322.5" y="312"/>
-  <use xlink:href="#glyph0-11" x="333.5" y="312"/>
-  <use xlink:href="#glyph0-12" x="344.5" y="312"/>
-  <use xlink:href="#glyph0-7" x="355.5" y="312"/>
-  <use xlink:href="#glyph0-4" x="366.5" y="312"/>
-  <use xlink:href="#glyph0-11" x="377.5" y="312"/>
-  <use xlink:href="#glyph0-12" x="388.5" y="312"/>
+  <use xlink:href="#glyph0-25" x="190.5" y="312"/>
+  <use xlink:href="#glyph0-9" x="201.5" y="312"/>
+  <use xlink:href="#glyph0-23" x="212.5" y="312"/>
+  <use xlink:href="#glyph0-9" x="223.5" y="312"/>
+  <use xlink:href="#glyph0-2" x="234.5" y="312"/>
+  <use xlink:href="#glyph0-15" x="245.5" y="312"/>
+  <use xlink:href="#glyph0-5" x="256.5" y="312"/>
+  <use xlink:href="#glyph0-19" x="267.5" y="312"/>
+  <use xlink:href="#glyph0-26" x="278.5" y="312"/>
+  <use xlink:href="#glyph0-4" x="289.5" y="312"/>
+  <use xlink:href="#glyph0-1" x="300.5" y="312"/>
+  <use xlink:href="#glyph0-27" x="311.5" y="312"/>
+  <use xlink:href="#glyph0-28" x="322.5" y="312"/>
+  <use xlink:href="#glyph0-29" x="333.5" y="312"/>
+  <use xlink:href="#glyph0-14" x="344.5" y="312"/>
+  <use xlink:href="#glyph0-9" x="355.5" y="312"/>
+  <use xlink:href="#glyph0-10" x="366.5" y="312"/>
+  <use xlink:href="#glyph0-1" x="377.5" y="312"/>
+  <use xlink:href="#glyph0-9" x="388.5" y="312"/>
+  <use xlink:href="#glyph0-11" x="399.5" y="312"/>
+  <use xlink:href="#glyph0-12" x="410.5" y="312"/>
+  <use xlink:href="#glyph0-7" x="421.5" y="312"/>
+  <use xlink:href="#glyph0-4" x="432.5" y="312"/>
+  <use xlink:href="#glyph0-11" x="443.5" y="312"/>
+  <use xlink:href="#glyph0-12" x="454.5" y="312"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-35" x="124.5" y="356.875977"/>
-  <use xlink:href="#glyph0-5" x="135.5" y="356.875977"/>
-  <use xlink:href="#glyph0-19" x="146.5" y="356.875977"/>
-  <use xlink:href="#glyph0-7" x="157.5" y="356.875977"/>
-  <use xlink:href="#glyph0-23" x="168.5" y="356.875977"/>
-  <use xlink:href="#glyph0-32" x="179.5" y="356.875977"/>
-  <use xlink:href="#glyph0-14" x="190.5" y="356.875977"/>
-  <use xlink:href="#glyph0-4" x="201.5" y="356.875977"/>
-  <use xlink:href="#glyph0-18" x="212.5" y="356.875977"/>
-  <use xlink:href="#glyph0-14" x="223.5" y="356.875977"/>
-  <use xlink:href="#glyph0-6" x="234.5" y="356.875977"/>
-  <use xlink:href="#glyph0-15" x="245.5" y="356.875977"/>
-  <use xlink:href="#glyph0-4" x="256.5" y="356.875977"/>
-  <use xlink:href="#glyph0-16" x="267.5" y="356.875977"/>
-  <use xlink:href="#glyph0-9" x="278.5" y="356.875977"/>
-  <use xlink:href="#glyph0-17" x="289.5" y="356.875977"/>
-  <use xlink:href="#glyph0-1" x="300.5" y="356.875977"/>
-  <use xlink:href="#glyph0-12" x="311.5" y="356.875977"/>
-  <use xlink:href="#glyph0-14" x="322.5" y="356.875977"/>
-  <use xlink:href="#glyph0-34" x="333.5" y="356.875977"/>
-  <use xlink:href="#glyph0-24" x="344.5" y="356.875977"/>
-  <use xlink:href="#glyph0-7" x="355.5" y="356.875977"/>
-  <use xlink:href="#glyph0-17" x="366.5" y="356.875977"/>
-  <use xlink:href="#glyph0-24" x="377.5" y="356.875977"/>
+  <use xlink:href="#glyph0-36" x="190.5" y="356.875977"/>
+  <use xlink:href="#glyph0-5" x="201.5" y="356.875977"/>
+  <use xlink:href="#glyph0-19" x="212.5" y="356.875977"/>
+  <use xlink:href="#glyph0-7" x="223.5" y="356.875977"/>
+  <use xlink:href="#glyph0-23" x="234.5" y="356.875977"/>
+  <use xlink:href="#glyph0-32" x="245.5" y="356.875977"/>
+  <use xlink:href="#glyph0-14" x="256.5" y="356.875977"/>
+  <use xlink:href="#glyph0-4" x="267.5" y="356.875977"/>
+  <use xlink:href="#glyph0-18" x="278.5" y="356.875977"/>
+  <use xlink:href="#glyph0-14" x="289.5" y="356.875977"/>
+  <use xlink:href="#glyph0-6" x="300.5" y="356.875977"/>
+  <use xlink:href="#glyph0-15" x="311.5" y="356.875977"/>
+  <use xlink:href="#glyph0-4" x="322.5" y="356.875977"/>
+  <use xlink:href="#glyph0-16" x="333.5" y="356.875977"/>
+  <use xlink:href="#glyph0-9" x="344.5" y="356.875977"/>
+  <use xlink:href="#glyph0-17" x="355.5" y="356.875977"/>
+  <use xlink:href="#glyph0-1" x="366.5" y="356.875977"/>
+  <use xlink:href="#glyph0-12" x="377.5" y="356.875977"/>
   <use xlink:href="#glyph0-14" x="388.5" y="356.875977"/>
-  <use xlink:href="#glyph0-5" x="399.5" y="356.875977"/>
-  <use xlink:href="#glyph0-15" x="410.5" y="356.875977"/>
-  <use xlink:href="#glyph0-9" x="421.5" y="356.875977"/>
-  <use xlink:href="#glyph0-14" x="432.5" y="356.875977"/>
-  <use xlink:href="#glyph0-18" x="443.5" y="356.875977"/>
-  <use xlink:href="#glyph0-22" x="454.5" y="356.875977"/>
-  <use xlink:href="#glyph0-23" x="465.5" y="356.875977"/>
-  <use xlink:href="#glyph0-23" x="476.5" y="356.875977"/>
-  <use xlink:href="#glyph0-32" x="487.5" y="356.875977"/>
+  <use xlink:href="#glyph0-35" x="399.5" y="356.875977"/>
+  <use xlink:href="#glyph0-24" x="410.5" y="356.875977"/>
+  <use xlink:href="#glyph0-7" x="421.5" y="356.875977"/>
+  <use xlink:href="#glyph0-17" x="432.5" y="356.875977"/>
+  <use xlink:href="#glyph0-24" x="443.5" y="356.875977"/>
+  <use xlink:href="#glyph0-14" x="454.5" y="356.875977"/>
+  <use xlink:href="#glyph0-5" x="465.5" y="356.875977"/>
+  <use xlink:href="#glyph0-15" x="476.5" y="356.875977"/>
+  <use xlink:href="#glyph0-9" x="487.5" y="356.875977"/>
+  <use xlink:href="#glyph0-14" x="498.5" y="356.875977"/>
+  <use xlink:href="#glyph0-18" x="509.5" y="356.875977"/>
+  <use xlink:href="#glyph0-22" x="520.5" y="356.875977"/>
+  <use xlink:href="#glyph0-23" x="531.5" y="356.875977"/>
+  <use xlink:href="#glyph0-23" x="542.5" y="356.875977"/>
+  <use xlink:href="#glyph0-32" x="553.5" y="356.875977"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-3" x="124.5" y="379.875977"/>
-  <use xlink:href="#glyph0-5" x="135.5" y="379.875977"/>
-  <use xlink:href="#glyph0-12" x="146.5" y="379.875977"/>
-  <use xlink:href="#glyph0-9" x="157.5" y="379.875977"/>
-  <use xlink:href="#glyph0-30" x="168.5" y="379.875977"/>
-  <use xlink:href="#glyph0-14" x="179.5" y="379.875977"/>
-  <use xlink:href="#glyph0-4" x="190.5" y="379.875977"/>
-  <use xlink:href="#glyph0-11" x="201.5" y="379.875977"/>
-  <use xlink:href="#glyph0-14" x="212.5" y="379.875977"/>
-  <use xlink:href="#glyph0-25" x="223.5" y="379.875977"/>
-  <use xlink:href="#glyph0-9" x="234.5" y="379.875977"/>
-  <use xlink:href="#glyph0-23" x="245.5" y="379.875977"/>
-  <use xlink:href="#glyph0-9" x="256.5" y="379.875977"/>
-  <use xlink:href="#glyph0-2" x="267.5" y="379.875977"/>
-  <use xlink:href="#glyph0-15" x="278.5" y="379.875977"/>
-  <use xlink:href="#glyph0-5" x="289.5" y="379.875977"/>
-  <use xlink:href="#glyph0-19" x="300.5" y="379.875977"/>
-  <use xlink:href="#glyph0-26" x="311.5" y="379.875977"/>
-  <use xlink:href="#glyph0-4" x="322.5" y="379.875977"/>
-  <use xlink:href="#glyph0-1" x="333.5" y="379.875977"/>
-  <use xlink:href="#glyph0-27" x="344.5" y="379.875977"/>
-  <use xlink:href="#glyph0-28" x="355.5" y="379.875977"/>
-  <use xlink:href="#glyph0-29" x="366.5" y="379.875977"/>
-  <use xlink:href="#glyph0-14" x="377.5" y="379.875977"/>
-  <use xlink:href="#glyph0-5" x="388.5" y="379.875977"/>
-  <use xlink:href="#glyph0-11" x="399.5" y="379.875977"/>
-  <use xlink:href="#glyph0-30" x="410.5" y="379.875977"/>
-  <use xlink:href="#glyph0-14" x="421.5" y="379.875977"/>
-  <use xlink:href="#glyph0-9" x="432.5" y="379.875977"/>
-  <use xlink:href="#glyph0-10" x="443.5" y="379.875977"/>
-  <use xlink:href="#glyph0-1" x="454.5" y="379.875977"/>
-  <use xlink:href="#glyph0-9" x="465.5" y="379.875977"/>
-  <use xlink:href="#glyph0-11" x="476.5" y="379.875977"/>
-  <use xlink:href="#glyph0-30" x="487.5" y="379.875977"/>
+  <use xlink:href="#glyph0-3" x="190.5" y="379.875977"/>
+  <use xlink:href="#glyph0-5" x="201.5" y="379.875977"/>
+  <use xlink:href="#glyph0-12" x="212.5" y="379.875977"/>
+  <use xlink:href="#glyph0-9" x="223.5" y="379.875977"/>
+  <use xlink:href="#glyph0-30" x="234.5" y="379.875977"/>
+  <use xlink:href="#glyph0-14" x="245.5" y="379.875977"/>
+  <use xlink:href="#glyph0-4" x="256.5" y="379.875977"/>
+  <use xlink:href="#glyph0-11" x="267.5" y="379.875977"/>
+  <use xlink:href="#glyph0-14" x="278.5" y="379.875977"/>
+  <use xlink:href="#glyph0-25" x="289.5" y="379.875977"/>
+  <use xlink:href="#glyph0-9" x="300.5" y="379.875977"/>
+  <use xlink:href="#glyph0-23" x="311.5" y="379.875977"/>
+  <use xlink:href="#glyph0-9" x="322.5" y="379.875977"/>
+  <use xlink:href="#glyph0-2" x="333.5" y="379.875977"/>
+  <use xlink:href="#glyph0-15" x="344.5" y="379.875977"/>
+  <use xlink:href="#glyph0-5" x="355.5" y="379.875977"/>
+  <use xlink:href="#glyph0-19" x="366.5" y="379.875977"/>
+  <use xlink:href="#glyph0-26" x="377.5" y="379.875977"/>
+  <use xlink:href="#glyph0-4" x="388.5" y="379.875977"/>
+  <use xlink:href="#glyph0-1" x="399.5" y="379.875977"/>
+  <use xlink:href="#glyph0-27" x="410.5" y="379.875977"/>
+  <use xlink:href="#glyph0-28" x="421.5" y="379.875977"/>
+  <use xlink:href="#glyph0-29" x="432.5" y="379.875977"/>
+  <use xlink:href="#glyph0-14" x="443.5" y="379.875977"/>
+  <use xlink:href="#glyph0-5" x="454.5" y="379.875977"/>
+  <use xlink:href="#glyph0-11" x="465.5" y="379.875977"/>
+  <use xlink:href="#glyph0-30" x="476.5" y="379.875977"/>
+  <use xlink:href="#glyph0-14" x="487.5" y="379.875977"/>
+  <use xlink:href="#glyph0-9" x="498.5" y="379.875977"/>
+  <use xlink:href="#glyph0-10" x="509.5" y="379.875977"/>
+  <use xlink:href="#glyph0-1" x="520.5" y="379.875977"/>
+  <use xlink:href="#glyph0-9" x="531.5" y="379.875977"/>
+  <use xlink:href="#glyph0-11" x="542.5" y="379.875977"/>
+  <use xlink:href="#glyph0-30" x="553.5" y="379.875977"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-7" x="124.5" y="402.875977"/>
-  <use xlink:href="#glyph0-1" x="135.5" y="402.875977"/>
-  <use xlink:href="#glyph0-12" x="146.5" y="402.875977"/>
-  <use xlink:href="#glyph0-14" x="157.5" y="402.875977"/>
-  <use xlink:href="#glyph0-18" x="168.5" y="402.875977"/>
-  <use xlink:href="#glyph0-22" x="179.5" y="402.875977"/>
-  <use xlink:href="#glyph0-11" x="190.5" y="402.875977"/>
-  <use xlink:href="#glyph0-17" x="201.5" y="402.875977"/>
-  <use xlink:href="#glyph0-1" x="212.5" y="402.875977"/>
-  <use xlink:href="#glyph0-7" x="223.5" y="402.875977"/>
-  <use xlink:href="#glyph0-4" x="234.5" y="402.875977"/>
-  <use xlink:href="#glyph0-11" x="245.5" y="402.875977"/>
-  <use xlink:href="#glyph0-5" x="256.5" y="402.875977"/>
-  <use xlink:href="#glyph0-23" x="267.5" y="402.875977"/>
-  <use xlink:href="#glyph0-7" x="278.5" y="402.875977"/>
-  <use xlink:href="#glyph0-1" x="289.5" y="402.875977"/>
-  <use xlink:href="#glyph0-32" x="300.5" y="402.875977"/>
+  <use xlink:href="#glyph0-7" x="190.5" y="402.875977"/>
+  <use xlink:href="#glyph0-1" x="201.5" y="402.875977"/>
+  <use xlink:href="#glyph0-12" x="212.5" y="402.875977"/>
+  <use xlink:href="#glyph0-14" x="223.5" y="402.875977"/>
+  <use xlink:href="#glyph0-18" x="234.5" y="402.875977"/>
+  <use xlink:href="#glyph0-22" x="245.5" y="402.875977"/>
+  <use xlink:href="#glyph0-11" x="256.5" y="402.875977"/>
+  <use xlink:href="#glyph0-17" x="267.5" y="402.875977"/>
+  <use xlink:href="#glyph0-1" x="278.5" y="402.875977"/>
+  <use xlink:href="#glyph0-7" x="289.5" y="402.875977"/>
+  <use xlink:href="#glyph0-4" x="300.5" y="402.875977"/>
+  <use xlink:href="#glyph0-11" x="311.5" y="402.875977"/>
+  <use xlink:href="#glyph0-5" x="322.5" y="402.875977"/>
+  <use xlink:href="#glyph0-23" x="333.5" y="402.875977"/>
+  <use xlink:href="#glyph0-7" x="344.5" y="402.875977"/>
+  <use xlink:href="#glyph0-1" x="355.5" y="402.875977"/>
+  <use xlink:href="#glyph0-32" x="366.5" y="402.875977"/>
 </g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.137255%,83.137255%,83.137255%);fill-opacity:1;" d="M 86.5 21 L 536.5 21 L 536.5 167 L 86.5 167 Z M 86.5 21 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.137255%,83.137255%,83.137255%);fill-opacity:1;" d="M 152.5 21 L 602.5 21 L 602.5 167 L 152.5 167 Z M 152.5 21 "/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-1" x="91.5" y="44"/>
-  <use xlink:href="#glyph0-2" x="102.5" y="44"/>
-  <use xlink:href="#glyph0-3" x="113.5" y="44"/>
-  <use xlink:href="#glyph0-4" x="124.5" y="44"/>
-  <use xlink:href="#glyph0-1" x="135.5" y="44"/>
-  <use xlink:href="#glyph0-5" x="146.5" y="44"/>
-  <use xlink:href="#glyph0-6" x="157.5" y="44"/>
-  <use xlink:href="#glyph0-7" x="168.5" y="44"/>
-  <use xlink:href="#glyph0-8" x="179.5" y="44"/>
-  <use xlink:href="#glyph0-17" x="190.5" y="44"/>
-  <use xlink:href="#glyph0-4" x="201.5" y="44"/>
-  <use xlink:href="#glyph0-15" x="212.5" y="44"/>
-  <use xlink:href="#glyph0-9" x="223.5" y="44"/>
+  <use xlink:href="#glyph0-1" x="157.5" y="44"/>
+  <use xlink:href="#glyph0-2" x="168.5" y="44"/>
+  <use xlink:href="#glyph0-3" x="179.5" y="44"/>
+  <use xlink:href="#glyph0-4" x="190.5" y="44"/>
+  <use xlink:href="#glyph0-1" x="201.5" y="44"/>
+  <use xlink:href="#glyph0-5" x="212.5" y="44"/>
+  <use xlink:href="#glyph0-6" x="223.5" y="44"/>
+  <use xlink:href="#glyph0-7" x="234.5" y="44"/>
+  <use xlink:href="#glyph0-8" x="245.5" y="44"/>
+  <use xlink:href="#glyph0-17" x="256.5" y="44"/>
+  <use xlink:href="#glyph0-4" x="267.5" y="44"/>
+  <use xlink:href="#glyph0-15" x="278.5" y="44"/>
+  <use xlink:href="#glyph0-9" x="289.5" y="44"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-36" x="91.5" y="88.875977"/>
-  <use xlink:href="#glyph0-4" x="102.5" y="88.875977"/>
-  <use xlink:href="#glyph0-4" x="113.5" y="88.875977"/>
-  <use xlink:href="#glyph0-1" x="124.5" y="88.875977"/>
-  <use xlink:href="#glyph0-14" x="135.5" y="88.875977"/>
-  <use xlink:href="#glyph0-6" x="146.5" y="88.875977"/>
-  <use xlink:href="#glyph0-15" x="157.5" y="88.875977"/>
+  <use xlink:href="#glyph0-37" x="157.5" y="88.875977"/>
   <use xlink:href="#glyph0-4" x="168.5" y="88.875977"/>
-  <use xlink:href="#glyph0-16" x="179.5" y="88.875977"/>
-  <use xlink:href="#glyph0-9" x="190.5" y="88.875977"/>
-  <use xlink:href="#glyph0-17" x="201.5" y="88.875977"/>
-  <use xlink:href="#glyph0-1" x="212.5" y="88.875977"/>
-  <use xlink:href="#glyph0-14" x="223.5" y="88.875977"/>
-  <use xlink:href="#glyph0-34" x="234.5" y="88.875977"/>
-  <use xlink:href="#glyph0-7" x="245.5" y="88.875977"/>
-  <use xlink:href="#glyph0-1" x="256.5" y="88.875977"/>
-  <use xlink:href="#glyph0-24" x="267.5" y="88.875977"/>
-  <use xlink:href="#glyph0-14" x="278.5" y="88.875977"/>
-  <use xlink:href="#glyph0-27" x="289.5" y="88.875977"/>
-  <use xlink:href="#glyph0-28" x="300.5" y="88.875977"/>
-  <use xlink:href="#glyph0-29" x="311.5" y="88.875977"/>
-  <use xlink:href="#glyph0-8" x="322.5" y="88.875977"/>
-  <use xlink:href="#glyph0-14" x="333.5" y="88.875977"/>
-  <use xlink:href="#glyph0-29" x="344.5" y="88.875977"/>
-  <use xlink:href="#glyph0-1" x="355.5" y="88.875977"/>
-  <use xlink:href="#glyph0-14" x="366.5" y="88.875977"/>
-  <use xlink:href="#glyph0-7" x="377.5" y="88.875977"/>
-  <use xlink:href="#glyph0-12" x="388.5" y="88.875977"/>
+  <use xlink:href="#glyph0-4" x="179.5" y="88.875977"/>
+  <use xlink:href="#glyph0-1" x="190.5" y="88.875977"/>
+  <use xlink:href="#glyph0-14" x="201.5" y="88.875977"/>
+  <use xlink:href="#glyph0-6" x="212.5" y="88.875977"/>
+  <use xlink:href="#glyph0-15" x="223.5" y="88.875977"/>
+  <use xlink:href="#glyph0-4" x="234.5" y="88.875977"/>
+  <use xlink:href="#glyph0-16" x="245.5" y="88.875977"/>
+  <use xlink:href="#glyph0-9" x="256.5" y="88.875977"/>
+  <use xlink:href="#glyph0-17" x="267.5" y="88.875977"/>
+  <use xlink:href="#glyph0-1" x="278.5" y="88.875977"/>
+  <use xlink:href="#glyph0-14" x="289.5" y="88.875977"/>
+  <use xlink:href="#glyph0-35" x="300.5" y="88.875977"/>
+  <use xlink:href="#glyph0-7" x="311.5" y="88.875977"/>
+  <use xlink:href="#glyph0-1" x="322.5" y="88.875977"/>
+  <use xlink:href="#glyph0-24" x="333.5" y="88.875977"/>
+  <use xlink:href="#glyph0-14" x="344.5" y="88.875977"/>
+  <use xlink:href="#glyph0-27" x="355.5" y="88.875977"/>
+  <use xlink:href="#glyph0-28" x="366.5" y="88.875977"/>
+  <use xlink:href="#glyph0-29" x="377.5" y="88.875977"/>
+  <use xlink:href="#glyph0-8" x="388.5" y="88.875977"/>
   <use xlink:href="#glyph0-14" x="399.5" y="88.875977"/>
-  <use xlink:href="#glyph0-11" x="410.5" y="88.875977"/>
-  <use xlink:href="#glyph0-4" x="421.5" y="88.875977"/>
-  <use xlink:href="#glyph0-1" x="432.5" y="88.875977"/>
+  <use xlink:href="#glyph0-29" x="410.5" y="88.875977"/>
+  <use xlink:href="#glyph0-1" x="421.5" y="88.875977"/>
+  <use xlink:href="#glyph0-14" x="432.5" y="88.875977"/>
+  <use xlink:href="#glyph0-7" x="443.5" y="88.875977"/>
+  <use xlink:href="#glyph0-12" x="454.5" y="88.875977"/>
+  <use xlink:href="#glyph0-14" x="465.5" y="88.875977"/>
+  <use xlink:href="#glyph0-11" x="476.5" y="88.875977"/>
+  <use xlink:href="#glyph0-4" x="487.5" y="88.875977"/>
+  <use xlink:href="#glyph0-1" x="498.5" y="88.875977"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-15" x="91.5" y="111.875977"/>
-  <use xlink:href="#glyph0-9" x="102.5" y="111.875977"/>
-  <use xlink:href="#glyph0-17" x="113.5" y="111.875977"/>
-  <use xlink:href="#glyph0-4" x="124.5" y="111.875977"/>
-  <use xlink:href="#glyph0-19" x="135.5" y="111.875977"/>
-  <use xlink:href="#glyph0-19" x="146.5" y="111.875977"/>
-  <use xlink:href="#glyph0-9" x="157.5" y="111.875977"/>
-  <use xlink:href="#glyph0-11" x="168.5" y="111.875977"/>
-  <use xlink:href="#glyph0-30" x="179.5" y="111.875977"/>
-  <use xlink:href="#glyph0-9" x="190.5" y="111.875977"/>
-  <use xlink:href="#glyph0-30" x="201.5" y="111.875977"/>
-  <use xlink:href="#glyph0-14" x="212.5" y="111.875977"/>
-  <use xlink:href="#glyph0-1" x="223.5" y="111.875977"/>
-  <use xlink:href="#glyph0-4" x="234.5" y="111.875977"/>
-  <use xlink:href="#glyph0-14" x="245.5" y="111.875977"/>
-  <use xlink:href="#glyph0-22" x="256.5" y="111.875977"/>
-  <use xlink:href="#glyph0-12" x="267.5" y="111.875977"/>
-  <use xlink:href="#glyph0-9" x="278.5" y="111.875977"/>
-  <use xlink:href="#glyph0-14" x="289.5" y="111.875977"/>
-  <use xlink:href="#glyph0-7" x="300.5" y="111.875977"/>
-  <use xlink:href="#glyph0-1" x="311.5" y="111.875977"/>
-  <use xlink:href="#glyph0-12" x="322.5" y="111.875977"/>
-  <use xlink:href="#glyph0-14" x="333.5" y="111.875977"/>
-  <use xlink:href="#glyph0-15" x="344.5" y="111.875977"/>
-  <use xlink:href="#glyph0-9" x="355.5" y="111.875977"/>
-  <use xlink:href="#glyph0-21" x="366.5" y="111.875977"/>
-  <use xlink:href="#glyph0-22" x="377.5" y="111.875977"/>
-  <use xlink:href="#glyph0-9" x="388.5" y="111.875977"/>
-  <use xlink:href="#glyph0-12" x="399.5" y="111.875977"/>
-  <use xlink:href="#glyph0-1" x="410.5" y="111.875977"/>
-  <use xlink:href="#glyph0-12" x="421.5" y="111.875977"/>
-  <use xlink:href="#glyph0-14" x="432.5" y="111.875977"/>
-  <use xlink:href="#glyph0-30" x="443.5" y="111.875977"/>
-  <use xlink:href="#glyph0-7" x="454.5" y="111.875977"/>
-  <use xlink:href="#glyph0-15" x="465.5" y="111.875977"/>
-  <use xlink:href="#glyph0-9" x="476.5" y="111.875977"/>
-  <use xlink:href="#glyph0-17" x="487.5" y="111.875977"/>
-  <use xlink:href="#glyph0-1" x="498.5" y="111.875977"/>
-  <use xlink:href="#glyph0-23" x="509.5" y="111.875977"/>
-  <use xlink:href="#glyph0-32" x="520.5" y="111.875977"/>
+  <use xlink:href="#glyph0-15" x="157.5" y="111.875977"/>
+  <use xlink:href="#glyph0-9" x="168.5" y="111.875977"/>
+  <use xlink:href="#glyph0-17" x="179.5" y="111.875977"/>
+  <use xlink:href="#glyph0-4" x="190.5" y="111.875977"/>
+  <use xlink:href="#glyph0-19" x="201.5" y="111.875977"/>
+  <use xlink:href="#glyph0-19" x="212.5" y="111.875977"/>
+  <use xlink:href="#glyph0-9" x="223.5" y="111.875977"/>
+  <use xlink:href="#glyph0-11" x="234.5" y="111.875977"/>
+  <use xlink:href="#glyph0-30" x="245.5" y="111.875977"/>
+  <use xlink:href="#glyph0-9" x="256.5" y="111.875977"/>
+  <use xlink:href="#glyph0-30" x="267.5" y="111.875977"/>
+  <use xlink:href="#glyph0-14" x="278.5" y="111.875977"/>
+  <use xlink:href="#glyph0-1" x="289.5" y="111.875977"/>
+  <use xlink:href="#glyph0-4" x="300.5" y="111.875977"/>
+  <use xlink:href="#glyph0-14" x="311.5" y="111.875977"/>
+  <use xlink:href="#glyph0-22" x="322.5" y="111.875977"/>
+  <use xlink:href="#glyph0-12" x="333.5" y="111.875977"/>
+  <use xlink:href="#glyph0-9" x="344.5" y="111.875977"/>
+  <use xlink:href="#glyph0-14" x="355.5" y="111.875977"/>
+  <use xlink:href="#glyph0-7" x="366.5" y="111.875977"/>
+  <use xlink:href="#glyph0-1" x="377.5" y="111.875977"/>
+  <use xlink:href="#glyph0-12" x="388.5" y="111.875977"/>
+  <use xlink:href="#glyph0-14" x="399.5" y="111.875977"/>
+  <use xlink:href="#glyph0-15" x="410.5" y="111.875977"/>
+  <use xlink:href="#glyph0-9" x="421.5" y="111.875977"/>
+  <use xlink:href="#glyph0-21" x="432.5" y="111.875977"/>
+  <use xlink:href="#glyph0-22" x="443.5" y="111.875977"/>
+  <use xlink:href="#glyph0-9" x="454.5" y="111.875977"/>
+  <use xlink:href="#glyph0-12" x="465.5" y="111.875977"/>
+  <use xlink:href="#glyph0-1" x="476.5" y="111.875977"/>
+  <use xlink:href="#glyph0-12" x="487.5" y="111.875977"/>
+  <use xlink:href="#glyph0-14" x="498.5" y="111.875977"/>
+  <use xlink:href="#glyph0-30" x="509.5" y="111.875977"/>
+  <use xlink:href="#glyph0-7" x="520.5" y="111.875977"/>
+  <use xlink:href="#glyph0-15" x="531.5" y="111.875977"/>
+  <use xlink:href="#glyph0-9" x="542.5" y="111.875977"/>
+  <use xlink:href="#glyph0-17" x="553.5" y="111.875977"/>
+  <use xlink:href="#glyph0-1" x="564.5" y="111.875977"/>
+  <use xlink:href="#glyph0-23" x="575.5" y="111.875977"/>
+  <use xlink:href="#glyph0-32" x="586.5" y="111.875977"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-5" x="91.5" y="134.875977"/>
-  <use xlink:href="#glyph0-11" x="102.5" y="134.875977"/>
-  <use xlink:href="#glyph0-30" x="113.5" y="134.875977"/>
-  <use xlink:href="#glyph0-14" x="124.5" y="134.875977"/>
-  <use xlink:href="#glyph0-3" x="135.5" y="134.875977"/>
-  <use xlink:href="#glyph0-9" x="146.5" y="134.875977"/>
-  <use xlink:href="#glyph0-1" x="157.5" y="134.875977"/>
-  <use xlink:href="#glyph0-1" x="168.5" y="134.875977"/>
-  <use xlink:href="#glyph0-9" x="179.5" y="134.875977"/>
-  <use xlink:href="#glyph0-15" x="190.5" y="134.875977"/>
-  <use xlink:href="#glyph0-14" x="201.5" y="134.875977"/>
-  <use xlink:href="#glyph0-1" x="212.5" y="134.875977"/>
-  <use xlink:href="#glyph0-4" x="223.5" y="134.875977"/>
-  <use xlink:href="#glyph0-14" x="234.5" y="134.875977"/>
-  <use xlink:href="#glyph0-22" x="245.5" y="134.875977"/>
-  <use xlink:href="#glyph0-12" x="256.5" y="134.875977"/>
-  <use xlink:href="#glyph0-9" x="267.5" y="134.875977"/>
-  <use xlink:href="#glyph0-14" x="278.5" y="134.875977"/>
-  <use xlink:href="#glyph0-5" x="289.5" y="134.875977"/>
-  <use xlink:href="#glyph0-1" x="300.5" y="134.875977"/>
-  <use xlink:href="#glyph0-14" x="311.5" y="134.875977"/>
-  <use xlink:href="#glyph0-23" x="322.5" y="134.875977"/>
+  <use xlink:href="#glyph0-5" x="157.5" y="134.875977"/>
+  <use xlink:href="#glyph0-11" x="168.5" y="134.875977"/>
+  <use xlink:href="#glyph0-30" x="179.5" y="134.875977"/>
+  <use xlink:href="#glyph0-14" x="190.5" y="134.875977"/>
+  <use xlink:href="#glyph0-3" x="201.5" y="134.875977"/>
+  <use xlink:href="#glyph0-9" x="212.5" y="134.875977"/>
+  <use xlink:href="#glyph0-1" x="223.5" y="134.875977"/>
+  <use xlink:href="#glyph0-1" x="234.5" y="134.875977"/>
+  <use xlink:href="#glyph0-9" x="245.5" y="134.875977"/>
+  <use xlink:href="#glyph0-15" x="256.5" y="134.875977"/>
+  <use xlink:href="#glyph0-14" x="267.5" y="134.875977"/>
+  <use xlink:href="#glyph0-1" x="278.5" y="134.875977"/>
+  <use xlink:href="#glyph0-4" x="289.5" y="134.875977"/>
+  <use xlink:href="#glyph0-14" x="300.5" y="134.875977"/>
+  <use xlink:href="#glyph0-22" x="311.5" y="134.875977"/>
+  <use xlink:href="#glyph0-12" x="322.5" y="134.875977"/>
   <use xlink:href="#glyph0-9" x="333.5" y="134.875977"/>
-  <use xlink:href="#glyph0-5" x="344.5" y="134.875977"/>
-  <use xlink:href="#glyph0-12" x="355.5" y="134.875977"/>
+  <use xlink:href="#glyph0-14" x="344.5" y="134.875977"/>
+  <use xlink:href="#glyph0-5" x="355.5" y="134.875977"/>
   <use xlink:href="#glyph0-1" x="366.5" y="134.875977"/>
+  <use xlink:href="#glyph0-14" x="377.5" y="134.875977"/>
+  <use xlink:href="#glyph0-23" x="388.5" y="134.875977"/>
+  <use xlink:href="#glyph0-9" x="399.5" y="134.875977"/>
+  <use xlink:href="#glyph0-5" x="410.5" y="134.875977"/>
+  <use xlink:href="#glyph0-12" x="421.5" y="134.875977"/>
+  <use xlink:href="#glyph0-1" x="432.5" y="134.875977"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-1" x="91.5" y="157.875977"/>
-  <use xlink:href="#glyph0-2" x="102.5" y="157.875977"/>
-  <use xlink:href="#glyph0-3" x="113.5" y="157.875977"/>
-  <use xlink:href="#glyph0-4" x="124.5" y="157.875977"/>
-  <use xlink:href="#glyph0-1" x="135.5" y="157.875977"/>
-  <use xlink:href="#glyph0-5" x="146.5" y="157.875977"/>
-  <use xlink:href="#glyph0-6" x="157.5" y="157.875977"/>
-  <use xlink:href="#glyph0-7" x="168.5" y="157.875977"/>
-  <use xlink:href="#glyph0-8" x="179.5" y="157.875977"/>
-  <use xlink:href="#glyph0-9" x="190.5" y="157.875977"/>
-  <use xlink:href="#glyph0-10" x="201.5" y="157.875977"/>
-  <use xlink:href="#glyph0-1" x="212.5" y="157.875977"/>
-  <use xlink:href="#glyph0-9" x="223.5" y="157.875977"/>
-  <use xlink:href="#glyph0-11" x="234.5" y="157.875977"/>
-  <use xlink:href="#glyph0-12" x="245.5" y="157.875977"/>
-  <use xlink:href="#glyph0-7" x="256.5" y="157.875977"/>
-  <use xlink:href="#glyph0-4" x="267.5" y="157.875977"/>
-  <use xlink:href="#glyph0-11" x="278.5" y="157.875977"/>
-  <use xlink:href="#glyph0-12" x="289.5" y="157.875977"/>
-  <use xlink:href="#glyph0-8" x="300.5" y="157.875977"/>
-  <use xlink:href="#glyph0-5" x="311.5" y="157.875977"/>
-  <use xlink:href="#glyph0-6" x="322.5" y="157.875977"/>
-  <use xlink:href="#glyph0-7" x="333.5" y="157.875977"/>
+  <use xlink:href="#glyph0-1" x="157.5" y="157.875977"/>
+  <use xlink:href="#glyph0-2" x="168.5" y="157.875977"/>
+  <use xlink:href="#glyph0-3" x="179.5" y="157.875977"/>
+  <use xlink:href="#glyph0-4" x="190.5" y="157.875977"/>
+  <use xlink:href="#glyph0-1" x="201.5" y="157.875977"/>
+  <use xlink:href="#glyph0-5" x="212.5" y="157.875977"/>
+  <use xlink:href="#glyph0-6" x="223.5" y="157.875977"/>
+  <use xlink:href="#glyph0-7" x="234.5" y="157.875977"/>
+  <use xlink:href="#glyph0-8" x="245.5" y="157.875977"/>
+  <use xlink:href="#glyph0-9" x="256.5" y="157.875977"/>
+  <use xlink:href="#glyph0-10" x="267.5" y="157.875977"/>
+  <use xlink:href="#glyph0-1" x="278.5" y="157.875977"/>
+  <use xlink:href="#glyph0-9" x="289.5" y="157.875977"/>
+  <use xlink:href="#glyph0-11" x="300.5" y="157.875977"/>
+  <use xlink:href="#glyph0-12" x="311.5" y="157.875977"/>
+  <use xlink:href="#glyph0-7" x="322.5" y="157.875977"/>
+  <use xlink:href="#glyph0-4" x="333.5" y="157.875977"/>
+  <use xlink:href="#glyph0-11" x="344.5" y="157.875977"/>
+  <use xlink:href="#glyph0-12" x="355.5" y="157.875977"/>
+  <use xlink:href="#glyph0-8" x="366.5" y="157.875977"/>
+  <use xlink:href="#glyph0-5" x="377.5" y="157.875977"/>
+  <use xlink:href="#glyph0-6" x="388.5" y="157.875977"/>
+  <use xlink:href="#glyph0-7" x="399.5" y="157.875977"/>
 </g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.137255%,83.137255%,83.137255%);fill-opacity:1;" d="M 153.132812 849.621094 L 460.132812 849.621094 L 460.132812 1040.621094 L 153.132812 1040.621094 Z M 153.132812 849.621094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.137255%,83.137255%,83.137255%);fill-opacity:1;" d="M 165.546875 1017.5625 L 604.546875 1017.5625 L 604.546875 1231.5625 L 165.546875 1231.5625 Z M 165.546875 1017.5625 "/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-1" x="158.132812" y="872.621094"/>
-  <use xlink:href="#glyph0-2" x="169.132812" y="872.621094"/>
-  <use xlink:href="#glyph0-3" x="180.132812" y="872.621094"/>
-  <use xlink:href="#glyph0-4" x="191.132812" y="872.621094"/>
-  <use xlink:href="#glyph0-1" x="202.132812" y="872.621094"/>
-  <use xlink:href="#glyph0-5" x="213.132812" y="872.621094"/>
-  <use xlink:href="#glyph0-6" x="224.132812" y="872.621094"/>
-  <use xlink:href="#glyph0-7" x="235.132812" y="872.621094"/>
+  <use xlink:href="#glyph0-1" x="170.546875" y="1040.5625"/>
+  <use xlink:href="#glyph0-2" x="181.546875" y="1040.5625"/>
+  <use xlink:href="#glyph0-3" x="192.546875" y="1040.5625"/>
+  <use xlink:href="#glyph0-4" x="203.546875" y="1040.5625"/>
+  <use xlink:href="#glyph0-1" x="214.546875" y="1040.5625"/>
+  <use xlink:href="#glyph0-5" x="225.546875" y="1040.5625"/>
+  <use xlink:href="#glyph0-6" x="236.546875" y="1040.5625"/>
+  <use xlink:href="#glyph0-7" x="247.546875" y="1040.5625"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-37" x="158.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-9" x="169.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-15" x="180.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-9" x="191.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-14" x="202.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-7" x="213.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-11" x="224.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-17" x="235.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-23" x="246.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-22" x="257.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-30" x="268.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-9" x="279.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-30" x="290.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-14" x="301.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-5" x="312.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-23" x="323.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-23" x="334.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-14" x="345.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-5" x="356.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-31" x="367.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-5" x="378.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-7" x="389.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-23" x="400.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-5" x="411.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-3" x="422.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-23" x="433.132812" y="917.49707"/>
-  <use xlink:href="#glyph0-9" x="444.132812" y="917.49707"/>
+  <use xlink:href="#glyph0-38" x="170.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-9" x="181.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-15" x="192.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-9" x="203.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-14" x="214.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-7" x="225.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-11" x="236.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-17" x="247.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-23" x="258.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-22" x="269.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-30" x="280.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-9" x="291.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-30" x="302.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-14" x="313.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-5" x="324.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-23" x="335.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-23" x="346.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-14" x="357.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-5" x="368.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-31" x="379.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-5" x="390.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-7" x="401.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-23" x="412.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-5" x="423.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-3" x="434.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-23" x="445.546875" y="1085.438477"/>
+  <use xlink:href="#glyph0-9" x="456.546875" y="1085.438477"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-25" x="158.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-9" x="169.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-23" x="180.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-9" x="191.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-2" x="202.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-15" x="213.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-5" x="224.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-19" x="235.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-26" x="246.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-4" x="257.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-1" x="268.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-27" x="279.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-28" x="290.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-29" x="301.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-14" x="312.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-23" x="323.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-7" x="334.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-3" x="345.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-15" x="356.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-5" x="367.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-15" x="378.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-7" x="389.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-9" x="400.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-12" x="411.132812" y="940.49707"/>
-  <use xlink:href="#glyph0-38" x="422.132812" y="940.49707"/>
+  <use xlink:href="#glyph0-25" x="170.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-9" x="181.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-23" x="192.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-9" x="203.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-2" x="214.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-15" x="225.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-5" x="236.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-19" x="247.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-26" x="258.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-4" x="269.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-1" x="280.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-27" x="291.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-28" x="302.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-29" x="313.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-14" x="324.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-23" x="335.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-7" x="346.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-3" x="357.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-15" x="368.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-5" x="379.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-15" x="390.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-7" x="401.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-9" x="412.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-12" x="423.546875" y="1108.438477"/>
+  <use xlink:href="#glyph0-39" x="434.546875" y="1108.438477"/>
 </g>
 <g style="fill:rgb(100%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-39" x="158.132812" y="985.373047"/>
+  <use xlink:href="#glyph0-40" x="170.546875" y="1153.314453"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-14" x="169.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-1" x="180.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-2" x="191.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-3" x="202.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-4" x="213.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-1" x="224.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-5" x="235.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-6" x="246.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-7" x="257.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-8" x="268.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-17" x="279.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-4" x="290.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-15" x="301.132812" y="985.373047"/>
-  <use xlink:href="#glyph0-9" x="312.132812" y="985.373047"/>
+  <use xlink:href="#glyph0-14" x="181.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-1" x="192.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-2" x="203.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-3" x="214.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-4" x="225.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-1" x="236.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-5" x="247.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-6" x="258.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-7" x="269.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-8" x="280.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-17" x="291.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-4" x="302.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-15" x="313.546875" y="1153.314453"/>
+  <use xlink:href="#glyph0-9" x="324.546875" y="1153.314453"/>
 </g>
 <g style="fill:rgb(100%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-39" x="158.132812" y="1008.373047"/>
+  <use xlink:href="#glyph0-40" x="170.546875" y="1176.314453"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-14" x="169.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-1" x="180.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-2" x="191.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-3" x="202.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-4" x="213.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-1" x="224.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-5" x="235.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-6" x="246.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-7" x="257.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-8" x="268.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-9" x="279.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-10" x="290.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-1" x="301.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-9" x="312.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-11" x="323.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-12" x="334.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-7" x="345.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-4" x="356.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-11" x="367.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-12" x="378.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-8" x="389.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-5" x="400.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-6" x="411.132812" y="1008.373047"/>
-  <use xlink:href="#glyph0-7" x="422.132812" y="1008.373047"/>
+  <use xlink:href="#glyph0-14" x="181.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-1" x="192.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-2" x="203.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-3" x="214.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-4" x="225.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-1" x="236.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-5" x="247.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-6" x="258.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-7" x="269.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-8" x="280.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-9" x="291.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-10" x="302.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-1" x="313.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-9" x="324.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-11" x="335.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-12" x="346.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-7" x="357.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-4" x="368.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-11" x="379.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-12" x="390.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-8" x="401.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-5" x="412.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-6" x="423.546875" y="1176.314453"/>
+  <use xlink:href="#glyph0-7" x="434.546875" y="1176.314453"/>
 </g>
 <g style="fill:rgb(100%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-39" x="158.132812" y="1031.373047"/>
+  <use xlink:href="#glyph0-40" x="170.546875" y="1199.314453"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-14" x="169.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-1" x="180.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-2" x="191.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-3" x="202.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-4" x="213.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-1" x="224.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-5" x="235.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-6" x="246.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-7" x="257.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-8" x="268.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-9" x="279.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-10" x="290.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-1" x="301.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-9" x="312.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-11" x="323.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-12" x="334.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-7" x="345.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-4" x="356.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-11" x="367.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-12" x="378.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-8" x="389.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-22" x="400.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-1" x="411.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-7" x="422.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-23" x="433.132812" y="1031.373047"/>
-  <use xlink:href="#glyph0-12" x="444.132812" y="1031.373047"/>
+  <use xlink:href="#glyph0-14" x="181.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-1" x="192.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-2" x="203.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-3" x="214.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-4" x="225.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-1" x="236.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-5" x="247.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-6" x="258.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-7" x="269.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-8" x="280.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-9" x="291.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-10" x="302.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-1" x="313.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-9" x="324.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-11" x="335.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-12" x="346.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-7" x="357.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-4" x="368.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-11" x="379.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-12" x="390.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-8" x="401.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-22" x="412.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-1" x="423.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-7" x="434.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-23" x="445.546875" y="1199.314453"/>
+  <use xlink:href="#glyph0-12" x="456.546875" y="1199.314453"/>
 </g>
-<path style="fill:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(46.666667%,46.666667%,46.666667%);stroke-opacity:1;stroke-dasharray:2,8;stroke-miterlimit:10;" d="M 877.31543 816.423416 C 896.026367 869.962479 915.170898 916.16951 934.745117 955.04451 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 261.355469 845.621094 L 263.226562 832.757812 L 249.90625 839.464844 Z M 261.355469 845.621094 "/>
-<path style="fill:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(46.666667%,46.666667%,46.666667%);stroke-opacity:1;stroke-dasharray:2,8;stroke-miterlimit:10;" d="M 1082.803711 793.423416 C 1066.94043 862.298416 1047.674805 916.16951 1025.006836 955.04451 " transform="matrix(1,0,0,1,-673.389648,-109.423416)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 351.617188 845.621094 L 363.421875 840.175781 L 350.539062 832.664062 Z M 351.617188 845.621094 "/>
+<g style="fill:rgb(100%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-40" x="170.546875" y="1222.314453"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-14" x="181.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-1" x="192.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-2" x="203.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-3" x="214.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-4" x="225.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-1" x="236.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-5" x="247.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-6" x="258.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-7" x="269.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-8" x="280.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-9" x="291.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-10" x="302.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-1" x="313.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-9" x="324.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-11" x="335.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-12" x="346.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-7" x="357.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-4" x="368.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-11" x="379.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-12" x="390.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-8" x="401.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-3" x="412.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-9" x="423.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-24" x="434.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-5" x="445.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-31" x="456.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-7" x="467.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-4" x="478.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-22" x="489.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-15" x="500.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-34" x="511.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-3" x="522.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-22" x="533.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-7" x="544.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-23" x="555.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-30" x="566.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-9" x="577.546875" y="1222.314453"/>
+  <use xlink:href="#glyph0-15" x="588.546875" y="1222.314453"/>
+</g>
+<path style="fill:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(46.666667%,46.666667%,46.666667%);stroke-opacity:1;stroke-dasharray:2,8;stroke-miterlimit:10;" d="M 1416.915349 856.045716 C 1450.348943 965.565247 1495.454412 1067.752747 1552.231756 1162.608216 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 314.933594 1013.5625 L 315.863281 1000.59375 L 303.066406 1008.253906 Z M 314.933594 1013.5625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(46.666667%,46.666667%,46.666667%);stroke-opacity:1;stroke-dasharray:2,8;stroke-miterlimit:10;" d="M 1721.266912 1055.045716 C 1700.309881 1088.471497 1681.638006 1124.32306 1665.251287 1162.608216 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 427.953125 1013.5625 L 439 1006.703125 L 425.289062 1000.835938 Z M 427.953125 1013.5625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(46.666667%,46.666667%,46.666667%);stroke-opacity:1;stroke-dasharray:2,8;stroke-miterlimit:10;" d="M 1616.298162 778.463685 C 1460.794256 807.373841 1439.220037 935.420716 1551.571599 1162.608216 " transform="matrix(1,0,0,1,-1237.298162,-149.045716)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 314.273438 1013.5625 L 316.238281 1000.710938 L 302.871094 1007.320312 Z M 314.273438 1013.5625 "/>
 </g>
 </svg>
diff --git a/settings.gradle b/settings.gradle
index f765964ad9..5ac47a3651 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,5 +8,6 @@ pluginManagement {
 include ":tgbotapi.core"
 include ":tgbotapi.extensions.api"
 include ":tgbotapi.extensions.utils"
+include ":tgbotapi.extensions.behaviour_builder"
 include ":tgbotapi"
 include ":docs"
diff --git a/tgbotapi.core/build.gradle b/tgbotapi.core/build.gradle
index 589813da19..1c8d3ef73e 100644
--- a/tgbotapi.core/build.gradle
+++ b/tgbotapi.core/build.gradle
@@ -48,7 +48,10 @@ kotlin {
                 api "com.soywiz.korlibs.klock:klock:$klock_version"
                 api "com.benasher44:uuid:$uuid_version"
 
+                api "dev.inmo:micro_utils.crypto:$micro_utils_version"
                 api "dev.inmo:micro_utils.coroutines:$micro_utils_version"
+                api "dev.inmo:micro_utils.serialization.base64:$micro_utils_version"
+                api "dev.inmo:micro_utils.serialization.encapsulator:$micro_utils_version"
 
                 api "io.ktor:ktor-client-core:$ktor_version"
                 api "com.github.matfax.klassindex:library:4.+"
@@ -76,7 +79,6 @@ kotlin {
                 implementation kotlin('test-junit')
             }
         }
-
         jsTest {
             dependencies {
                 implementation kotlin('test-junit')
diff --git a/tgbotapi.core/mpp_publish_template.kpsb b/tgbotapi.core/mpp_publish_template.kpsb
index 65002ecf56..6a42a55995 100644
--- a/tgbotapi.core/mpp_publish_template.kpsb
+++ b/tgbotapi.core/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
\ No newline at end of file
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
\ No newline at end of file
diff --git a/tgbotapi.core/publish.gradle b/tgbotapi.core/publish.gradle
index cc02416726..830dcfc8cd 100644
--- a/tgbotapi.core/publish.gradle
+++ b/tgbotapi.core/publish.gradle
@@ -1,8 +1,12 @@
 apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
+task sourceJar (type : Jar) {
+    classifier = 'sources'
+}
 
 afterEvaluate {
     project.publishing.publications.all {
@@ -10,6 +14,7 @@ afterEvaluate {
         groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
             artifactId = "${project.name}"
+            artifact sourceJar
         } else {
             artifactId = "${project.name}-$name"
         }
@@ -62,4 +67,9 @@ publishing {
         }
         
     }
-}
\ No newline at end of file
+}
+
+signing {
+    useGpgCmd()
+    publishing.publications.forEach { sign it }
+}
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
index 139ae89e82..7cee50ae0b 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
 
 interface Captioned {
     val caption: String?
@@ -13,8 +12,7 @@ interface CaptionedOutput : Captioned {
 
 interface CaptionedInput : Captioned {
     /**
-     * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     * @see [CaptionedInput.fullEntitiesList]
+     * Full list of entities. This list WILL contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
      */
     val captionEntities: List<TextPart>
 }
@@ -25,10 +23,3 @@ interface CaptionedInput : Captioned {
  */
 val CaptionedInput.textSources
     get() = captionEntities.justTextSources()
-
-/**
- * Convert its [CaptionedInput.captionEntities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
- * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
- */
-@Deprecated("Currently list of entities already full. This method is redundant")
-fun CaptionedInput.fullEntitiesList(): TextSourcesList = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList()
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
index fb837163fd..05e7cd1c63 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
 
 interface Explained {
     val explanation: String?
@@ -19,8 +18,7 @@ interface ExplainedOutput : ParsableExplainedOutput, EntitiesExplainedOutput
 
 interface ExplainedInput : Explained {
     /**
-     * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     * @see [ExplainedInput.fullEntitiesList]
+     * Full list of entities. This list WILL contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
      */
     val explanationEntities: List<TextPart>
 }
@@ -31,10 +29,3 @@ interface ExplainedInput : Explained {
  */
 val ExplainedInput.textSources
     get() = explanationEntities.justTextSources()
-
-/**
- * Convert its [ExplainedInput.explanationEntities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
- * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
- */
-@Deprecated("Currently list of entities already full. This method is redundant")
-fun ExplainedInput.fullEntitiesList(): TextSourcesList = explanation ?.fullListOfSubSource(explanationEntities) ?.map { it.source } ?: emptyList()
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
index 08f70a5041..06481a6ebe 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt
@@ -8,10 +8,6 @@ import dev.inmo.tgbotapi.types.textLength
 const val DirectInvocationOfTextSourceConstructor = "It is strongly not recommended to use constructors directly instead of factory methods"
 
 typealias TextSourcesList = List<TextSource>
-@Deprecated("All lists of TextSource in public API now are full. So, this typealias is redundant")
-typealias FullTextSourcesList = List<TextSource>
-@Deprecated("All lists of TextPart in public API now are full. So, this typealias is redundant")
-typealias FullTextPartsList = List<TextPart>
 
 interface TextSource {
     val markdown: String
@@ -21,16 +17,6 @@ interface TextSource {
 
     val asText: String
         get() = source
-
-    @Deprecated("Rename", ReplaceWith("markdown"))
-    val asMarkdownSource: String
-        get() = markdown
-    @Deprecated("Rename", ReplaceWith("markdownV2"))
-    val asMarkdownV2Source: String
-        get() = markdownV2
-    @Deprecated("Rename", ReplaceWith("html"))
-    val asHtmlSource: String
-        get() = html
 }
 
 @Suppress("NOTHING_TO_INLINE")
@@ -43,13 +29,7 @@ inline operator fun TextSource.plus(text: String) = listOf(this, regular(text))
 inline operator fun List<TextSource>.plus(text: String) = this + regular(text)
 
 interface MultilevelTextSource : TextSource {
-    @Deprecated("Will be removed in near major release")
-    val textParts: List<TextPart>
-        get() = textParts(0)
     val subsources: List<TextSource>
-    @Deprecated("Will be removed in near major release", ReplaceWith("subsources"))
-    val textSources: List<TextSource>
-        get() = subsources
 }
 
 data class TextPart(
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt
index 4ff32e73de..0b556444e5 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt
@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.CommonAbstracts
 
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
 
 interface Texted {
     val text: String?
@@ -19,22 +18,18 @@ interface TextedOutput : ParsableOutput, EntitiesOutput
 
 interface TextedInput : Texted {
     /**
-     * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     * @see [CaptionedInput.fullEntitiesList]
+     * Here must be full list of entities. This list must contains [TextPart]s with
+     * [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource] in case if source text contains parts of
+     * regular text
      */
     val textEntities: List<TextPart>
 }
 
 /**
+ * Full list of [TextSource] built from source[TextedInput.textEntities]
+ *
  * @see TextedInput.textEntities
  * @see justTextSources
  */
 val TextedInput.textSources
     get() = textEntities.justTextSources()
-
-/**
- * Convert its [TextedInput.textEntities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
- * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
- */
-@Deprecated("Currently list of entities already full. This method is redundant")
-fun TextedInput.fullEntitiesList(): TextSourcesList = text ?.fullListOfSubSource(textEntities) ?.map { it.source } ?: emptyList()
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt
index db18339ec3..97225fce01 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt
@@ -5,7 +5,8 @@ import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.Ktor.base.*
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
-import dev.inmo.tgbotapi.bot.settings.limiters.*
+import dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter
+import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.Response
 import dev.inmo.tgbotapi.utils.*
@@ -67,7 +68,7 @@ class KtorRequestsExecutor(
         return safely(
             { e ->
                 throw if (e is ClientRequestException) {
-                    val content = e.response ?.readText() ?: throw e
+                    val content = e.response.readText()
                     val responseObject = jsonFormatter.decodeFromString(Response.serializer(), content)
                     newRequestException(
                         responseObject,
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt
index 11a25ddfac..bedbc96283 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt
@@ -6,7 +6,6 @@ import dev.inmo.tgbotapi.bot.exceptions.newRequestException
 import dev.inmo.tgbotapi.requests.GetUpdates
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.Response
-import dev.inmo.tgbotapi.types.RetryAfterError
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.client.call.receive
@@ -14,7 +13,6 @@ import io.ktor.client.features.timeout
 import io.ktor.client.request.*
 import io.ktor.client.statement.HttpResponse
 import io.ktor.http.ContentType
-import kotlinx.coroutines.delay
 import kotlinx.serialization.json.Json
 import kotlin.collections.set
 
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/MultipartRequestCallFactory.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/MultipartRequestCallFactory.kt
index ed440617ad..87cae741b3 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/MultipartRequestCallFactory.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/MultipartRequestCallFactory.kt
@@ -25,10 +25,9 @@ object MultipartRequestCallFactory : AbstractRequestCallFactory() {
                             Headers.build {
                                 append(HttpHeaders.ContentType, value.mimeType)
                                 append(HttpHeaders.ContentDisposition, "filename=${value.fileId}")
-                            }
-                        ) {
-                            value.file.asInput()
-                        }
+                            },
+                            block = value.file::input
+                        )
                         is FileId -> append(key, value.fileId)
                         else -> append(key, value.toString())
                     }
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt
index f792616fc2..687392c696 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.bot.exceptions
 
 import com.soywiz.klock.DateTime
-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.Response
+import dev.inmo.tgbotapi.types.RetryAfterError
 import io.ktor.utils.io.errors.IOException
 
 fun newRequestException(
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt
index d87b007544..a38d5a60fd 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt
@@ -1,15 +1,11 @@
 package dev.inmo.tgbotapi.bot.settings.limiters
 
 import com.soywiz.klock.DateTime
-import dev.inmo.micro_utils.coroutines.*
 import dev.inmo.tgbotapi.types.MilliSeconds
 import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlin.coroutines.Continuation
 import kotlin.math.roundToLong
 
 private fun now(): Long = DateTime.nowUnixLong()
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt
index 477b4a48f8..643d302bbd 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt
@@ -2,11 +2,13 @@ package dev.inmo.tgbotapi.bot.settings.limiters
 
 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.exceptions.TooMuchRequestsException
-import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MilliSeconds
+import dev.inmo.tgbotapi.types.RetryAfterError
 import io.ktor.client.features.ClientRequestException
 import io.ktor.http.HttpStatusCode
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.first
 
 /**
  * This limiter will limit requests only after getting a [RetryAfterError] or [ClientRequestException] with
@@ -60,6 +62,3 @@ class ExceptionsOnlyLimiter(
         }
     }
 }
-
-@Deprecated("Renamed", ReplaceWith("ExceptionsOnlyLimiter", "dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter"))
-typealias EmptyLimiter = ExceptionsOnlyLimiter
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/PowLimiter.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/PowLimiter.kt
index 2eb0a87fa9..bb20345101 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/PowLimiter.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/PowLimiter.kt
@@ -1,9 +1,9 @@
 package dev.inmo.tgbotapi.bot.settings.limiters
 
-import dev.inmo.micro_utils.coroutines.*
+import dev.inmo.micro_utils.coroutines.actor
+import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.types.MilliSeconds
 import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlin.coroutines.*
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/SetPassportDataErrors.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/SetPassportDataErrors.kt
new file mode 100644
index 0000000000..80a039fd40
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/SetPassportDataErrors.kt
@@ -0,0 +1,22 @@
+package dev.inmo.tgbotapi.requests
+
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.passport.PassportElementError
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class SetPassportDataErrors(
+    @SerialName(userIdField)
+    val user: UserId,
+    @SerialName(errorsField)
+    val errors: List<PassportElementError>
+) : SimpleRequest<Boolean> {
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override fun method(): String = "setPassportDataErrors"
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt
index 868559b16d..8439853634 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/UnpinChatMessage.kt
@@ -2,10 +2,7 @@ package dev.inmo.tgbotapi.requests.chat.modify
 
 import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.chatIdField
-import dev.inmo.tgbotapi.types.messageIdField
+import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
index 817ff9ba0c..4ddbf8e68f 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
@@ -9,8 +9,6 @@ import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
-import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import kotlinx.serialization.*
 
 fun CopyMessage(
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt
index df4a949fa1..1352d3a9b9 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt
@@ -8,6 +8,10 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InputMedia.*
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializerClass
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.media.AudioContent
+import dev.inmo.tgbotapi.types.message.content.media.DocumentContent
 import dev.inmo.tgbotapi.utils.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
@@ -17,13 +21,13 @@ const val rawSendingMediaGroupsWarning = "Media groups contains restrictions rel
     " types. Currently it is possible to combine photo + video OR audio OR documents"
 
 @RiskFeature(rawSendingMediaGroupsWarning)
-fun SendMediaGroup(
+fun <T : MediaGroupContent> SendMediaGroup(
     chatId: ChatIdentifier,
     media: List<MediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null
-): Request<List<MediaGroupMessage>> {
+): Request<List<MediaGroupMessage<T>>> {
     if (media.size !in mediaCountInMediaGroup) {
         throwRangeError("Count of members in media group", mediaCountInMediaGroup, media.size)
     }
@@ -47,14 +51,14 @@ fun SendMediaGroup(
         allowSendingWithoutReply
     )
 
-    return if (files.isEmpty()) {
+    return (if (files.isEmpty()) {
         data
     } else {
         MultipartRequestImpl(
             data,
             SendMediaGroupFiles(files)
         )
-    }
+    }) as Request<List<MediaGroupMessage<T>>>
 }
 
 /**
@@ -69,7 +73,7 @@ inline fun SendPlaylist(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null
-) = SendMediaGroup(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
+) = SendMediaGroup<AudioContent>(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
 
 /**
  * Use this method to be sure that you are correctly sending documents media group
@@ -83,7 +87,7 @@ inline fun SendDocumentsGroup(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null
-) = SendMediaGroup(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
+) = SendMediaGroup<DocumentContent>(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
 
 /**
  * Use this method to be sure that you are correctly sending visual media group
@@ -98,9 +102,9 @@ inline fun SendVisualMediaGroup(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null
-) = SendMediaGroup(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
+) = SendMediaGroup<VisualMediaGroupContent>(chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply)
 
-private val messagesListSerializer: KSerializer<List<MediaGroupMessage>>
+private val messagesListSerializer: KSerializer<List<MediaGroupMessage<MediaGroupContent>>>
     = ListSerializer(TelegramBotAPIMessageDeserializeOnlySerializerClass())
 
 @Serializable
@@ -114,7 +118,7 @@ data class SendMediaGroupData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(allowSendingWithoutReplyField)
     override val allowSendingWithoutReply: Boolean? = null
-) : DataRequest<List<MediaGroupMessage>>, SendMessageRequest<List<MediaGroupMessage>> {
+) : DataRequest<List<MediaGroupMessage<MediaGroupContent>>>, SendMessageRequest<List<MediaGroupMessage<MediaGroupContent>>> {
     @SerialName(mediaField)
     private val convertedMedia: String
         get() = buildJsonArray {
@@ -127,7 +131,7 @@ data class SendMediaGroupData internal constructor(
     override fun method(): String = "sendMediaGroup"
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
-    override val resultDeserializer: DeserializationStrategy<List<MediaGroupMessage>>
+    override val resultDeserializer: DeserializationStrategy<List<MediaGroupMessage<MediaGroupContent>>>
         get() = messagesListSerializer
 }
 
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
index 5c2784e85d..0115d80198 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
@@ -87,7 +87,7 @@ fun Poll.createRequest(
             correctOptionId,
             isAnonymous,
             isClosed,
-            fullEntitiesList(),
+            textSources,
             scheduledCloseInfo,
             disableNotification,
             replyToMessageId,
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt
index 3e54a9c6ad..087ec7723b 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt
@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.requests.webhook
 
 import dev.inmo.tgbotapi.requests.abstracts.*
-import dev.inmo.tgbotapi.requests.send.media.base.*
+import dev.inmo.tgbotapi.requests.send.media.base.DataRequest
+import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
index 34538eedf0..7346a72269 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
@@ -62,12 +62,6 @@ val inlineQueryAnswerResultsLimit = 0 .. 50
 val customTitleLength = 0 .. 16
 
 val dartsCubeAndBowlingDiceResultLimit = 1 .. 6
-@Deprecated("Renamed", ReplaceWith("dartsCubeAndBowlingDiceResultLimit", "dev.inmo.tgbotapi.types.dartsCubeAndBowlingDiceResultLimit"))
-val dartsAndCubeDiceResultLimit
-    get() = dartsCubeAndBowlingDiceResultLimit
-@Deprecated("Renamed", ReplaceWith("dartsCubeAndBowlingDiceResultLimit", "dev.inmo.tgbotapi.types.dartsCubeAndBowlingDiceResultLimit"))
-val diceResultLimit
-    get() = dartsCubeAndBowlingDiceResultLimit
 val basketballAndFootballDiceResultLimit = 1 .. 5
 val slotMachineDiceResultLimit = 1 .. 64
 
@@ -363,3 +357,25 @@ const val forceField = "force"
 
 const val regularPollType = "regular"
 const val quizPollType = "quiz"
+
+const val dataField = "data"
+const val credentialsField = "credentials"
+const val hashField = "hash"
+const val translationField = "translation"
+const val translationFileField = "translation_file"
+const val fileField = "file"
+const val filesField = "files"
+const val translationFilesField = "translation_files"
+const val frontSideField = "front_side"
+const val reverseSideField = "reverse_side"
+const val selfieField = "selfie"
+const val secretField = "secret"
+
+const val errorsField = "errors"
+const val sourceField = "source"
+const val fieldNameField = "field_name"
+const val dataHashField = "data_hash"
+const val fileHashField = "file_hash"
+const val fileHashesField = "file_hashes"
+const val messageField = "message"
+const val unspecifiedField = "unspecified"
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt
index b27d04396d..b56f188204 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.audio
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithInputMessageContentInlineQueryResult
@@ -8,10 +7,5 @@ import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.WithInp
 const val inlineQueryResultAudioType = "audio"
 
 interface InlineQueryResultAudioCommon : InlineQueryResult,
-    CaptionedOutput,
     TextedOutput,
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}
+    WithInputMessageContentInlineQueryResult
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt
index fa51b3e0e0..44ce297be0 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.document
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
@@ -9,10 +8,5 @@ const val inlineQueryResultDocumentType = "document"
 interface InlineQueryResultDocumentCommon : InlineQueryResult,
     TitledInlineQueryResult,
     DescribedInlineQueryResult,
-    CaptionedOutput,
     TextedOutput,
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}
+    WithInputMessageContentInlineQueryResult
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt
index 95e5f14480..a99ba9c91c 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCommon.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.gif
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
@@ -8,10 +7,5 @@ const val inlineQueryResultGifType = "gif"
 
 interface InlineQueryResultGifCommon : InlineQueryResult,
     OptionallyTitledInlineQueryResult,
-    CaptionedOutput,
     TextedOutput,
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}
+    WithInputMessageContentInlineQueryResult
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt
index 69b4e5b88c..cdf1e72963 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/mpeg4gif/InlineQueryResultMpeg4GifCommon.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
@@ -8,10 +7,5 @@ const val inlineQueryResultMpeg4GifType = "mpeg4_gif"
 
 interface InlineQueryResultMpeg4GifCommon : InlineQueryResult,
     OptionallyTitledInlineQueryResult,
-    CaptionedOutput,
     TextedOutput,
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}
+    WithInputMessageContentInlineQueryResult
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt
index 1f33a3a9b9..85a05c23a9 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/photo/InlineQueryResultPhotoCommon.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.photo
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
@@ -9,10 +8,5 @@ const val inlineQueryResultPhotoType = "photo"
 interface InlineQueryResultPhotoCommon : InlineQueryResult,
     OptionallyTitledInlineQueryResult,
     DescribedInlineQueryResult,
-    CaptionedOutput,
     TextedOutput,
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}
+    WithInputMessageContentInlineQueryResult
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt
index a015faac61..1543537e76 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/video/InlineQueryResultVideoCommon.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.video
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
@@ -9,10 +8,5 @@ const val inlineQueryResultVideoType = "video"
 interface InlineQueryResultVideoCommon : InlineQueryResult,
     TitledInlineQueryResult,
     DescribedInlineQueryResult,
-    CaptionedOutput,
     TextedOutput,
-    WithInputMessageContentInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}
+    WithInputMessageContentInlineQueryResult
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt
index 0bb3dee55b..5c1ffb868c 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/results/voice/InlineQueryResultVoiceCommon.kt
@@ -1,17 +1,11 @@
 package dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.results.voice
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.*
 
 const val inlineQueryResultVoiceType = "voice"
 
 interface InlineQueryResultVoiceCommon : InlineQueryResult,
-    CaptionedOutput,
     TextedOutput,
     WithInputMessageContentInlineQueryResult,
-    TitledInlineQueryResult {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-}
+    TitledInlineQueryResult
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt
index 9a2d74746b..5871b5a144 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InputMessageContent/InputTextMessageContent.kt
@@ -37,10 +37,7 @@ data class InputTextMessageContent internal constructor(
     private val rawEntities: List<RawMessageEntity>? = null,
     @SerialName(disableWebPagePreviewField)
     override val disableWebPagePreview: Boolean? = null
-) : CaptionedOutput, TextedOutput, DisableWebPagePreview, InputMessageContent {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
+) : TextedOutput, DisableWebPagePreview, InputMessageContent {
     override val entities: List<TextSource>? by lazy {
         rawEntities ?.asTextParts(text) ?.justTextSources()
     }
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt
index 48e99180ca..81f0d88c33 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMedia.kt
@@ -3,9 +3,6 @@ package dev.inmo.tgbotapi.types.InputMedia
 import dev.inmo.tgbotapi.requests.abstracts.InputFile
 import kotlinx.serialization.Serializable
 
-@Deprecated("Will be removed due to redundancy for end-side users")
-fun String.toInputMediaFileAttachmentName() = "attach://$this"
-
 @Serializable(InputMediaSerializer::class)
 interface InputMedia {
     val type: String
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt
index 5eb5e61c8e..77eaec8b68 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAnimation.kt
@@ -42,16 +42,12 @@ data class InputMediaAnimation internal constructor(
     override val height: Int? = null,
     override val duration: Long? = null,
     override val thumb: InputFile? = null
-) : InputMedia, SizedInputMedia, DuratedInputMedia, ThumbedInputMedia, TextedOutput, CaptionedOutput {
+) : InputMedia, SizedInputMedia, DuratedInputMedia, ThumbedInputMedia, TextedOutput {
     override val type: String = "animation"
     override val entities: List<TextSource>? by lazy {
         rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
     }
 
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
-
     @SerialName(mediaField)
     override val media: String
     init { media = file.fileIdToSend } // crutch until js compiling will be fixed
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt
index 7e63cc915b..77fa02d59b 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/MediaGroupMemberInputMedia.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.InputMedia
 
-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedOutput
 import dev.inmo.tgbotapi.CommonAbstracts.TextedOutput
 import kotlinx.serialization.*
 import kotlinx.serialization.json.Json
@@ -16,10 +15,7 @@ internal fun <T> T.buildArguments(withSerializer: SerializationStrategy<T>) = ar
 )
 
 @Serializable(MediaGroupMemberInputMediaSerializer::class)
-interface MediaGroupMemberInputMedia : InputMedia, CaptionedOutput, TextedOutput {
-    @Deprecated("Will be removed in next major release")
-    override val caption: String?
-        get() = text
+interface MediaGroupMemberInputMedia : InputMedia, TextedOutput {
     fun serialize(format: StringFormat): String
 }
 
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt
index d2b51c84b1..e44851ad94 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/ThumbedInputMedia.kt
@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.types.InputMedia
 
-import dev.inmo.tgbotapi.requests.abstracts.*
+import dev.inmo.tgbotapi.requests.abstracts.InputFile
 
 interface ThumbedInputMedia : InputMedia {
     val thumb: InputFile?
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
index d4a05a7bc4..83223e01cb 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.boldMarkdown
-import dev.inmo.tgbotapi.utils.internal.boldMarkdownV2
 
 /**
  * @see bold
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
index 1923aa88bc..83d00409a0 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
@@ -1,10 +1,9 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
+import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.commandMarkdown
-import dev.inmo.tgbotapi.utils.internal.commandMarkdownV2
 
 private val commandRegex = Regex("[/!][^@\\s]*")
 
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
index 4fa504f5ce..eb80cbf655 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.cashTagMarkdown
-import dev.inmo.tgbotapi.utils.internal.cashTagMarkdownV2
 
 /**
  * @see cashTag
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
index 7935f01fc3..e71c556e9e 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
@@ -2,10 +2,8 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.codeMarkdown
-import dev.inmo.tgbotapi.utils.internal.codeMarkdownV2
 
 /**
  * @see code
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
index 6de5d3ddce..83311b871e 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.emailMarkdown
-import dev.inmo.tgbotapi.utils.internal.emailMarkdownV2
 
 /**
  * @see email
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
index 109ef54cbc..3b33b8faf0 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.hashTagMarkdown
-import dev.inmo.tgbotapi.utils.internal.hashTagMarkdownV2
 
 /**
  * @see hashtag
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
index 92e71013c6..e72ed0b357 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.italicMarkdown
-import dev.inmo.tgbotapi.utils.internal.italicMarkdownV2
 
 /**
  * @see italic
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
index 421c89c7a3..288a191773 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.mentionMarkdown
-import dev.inmo.tgbotapi.utils.internal.mentionMarkdownV2
 
 private val String.withoutCommercialAt
     get() = if (startsWith("@")) {
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
index ea3bb8feae..e17c1ec716 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.phoneMarkdown
-import dev.inmo.tgbotapi.utils.internal.phoneMarkdownV2
 
 /**
  * @see phone
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt
index 4c001f5387..e22910e0f1 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt
@@ -1,10 +1,9 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
+import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.preMarkdown
-import dev.inmo.tgbotapi.utils.internal.preMarkdownV2
 
 /**
  * @see pre
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt
index 1d78129ca6..e880d6e2ba 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt
@@ -1,10 +1,9 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
+import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.regularMarkdown
-import dev.inmo.tgbotapi.utils.internal.regularMarkdownV2
 
 /**
  * @see regular
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt
index a1557d1b88..524f3ca1a1 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.strikethroughMarkdown
-import dev.inmo.tgbotapi.utils.internal.strikethroughMarkdownV2
 
 /**
  * @see strikethrough
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt
index 482fb7dcbc..c6170764fd 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt
@@ -1,10 +1,9 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
+import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.linkMarkdown
-import dev.inmo.tgbotapi.utils.internal.linkMarkdownV2
 
 /**
  * @see link
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
index 8fd7a50521..4166e4b489 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
@@ -2,10 +2,8 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.User
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.textMentionMarkdown
-import dev.inmo.tgbotapi.utils.internal.textMentionMarkdownV2
 
 /**
  * @see mention
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt
index c2cad771c6..cf84858378 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt
@@ -1,10 +1,9 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
+import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.linkMarkdown
-import dev.inmo.tgbotapi.utils.internal.linkMarkdownV2
 
 /**
  * @see link
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt
index 4a7a799fdb..febc609a9d 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt
@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.underlineMarkdown
-import dev.inmo.tgbotapi.utils.internal.underlineMarkdownV2
 
 /**
  * @see underline
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PrivateChat.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PrivateChat.kt
index d87404fdad..83dfb87afc 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PrivateChat.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/abstracts/PrivateChat.kt
@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.types.chat.abstracts
 
-import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.chat.PreviewChatSerializer
 import kotlinx.serialization.Serializable
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TelegramMediaFile.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TelegramMediaFile.kt
index f0614a5f48..149391a69c 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TelegramMediaFile.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/TelegramMediaFile.kt
@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.types.FileUniqueId
 
 internal const val fileIdField = "file_id"
 internal const val fileSizeField = "file_size"
+internal const val fileDateField = "file_date"
 internal const val filePathField = "file_path"
 
 /**
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelEventMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelEventMessage.kt
index 009dd19ef7..65bcc348cc 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelEventMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelEventMessage.kt
@@ -4,7 +4,6 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChannelEvent
-import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 
 data class ChannelEventMessage<T : ChannelEvent>(
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMediaGroupMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMediaGroupMessage.kt
index 70d670d41e..3f3688e702 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMediaGroupMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMediaGroupMessage.kt
@@ -9,14 +9,14 @@ import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 
-data class ChannelMediaGroupMessage(
+data class ChannelMediaGroupMessage<T : MediaGroupContent>(
     override val messageId: MessageIdentifier,
     override val chat: Chat,
     override val date: DateTime,
     override val mediaGroupId: MediaGroupIdentifier,
-    override val content: MediaGroupContent,
+    override val content: T,
     override val editDate: DateTime?,
     override val forwardInfo: ForwardInfo?,
     override val replyTo: Message?,
     override val replyMarkup: InlineKeyboardMarkup?
-) : MediaGroupMessage
+) : MediaGroupMessage<T>
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt
index ba28d6c5ba..73cdf10cb9 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt
@@ -20,6 +20,3 @@ data class ChannelMessageImpl<T: MessageContent>(
     override val senderBot: CommonBot?,
     override val authorSignature: AuthorSignature?
 ) : ChannelMessage<T>
-
-@Deprecated("Renamed", ReplaceWith("ChannelMessageImpl", "dev.inmo.tgbotapi.types.message.ChannelMessageImpl"))
-typealias ChannelMessage<T> = ChannelMessageImpl<T>
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonGroupEventMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonGroupEventMessage.kt
index d3c2edb7a4..03e228f693 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonGroupEventMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonGroupEventMessage.kt
@@ -7,9 +7,6 @@ import dev.inmo.tgbotapi.types.chat.abstracts.GroupChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.GroupEventMessage
 
-@Deprecated("Renamed", ReplaceWith("CommonGroupEventMessage"))
-typealias GroupEventMessage = CommonGroupEventMessage<*>
-
 data class CommonGroupEventMessage<T : GroupEvent>(
     override val messageId: MessageIdentifier,
     override val user: User,
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMediaGroupMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMediaGroupMessage.kt
index 2694c7d187..49d1118e57 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMediaGroupMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonMediaGroupMessage.kt
@@ -7,15 +7,15 @@ import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 
-data class CommonMediaGroupMessage(
+data class CommonMediaGroupMessage<T : MediaGroupContent>(
     override val messageId: MessageIdentifier,
     override val user: User,
     override val chat: Chat,
     override val date: DateTime,
     override val mediaGroupId: MediaGroupIdentifier,
-    override val content: MediaGroupContent,
+    override val content: T,
     override val editDate: DateTime?,
     override val forwardInfo: ForwardInfo?,
     override val replyTo: Message?,
     override val replyMarkup: InlineKeyboardMarkup?
-) : MediaGroupMessage, FromUserMessage
+) : MediaGroupMessage<T>, FromUserMessage
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonSupergroupEventMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonSupergroupEventMessage.kt
index d79212f169..b63a7dbf1b 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonSupergroupEventMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonSupergroupEventMessage.kt
@@ -4,13 +4,9 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.User
 import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat
-import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.SupergroupEventMessage
 
-@Deprecated("Renamed", ReplaceWith("CommonSupergroupEventMessage"))
-typealias SupergroupEventMessage = CommonSupergroupEventMessage<*>
-
 data class CommonSupergroupEventMessage<T : SupergroupEvent>(
     override val messageId: MessageIdentifier,
     override val user: User,
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PassportMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PassportMessage.kt
new file mode 100644
index 0000000000..55153e159f
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PassportMessage.kt
@@ -0,0 +1,17 @@
+package dev.inmo.tgbotapi.types.message
+
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.User
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.FromUserMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.passport.PassportData
+
+data class PassportMessage(
+    override val messageId: MessageIdentifier,
+    override val chat: Chat,
+    override val user: User,
+    override val date: DateTime,
+    val passportData: PassportData
+) : Message, FromUserMessage
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt
index 232fb6a88a..e627f034e3 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt
@@ -22,6 +22,3 @@ data class PrivateMessageImpl<T: MessageContent>(
     override val senderBot: CommonBot?,
     val paymentInfo: SuccessfulPaymentInfo?
 ) : PrivateMessage<T>
-
-@Deprecated("Renamed", ReplaceWith("PrivateMessageImpl", "dev.inmo.tgbotapi.types.message.PrivateMessageImpl"))
-typealias CommonMessageImpl<T> = PrivateMessageImpl<T>
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
index a51e011d8a..b692284b71 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
@@ -18,6 +18,7 @@ import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.content.media.*
 import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
 import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentInfo
+import dev.inmo.tgbotapi.types.passport.PassportData
 import dev.inmo.tgbotapi.types.payments.Invoice
 import dev.inmo.tgbotapi.types.payments.SuccessfulPayment
 import dev.inmo.tgbotapi.types.polls.Poll
@@ -84,7 +85,7 @@ internal data class RawMessage(
     private val connected_website: String? = null,
 
     // passport property
-    private val passport_data: Unit? = null,
+    private val passport_data: PassportData? = null,
     private val proximity_alert_triggered: ProximityAlertTriggered? = null,
 
     private val reply_markup: InlineKeyboardMarkup? = null
@@ -324,6 +325,14 @@ internal data class RawMessage(
                     )
                     else -> error("Unknown type of chat: $chat")
                 }
+            } ?: passport_data ?.let{
+                PassportMessage(
+                    messageId,
+                    chat,
+                    from ?: error("For passport must be provided user, but got null"),
+                    date.asDate,
+                    passport_data
+                )
             } ?: error("Was not found supported type of data")
         } catch (e: Exception) {
             UnknownMessageType(
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/MediaGroupMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/MediaGroupMessage.kt
index c78ab44f77..307ba6e78c 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/MediaGroupMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/MediaGroupMessage.kt
@@ -3,6 +3,6 @@ package dev.inmo.tgbotapi.types.message.abstracts
 import dev.inmo.tgbotapi.types.MediaGroupIdentifier
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 
-interface MediaGroupMessage : CommonMessage<MediaGroupContent> {
+interface MediaGroupMessage<T : MediaGroupContent> : CommonMessage<T> {
     val mediaGroupId: MediaGroupIdentifier
 }
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
index 304ace106a..83a5488e46 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types.message.content
 
-import dev.inmo.tgbotapi.CommonAbstracts.*
+import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.TextedInput
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.SendTextMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
@@ -10,17 +11,11 @@ import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.utils.internal.*
-import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
-import dev.inmo.tgbotapi.utils.internal.toMarkdownTexts
 
 data class TextContent(
     override val text: String,
     override val textEntities: List<TextPart> = emptyList()
 ) : MessageContent, TextedInput {
-    @Deprecated("Has been renamed", ReplaceWith("textEntities"))
-    val entities: List<TextPart>
-        get() = textEntities
-
     override fun createResend(
         chatId: ChatIdentifier,
         disableNotification: Boolean,
@@ -77,10 +72,3 @@ data class TextContent(
         )
     }
 }
-
-/**
- * Convert its [TextContent.entities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
- * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
- */
-@Deprecated("Useless due to the fact that currently every message contains full list of sources")
-fun TextContent.fullEntitiesList(): TextSourcesList = text.fullListOfSubSource(entities).map { it.source }
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt
index a284c0c4b8..7cf2eb6b16 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/abstracts/MediaGroupContent.kt
@@ -1,12 +1,18 @@
 package dev.inmo.tgbotapi.types.message.content.abstracts
 
 import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput
-import dev.inmo.tgbotapi.types.InputMedia.MediaGroupMemberInputMedia
+import dev.inmo.tgbotapi.types.InputMedia.*
 
 interface MediaGroupContent : MediaContent, CaptionedInput {
     fun toMediaGroupMemberInputMedia(): MediaGroupMemberInputMedia
 }
 
-interface VisualMediaGroupContent : MediaGroupContent
-interface AudioMediaGroupContent : MediaGroupContent
-interface DocumentMediaGroupContent : MediaGroupContent
+interface VisualMediaGroupContent : MediaGroupContent {
+    override fun toMediaGroupMemberInputMedia(): VisualMediaGroupMemberInputMedia
+}
+interface AudioMediaGroupContent : MediaGroupContent {
+    override fun toMediaGroupMemberInputMedia(): AudioMediaGroupMemberInputMedia
+}
+interface DocumentMediaGroupContent : MediaGroupContent {
+    override fun toMediaGroupMemberInputMedia(): DocumentMediaGroupMemberInputMedia
+}
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/EncryptedData.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/EncryptedData.kt
new file mode 100644
index 0000000000..ce198b65da
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/EncryptedData.kt
@@ -0,0 +1,23 @@
+package dev.inmo.tgbotapi.types.passport
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+typealias EncryptedAndBase64EncodedData = String
+typealias EncryptedByBotPublicKeyData = String
+typealias EncryptedData = String
+
+@Serializable
+data class EncryptedCredentials(
+    @SerialName(dataField)
+    @Serializable(Base64StringSerializer::class)
+    val data: EncryptedData,
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    val hash: String,
+    @SerialName(secretField)
+    @Serializable(Base64StringSerializer::class)
+    val secret: EncryptedByBotPublicKeyData
+)
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/PassportData.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/PassportData.kt
new file mode 100644
index 0000000000..9bf4884791
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/PassportData.kt
@@ -0,0 +1,15 @@
+package dev.inmo.tgbotapi.types.passport
+
+import dev.inmo.tgbotapi.types.credentialsField
+import dev.inmo.tgbotapi.types.dataField
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.EncryptedPassportElement
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PassportData(
+    @SerialName(dataField)
+    val data: List<EncryptedPassportElement>,
+    @SerialName(credentialsField)
+    val credentials: EncryptedCredentials
+)
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/PassportElementError.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/PassportElementError.kt
new file mode 100644
index 0000000000..a3cf28594a
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/PassportElementError.kt
@@ -0,0 +1,266 @@
+@file:Suppress("unused", "EXPERIMENTAL_API_USAGE")
+
+package dev.inmo.tgbotapi.types.passport
+
+import dev.inmo.micro_utils.crypto.MD5
+import dev.inmo.micro_utils.crypto.md5
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.*
+import dev.inmo.tgbotapi.types.passport.encrypted_data.type
+import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.*
+
+val ByteArray.passportFileHash: MD5
+    get() = md5()
+
+@Serializable(PassportElementErrorSerializer::class)
+sealed class PassportElementError {
+    abstract val source: String
+    abstract val type: String
+    abstract val message: String
+}
+
+data class UnknownPassportElementError(
+    val raw: JsonObject
+) : PassportElementError() {
+    override val source: String = raw[sourceField] ?.jsonPrimitive ?.contentOrNull ?: ""
+    override val type: String = raw[typeField] ?.jsonPrimitive ?.contentOrNull ?: ""
+    override val message: String = raw[messageField] ?.jsonPrimitive ?.contentOrNull ?: ""
+}
+
+object PassportElementErrorSerializer : KSerializer<PassportElementError> {
+    private val jsonObjectSerializer = JsonObject.serializer()
+    override val descriptor: SerialDescriptor
+        get() = jsonObjectSerializer.descriptor
+    override fun deserialize(decoder: Decoder): PassportElementError {
+        val json = jsonObjectSerializer.deserialize(decoder)
+        return when (json[sourceField] ?.jsonPrimitive ?.content) {
+            "dataField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorDataField.serializer(), json)
+            "frontSideField" ->  nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorFrontSide.serializer(), json)
+            "reverseSideField" ->  nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorReverseSide.serializer(), json)
+            "selfieField" ->  nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorSelfie.serializer(), json)
+            "fileField" ->  nonstrictJsonFormat.decodeFromJsonElement(PassportElementFileError.serializer(), json)
+            "filesField" ->  nonstrictJsonFormat.decodeFromJsonElement(PassportElementFilesError.serializer(), json)
+            "translationFileField" ->  nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorTranslationFile.serializer(), json)
+            "translationFilesField" ->  nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorTranslationFiles.serializer(), json)
+            "unspecifiedField" ->  nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorUnspecified.serializer(), json)
+            else -> UnknownPassportElementError(json)
+        }
+    }
+    override fun serialize(encoder: Encoder, value: PassportElementError) {
+        val neverMindAboutThisVariable = when (value) {
+            is PassportElementErrorFrontSide -> PassportElementErrorFrontSide.serializer().serialize(encoder, value)
+            is PassportElementErrorReverseSide -> PassportElementErrorReverseSide.serializer().serialize(encoder, value)
+            is PassportElementErrorSelfie -> PassportElementErrorSelfie.serializer().serialize(encoder, value)
+            is PassportElementErrorFile -> PassportElementErrorFile.serializer().serialize(encoder, value)
+            is PassportElementErrorTranslationFile -> PassportElementErrorTranslationFile.serializer().serialize(encoder, value)
+            is PassportElementErrorUnspecified -> PassportElementErrorUnspecified.serializer().serialize(encoder, value)
+            is PassportElementErrorDataField -> PassportElementErrorDataField.serializer().serialize(encoder, value)
+            is PassportElementErrorFiles -> PassportElementErrorFiles.serializer().serialize(encoder, value)
+            is PassportElementErrorTranslationFiles -> PassportElementErrorTranslationFiles.serializer().serialize(encoder, value)
+            is UnknownPassportElementError -> jsonObjectSerializer.serialize(encoder, value.raw)
+        }
+    }
+}
+
+@Serializable
+sealed class PassportSingleElementError : PassportElementError() {
+    abstract val elementHash: String
+}
+
+@Serializable
+sealed class PassportMultipleElementsError : PassportElementError() {
+    abstract val elementsHashes: List<String>
+}
+
+@Serializable
+sealed class PassportElementFileError : PassportSingleElementError()
+
+@Serializable
+sealed class PassportElementFilesError : PassportMultipleElementsError()
+
+@Serializable
+data class PassportElementErrorDataField(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fieldNameField)
+    val fieldName: String,
+    @SerialName(dataHashField)
+    @Serializable(Base64StringSerializer::class)
+    override val elementHash: String,
+    @SerialName(messageField)
+    override val message: String
+) : PassportSingleElementError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = dataField
+}
+fun WithData.createDataError(field: String, message: String) = PassportElementErrorDataField(
+    type,
+    field,
+    hash,
+    message
+)
+
+@Serializable
+data class PassportElementErrorFrontSide(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fileHashField)
+    @Serializable(Base64StringSerializer::class)
+    override val elementHash: String,
+    @SerialName(messageField)
+    override val message: String
+) : PassportElementFileError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = frontSideField
+}
+fun WithFrontSide.createFrontSideError(message: String, unencryptedFileHash: String) = PassportElementErrorFrontSide(
+    type,
+    unencryptedFileHash,
+    message
+)
+
+@Serializable
+data class PassportElementErrorReverseSide(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fileHashField)
+    @Serializable(Base64StringSerializer::class)
+    override val elementHash: String,
+    @SerialName(messageField)
+    override val message: String
+) : PassportElementFileError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = reverseSideField
+}
+fun WithReverseSide.createReverseSideError(message: String, unencryptedFileHash: String) = PassportElementErrorReverseSide(
+    type,
+    unencryptedFileHash,
+    message
+)
+@Serializable
+data class PassportElementErrorSelfie(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fileHashField)
+    @Serializable(Base64StringSerializer::class)
+    override val elementHash: String,
+    @SerialName(messageField)
+    override val message: String
+) : PassportElementFileError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = selfieField
+}
+fun WithSelfie.createSelfieError(message: String, unencryptedFileHash: String) = PassportElementErrorSelfie(
+    type,
+    unencryptedFileHash,
+    message
+)
+
+
+@Serializable
+data class PassportElementErrorFile(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fileHashField)
+    @Serializable(Base64StringSerializer::class)
+    override val elementHash: String,
+    @SerialName(messageField)
+    override val message: String
+) : PassportElementFileError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = fileField
+}
+fun FilesCollection.createFileError(message: String, unencryptedFileHash: String) = PassportElementErrorFile(
+    type,
+    unencryptedFileHash,
+    message
+)
+
+@Serializable
+data class PassportElementErrorFiles(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fileHashesField)
+    override val elementsHashes: List<@Serializable(Base64StringSerializer::class) String>,
+    @SerialName(messageField)
+    override val message: String
+) : PassportElementFilesError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = filesField
+}
+fun FilesCollection.createFilesError(message: String, unencryptedFileHashes: List<String>) = PassportElementErrorFiles(
+    type,
+    unencryptedFileHashes,
+    message
+)
+
+
+@Serializable
+data class PassportElementErrorTranslationFile(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fileHashField)
+    @Serializable(Base64StringSerializer::class)
+    override val elementHash: String,
+    @SerialName(messageField)
+    override val message: String
+) : PassportElementFileError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = translationFileField
+}
+fun Translatable.createFileError(message: String, unencryptedFileHash: String) = PassportElementErrorTranslationFile(
+    type,
+    unencryptedFileHash,
+    message
+)
+@Serializable
+data class PassportElementErrorTranslationFiles(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fileHashesField)
+    override val elementsHashes: List<@Serializable(Base64StringSerializer::class) String>,
+    @SerialName(messageField)
+    override val message: String
+) : PassportElementFilesError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = translationFilesField
+}
+fun Translatable.createFilesError(message: String, unencryptedFileHashes: List<String>) = PassportElementErrorTranslationFiles(
+    type,
+    unencryptedFileHashes,
+    message
+)
+
+@Serializable
+data class PassportElementErrorUnspecified(
+    @SerialName(typeField)
+    override val type: String,
+    @SerialName(fileHashField)
+    @Serializable(Base64StringSerializer::class)
+    override val elementHash: String,
+    @SerialName(messageField)
+    override val message: String
+) : PassportElementFileError() {
+    @SerialName(sourceField)
+    @Required
+    override val source: String = unspecifiedField
+}
+fun EncryptedPassportElement.createUnspecifiedError(message: String, elementHash: String) = PassportElementErrorUnspecified(
+    type,
+    elementHash,
+    message
+)
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Email.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Email.kt
new file mode 100644
index 0000000000..c5e83c94d8
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Email.kt
@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.emailField
+import dev.inmo.tgbotapi.types.hashField
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithEmail
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Email(
+    @SerialName(emailField)
+    override val email: String,
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : WithEmail {
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedAddress.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedAddress.kt
new file mode 100644
index 0000000000..b63f1865bf
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedAddress.kt
@@ -0,0 +1,17 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.dataField
+import dev.inmo.tgbotapi.types.passport.EncryptedData
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EncryptedAddress(
+    @SerialName(dataField)
+    @Serializable(Base64StringSerializer::class)
+    override val data: EncryptedData,
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : WithData
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedElementSerializer.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedElementSerializer.kt
new file mode 100644
index 0000000000..28caca9889
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedElementSerializer.kt
@@ -0,0 +1,63 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.micro_utils.serialization.encapsulator.Encapsulator
+import dev.inmo.tgbotapi.types.hashField
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.EncryptedPassportElement
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.UnknownEncryptedPassportElement
+import dev.inmo.tgbotapi.types.typeField
+import dev.inmo.tgbotapi.utils.RiskFeature
+import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.*
+
+val encryptedElementsClassesByTypes = mapOf(
+    "personal_details" to Encapsulator(EncryptedPersonalDetails::class, EncryptedPersonalDetails.serializer()),
+    "passport" to Encapsulator(CommonPassport::class, CommonPassport.serializer()),
+    "driver_license" to Encapsulator(DriverLicense::class, DriverLicense.serializer()),
+    "identity_card" to Encapsulator(IdentityCard::class, IdentityCard.serializer()),
+    "internal_passport" to Encapsulator(InternalPassport::class, InternalPassport.serializer()),
+    "address" to Encapsulator(EncryptedAddress::class, EncryptedAddress.serializer()),
+    "utility_bill" to Encapsulator(UtilityBill::class, UtilityBill.serializer()),
+    "bank_statement" to Encapsulator(BankStatement::class, BankStatement.serializer()),
+    "rental_agreement" to Encapsulator(RentalAgreement::class, RentalAgreement.serializer()),
+    "passport_registration" to Encapsulator(PassportRegistration::class, PassportRegistration.serializer()),
+    "temporary_registration" to Encapsulator(TemporaryRegistration::class, TemporaryRegistration.serializer()),
+    "phone_number" to Encapsulator(PhoneNumber::class, PhoneNumber.serializer()),
+    "email" to Encapsulator(Email::class, Email.serializer())
+)
+
+@RiskFeature("Remember that this method may return \"unknown\" in case if encrypted element was not defined in library")
+val EncryptedPassportElement.type: String
+    get() = encryptedElementsClassesByTypes.keys.firstOrNull { encryptedElementsClassesByTypes.getValue(it).klass.isInstance(this) } ?: "unknown"
+
+@Serializer(EncryptedPassportElement::class)
+object EncryptedElementSerializer : KSerializer<EncryptedPassportElement> {
+    private val jsonSerializer = JsonObject.serializer()
+    override val descriptor: SerialDescriptor = jsonSerializer.descriptor
+
+    override fun deserialize(decoder: Decoder): EncryptedPassportElement {
+        val json = jsonSerializer.deserialize(decoder)
+        return json[typeField] ?.jsonPrimitive ?.content ?.let { type ->
+            encryptedElementsClassesByTypes[type] ?.serializer ?.let { deserializer ->
+                nonstrictJsonFormat.decodeFromJsonElement(deserializer, json)
+            }
+        } ?: UnknownEncryptedPassportElement(json, json[hashField] ?.jsonPrimitive ?.content ?: "")
+    }
+
+    override fun serialize(encoder: Encoder, value: EncryptedPassportElement) {
+        val json = value.let {
+            encryptedElementsClassesByTypes.forEach { (key, encapsulator) ->
+                val json = encapsulator.encapsulate(value) { data ->
+                    nonstrictJsonFormat.encodeToJsonElement(this as KSerializer<EncryptedPassportElement>, data).jsonObject
+                } ?: return@forEach
+                return@let JsonObject(json + (typeField to JsonPrimitive(key)))
+            }
+            (value as? UnknownEncryptedPassportElement) ?.rawJson ?: return
+        }
+        jsonSerializer.serialize(encoder, json)
+    }
+}
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedPersonalDetails.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedPersonalDetails.kt
new file mode 100644
index 0000000000..90149a261e
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedPersonalDetails.kt
@@ -0,0 +1,17 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.dataField
+import dev.inmo.tgbotapi.types.passport.EncryptedData
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EncryptedPersonalDetails(
+    @SerialName(dataField)
+    @Serializable(Base64StringSerializer::class)
+    override val data: EncryptedData,
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : WithData
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Passport.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Passport.kt
new file mode 100644
index 0000000000..882c91c895
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Passport.kt
@@ -0,0 +1,42 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.passport.EncryptedData
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+sealed class Passport : WithData, WithFrontSide, WithSelfie, Translatable
+
+@Serializable
+data class CommonPassport(
+    @SerialName(dataField)
+    @Serializable(Base64StringSerializer::class)
+    override val data: EncryptedData,
+    @SerialName(frontSideField)
+    override val frontSide: PassportFile? = null,
+    @SerialName(selfieField)
+    override val selfie: PassportFile? = null,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : Passport()
+@Serializable
+data class InternalPassport(
+    @SerialName(dataField)
+    @Serializable(Base64StringSerializer::class)
+    override val data: EncryptedData,
+    @SerialName(frontSideField)
+    override val frontSide: PassportFile? = null,
+    @SerialName(selfieField)
+    override val selfie: PassportFile? = null,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : Passport()
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PassportFile.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PassportFile.kt
new file mode 100644
index 0000000000..cf00e2fc2a
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PassportFile.kt
@@ -0,0 +1,23 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.abstracts.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * This object represents a file uploaded to Telegram Passport. Currently all Telegram Passport files are in JPEG format
+ * when decrypted and don't exceed 10MB.
+ */
+@Serializable
+data class PassportFile(
+    @SerialName(fileIdField)
+    override val fileId: FileId,
+    @SerialName(fileUniqueIdField)
+    override val fileUniqueId: FileUniqueId,
+    @SerialName(fileDateField)
+    val uploadingDate: TelegramDate,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null
+) : TelegramMediaFile
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PhoneNumber.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PhoneNumber.kt
new file mode 100644
index 0000000000..563339ade1
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PhoneNumber.kt
@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.hashField
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithPhoneNumber
+import dev.inmo.tgbotapi.types.phoneNumberField
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PhoneNumber(
+    @SerialName(phoneNumberField)
+    override val phoneNumber: String,
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : WithPhoneNumber {
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/TranslatableFilesCollection.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/TranslatableFilesCollection.kt
new file mode 100644
index 0000000000..4339ad958b
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/TranslatableFilesCollection.kt
@@ -0,0 +1,63 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.FilesCollection
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.Translatable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+sealed class TranslatableFilesCollection : Translatable, FilesCollection
+
+@Serializable
+data class UtilityBill(
+    @SerialName(filesField)
+    override val files: List<PassportFile>,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : TranslatableFilesCollection()
+@Serializable
+data class BankStatement(
+    @SerialName(filesField)
+    override val files: List<PassportFile>,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : TranslatableFilesCollection()
+@Serializable
+data class RentalAgreement(
+    @SerialName(filesField)
+    override val files: List<PassportFile>,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : TranslatableFilesCollection()
+@Serializable
+data class PassportRegistration(
+    @SerialName(filesField)
+    override val files: List<PassportFile>,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : TranslatableFilesCollection()
+@Serializable
+data class TemporaryRegistration(
+    @SerialName(filesField)
+    override val files: List<PassportFile>,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : TranslatableFilesCollection()
+
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/TranslatableIDDocument.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/TranslatableIDDocument.kt
new file mode 100644
index 0000000000..45d874c784
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/TranslatableIDDocument.kt
@@ -0,0 +1,47 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.passport.EncryptedData
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+sealed class TranslatableIDDocument : WithData, WithFrontSide, WithReverseSide, WithSelfie, Translatable
+
+@Serializable
+data class DriverLicense(
+    @SerialName(dataField)
+    @Serializable(Base64StringSerializer::class)
+    override val data: EncryptedData,
+    @SerialName(frontSideField)
+    override val frontSide: PassportFile? = null,
+    @SerialName(reverseSideField)
+    override val reverseSide: PassportFile? = null,
+    @SerialName(selfieField)
+    override val selfie: PassportFile? = null,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : TranslatableIDDocument()
+
+@Serializable
+data class IdentityCard(
+    @SerialName(dataField)
+    @Serializable(Base64StringSerializer::class)
+    override val data: EncryptedData,
+    @SerialName(frontSideField)
+    override val frontSide: PassportFile? = null,
+    @SerialName(reverseSideField)
+    override val reverseSide: PassportFile? = null,
+    @SerialName(selfieField)
+    override val selfie: PassportFile? = null,
+    @SerialName(translationField)
+    override val translations: List<PassportFile> = emptyList(),
+    @SerialName(hashField)
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : TranslatableIDDocument()
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/EncryptedPassportElement.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/EncryptedPassportElement.kt
new file mode 100644
index 0000000000..4716d225d2
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/EncryptedPassportElement.kt
@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonObject
+
+@Serializable(EncryptedElementSerializer::class)
+interface EncryptedPassportElement {
+    val hash: String
+}
+
+@Serializable(EncryptedElementSerializer::class)
+data class UnknownEncryptedPassportElement(
+    val rawJson: JsonObject,
+    @Serializable(Base64StringSerializer::class)
+    override val hash: String
+) : EncryptedPassportElement
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/FilesCollection.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/FilesCollection.kt
new file mode 100644
index 0000000000..aa58eb3ecc
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/FilesCollection.kt
@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import dev.inmo.tgbotapi.types.passport.encrypted_data.PassportFile
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+interface FilesCollection : EncryptedPassportElement {
+    val files: List<PassportFile>
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/Translatable.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/Translatable.kt
new file mode 100644
index 0000000000..0e7d7f0af9
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/Translatable.kt
@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import dev.inmo.tgbotapi.types.passport.encrypted_data.PassportFile
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+interface Translatable : EncryptedPassportElement {
+    val translations: List<PassportFile>
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithData.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithData.kt
new file mode 100644
index 0000000000..163b9d43b6
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithData.kt
@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.tgbotapi.types.passport.EncryptedData
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+interface WithData : EncryptedPassportElement {
+    val data: EncryptedData
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithEmail.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithEmail.kt
new file mode 100644
index 0000000000..57b069a55f
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithEmail.kt
@@ -0,0 +1,9 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+interface WithEmail : EncryptedPassportElement {
+    val email: String
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithFrontSide.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithFrontSide.kt
new file mode 100644
index 0000000000..400ffae9cd
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithFrontSide.kt
@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import dev.inmo.tgbotapi.types.passport.encrypted_data.PassportFile
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+interface WithFrontSide : EncryptedPassportElement {
+    val frontSide: PassportFile?
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithPhoneNumber.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithPhoneNumber.kt
new file mode 100644
index 0000000000..47e1ecdf30
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithPhoneNumber.kt
@@ -0,0 +1,9 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+interface WithPhoneNumber : EncryptedPassportElement {
+    val phoneNumber: String
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithReverseSide.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithReverseSide.kt
new file mode 100644
index 0000000000..059b517955
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithReverseSide.kt
@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import dev.inmo.tgbotapi.types.passport.encrypted_data.PassportFile
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+interface WithReverseSide : EncryptedPassportElement {
+    val reverseSide: PassportFile?
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithSelfie.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithSelfie.kt
new file mode 100644
index 0000000000..fed2706bab
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithSelfie.kt
@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
+
+import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
+import dev.inmo.tgbotapi.types.passport.encrypted_data.PassportFile
+import kotlinx.serialization.Serializable
+
+@Serializable(EncryptedElementSerializer::class)
+interface WithSelfie : EncryptedPassportElement {
+    val selfie: PassportFile?
+}
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt
index fa4532d80d..505caf47ef 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/ChannelPostMediaGroupUpdate.kt
@@ -2,11 +2,12 @@ package dev.inmo.tgbotapi.types.update.MediaGroupUpdates
 
 import dev.inmo.tgbotapi.types.UpdateIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 
 data class ChannelPostMediaGroupUpdate(
     override val origins: List<BaseMessageUpdate>
 ) : SentMediaGroupUpdate {
     override val updateId: UpdateIdentifier = origins.last().updateId
-    override val data: List<MediaGroupMessage> = origins.mapNotNull { it.data as? MediaGroupMessage }
+    override val data: List<MediaGroupMessage<MediaGroupContent>> = origins.mapNotNull { it.data as? MediaGroupMessage<MediaGroupContent> }
 }
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt
index 596088bbcb..8c0935d199 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditChannelPostMediaGroupUpdate.kt
@@ -2,11 +2,12 @@ package dev.inmo.tgbotapi.types.update.MediaGroupUpdates
 
 import dev.inmo.tgbotapi.types.UpdateIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.EditChannelPostUpdate
 
 data class EditChannelPostMediaGroupUpdate(
     override val origin: EditChannelPostUpdate
 ) : EditMediaGroupUpdate {
     override val updateId: UpdateIdentifier = origin.updateId
-    override val data: MediaGroupMessage = origin.data as MediaGroupMessage
+    override val data: MediaGroupMessage<MediaGroupContent> = origin.data as MediaGroupMessage<MediaGroupContent>
 }
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt
index 0a88e5c117..075b3c38d2 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/EditMessageMediaGroupUpdate.kt
@@ -2,11 +2,12 @@ package dev.inmo.tgbotapi.types.update.MediaGroupUpdates
 
 import dev.inmo.tgbotapi.types.UpdateIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.EditMessageUpdate
 
 data class EditMessageMediaGroupUpdate(
     override val origin: EditMessageUpdate
 ) : EditMediaGroupUpdate {
     override val updateId: UpdateIdentifier = origin.updateId
-    override val data: MediaGroupMessage = origin.data as MediaGroupMessage
+    override val data: MediaGroupMessage<MediaGroupContent> = origin.data as MediaGroupMessage<MediaGroupContent>
 }
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MediaGroupUpdate.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MediaGroupUpdate.kt
index 77c7f41f8d..b50e772ba7 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MediaGroupUpdate.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MediaGroupUpdate.kt
@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types.update.MediaGroupUpdates
 
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.abstracts.*
 
 /**
@@ -13,11 +14,11 @@ import dev.inmo.tgbotapi.types.update.abstracts.*
 interface MediaGroupUpdate : Update
 
 interface SentMediaGroupUpdate: MediaGroupUpdate {
-    override val data: List<MediaGroupMessage>
+    override val data: List<MediaGroupMessage<MediaGroupContent>>
     val origins: List<BaseMessageUpdate>
 }
 
 interface EditMediaGroupUpdate : BaseEditMessageUpdate, MediaGroupUpdate {
-    override val data: MediaGroupMessage
+    override val data: MediaGroupMessage<MediaGroupContent>
     val origin: BaseMessageUpdate
 }
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt
index f5bb8e69e7..3dd3c86cb0 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MediaGroupUpdates/MessageMediaGroupUpdate.kt
@@ -2,11 +2,12 @@ package dev.inmo.tgbotapi.types.update.MediaGroupUpdates
 
 import dev.inmo.tgbotapi.types.UpdateIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 
 data class MessageMediaGroupUpdate(
     override val origins: List<BaseMessageUpdate>
 ) : SentMediaGroupUpdate {
     override val updateId: UpdateIdentifier = origins.last().updateId
-    override val data: List<MediaGroupMessage> = origins.mapNotNull { it.data as? MediaGroupMessage }
+    override val data: List<MediaGroupMessage<MediaGroupContent>> = origins.mapNotNull { it.data as? MediaGroupMessage<MediaGroupContent> }
 }
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt
index 1e8adcf5f0..b07bc97cf6 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt
@@ -7,34 +7,72 @@ import dev.inmo.tgbotapi.types.update.abstracts.UnknownUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import kotlinx.coroutines.flow.*
 
-@Suppress("EXPERIMENTAL_API_USAGE", "unused")
-class FlowsUpdatesFilter(
-    broadcastChannelsSize: Int = 100
-): UpdatesFilter {
-    private val updatesSharedFlow = MutableSharedFlow<Update>(extraBufferCapacity = broadcastChannelsSize)
-    @Suppress("MemberVisibilityCanBePrivate")
-    val allUpdatesFlow: Flow<Update> = updatesSharedFlow.asSharedFlow()
-
+interface FlowsUpdatesFilter : UpdatesFilter {
     override val allowedUpdates: List<String>
         get() = ALL_UPDATES_LIST
+    val allUpdatesFlow: Flow<Update>
+    val allUpdatesWithoutMediaGroupsGroupingFlow: Flow<Update>
+
+    val messageFlow: Flow<MessageUpdate>
+    val messageMediaGroupFlow: Flow<MessageMediaGroupUpdate>
+    val editedMessageFlow: Flow<EditMessageUpdate>
+    val editedMessageMediaGroupFlow: Flow<EditMessageMediaGroupUpdate>
+    val channelPostFlow: Flow<ChannelPostUpdate>
+    val channelPostMediaGroupFlow: Flow<ChannelPostMediaGroupUpdate>
+    val editedChannelPostFlow: Flow<EditChannelPostUpdate>
+    val editedChannelPostMediaGroupFlow: Flow<EditChannelPostMediaGroupUpdate>
+    val chosenInlineResultFlow: Flow<ChosenInlineResultUpdate>
+    val inlineQueryFlow: Flow<InlineQueryUpdate>
+    val callbackQueryFlow: Flow<CallbackQueryUpdate>
+    val shippingQueryFlow: Flow<ShippingQueryUpdate>
+    val preCheckoutQueryFlow: Flow<PreCheckoutQueryUpdate>
+    val pollFlow: Flow<PollUpdate>
+    val pollAnswerFlow: Flow<PollAnswerUpdate>
+    val unknownUpdateTypeFlow: Flow<UnknownUpdate>
+}
+
+/**
+ * Creates [DefaultFlowsUpdatesFilter]
+ */
+@Suppress("FunctionName")
+fun FlowsUpdatesFilter(
+    broadcastChannelsSize: Int = 100
+) = DefaultFlowsUpdatesFilter(broadcastChannelsSize)
+
+@Suppress("EXPERIMENTAL_API_USAGE", "unused")
+class DefaultFlowsUpdatesFilter(
+    broadcastChannelsSize: Int = 100
+): FlowsUpdatesFilter {
+    private val updatesSharedFlow = MutableSharedFlow<Update>(extraBufferCapacity = broadcastChannelsSize)
+    @Suppress("MemberVisibilityCanBePrivate")
+    override val allUpdatesFlow: Flow<Update> = updatesSharedFlow.asSharedFlow()
+    @Suppress("MemberVisibilityCanBePrivate")
+    override val allUpdatesWithoutMediaGroupsGroupingFlow: Flow<Update> = allUpdatesFlow.flatMapConcat {
+        when (it) {
+            is SentMediaGroupUpdate -> it.origins.asFlow()
+            is EditMediaGroupUpdate -> flowOf(it.origin)
+            else -> flowOf(it)
+        }
+    }
+
     override val asUpdateReceiver: UpdateReceiver<Update> = {
         updatesSharedFlow.emit(it)
     }
 
-    val messageFlow: Flow<MessageUpdate> = allUpdatesFlow.filterIsInstance()
-    val messageMediaGroupFlow: Flow<MessageMediaGroupUpdate> = allUpdatesFlow.filterIsInstance()
-    val editedMessageFlow: Flow<EditMessageUpdate> = allUpdatesFlow.filterIsInstance()
-    val editedMessageMediaGroupFlow: Flow<EditMessageMediaGroupUpdate> = allUpdatesFlow.filterIsInstance()
-    val channelPostFlow: Flow<ChannelPostUpdate> = allUpdatesFlow.filterIsInstance()
-    val channelPostMediaGroupFlow: Flow<ChannelPostMediaGroupUpdate> = allUpdatesFlow.filterIsInstance()
-    val editedChannelPostFlow: Flow<EditChannelPostUpdate> = allUpdatesFlow.filterIsInstance()
-    val editedChannelPostMediaGroupFlow: Flow<EditChannelPostMediaGroupUpdate> = allUpdatesFlow.filterIsInstance()
-    val chosenInlineResultFlow: Flow<ChosenInlineResultUpdate> = allUpdatesFlow.filterIsInstance()
-    val inlineQueryFlow: Flow<InlineQueryUpdate> = allUpdatesFlow.filterIsInstance()
-    val callbackQueryFlow: Flow<CallbackQueryUpdate> = allUpdatesFlow.filterIsInstance()
-    val shippingQueryFlow: Flow<ShippingQueryUpdate> = allUpdatesFlow.filterIsInstance()
-    val preCheckoutQueryFlow: Flow<PreCheckoutQueryUpdate> = allUpdatesFlow.filterIsInstance()
-    val pollFlow: Flow<PollUpdate> = allUpdatesFlow.filterIsInstance()
-    val pollAnswerFlow: Flow<PollAnswerUpdate> = allUpdatesFlow.filterIsInstance()
-    val unknownUpdateTypeFlow: Flow<UnknownUpdate> = allUpdatesFlow.filterIsInstance()
+    override val messageFlow: Flow<MessageUpdate> = allUpdatesFlow.filterIsInstance()
+    override val messageMediaGroupFlow: Flow<MessageMediaGroupUpdate> = allUpdatesFlow.filterIsInstance()
+    override val editedMessageFlow: Flow<EditMessageUpdate> = allUpdatesFlow.filterIsInstance()
+    override val editedMessageMediaGroupFlow: Flow<EditMessageMediaGroupUpdate> = allUpdatesFlow.filterIsInstance()
+    override val channelPostFlow: Flow<ChannelPostUpdate> = allUpdatesFlow.filterIsInstance()
+    override val channelPostMediaGroupFlow: Flow<ChannelPostMediaGroupUpdate> = allUpdatesFlow.filterIsInstance()
+    override val editedChannelPostFlow: Flow<EditChannelPostUpdate> = allUpdatesFlow.filterIsInstance()
+    override val editedChannelPostMediaGroupFlow: Flow<EditChannelPostMediaGroupUpdate> = allUpdatesFlow.filterIsInstance()
+    override val chosenInlineResultFlow: Flow<ChosenInlineResultUpdate> = allUpdatesFlow.filterIsInstance()
+    override val inlineQueryFlow: Flow<InlineQueryUpdate> = allUpdatesFlow.filterIsInstance()
+    override val callbackQueryFlow: Flow<CallbackQueryUpdate> = allUpdatesFlow.filterIsInstance()
+    override val shippingQueryFlow: Flow<ShippingQueryUpdate> = allUpdatesFlow.filterIsInstance()
+    override val preCheckoutQueryFlow: Flow<PreCheckoutQueryUpdate> = allUpdatesFlow.filterIsInstance()
+    override val pollFlow: Flow<PollUpdate> = allUpdatesFlow.filterIsInstance()
+    override val pollAnswerFlow: Flow<PollAnswerUpdate> = allUpdatesFlow.filterIsInstance()
+    override val unknownUpdateTypeFlow: Flow<UnknownUpdate> = allUpdatesFlow.filterIsInstance()
 }
\ No newline at end of file
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Annotations.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Annotations.kt
index f89e623676..2d516c712a 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Annotations.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Annotations.kt
@@ -18,6 +18,7 @@ package dev.inmo.tgbotapi.utils
 )
 annotation class PreviewFeature
 
+const val lowLevelRiskFeatureMessage = "This method is low-level and not recommended to direct use"
 @RequiresOptIn(
     "This feature can work unstable and may have some restrictions in Telegram System",
     RequiresOptIn.Level.WARNING
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/HandleSafely.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/HandleSafely.kt
deleted file mode 100644
index 6f93f28984..0000000000
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/HandleSafely.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package dev.inmo.tgbotapi.utils
-
-import dev.inmo.micro_utils.coroutines.ExceptionHandler
-import dev.inmo.micro_utils.coroutines.safely
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.supervisorScope
-
-
-@Deprecated("In future will be used typealias from micro_utils", ReplaceWith("ExceptionHandler", "dev.inmo.micro_utils.coroutines.ExceptionHandler"))
-typealias ExceptionHandler<T> = ExceptionHandler<T>
-/**
- * It will run [block] inside of [supervisorScope] to avoid problems with catching of exceptions
- *
- * @param [onException] Will be called when happen exception inside of [block]. By default will throw exception - this
- * exception will be available for catching
- */
-@Deprecated("In future will be used typealias from micro_utils", ReplaceWith("safely", "dev.inmo.micro_utils.coroutines.safely"))
-suspend inline fun <T> handleSafely(
-    noinline onException: ExceptionHandler<T> = { throw it },
-    noinline block: suspend CoroutineScope.() -> T
-): T = safely(onException, block)
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt
index a5beeeb0ca..167f6b80b8 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/StorageFile.kt
@@ -5,19 +5,40 @@ import io.ktor.utils.io.core.ByteReadPacket
 import io.ktor.utils.io.core.Input
 import kotlinx.serialization.Serializable
 
+/**
+ * Information about file for [StorageFile]
+ *
+ * @param contentType Raw type like "application/json"
+ * @param fileName This filename will be used in telegram system as name of file
+ */
 @Serializable
 data class StorageFileInfo(
     val contentType: String,
     val fileName: String
 ) {
+    /**
+     * This methods is required for random generation of name for keeping warranties about unique file name
+     */
     fun generateCustomName() = "${uuid4()}.${fileName.fileExtension}"
 }
 
+/**
+ * Contains info about file, which potentially can be sent to telegram system.
+ *
+ * @param storageFileInfo Information about this file
+ * @param inputSource Lambda which able to allocate [Input] for uploading/manipulating data
+ *
+ * @see StorageFileInfo
+ * @see asStorageFile
+ */
 data class StorageFile(
     val storageFileInfo: StorageFileInfo,
     private val inputSource: () -> Input
 ) {
-    fun asInput() = inputSource()
+    val input: Input
+        get() = inputSource()
+    @Deprecated("This method will be fully replaced with input property", ReplaceWith("input"))
+    fun asInput() = input
 }
 
 @Suppress("NOTHING_TO_INLINE")
@@ -31,5 +52,8 @@ inline fun StorageFile(
     ByteReadPacket(bytes)
 }
 
-@Suppress("NOTHING_TO_INLINE")
+/**
+ *
+ */
+@Suppress("NOTHING_TO_INLINE", "unused")
 inline fun ByteArray.asStorageFile(fileName: String, mimeType: MimeType) = StorageFile(fileName, this, mimeType)
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/BaseMessageUpdateToMediaGroupUpdate.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/BaseMessageUpdateToMediaGroupUpdate.kt
deleted file mode 100644
index 5e4cc86d4f..0000000000
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/BaseMessageUpdateToMediaGroupUpdate.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package dev.inmo.tgbotapi.utils.internal
-
-import dev.inmo.tgbotapi.types.MediaGroupIdentifier
-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.BaseMessageUpdate
-import dev.inmo.tgbotapi.types.update.abstracts.Update
-
-private inline val Pair<MediaGroupMessage, *>.message
-    get() = first
-
-internal fun List<BaseMessageUpdate>.convertWithMediaGroupUpdates(): List<Update> {
-    val resultUpdates = mutableListOf<Update>()
-    val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<BaseMessageUpdate>>()
-    for (update in this) {
-        val asEditMediaGroupMessage = update.toEditMediaGroupUpdate()
-        if (asEditMediaGroupMessage != null) {
-            resultUpdates.add(asEditMediaGroupMessage)
-        } else {
-            val data = update.data
-            if (data is MediaGroupMessage) {
-                (mediaGroups[data.mediaGroupId] ?: mutableListOf<BaseMessageUpdate>().also { mediaGroups[data.mediaGroupId] = it }).add(update)
-            } else {
-                resultUpdates.add(update)
-            }
-        }
-    }
-    mediaGroups.values.map {
-        it.toSentMediaGroupUpdate() ?.let { mediaGroupUpdate ->
-            resultUpdates.add(mediaGroupUpdate)
-        }
-    }
-    return resultUpdates.sortedBy { it.updateId }
-}
-
-internal fun List<BaseMessageUpdate>.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 BaseMessageUpdate.toEditMediaGroupUpdate(): EditMediaGroupUpdate? = (this as? EditMediaGroupUpdate) ?: let {
-    when (this) {
-        is EditMessageUpdate -> EditMessageMediaGroupUpdate(this)
-        is EditChannelPostUpdate -> EditChannelPostMediaGroupUpdate(this)
-        else -> null
-    }
-}
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
index 5502e2e29a..c5347a12ad 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
@@ -1,10 +1,10 @@
 package dev.inmo.tgbotapi.utils.internal
 
 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ParseMode.*
+import dev.inmo.tgbotapi.types.captionLength
 import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.message.content.fullEntitiesList
+import dev.inmo.tgbotapi.types.textLength
 
 internal fun createFormattedText(
     entities: TextSourcesList,
@@ -56,13 +56,7 @@ internal fun TextSourcesList.toMarkdownTexts(): List<String> = createMarkdownTex
     this,
     textLength.last
 )
-internal fun TextContent.toMarkdownTexts(): List<String> = fullEntitiesList().toMarkdownTexts()
-
-internal fun TextSourcesList.toMarkdownExplanations(): List<String> = createMarkdownText(
-    this,
-    explanationLimit.last
-)
-internal fun ExplainedInput.toMarkdownExplanations(): List<String> = fullEntitiesList().toMarkdownTexts()
+internal fun TextContent.toMarkdownTexts(): List<String> = textSources.toMarkdownTexts()
 
 
 internal fun createMarkdownV2Text(
@@ -74,19 +68,13 @@ internal fun TextSourcesList.toMarkdownV2Captions(): List<String> = createMarkdo
     this,
     captionLength.last
 )
-internal fun CaptionedInput.toMarkdownV2Captions(): List<String> = fullEntitiesList().toMarkdownV2Captions()
+internal fun CaptionedInput.toMarkdownV2Captions(): List<String> = textSources.toMarkdownV2Captions()
 
 internal fun TextSourcesList.toMarkdownV2Texts(): List<String> = createMarkdownV2Text(
     this,
     textLength.last
 )
-internal fun TextContent.toMarkdownV2Texts(): List<String> = fullEntitiesList().toMarkdownV2Texts()
-
-internal fun TextSourcesList.toMarkdownV2Explanations(): List<String> = createMarkdownV2Text(
-    this,
-    explanationLimit.last
-)
-internal fun ExplainedInput.toMarkdownV2Explanations(): List<String> = fullEntitiesList().toMarkdownV2Texts()
+internal fun TextContent.toMarkdownV2Texts(): List<String> = textSources.toMarkdownV2Texts()
 
 
 internal fun createHtmlText(
@@ -98,12 +86,12 @@ internal fun TextSourcesList.toHtmlCaptions(): List<String> = createHtmlText(
     this,
     captionLength.last
 )
-internal fun CaptionedInput.toHtmlCaptions(): List<String> = fullEntitiesList().toHtmlCaptions()
+internal fun CaptionedInput.toHtmlCaptions(): List<String> = textSources.toHtmlCaptions()
 
 internal fun TextSourcesList.toHtmlTexts(): List<String> = createHtmlText(
     this,
     textLength.last
 )
-internal fun TextContent.toHtmlTexts(): List<String> = fullEntitiesList().toHtmlTexts()
+internal fun TextContent.toHtmlTexts(): List<String> = textSources.toHtmlTexts()
 
 
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/MultilevelTextSourceFormatting.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/MultilevelTextSourceFormatting.kt
index ec8cf5ab7c..bac1e06c41 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/MultilevelTextSourceFormatting.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/MultilevelTextSourceFormatting.kt
@@ -148,8 +148,3 @@ internal fun MultilevelTextSource.hashTagHTML(): String = optionalPrefix("#") +
 
 internal fun MultilevelTextSource.phoneMarkdownV2(): String = subsources.joinSubSourcesMarkdownV2()
 internal fun MultilevelTextSource.phoneHTML(): String = subsources.joinSubSourcesHtml()
-
-
-internal fun MultilevelTextSource.commandMarkdownV2(): String = optionalPrefix("/") + subsources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.commandHTML(): String = optionalPrefix("/") + subsources.joinSubSourcesHtml()
-
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/StringFormatting.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/StringFormatting.kt
index 2c3b8e8076..dce43d2d63 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/StringFormatting.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/StringFormatting.kt
@@ -99,12 +99,10 @@ private inline fun String.hashTag(adapt: String.() -> String): String = if (star
 }
 
 internal fun String.textMentionMarkdown(userId: UserId): String = linkMarkdown(userId.link)
-internal fun String.textMentionMarkdownV2(userId: UserId): String = linkMarkdownV2(userId.link)
 
 internal fun String.mentionMarkdown(): String = mention(String::toMarkdown)
 
 internal fun String.hashTagMarkdown(): String = hashTag(String::toMarkdown)
-internal fun String.hashTagHTML(): String = hashTag(String::toHtml)
 
 internal fun String.phoneMarkdown(): String = toMarkdown()
 
@@ -136,14 +134,6 @@ internal infix fun Pair<String, String>.link(parseMode: ParseMode): String = whe
     is MarkdownV2 -> first.linkMarkdownV2(second)
 }
 
-
-internal infix fun String.command(parseMode: ParseMode): String = when (parseMode) {
-    is HTML -> commandHTML()
-    is Markdown -> commandMarkdown()
-    is MarkdownV2 -> commandMarkdownV2()
-}
-
-
 internal infix fun String.underline(parseMode: ParseMode): String = when (parseMode) {
     is HTML -> underlineHTML()
     is Markdown -> underlineMarkdown()
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContext.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContext.kt
new file mode 100644
index 0000000000..425970e31e
--- /dev/null
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContext.kt
@@ -0,0 +1,32 @@
+package dev.inmo.tgbotapi.utils.passport
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.DownloadFile
+import dev.inmo.tgbotapi.requests.get.GetFile
+import dev.inmo.tgbotapi.types.passport.encrypted_data.PassportFile
+import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData
+import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
+import kotlinx.serialization.json.JsonObject
+
+interface Decryptor {
+    fun ByteArray.decrypt(): ByteArray
+}
+
+suspend fun Decryptor.decrypt(
+    file: PassportFile,
+    bot: TelegramBot
+): ByteArray {
+    return bot.execute(
+        DownloadFile(
+            bot.execute(
+                GetFile(file.fileId)
+            ).filePath
+        )
+    ).decrypt()
+}
+fun Decryptor.decryptData(
+    data: WithData
+) = nonstrictJsonFormat.decodeFromString(
+    JsonObject.serializer(),
+    data.data.encodeToByteArray().decrypt().decodeToString()
+)
diff --git a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt
index 34a7e66975..459bcdf648 100644
--- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt
+++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt
@@ -1,8 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity
 
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.CommonAbstracts.plus
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.utils.internal.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt
index a4150e0d3d..ee3941f1ff 100644
--- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt
+++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt
@@ -3,7 +3,8 @@ package dev.inmo.tgbotapi.types.MessageEntity
 import dev.inmo.tgbotapi.CommonAbstracts.justTextSources
 import dev.inmo.tgbotapi.utils.internal.toHtmlTexts
 import dev.inmo.tgbotapi.utils.internal.toMarkdownV2Texts
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class TextPartsCreatingTests {
     @Test
diff --git a/tgbotapi.core/src/jsTest/kotlin/dev/inmo/tgbotapi/passport/DecryptionTestKeys.kt b/tgbotapi.core/src/jsTest/kotlin/dev/inmo/tgbotapi/passport/DecryptionTestKeys.kt
new file mode 100644
index 0000000000..e82a07397c
--- /dev/null
+++ b/tgbotapi.core/src/jsTest/kotlin/dev/inmo/tgbotapi/passport/DecryptionTestKeys.kt
@@ -0,0 +1,32 @@
+package dev.inmo.tgbotapi.passport
+
+import dev.inmo.tgbotapi.types.passport.EncryptedAndBase64EncodedData
+
+//actual val privateKey = """-----BEGIN RSA PRIVATE KEY-----
+//MIIEowIBAAKCAQEAt0hdC7xyjrRAXxqrd5i06haPfKLdAvRWsPy2yWtYTFom5dBj
+//atMUnFKekTwsmhKbRPBoqF7Da0RF+/Y9q9zmZv05+tNz2FEYGJ6o7r/gdAEX+pKs
+//Hd84avm9RahGOwbZgcE8r8Md/tg/ZJCSMsVElzM/Gw02+U1uJQE4n/E2AATbRl0M
+//oWdyXjh6Zk6HMiTCvhtQOHoMa9yI00wmHVAlZonovZSRQ2mqfwPlbkDhjsDUQMZp
+//WcSPQblAd8FLcWsR1Mh86rQl1GxZVWYONaNwoeATe4p6Ng438HCL7jO7nc4jXJwp
+//xqwGI9eUYlHolApBeMQK7oEYDTQ+e0iTvFryPQIDAQABAoIBAAnV81BW65rm53Fz
+//H/KKGmNZlJeuscefzysuVKzYeuOWDvJUTZGFBF0jPekzXn1iNDzt3d/zPe96uXq9
+//CzA26ZJrUno4cMYSDAX+NbiiSWxQRrYmut/bg86R2mtrjWFLi86fzR7tjKWJe1Vt
+//QLtCxNyMXn2YJvQYCKopt501t50mjkgR3xM375cfVmpomcZXh1K+z4ZxFVzivjvK
+//ZAga3BPQ/hd6dhnwUdB/yFZFao1dDmsvJVjsnjpnWD3uqtciTeg2iqtXVLpaLfbJ
+//gWOt5P94uIP5r1+qvyrrPXzUGONm4l+43zgvleEgAXWGxnutsYaFfazVQ6qOVyE7
+//fGMQfcECgYEA5Zt1fwTVoYIohq4Do/y5TnNcoj4AajXZU1OutFcPM3aNex16UPBW
+//hP7Gakq3TwTKxEILDqOwo86IJuG+lX18kUwaj1f/3T0kDFvE6iLimiPYRNByog4c
+//Z5Kwqn+vrnl4ciRDoz7jJsURms2PE7mYV7bndA24Gb0FZJRWiB1xI+0CgYEAzFm7
+//uTSyzacTsqorkyUFIwoGgMIE5NDBQNCVhflJcrmuHRYNwxkH9HRCXqyeHKLiNPRa
+//zAoBo3WynjActoy0tFJ90qZI1203iT9BMRbPDiZEXnMH4MrWmk7e7poAUsPVKaRr
+//hxvHjr2gTOLY0ClolMvnyNxZcZ/jBxAG0WwK3ZECgYEAwSkdmbQZfPwg19zBF05f
+//Ho6SmbMLak7O+/jkerbbBPJxZ+eOpVTrlIs5pOYifImNg7oDz1cKHWR8yikTynN9
+//PkcF+R2RFTCAiR0S9d5PQFlzccDjD05Lux5/HZC53VA3cd7sQAOB2XXkr5TLD08N
+//yI0I/mskPBL23Hymp3ANZKkCgYAO2fqttCnGjnz9ACcYk5ky+biNRQyMAKv65O3p
+//BbwTzXDdBkxLwJb2ajikntEC7ceY56VtrNB/q78mhgKgNcuwS0p/s7wZhAOEQwee
+//5LR5p8hSQPPyn2tHXbIQDzs0yKzGUP/LmvY+5oMu81Gkl03VephG3dTWUDN0wPJt
+//5/dGMQKBgE++3BNLLV8siedqwjhSrRB/KmpbLPtoOUlRJYBfG+oITgl/d/W2NKOg
+//C5GztdiZUKlHsvvcYoAAWrgEE3bKg+D7GI15yzAjQQZH6AOgL+CEnunIHBaxEEgG
+//RS39yB/kPcn9ZtvcJd9v8myQnQjhco8Z2RUwb6IUIoOBvZlSGhGe
+//-----END RSA PRIVATE KEY-----"""
+//actual val encryptedLoremIpsum: EncryptedAndBase64EncodedData = "KeuPVezTbMW4MvOGJFTAt34PRaL9iepGb1g4QEi5EQYjKXeXo7RytFOCVx6pW9O/uoMWhl+cX32kNqJVWyK7a22kuhnNT2+aiXqEpuh+madx+LK1zUvGDR1A1Mrf3fFOugcnadCQKICiqvl9cFdqsBkJQOFEs9qj5wiu1F57kekuHLWI7ZnHOojkRNq7l1aCHL0DxcLCfZW5CtWAi8g/zUE5WnGd+vUZ+hqc1vnehDul8JE8YUQbAiIxetzba9XoWouTHYZRZcNCztDbrRBYnq2UCcI5adEwQ3VNcES0lIjRuwn1BBWpvk7VOjqh+4c2tSebDX5AkqrO8XwQYwo8OwvZF+hUXFRK6QLHd4B1JQIdygCaEODG0X353upiEKJXDBqv/ZMXR9KqYZBZEfu48ZM/J6heNjVSOP4TSDrXywJgIOieu8mrQ4d7Or7Twnsu/B+bqS37PvVlfU4wHLl7ehXFj4Kusat6cIrb0R4F/Y3fL4+FcfEsk4ioEAndYBFrc1S11vo/TkcuFnXtqrr181gC5JD5LtsUH6sst36vE/JdL/UwTGqhu+rDUcgvr7FiunkasWBnzCtFs58JJrRycUKPzyKINS16GkY8yYtp7xJXBGPYOFM+J7npcKW7P41j1KceDaUArjph2yIELEXCr8qUZzWXZdrw96Te8gLi99c="
diff --git a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFileFromJavaFile.kt b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFileFromJavaFile.kt
index 7492cc3d98..34350831f3 100644
--- a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFileFromJavaFile.kt
+++ b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFileFromJavaFile.kt
@@ -1,9 +1,7 @@
 package dev.inmo.tgbotapi.requests.abstracts
 
-import dev.inmo.tgbotapi.utils.MimeType
 import dev.inmo.tgbotapi.utils.StorageFile
 import java.io.File
-import java.io.InputStream
 
 fun File.toInputFile() = if (exists()) {
     MultipartFile(
diff --git a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/passport/FileHashes.kt b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/passport/FileHashes.kt
new file mode 100644
index 0000000000..0249909252
--- /dev/null
+++ b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/types/passport/FileHashes.kt
@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.types.passport
+
+import dev.inmo.micro_utils.crypto.MD5
+import java.io.File
+
+val File.passportFileHash: MD5
+    get() = readBytes().passportFileHash
diff --git a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/StorageFileFactory.kt b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/StorageFileFactory.kt
index 4aab4c57b6..8d7ebe5c53 100644
--- a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/StorageFileFactory.kt
+++ b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/StorageFileFactory.kt
@@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.utils
 
 import io.ktor.utils.io.streams.asInput
 import java.io.File
-import java.io.InputStream
 import java.nio.file.Files
 
 fun StorageFile(
diff --git a/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContextRealization.kt b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContextRealization.kt
new file mode 100644
index 0000000000..402a295a99
--- /dev/null
+++ b/tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContextRealization.kt
@@ -0,0 +1,39 @@
+package dev.inmo.tgbotapi.utils.passport
+
+import dev.inmo.micro_utils.crypto.decodeBase64
+import java.security.KeyFactory
+import java.security.interfaces.RSAPrivateKey
+import java.security.spec.PKCS8EncodedKeySpec
+import javax.crypto.Cipher
+
+private val regexToRemoveFromKey = Regex("(-----(BEGIN|END) ((?:.*? KEY)|CERTIFICATE)-----|[\\s])")
+
+/**
+ * @param key PKCS8
+ */
+class PKCS8Decryptor (key: String): Decryptor {
+    private val privateKey: RSAPrivateKey = KeyFactory.getInstance("RSA").generatePrivate(
+        PKCS8EncodedKeySpec(key.replace(regexToRemoveFromKey, "").decodeBase64())
+    ) as RSAPrivateKey
+    private val chunkSize: Int = privateKey.modulus.bitLength() / 8
+
+    override fun ByteArray.decrypt(): ByteArray {
+        return Cipher.getInstance("RSA/ECB/PKCS1Padding").run {
+            init(Cipher.DECRYPT_MODE, privateKey)
+            (0 until size step chunkSize).flatMap {
+                val firstIndex = it
+                val lastIndexExclusive = if (it + chunkSize > size) {
+                    size
+                } else {
+                    it + chunkSize
+                }
+                doFinal(copyOfRange(firstIndex, lastIndexExclusive)).toList()
+            }.toByteArray()
+        }
+    }
+}
+
+fun Decryptor(key: String) = PKCS8Decryptor(key)
+
+inline fun <T> doWithDecryptor(decryptor: Decryptor, crossinline block: Decryptor.() -> T) = decryptor.run(block)
+inline fun <T> doWithDecryptor(key: String, crossinline block: Decryptor.() -> T) = doWithDecryptor(Decryptor(key), block)
diff --git a/tgbotapi.core/src/jvmTest/kotlin/dev/inmo/tgbotapi/passport/DecryptionTest.kt b/tgbotapi.core/src/jvmTest/kotlin/dev/inmo/tgbotapi/passport/DecryptionTest.kt
new file mode 100644
index 0000000000..7f9562bffb
--- /dev/null
+++ b/tgbotapi.core/src/jvmTest/kotlin/dev/inmo/tgbotapi/passport/DecryptionTest.kt
@@ -0,0 +1,52 @@
+package dev.inmo.tgbotapi.passport
+
+import dev.inmo.micro_utils.crypto.decodeBase64
+import dev.inmo.tgbotapi.utils.passport.Decryptor
+import dev.inmo.tgbotapi.utils.passport.doWithDecryptor
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+//expect val privateKey: String
+//expect val encryptedLoremIpsum: EncryptedAndBase64EncodedData
+val privateKey: String = """-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCaaMFkmMBi6Vl5
+vzy7wQjoZNLN+e9e6Lb/WBekJxfbNMt+EN9Zv7xT9xzfY68DX7v0uGoLcAqS5Mh5
+8ELiJbzg4O8dbxkggt0G+kxcbT+a3ofm1Aqhr+LkpsFh5qbLqbAHSQJAF0HPqrAc
+5c6MoQVTZlWGU/j3enCcUFo7Jpsi8La6MqYboF5xGwGEZ9tOA6rMDSekr5Rdm637
+D/w4h284UX7VnqPdpZ/943VK2qvmPjm8HkFSxkSAB8RHlFyjazzm9FNOcVRGLynv
+/cq7mWgyxt5nqiCG7w+lFNAFNQNvAO0rfeiTJbEzubquu4Mg31QrvLIuz+fUbsGk
+ipfpN1czAgMBAAECggEAPlAoO8CpY0FoqolSqTKttZt6t0U2JMclksaqQ8TDC+Oy
+e52zhTSre/ct37kK2AG6iHgj05nTqpRJk2wykbFJGDeuR+Kd8VDeggJg7qvoD0fe
+8HiCEd45Yq0pPaknhulj8Iy2K8c29+eaSw8y2+3fiFi0CxG4V6dB6tNClrxtvxtl
+IE85Utzmk4PLTCs010zxNVm+FwrvqlpjjhspljzleUuWE1KuldO9tNSlwUUfBr4i
+BJJn4jDkQMloXoM/ArZEp7mn57N9+ZuEgVjRMCpRGEAbQI+aLCznBB1kCOY7WL8S
+CwkP++SvcptaUpOjoXZZyuGU4CgBnu0+40ORbNchgQKBgQDLIbB9+WHDcZAn1g6M
+8jaNDRU4HGu5vJSajFQK8Uaczg87hAxmk6R1GF0LOyoadaVmD5ax93mQxWSE/4hT
+wyAPaQOFl7A/i1k/Dx/kURjRwF1sLWDFdMo/8t5bXumzrzb1bHYnHPS7S0lBAU+X
+SrbIw+hv69aKawcQqdd54S1OBwKBgQDCmMarwMVn4xnOh+DOuLS4IQzPT84WgzH+
+wKw55hZGMqZ4S3JRVv256daweEbKAeR5NCccPmir0H86jwUW6WFAtxqfPWF4piVi
+UD6DrUt0gWwzMGy3kbAp0hLBtsQRp/41mKuAXkvMVQ2ysInn6lmHhZvjduK8lvKh
+fMRDMjxidQKBgFiciK5blI86wgTutwg7PRrI40HH/CJZJoZIwvzHBeOvbCutTe+N
+ZoeCKkyU8af7PDzKfhWCfHBv+4qdIi5QB3NRfyzO4B7IPhVpFqN10RrnDJn9LaLV
+cMj2vJMlU1OEErh7KQuk8QmnLPyDguHfwN7Rv1rbiYp2Z+2X+Zx8Y1QPAoGBAJIf
+nq/CJXoJMou/xLP2Rt4tEy1pQ9vr0FL341vmxrsXtaGHJeSmagh861XAO4fdO+83
+llbDFl5ORft3Ad9eiETMOhVxRgwO1uuoTgkazBpERTd7GWgO4jXFJYiI8VpAx8b/
+SWkvZcOd6pdPsX6Qn4IAdjqsPz5WKwPQaJ/8zRMxAoGAGaOuyXaFZNl8IeTGYMDL
+OEg9BHa+Du8jSv0vL/fCN2s/2TcvSa9uEnv8KHz59JHevvxoDNbQYlN8Ge8adFv4
+xZYQ3h/qh2ohnTUfrG4hcFUVBuv5HBdwgWhVFm5v98KQsqVzGfKorN2DemEv3/au
+PFGkuu4lCPeDqu5u0dBojoA=
+-----END PRIVATE KEY-----"""
+val encryptedLoremIpsum = "KeuPVezTbMW4MvOGJFTAt34PRaL9iepGb1g4QEi5EQYjKXeXo7RytFOCVx6pW9O/uoMWhl+cX32kNqJVWyK7a22kuhnNT2+aiXqEpuh+madx+LK1zUvGDR1A1Mrf3fFOugcnadCQKICiqvl9cFdqsBkJQOFEs9qj5wiu1F57kekuHLWI7ZnHOojkRNq7l1aCHL0DxcLCfZW5CtWAi8g/zUE5WnGd+vUZ+hqc1vnehDul8JE8YUQbAiIxetzba9XoWouTHYZRZcNCztDbrRBYnq2UCcI5adEwQ3VNcES0lIjRuwn1BBWpvk7VOjqh+4c2tSebDX5AkqrO8XwQYwo8OwvZF+hUXFRK6QLHd4B1JQIdygCaEODG0X353upiEKJXDBqv/ZMXR9KqYZBZEfu48ZM/J6heNjVSOP4TSDrXywJgIOieu8mrQ4d7Or7Twnsu/B+bqS37PvVlfU4wHLl7ehXFj4Kusat6cIrb0R4F/Y3fL4+FcfEsk4ioEAndYBFrc1S11vo/TkcuFnXtqrr181gC5JD5LtsUH6sst36vE/JdL/UwTGqhu+rDUcgvr7FiunkasWBnzCtFs58JJrRycUKPzyKINS16GkY8yYtp7xJXBGPYOFM+J7npcKW7P41j1KceDaUArjph2yIELEXCr8qUZzWXZdrw96Te8gLi99c="
+
+
+class DecryptionTest {
+    val inputText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+    @Test
+    fun testThatDecryptionIsWorkingCorrectly() {
+        doWithDecryptor(privateKey) {
+            val decrypted = encryptedLoremIpsum.decodeBase64().decrypt().decodeToString()
+            assertEquals(inputText, decrypted)
+        }
+    }
+}
diff --git a/tgbotapi.extensions.api/mpp_publish_template.kpsb b/tgbotapi.extensions.api/mpp_publish_template.kpsb
index b812473a40..761921ed95 100644
--- a/tgbotapi.extensions.api/mpp_publish_template.kpsb
+++ b/tgbotapi.extensions.api/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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"}]}}
\ No newline at end of file
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
\ No newline at end of file
diff --git a/tgbotapi.extensions.api/publish.gradle b/tgbotapi.extensions.api/publish.gradle
index 0686bbf32b..0266714313 100644
--- a/tgbotapi.extensions.api/publish.gradle
+++ b/tgbotapi.extensions.api/publish.gradle
@@ -1,8 +1,12 @@
 apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
+task sourceJar (type : Jar) {
+    classifier = 'sources'
+}
 
 afterEvaluate {
     project.publishing.publications.all {
@@ -10,6 +14,7 @@ afterEvaluate {
         groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
             artifactId = "${project.name}"
+            artifact sourceJar
         } else {
             artifactId = "${project.name}-$name"
         }
@@ -62,4 +67,9 @@ publishing {
         }
         
     }
-}
\ No newline at end of file
+}
+
+signing {
+    useGpgCmd()
+    publishing.publications.forEach { sign it }
+}
diff --git a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt
index 9e3c3dd8f5..ba33c8425f 100644
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotBuilder.kt
@@ -45,17 +45,3 @@ fun buildBot(
     TelegramAPIUrlsKeeper(token, apiUrl),
     BotBuilder().apply(block).createHttpClient()
 )
-
-/**
- * @return Created by [telegramBotWithCustomClientConfig] function [TelegramBot]. This executor will be preconfigured using [token] and
- * [block]
- */
-@Deprecated("Renamed", ReplaceWith("buildBot", "dev.inmo.tgbotapi.extensions.api.buildBot"))
-fun telegramBot(
-    token: String,
-    block: BotBuilder.() -> Unit
-): TelegramBot = buildBot(
-    token,
-    telegramBotAPIDefaultUrl,
-    block
-)
diff --git a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt
index 18c1c2bcfb..c704fc94b2 100644
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/BotExtensions.kt
+++ b/tgbotapi.extensions.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.KtorRequestsExecutorBuilder
+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
@@ -8,23 +8,13 @@ import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.*
 
-/**
- * Allows to create bot using bot [urlsKeeper]
- */
-@Deprecated("Replaced in core", ReplaceWith("telegramBot", "dev.inmo.tgbotapi.bot.Ktor.telegramBot"))
-fun telegramBot(
-    urlsKeeper: TelegramAPIUrlsKeeper
-): TelegramBot = dev.inmo.tgbotapi.bot.Ktor.telegramBot(
-    urlsKeeper
-)
-
 /**
  * Allows to create bot using bot [urlsKeeper] and already prepared [client]
  */
 fun telegramBot(
     urlsKeeper: TelegramAPIUrlsKeeper,
     client: HttpClient
-): TelegramBot = dev.inmo.tgbotapi.bot.Ktor.telegramBot(urlsKeeper) {
+): TelegramBot = telegramBot(urlsKeeper) {
     this.client = client
 }
 
@@ -69,16 +59,6 @@ inline fun telegramBot(
     HttpClient(clientConfig)
 )
 
-/**
- * Allows to create bot using bot [token], [apiUrl] (for custom api servers) and already prepared [client]
- */
-@Deprecated("Replaced in core", ReplaceWith("telegramBot", "dev.inmo.tgbotapi.bot.Ktor.telegramBot"))
-@Suppress("NOTHING_TO_INLINE")
-inline fun telegramBot(
-    token: String,
-    apiUrl: String = telegramBotAPIDefaultUrl
-): TelegramBot = dev.inmo.tgbotapi.bot.Ktor.telegramBot(token, apiUrl)
-
 /**
  * Allows to create bot using bot [token], [apiUrl] (for custom api servers) and already prepared [client]
  */
@@ -130,37 +110,3 @@ inline fun telegramBot(
     TelegramAPIUrlsKeeper(token, apiUrl),
     clientConfig
 )
-
-/**
- * Allows to create bot using bot [urlsKeeper] and specify [HttpClientEngine] by passing [clientEngine] param and optionally
- * configure [HttpClient] using [clientConfig]
- */
-@Deprecated("Will be removed in next releases", ReplaceWith("telegramBot", "dev.inmo.tgbotapi.extensions.api.telegramBot"))
-fun telegramBotWithCustomClientConfig(
-    urlsKeeper: TelegramAPIUrlsKeeper,
-    clientEngine: HttpClientEngine,
-    clientConfig: HttpClientConfig<*>.() -> Unit
-): TelegramBot = telegramBot(
-    urlsKeeper,
-    HttpClient(clientEngine, clientConfig)
-)
-
-/**
- * Allows to create bot using bot [urlsKeeper] and optionally configure [HttpClient] using [clientConfig]
- */
-@Deprecated("Will be removed in next releases", ReplaceWith("telegramBot", "dev.inmo.tgbotapi.extensions.api.telegramBot"))
-fun telegramBotWithCustomClientConfig(
-    urlsKeeper: TelegramAPIUrlsKeeper,
-    clientConfig: HttpClientConfig<*>.() -> Unit
-): TelegramBot = telegramBot(
-    urlsKeeper,
-    HttpClient(clientConfig)
-)
-
-@Suppress("NOTHING_TO_INLINE")
-@Deprecated("Renamed", ReplaceWith("telegramBot", "dev.inmo.tgbotapi.extensions.api.telegramBot"))
-inline fun telegramBotWithCustomClientConfig(
-    token: String,
-    apiUrl: String = telegramBotAPIDefaultUrl,
-    noinline clientConfig: HttpClientConfig<*>.() -> Unit
-) = telegramBot(token, apiUrl = apiUrl, clientConfig = clientConfig)
diff --git a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
index 42caeeb6b8..8a35681bd7 100644
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
@@ -23,7 +23,7 @@ internal fun List<Update>.convertWithMediaGroupUpdates(): List<Update> {
     val resultUpdates = mutableListOf<Update>()
     val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<BaseSentMessageUpdate>>()
     for (update in this) {
-        val data = (update.data as? MediaGroupMessage)
+        val data = (update.data as? MediaGroupMessage<*>)
         if (data == null) {
             resultUpdates.add(update)
             continue
diff --git a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
index ada3cc7b95..41b26fafa9 100644
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/UnpinChatMessage.kt
@@ -5,7 +5,6 @@ import dev.inmo.tgbotapi.requests.chat.modify.UnpinChatMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 suspend fun TelegramBot.unpinChatMessage(
diff --git a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt
index 31cabb0734..1f444aa8c0 100644
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendVenue.kt
@@ -2,12 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.send
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.SendVenue
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.FoursquareId
-import dev.inmo.tgbotapi.types.FoursquareType
-import dev.inmo.tgbotapi.types.GooglePlaceId
-import dev.inmo.tgbotapi.types.GooglePlaceType
-import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.location.StaticLocation
diff --git a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
index 6a115897b8..e8cf10588f 100644
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
@@ -7,6 +7,8 @@ import dev.inmo.tgbotapi.types.InputMedia.*
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
 import dev.inmo.tgbotapi.utils.RiskFeature
 
 /**
@@ -20,7 +22,7 @@ suspend fun TelegramBot.sendMediaGroup(
     replyToMessageId: MessageIdentifier? = null,
     allowSendingWithoutReply: Boolean? = null
 ) = execute(
-    SendMediaGroup(
+    SendMediaGroup<MediaGroupContent>(
         chatId, media, disableNotification, replyToMessageId, allowSendingWithoutReply
     )
 )
diff --git a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt
index 3f9e249fea..54845e4c3a 100644
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandling.kt
@@ -31,7 +31,7 @@ fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
         launch {
             for (update in updatesChannel) {
                 when (val data = update.data) {
-                    is MediaGroupMessage -> mediaGroupChannel.send("${data.mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
+                    is MediaGroupMessage<*> -> mediaGroupChannel.send("${data.mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
                     else -> output(update)
                 }
             }
diff --git a/tgbotapi.extensions.behaviour_builder/README.md b/tgbotapi.extensions.behaviour_builder/README.md
new file mode 100644
index 0000000000..70296ce190
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/README.md
@@ -0,0 +1,62 @@
+# TelegramBotAPI Behaviour Builder Extensions
+
+This extension was created to make it more simple to build bot steps handling. Usually, you must use something like:
+
+```kotlin
+val bot = telegramBot(TOKEN)
+bot.startGettingFlowsUpdatesByLongPolling {
+    messagesFlow.subscribeSafelyWithoutExceptions {
+        // ...
+    }
+    // here I already tired to write this example 😫
+}
+```
+
+This library offer other way to do a lot of routine in more simple way:
+
+```kotlin
+telegramBot(token) {
+    onCommand("start".regex) {
+        execute(SendTextMessage(it.chat.id, "This bot can ...")) // replaceable with reply(it, "This bot can ...") when you are using `tgbotapi.extensions.api`
+    }
+}
+```
+
+## Triggers
+
+In terminology of this project the `Triggers` are things which have no initial message, may have own filter for incoming
+messages and filter messages for context which will be used in subcontext. Full syntax with `onText` as an example:
+
+```kotlin
+telegramBot(TOKEN) {
+    onText(
+        includeFilterByChatInBehaviourSubContext = true, // if false - last lambda will receive all messages instead of filtered by chat messages
+        additionalFilter = { message: CommonMessage<TextContent> ->
+            // here you may check incoming message for any requirements before it will be passed to the main lambda
+        }
+    ) { message: CommonMessage<TextContent> -> // this here is `BehaviourContext`
+        // here put your actions and additional waiters
+    }
+}
+```
+
+## Waiters
+
+Waiters targeted to get some content "here and now", they must be used inside some trigger main lambda:
+
+```kotlin
+telegramBot(TOKEN) {
+    onCommand("start") { message: CommonMessage<TextContent> ->
+        val userPhotos = waitPhoto(
+            SendTextMessage(it.chat.id, "Ok, send me some photo, please"), // init request, can be any `Request` object
+            { update: Update -> // That is update which is NOT passed requirements. In current context we expect some photo, but received something else
+                SendTextMessage(it.chat.id, "Excuse me, but I can accept only photos") // it could be null
+            },
+            2, // some count of photos
+            includeMediaGroups = true, // if false, messages related to some media group will be skipped and recognized as incorrect
+        ) { message: CommonMessate<PhotoContent> -> // this method is optional and you can use it in case you want to add some additional requirements checks
+            message.content // return null if message didn't passed requirements
+        }
+    }
+}
+```
diff --git a/tgbotapi.extensions.behaviour_builder/build.gradle b/tgbotapi.extensions.behaviour_builder/build.gradle
new file mode 100644
index 0000000000..d84108226f
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/build.gradle
@@ -0,0 +1,46 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        jcenter()
+        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"
+}
+
+project.version = "$library_version"
+project.group = "$library_group"
+
+apply from: "publish.gradle"
+
+repositories {
+    mavenLocal()
+    jcenter()
+    mavenCentral()
+    maven { url "https://kotlin.bintray.com/kotlinx" }
+}
+
+kotlin {
+    jvm()
+    js(BOTH) {
+        browser()
+        nodejs()
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                api project(":tgbotapi.extensions.utils")
+            }
+        }
+    }
+}
diff --git a/tgbotapi.extensions.behaviour_builder/mpp_publish_template.kpsb b/tgbotapi.extensions.behaviour_builder/mpp_publish_template.kpsb
new file mode 100644
index 0000000000..0c1022373b
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/mpp_publish_template.kpsb
@@ -0,0 +1 @@
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
\ No newline at end of file
diff --git a/tgbotapi.extensions.behaviour_builder/publish.gradle b/tgbotapi.extensions.behaviour_builder/publish.gradle
new file mode 100644
index 0000000000..810de33d55
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/publish.gradle
@@ -0,0 +1,75 @@
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+task sourceJar (type : Jar) {
+    classifier = 'sources'
+}
+
+afterEvaluate {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
+        if (it.name.contains('kotlinMultiplatform')) {
+            artifactId = "${project.name}"
+            artifact sourceJar
+        } else {
+            artifactId = "${project.name}-$name"
+        }
+    }
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "This extensions project contains tools for simple interaction with chats"
+            name = "Telegram Bot API Steps Extensions"
+            url = "https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                url = "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/TelegramBotAPI/${project.name}/;publish=1;override=1")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}
+
+signing {
+    useGpgCmd()
+    publishing.publications.forEach { sign it }
+}
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt
new file mode 100644
index 0000000000..cd14764a51
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourBuilders.kt
@@ -0,0 +1,54 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling
+import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
+import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
+import dev.inmo.tgbotapi.utils.PreviewFeature
+import kotlinx.coroutines.CoroutineScope
+
+/**
+ * Use this method in case you wish to make some additional actions with [flowUpdatesFilter].
+ *
+ * **WARNING** This method WILL NOT launch any listening of updates. Use something like
+ * [startGettingOfUpdatesByLongPolling] or tools for work with webhooks
+ *
+ * @see [BehaviourContext]
+ * @see startGettingOfUpdatesByLongPolling
+ */
+@PreviewFeature
+suspend fun TelegramBot.buildBehaviour(
+    scope: CoroutineScope,
+    flowUpdatesFilter: FlowsUpdatesFilter,
+    block: BehaviourContextReceiver<Unit>
+) {
+    BehaviourContext(
+        this,
+        scope,
+        flowUpdatesFilter
+    ).block()
+}
+
+/**
+ * Use this method to build bot behaviour and run it via long polling. In case you wish to get [FlowsUpdatesFilter] for
+ * additional manipulations, you must provide external [FlowsUpdatesFilter] in other [buildBehaviour] function.
+ *
+ * @see buildBehaviour
+ * @see BehaviourContext
+ * @see startGettingOfUpdatesByLongPolling
+ */
+@PreviewFeature
+suspend fun TelegramBot.buildBehaviour(
+    scope: CoroutineScope,
+    block: BehaviourContextReceiver<Unit>
+) = FlowsUpdatesFilter().let {
+    buildBehaviour(
+        scope,
+        it,
+        block
+    )
+    longPolling(
+        it,
+        scope = scope
+    )
+}
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
new file mode 100644
index 0000000000..d881a5f1ba
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
@@ -0,0 +1,68 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder
+
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.types.update.abstracts.Update
+import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.filter
+
+typealias BehaviourContextReceiver<T> = suspend BehaviourContext.() -> T
+typealias BehaviourContextAndTypeReceiver<T, I> = suspend BehaviourContext.(I) -> T
+
+/**
+ * This class contains all necessary tools for work with bots and especially for [buildBehaviour]
+ *
+ * @param scope This param will be used for creating of some subscriptions inside of methods, updates listening and
+ * different other things in context of working with [CoroutineScope] and coroutines.
+ * @param flowsUpdatesFilter This parameter will be used to subscribe on different types of update
+ */
+data class BehaviourContext(
+    val bot: TelegramBot,
+    val scope: CoroutineScope,
+    val flowsUpdatesFilter: FlowsUpdatesFilter = FlowsUpdatesFilter()
+) : FlowsUpdatesFilter by flowsUpdatesFilter, TelegramBot by bot, CoroutineScope by scope
+
+/**
+ * Creates new one [BehaviourContext], adding subsequent [FlowsUpdatesFilter] in case [newFlowsUpdatesFilterSetUp] is provided and
+ * [CoroutineScope] as new [BehaviourContext.scope]
+ *
+ * @param newFlowsUpdatesFilterSetUp As a parameter receives [FlowsUpdatesFilter] from old [this] [BehaviourContext.flowsUpdatesFilter]
+ */
+suspend fun <T> BehaviourContext.doInSubContextWithFlowsUpdatesFilterSetup(
+    newFlowsUpdatesFilterSetUp: BehaviourContextAndTypeReceiver<Unit, FlowsUpdatesFilter>?,
+    behaviourContextReceiver: BehaviourContextReceiver<T>
+) = copy(
+    flowsUpdatesFilter = FlowsUpdatesFilter(),
+    scope = CoroutineScope(scope.coroutineContext + SupervisorJob())
+).run {
+    newFlowsUpdatesFilterSetUp ?.let {
+        it.apply { invoke(this@run, this@doInSubContextWithFlowsUpdatesFilterSetup.flowsUpdatesFilter) }
+    }
+    behaviourContextReceiver().also { stop() }
+}
+
+/**
+ * Creates new one [BehaviourContext], adding subsequent [FlowsUpdatesFilter] in case [updatesFilter] is provided and
+ * [CoroutineScope] as new [BehaviourContext.scope]
+ */
+suspend fun <T> BehaviourContext.doInSubContextWithUpdatesFilter(
+    updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?,
+    behaviourContextReceiver: BehaviourContextReceiver<T>
+) = doInSubContextWithFlowsUpdatesFilterSetup(
+    newFlowsUpdatesFilterSetUp = updatesFilter ?.let {
+        { oldOne ->
+            oldOne.allUpdatesFlow.filter { updatesFilter(it) }.subscribeSafelyWithoutExceptions(scope, asUpdateReceiver)
+        }
+    },
+    behaviourContextReceiver
+)
+
+suspend fun <T> BehaviourContext.doInSubContext(
+    behaviourContextReceiver: BehaviourContextReceiver<T>
+) = doInSubContextWithFlowsUpdatesFilterSetup(newFlowsUpdatesFilterSetUp = null, behaviourContextReceiver)
+
+/**
+ * This method will cancel ALL subsequent contexts, expectations and waiters
+ */
+fun BehaviourContext.stop() = scope.cancel()
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/Variants.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/Variants.kt
new file mode 100644
index 0000000000..63ed115bef
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/Variants.kt
@@ -0,0 +1,31 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder
+
+import dev.inmo.micro_utils.coroutines.DeferredAction
+import dev.inmo.micro_utils.coroutines.invokeFirstOf
+import kotlinx.coroutines.*
+
+suspend fun <T> BehaviourContext.parallel(
+    action: BehaviourContextReceiver<T>
+) = async {
+    action()
+}
+
+inline infix fun <T, O> Deferred<T>.withAction(noinline callback: suspend (T) -> O) = DeferredAction(this, callback)
+
+inline fun <T> Deferred<T>.asAction() = DeferredAction(this) { it }
+
+suspend fun <O> BehaviourContext.oneOfActions(
+    deferredActions: Iterable<DeferredAction<*, O>>
+) = deferredActions.invokeFirstOf(scope)
+
+suspend fun <O> BehaviourContext.oneOfActions(
+    vararg deferredActions: DeferredAction<*, O>
+) = this@oneOfActions.oneOfActions(deferredActions.toList())
+
+suspend fun <O> BehaviourContext.oneOf(
+    deferredActions: Iterable<Deferred<O>>
+) = oneOfActions(deferredActions.map { it.asAction() })
+
+suspend fun <O> BehaviourContext.oneOf(
+    vararg deferredActions: Deferred<O>
+) = oneOf(deferredActions.toList())
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt
new file mode 100644
index 0000000000..2e95e776fb
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/Base.kt
@@ -0,0 +1,124 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
+
+import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.types.update.abstracts.Update
+import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
+import dev.inmo.tgbotapi.utils.RiskFeature
+import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.flow.*
+
+private val cancelledByFilterException = CancellationException("Cancelled by filter precreatedException")
+
+typealias RequestBuilder<T> = suspend (Update) -> Request<T>
+typealias NullableRequestBuilder<T> = suspend (Update) -> Request<T>?
+
+/**
+ * @param initRequest If not null, this request will be sent by [bot] before returning value
+ * @param count If set, result [Flow] will return [count] elements on each [Flow.collect]
+ * @param errorFactory If set, this factory will be used to produce requests in case when user have sent incorrect data
+ * @param cancelRequestFactory If set, this factory will be used to produce requests in case when it is required to say
+ * user that chain of scenario has been cancelled
+ * @param cancelTrigger When this trigger returns true, chain is cancelled
+ * @param filter It is main param, which will be called on each update. When it return not null, result will be returned
+ * as is, but when it returns null, then will be called [cancelTrigger] (if it will return true - [cancelRequestFactory]
+ * will be called too), [errorFactory] and then will be returned null
+ */
+@RiskFeature(lowLevelRiskFeatureMessage)
+suspend fun <T> FlowsUpdatesFilter.expectFlow(
+    bot: TelegramBot,
+    initRequest: Request<*>? = null,
+    count: Int? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    cancelRequestFactory: NullableRequestBuilder<*> = { null },
+    cancelTrigger: suspend (Update) -> Boolean = { cancelRequestFactory(it) != null },
+    filter: suspend (Update) -> List<T>
+): Flow<T> {
+    val flow = allUpdatesFlow.flatMapConcat {
+        val result = safelyWithoutExceptions { filter(it) }
+        (if (result == null || result.isEmpty()) {
+            if (cancelTrigger(it)) {
+                cancelRequestFactory(it) ?.also {
+                    safelyWithoutExceptions { bot.execute(it) }
+                    throw cancelledByFilterException
+                }
+            }
+            errorFactory(it) ?.also { errorRequest ->
+                safelyWithoutExceptions { bot.execute(errorRequest) }
+            }
+            emptyList()
+        } else {
+            result
+        }).asFlow()
+    }
+    val result = if (count == null) {
+        flow
+    } else {
+        flow.take(count)
+    }
+    initRequest ?.also { safelyWithoutExceptions { bot.execute(initRequest) } }
+    return result
+}
+
+/**
+ * @param initRequest If not null, this request will be sent by [bot] before returning value
+ * @param count If set, result [Flow] will return [count] elements on each [Flow.collect]
+ * @param errorFactory If set, this factory will be used to produce requests in case when user have sent incorrect data
+ * @param cancelRequestFactory If set, this factory will be used to produce requests in case when it is required to say
+ * user that chain of scenario has been cancelled
+ * @param cancelTrigger When this trigger returns true, chain is cancelled
+ * @param filter It is main param, which will be called on each update. When it return not null, result will be returned
+ * as is, but when it returns null, then will be called [cancelTrigger] (if it will return true - [cancelRequestFactory]
+ * will be called too), [errorFactory] and then will be returned null
+ */
+suspend fun <T> BehaviourContext.expectFlow(
+    initRequest: Request<*>? = null,
+    count: Int? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    cancelRequestFactory: NullableRequestBuilder<*> = { null },
+    cancelTrigger: suspend (Update) -> Boolean = { cancelRequestFactory(it) != null },
+    filter: suspend (Update) -> List<T>
+) = flowsUpdatesFilter.expectFlow(bot, initRequest, count, errorFactory, cancelRequestFactory, cancelTrigger, filter)
+
+/**
+ * @param initRequest If not null, this request will be sent by [bot] before returning value
+ * @param errorFactory If set, this factory will be used to produce requests in case when user have sent incorrect data
+ * @param cancelRequestFactory If set, this factory will be used to produce requests in case when it is required to say
+ * user that chain of scenario has been cancelled
+ * @param cancelTrigger When this trigger returns true, chain is cancelled
+ * @param filter It is main param, which will be called on each update. When it return not null, result will be returned
+ * as is, but when it returns null, then will be called [cancelTrigger] (if it will return true - [cancelRequestFactory]
+ * will be called too), [errorFactory] and then will be returned null
+ */
+@RiskFeature(lowLevelRiskFeatureMessage)
+suspend fun <T> FlowsUpdatesFilter.expectOne(
+    bot: TelegramBot,
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    cancelRequestFactory: NullableRequestBuilder<*> = { null },
+    cancelTrigger: suspend (Update) -> Boolean = { cancelRequestFactory(it) != null },
+    filter: suspend (Update) -> T?
+): T = expectFlow(bot, initRequest, 1, errorFactory, cancelRequestFactory, cancelTrigger) {
+    listOfNotNull(filter.invoke(it))
+}.first()
+
+/**
+ * @param initRequest If not null, this request will be sent by [bot] before returning value
+ * @param errorFactory If set, this factory will be used to produce requests in case when user have sent incorrect data
+ * @param cancelRequestFactory If set, this factory will be used to produce requests in case when it is required to say
+ * user that chain of scenario has been cancelled
+ * @param cancelTrigger When this trigger returns true, chain is cancelled
+ * @param filter It is main param, which will be called on each update. When it return not null, result will be returned
+ * as is, but when it returns null, then will be called [cancelTrigger] (if it will return true - [cancelRequestFactory]
+ * will be called too), [errorFactory] and then will be returned null
+ */
+suspend fun <T> BehaviourContext.expectOne(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    cancelRequestFactory: NullableRequestBuilder<*> = { null },
+    cancelTrigger: suspend (Update) -> Boolean = { cancelRequestFactory(it) != null },
+    filter: suspend (Update) -> T?
+) = flowsUpdatesFilter.expectOne(bot, initRequest, errorFactory, cancelRequestFactory, cancelTrigger, filter)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
new file mode 100644
index 0000000000..e9e70a84c6
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
@@ -0,0 +1,102 @@
+@file:Suppress("unused")
+
+package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
+
+import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.types.CallbackQuery.*
+import kotlinx.coroutines.flow.toList
+
+typealias CallbackQueryMapper<T> = T.() -> T?
+
+private suspend fun <O> BehaviourContext.waitCallbackQueries(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    mapper: suspend CallbackQuery.() -> O?
+): List<O> = expectFlow(
+    initRequest,
+    count,
+    errorFactory
+) {
+    it.asCallbackQueryUpdate() ?.data ?.mapper().let(::listOfNotNull)
+}.toList().toList()
+
+
+private suspend inline fun <reified T : CallbackQuery> BehaviourContext.waitEvents(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    noinline errorFactory: NullableRequestBuilder<*> = { null },
+    noinline filter: CallbackQueryMapper<T>? = null
+) : List<T> = waitCallbackQueries<T>(
+    count,
+    initRequest,
+    errorFactory
+) {
+    if (this is T) {
+        if (filter == null) {
+            this
+        } else {
+            filter(this)
+        }
+    } else {
+        null
+    }
+}
+
+
+suspend fun BehaviourContext.waitDataCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<DataCallbackQuery>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitGameShortNameCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<GameShortNameCallbackQuery>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitInlineMessageIdCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<InlineMessageIdCallbackQuery>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitInlineMessageIdDataCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<InlineMessageIdDataCallbackQuery>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitInlineMessageIdGameShortNameCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<InlineMessageIdGameShortNameCallbackQuery>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitMessageCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<MessageCallbackQuery>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitMessageDataCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<MessageDataCallbackQuery>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitMessageGameShortNameCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<MessageGameShortNameCallbackQuery>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitUnknownCallbackQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CallbackQueryMapper<UnknownCallbackQueryType>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
new file mode 100644
index 0000000000..fe5cdbf153
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
@@ -0,0 +1,202 @@
+@file:Suppress("unused")
+
+package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
+
+import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
+import dev.inmo.tgbotapi.types.message.content.*
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
+import kotlinx.coroutines.flow.toList
+
+typealias CommonMessageToContentMapper<T> = suspend CommonMessage<T>.() -> T?
+
+private suspend fun <O> BehaviourContext.waitCommonMessage(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    includeMediaGroups: Boolean = true,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    mapper: suspend CommonMessage<MessageContent>.() -> O?
+): List<O> = expectFlow(
+    initRequest,
+    count,
+    errorFactory
+) {
+    if (includeMediaGroups) {
+        it.asSentMediaGroupUpdate() ?.data ?.mapNotNull {
+            (it as CommonMessage<MessageContent>).mapper()
+        } ?.let { return@expectFlow it }
+    }
+    it.asMessageUpdate() ?.data ?.asCommonMessage() ?.mapper().let(::listOfNotNull)
+}.toList().toList()
+
+private suspend inline fun <reified T : MessageContent> BehaviourContext.waitContent(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    includeMediaGroups: Boolean = true,
+    noinline errorFactory: NullableRequestBuilder<*> = { null },
+    noinline filter: CommonMessageToContentMapper<T>? = null
+) : List<T> = waitCommonMessage<T>(
+    count,
+    initRequest,
+    includeMediaGroups,
+    errorFactory
+) {
+    if (content is T) {
+        @Suppress("UNCHECKED_CAST")
+        val message = (this as CommonMessage<T>)
+        if (filter == null) {
+            message.content
+        } else {
+            safelyWithoutExceptions { filter(message) }
+        }
+    } else {
+        null
+    }
+}
+
+suspend fun BehaviourContext.waitContentMessage(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<MessageContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitContact(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<ContactContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitDice(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<DiceContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitGame(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<GameContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitLocation(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<LocationContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitPoll(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<PollContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitText(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<TextContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitVenue(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<VenueContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitAudioMediaGroupContent(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = true,
+    filter: CommonMessageToContentMapper<AudioMediaGroupContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitDocumentMediaGroupContent(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = true,
+    filter: CommonMessageToContentMapper<DocumentMediaGroupContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitMedia(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = false,
+    filter: CommonMessageToContentMapper<MediaContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitAnyMediaGroupContent(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = true,
+    filter: CommonMessageToContentMapper<MediaGroupContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitVisualMediaGroupContent(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = true,
+    filter: CommonMessageToContentMapper<VisualMediaGroupContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitAnimation(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<AnimationContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitAudio(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = false,
+    filter: CommonMessageToContentMapper<AudioContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitDocument(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = false,
+    filter: CommonMessageToContentMapper<DocumentContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitPhoto(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = false,
+    filter: CommonMessageToContentMapper<PhotoContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitSticker(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<StickerContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitVideo(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    includeMediaGroups: Boolean = false,
+    filter: CommonMessageToContentMapper<VideoContent>? = null
+) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
+suspend fun BehaviourContext.waitVideoNote(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<VideoNoteContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitVoice(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<VoiceContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
+suspend fun BehaviourContext.waitInvoice(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: CommonMessageToContentMapper<InvoiceContent>? = null
+) = waitContent(count, initRequest, false, errorFactory, filter)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
new file mode 100644
index 0000000000..0093fa5111
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
@@ -0,0 +1,144 @@
+@file:Suppress("unused")
+
+package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
+
+import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.utils.asChatEventMessage
+import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.types.message.ChatEvents.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
+import kotlinx.coroutines.flow.toList
+
+typealias EventMessageToEventMapper<T> = suspend ChatEventMessage<T>.() -> T?
+
+private suspend fun <O> BehaviourContext.waitEventMessages(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    mapper: suspend ChatEventMessage<ChatEvent>.() -> O?
+): List<O> = expectFlow(
+    initRequest,
+    count,
+    errorFactory
+) {
+    it.asMessageUpdate() ?.data ?.asChatEventMessage() ?.mapper().let(::listOfNotNull)
+}.toList().toList()
+
+
+private suspend inline fun <reified T : ChatEvent> BehaviourContext.waitEvents(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    noinline errorFactory: NullableRequestBuilder<*> = { null },
+    noinline filter: EventMessageToEventMapper<T>? = null
+) : List<T> = waitEventMessages<T>(
+    initRequest,
+    errorFactory,
+    count
+) {
+    if (chatEvent is T) {
+        @Suppress("UNCHECKED_CAST")
+        val message = (this as ChatEventMessage<T>)
+        if (filter == null) {
+            message.chatEvent
+        } else {
+            filter(message)
+        }
+    } else {
+        null
+    }
+}
+
+suspend fun BehaviourContext.waitChannelEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<ChannelEvent>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+
+suspend fun BehaviourContext.waitChatEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<ChatEvent>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitCommonEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<CommonEvent>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitGroupEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<GroupEvent>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitSupergroupEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<SupergroupEvent>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+
+suspend fun BehaviourContext.waitChannelChatCreatedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<ChannelChatCreated>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitDeleteChatPhotoEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<DeleteChatPhoto>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitGroupChatCreatedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<GroupChatCreated>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitLeftChatMemberEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<LeftChatMember>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitNewChatPhotoEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<NewChatPhoto>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitNewChatMembersEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<NewChatMembers>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitNewChatTitleEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<NewChatTitle>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitPinnedMessageEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<PinnedMessage>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitProximityAlertTriggeredEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<ProximityAlertTriggered>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitSupergroupChatCreatedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<SupergroupChatCreated>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt
new file mode 100644
index 0000000000..5aa0bc8e90
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitMediaGroup.kt
@@ -0,0 +1,67 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
+
+import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.utils.asSentMediaGroupUpdate
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.media.PhotoContent
+import dev.inmo.tgbotapi.types.message.content.media.VideoContent
+import dev.inmo.tgbotapi.utils.PreviewFeature
+import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.flow.toList
+
+@PreviewFeature
+internal suspend inline fun <reified T : MediaGroupContent> BehaviourContext.buildMediaGroupWaiter(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    noinline errorFactory: NullableRequestBuilder<*> = { null },
+    noinline filter: (suspend (List<MediaGroupMessage<T>>) -> Boolean)? = null
+) = flowsUpdatesFilter.expectFlow(bot, initRequest, count, errorFactory) { update ->
+    update.asSentMediaGroupUpdate() ?.data ?.let { mediaGroup ->
+        if (mediaGroup.all { message -> message.content is T } && (filter == null || filter(mediaGroup as List<MediaGroupMessage<T>>))) {
+            listOf(
+                mediaGroup.map { it.content as T }
+            )
+        } else {
+            null
+        }
+    } ?: emptyList()
+}.take(count).toList()
+
+suspend fun BehaviourContext.waitMediaGroup(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: (suspend (List<MediaGroupMessage<MediaGroupContent>>) -> Boolean)? = null
+) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitPlaylist(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: (suspend (List<MediaGroupMessage<AudioMediaGroupContent>>) -> Boolean)? = null
+) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitDocumentsGroup(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: (suspend (List<MediaGroupMessage<DocumentMediaGroupContent>>) -> Boolean)? = null
+) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitVisualGallery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: (suspend (List<MediaGroupMessage<VisualMediaGroupContent>>) -> Boolean)? = null
+) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitPhotoGallery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: (suspend (List<MediaGroupMessage<PhotoContent>>) -> Boolean)? = null
+) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitVideoGallery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: (suspend (List<MediaGroupMessage<VideoContent>>) -> Boolean)? = null
+) = buildMediaGroupWaiter(count, initRequest, errorFactory, filter)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt
new file mode 100644
index 0000000000..d66c64eab8
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt
@@ -0,0 +1,81 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
+
+
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
+import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
+import dev.inmo.tgbotapi.types.CallbackQuery.*
+
+internal suspend inline fun <reified T : CallbackQuery> BehaviourContext.onCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline additionalFilter: (suspend (T) -> Boolean)? = null,
+    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, T>
+) = flowsUpdatesFilter.expectFlow(bot) {
+    it.asCallbackQueryUpdate() ?.data ?.let { query ->
+        if (query is T) {
+            if (additionalFilter == null || additionalFilter(query)) query else null
+        } else {
+            null
+        }
+    }.let(::listOfNotNull)
+}.subscribeSafelyWithoutExceptions(scope) { triggerQuery ->
+    doInSubContextWithUpdatesFilter(
+        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
+            { it.sourceChat() ?.id ?.chatId == triggerQuery.user.id.chatId }
+        } else {
+            null
+        }
+    ) {
+        scenarioReceiver(triggerQuery)
+    }
+}
+
+
+suspend fun BehaviourContext.onDataCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (DataCallbackQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, DataCallbackQuery>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+
+suspend fun BehaviourContext.onGameShortNameCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (GameShortNameCallbackQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, GameShortNameCallbackQuery>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onInlineMessageIdCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (InlineMessageIdCallbackQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, InlineMessageIdCallbackQuery>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onInlineMessageIdDataCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (InlineMessageIdDataCallbackQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, InlineMessageIdDataCallbackQuery>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onInlineMessageIdGameShortNameCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (InlineMessageIdGameShortNameCallbackQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, InlineMessageIdGameShortNameCallbackQuery>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onMessageCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (MessageCallbackQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, MessageCallbackQuery>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onMessageDataCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (MessageDataCallbackQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, MessageDataCallbackQuery>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onMessageGameShortNameCallbackQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (MessageGameShortNameCallbackQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, MessageGameShortNameCallbackQuery>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onUnknownCallbackQueryType(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (UnknownCallbackQueryType) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, UnknownCallbackQueryType>
+) = onCallbackQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt
new file mode 100644
index 0000000000..35c88e1f0e
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt
@@ -0,0 +1,48 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
+
+import dev.inmo.tgbotapi.CommonAbstracts.textSources
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
+import dev.inmo.tgbotapi.types.message.content.TextContent
+import kotlinx.coroutines.Job
+
+suspend fun BehaviourContext.command(
+    commandRegex: Regex,
+    requireOnlyCommandInMessage: Boolean = true,
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
+): Job = onText(
+    includeFilterByChatInBehaviourSubContext,
+    { message ->
+        val content = message.content
+        val textSources = content.textSources
+        val sizeRequirement = if (requireOnlyCommandInMessage) {
+            textSources.size == 1
+        } else {
+            true
+        }
+        sizeRequirement && textSources.any { commandRegex.matches(it.asBotCommandTextSource() ?.command ?: return@any false) }
+    },
+    scenarioReceiver
+)
+suspend fun BehaviourContext.command(
+    command: String,
+    requireOnlyCommandInMessage: Boolean = true,
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
+) = command(command.toRegex(), requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, scenarioReceiver)
+
+suspend inline fun BehaviourContext.onCommand(
+    commandRegex: Regex,
+    requireOnlyCommandInMessage: Boolean = true,
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
+): Job = command(commandRegex, requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, scenarioReceiver)
+
+suspend inline fun BehaviourContext.onCommand(
+    command: String,
+    requireOnlyCommandInMessage: Boolean = true,
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
+): Job = onCommand(command.toRegex(), requireOnlyCommandInMessage, includeFilterByChatInBehaviourSubContext, scenarioReceiver)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt
new file mode 100644
index 0000000000..591686026e
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt
@@ -0,0 +1,170 @@
+@file:Suppress("unused", "UNCHECKED_CAST")
+
+package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
+
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
+import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
+import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
+import dev.inmo.tgbotapi.types.message.content.*
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
+import dev.inmo.tgbotapi.utils.PreviewFeature
+
+typealias CommonMessageFilter<T> = (suspend (CommonMessage<T>) -> Boolean)
+
+@PreviewFeature
+internal suspend inline fun <reified T : MessageContent> BehaviourContext.onContent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    includeMediaGroups: Boolean = true,
+    noinline additionalFilter: CommonMessageFilter<T>? = null,
+    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<T>>
+) = flowsUpdatesFilter.expectFlow(bot) {
+    if (includeMediaGroups) {
+        it.asSentMediaGroupUpdate() ?.data ?.mapNotNull {
+            if (it.content is T) {
+                val adaptedMessage = it as CommonMessage<T>
+                if (additionalFilter == null || additionalFilter(adaptedMessage)) adaptedMessage else null
+            } else {
+                null
+            }
+        } ?.let {
+            return@expectFlow it
+        }
+    }
+    it.asMessageUpdate() ?.data ?.asCommonMessage() ?.let { message ->
+        if (message.content is T) {
+            val adaptedMessage = message as CommonMessage<T>
+            if (additionalFilter == null || additionalFilter(adaptedMessage)) adaptedMessage else null
+        } else {
+            null
+        }
+    }.let(::listOfNotNull)
+}.subscribeSafelyWithoutExceptions(scope) { triggerMessage ->
+    doInSubContextWithUpdatesFilter(
+        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
+            { it.sourceChat() ?.id ?.chatId == triggerMessage.chat.id.chatId }
+        } else {
+            null
+        }
+    ) {
+        scenarioReceiver(triggerMessage)
+    }
+}
+
+suspend fun BehaviourContext.onContentMessage(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<MessageContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<MessageContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onContact(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<ContactContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<ContactContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onDice(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<DiceContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<DiceContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onGame(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<GameContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<GameContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onLocation(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<LocationContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<LocationContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onPoll(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<PollContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<PollContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onText(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<TextContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<TextContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVenue(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<VenueContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<VenueContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onAudioMediaGroup(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<AudioMediaGroupContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<AudioMediaGroupContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, true, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onDocumentMediaGroupContent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    includeMediaGroups: Boolean = true,
+    additionalFilter: CommonMessageFilter<DocumentMediaGroupContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<DocumentMediaGroupContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, includeMediaGroups, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onMediaCollection(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    includeMediaGroups: Boolean = false,
+    additionalFilter: (suspend (CommonMessage<MediaCollectionContent<TelegramMediaFile>>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<MediaCollectionContent<TelegramMediaFile>>>
+) = onContent(includeFilterByChatInBehaviourSubContext, includeMediaGroups, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onMedia(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    includeMediaGroups: Boolean = true,
+    additionalFilter: CommonMessageFilter<MediaContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<MediaContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, includeMediaGroups, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onAnimation(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<AnimationContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<AnimationContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onAudio(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    includeMediaGroups: Boolean = false,
+    additionalFilter: CommonMessageFilter<AudioContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<AudioContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, includeMediaGroups, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onDocument(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    includeMediaGroups: Boolean = false,
+    additionalFilter: CommonMessageFilter<DocumentContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<DocumentContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, includeMediaGroups, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onPhoto(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    includeMediaGroups: Boolean = false,
+    additionalFilter: CommonMessageFilter<PhotoContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<PhotoContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, includeMediaGroups, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onSticker(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<StickerContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<StickerContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVideo(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    includeMediaGroups: Boolean = false,
+    additionalFilter: CommonMessageFilter<VideoContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<VideoContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, includeMediaGroups, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVideoNote(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<VideoNoteContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<VideoNoteContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVoice(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<VoiceContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<VoiceContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onInvoice(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: CommonMessageFilter<InvoiceContent>? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, CommonMessage<InvoiceContent>>
+) = onContent(includeFilterByChatInBehaviourSubContext, false, additionalFilter, scenarioReceiver)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
new file mode 100644
index 0000000000..d5b9404550
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
@@ -0,0 +1,111 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
+
+
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
+import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
+import dev.inmo.tgbotapi.types.message.ChatEvents.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
+
+internal suspend inline fun <reified T : ChatEvent> BehaviourContext.onEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline additionalFilter: (suspend (ChatEventMessage<T>) -> Boolean)? = null,
+    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<T>>
+) = flowsUpdatesFilter.expectFlow(bot) {
+    it.asMessageUpdate() ?.data ?.asChatEventMessage() ?.let { message ->
+        if (message.chatEvent is T) {
+            val adaptedMessage = message as ChatEventMessage<T>
+            if (additionalFilter == null || additionalFilter(adaptedMessage)) adaptedMessage else null
+        } else {
+            null
+        }
+    }.let(::listOfNotNull)
+}.subscribeSafelyWithoutExceptions(scope) { triggerMessage ->
+    doInSubContextWithUpdatesFilter(
+        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
+            { it.sourceChat() ?.id ?.chatId == triggerMessage.chat.id.chatId }
+        } else null
+    ) {
+        scenarioReceiver(triggerMessage)
+    }
+}
+
+suspend fun BehaviourContext.onChannelEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<ChannelEvent>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<ChannelEvent>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onChatEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<ChatEvent>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<ChatEvent>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onCommonEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<CommonEvent>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<CommonEvent>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onGroupEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<GroupEvent>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<GroupEvent>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onSupergroupEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<SupergroupEvent>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<SupergroupEvent>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+
+suspend fun BehaviourContext.onChannelChatCreated(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<ChannelChatCreated>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<ChannelChatCreated>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onDeleteChatPhoto(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<DeleteChatPhoto>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<DeleteChatPhoto>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onGroupChatCreated(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<GroupChatCreated>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<GroupChatCreated>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onLeftChatMember(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<LeftChatMember>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<LeftChatMember>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onNewChatMembers(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<NewChatMembers>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<NewChatMembers>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onNewChatPhoto(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<NewChatPhoto>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<NewChatPhoto>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onNewChatTitle(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<NewChatTitle>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<NewChatTitle>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onPinnedMessage(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<PinnedMessage>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<PinnedMessage>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onProximityAlertTriggered(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<ProximityAlertTriggered>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<ProximityAlertTriggered>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onSupergroupChatCreated(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<SupergroupChatCreated>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<SupergroupChatCreated>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt
new file mode 100644
index 0000000000..639f2cbeff
--- /dev/null
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt
@@ -0,0 +1,75 @@
+@file:Suppress("unused")
+
+package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
+
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
+import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
+import dev.inmo.tgbotapi.extensions.utils.shortcuts.chat
+import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.utils.PreviewFeature
+
+@PreviewFeature
+internal suspend inline fun <reified T : MediaGroupContent> BehaviourContext.buildMediaGroupTrigger(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline additionalFilter: (suspend (List<MediaGroupMessage<T>>) -> Boolean)? = null,
+    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, List<MediaGroupMessage<T>>>
+) = flowsUpdatesFilter.expectFlow(bot) { update ->
+    update.asSentMediaGroupUpdate() ?.data ?.let { mediaGroup ->
+        if (mediaGroup.all { message -> message.content is T } && (additionalFilter == null || additionalFilter(mediaGroup as List<MediaGroupMessage<T>>))) {
+            listOf(mediaGroup as List<MediaGroupMessage<T>>)
+        } else {
+            null
+        }
+    } ?: emptyList()
+}.subscribeSafelyWithoutExceptions(scope) { mediaGroup ->
+    val mediaGroupChat = mediaGroup.chat!!
+    doInSubContextWithUpdatesFilter(
+        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
+            { it.sourceChat() ?.id ?.chatId == mediaGroupChat.id.chatId }
+        } else null
+    ) {
+        scenarioReceiver(mediaGroup)
+    }
+}
+
+suspend fun BehaviourContext.onMediaGroup(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (List<MediaGroupMessage<MediaGroupContent>>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, List<MediaGroupMessage<MediaGroupContent>>>
+) = buildMediaGroupTrigger(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onPlaylist(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (List<MediaGroupMessage<AudioMediaGroupContent>>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, List<MediaGroupMessage<AudioMediaGroupContent>>>
+) = buildMediaGroupTrigger(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onDocumentsGroup(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (List<MediaGroupMessage<DocumentMediaGroupContent>>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, List<MediaGroupMessage<DocumentMediaGroupContent>>>
+) = buildMediaGroupTrigger(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVisualGallery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (List<MediaGroupMessage<VisualMediaGroupContent>>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, List<MediaGroupMessage<VisualMediaGroupContent>>>
+) = buildMediaGroupTrigger(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVisualMediaGroup(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (List<MediaGroupMessage<VisualMediaGroupContent>>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, List<MediaGroupMessage<VisualMediaGroupContent>>>
+) = onVisualGallery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onPhotoGallery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (List<MediaGroupMessage<PhotoContent>>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, List<MediaGroupMessage<PhotoContent>>>
+) = buildMediaGroupTrigger(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVideoGallery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (List<MediaGroupMessage<VideoContent>>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, List<MediaGroupMessage<VideoContent>>>
+) = buildMediaGroupTrigger(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+
diff --git a/tgbotapi.extensions.utils/mpp_publish_template.kpsb b/tgbotapi.extensions.utils/mpp_publish_template.kpsb
index fdf1c71301..461908fb92 100644
--- a/tgbotapi.extensions.utils/mpp_publish_template.kpsb
+++ b/tgbotapi.extensions.utils/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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 Utility Extensions","description":"Util extensions for more useful work with updates and other things","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-utils","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
\ No newline at end of file
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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 Utility Extensions","description":"Util extensions for more useful work with updates and other things","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-utils","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
\ No newline at end of file
diff --git a/tgbotapi.extensions.utils/publish.gradle b/tgbotapi.extensions.utils/publish.gradle
index 94ab11f8c8..e812aa7116 100644
--- a/tgbotapi.extensions.utils/publish.gradle
+++ b/tgbotapi.extensions.utils/publish.gradle
@@ -1,8 +1,12 @@
 apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
+task sourceJar (type : Jar) {
+    classifier = 'sources'
+}
 
 afterEvaluate {
     project.publishing.publications.all {
@@ -10,6 +14,7 @@ afterEvaluate {
         groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
             artifactId = "${project.name}"
+            artifact sourceJar
         } else {
             artifactId = "${project.name}-$name"
         }
@@ -62,4 +67,9 @@ publishing {
         }
         
     }
-}
\ No newline at end of file
+}
+
+signing {
+    useGpgCmd()
+    publishing.publications.forEach { sign it }
+}
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt
index 4ce0fb76a7..25c0e86e29 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt
@@ -1,6 +1,8 @@
 @file:Suppress("NOTHING_TO_INLINE", "unused", "UNCHECKED_CAST")
 
 package dev.inmo.tgbotapi.extensions.utils
+import dev.inmo.tgbotapi.CommonAbstracts.MultilevelTextSource
+import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.CallbackQuery.*
 import dev.inmo.tgbotapi.types.ChatMember.*
@@ -20,6 +22,7 @@ import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InputMessageContent
 import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery
 import dev.inmo.tgbotapi.types.InputMedia.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.actions.*
 import dev.inmo.tgbotapi.types.buttons.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.*
@@ -30,11 +33,10 @@ import dev.inmo.tgbotapi.types.files.abstracts.*
 import dev.inmo.tgbotapi.types.message.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
 import dev.inmo.tgbotapi.types.message.abstracts.*
-import dev.inmo.tgbotapi.types.message.abstracts.ChannelMessage
-import dev.inmo.tgbotapi.types.message.abstracts.GroupEventMessage
-import dev.inmo.tgbotapi.types.message.abstracts.SupergroupEventMessage
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage
+import dev.inmo.tgbotapi.types.message.content.*
+import dev.inmo.tgbotapi.types.message.content.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
 import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.*
 import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.*
@@ -158,17 +160,17 @@ inline fun Message.asChannelEventMessage(): ChannelEventMessage<ChannelEvent>? =
 @PreviewFeature
 inline fun Message.requireChannelEventMessage(): ChannelEventMessage<ChannelEvent> = this as ChannelEventMessage<ChannelEvent>
 @PreviewFeature
-inline fun Message.asChannelMediaGroupMessage(): ChannelMediaGroupMessage? = this as? ChannelMediaGroupMessage
+inline fun Message.asChannelMediaGroupMessage(): ChannelMediaGroupMessage<MediaGroupContent>? = this as? ChannelMediaGroupMessage<MediaGroupContent>
 @PreviewFeature
-inline fun Message.requireChannelMediaGroupMessage(): ChannelMediaGroupMessage = this as ChannelMediaGroupMessage
+inline fun Message.requireChannelMediaGroupMessage(): ChannelMediaGroupMessage<MediaGroupContent> = this as ChannelMediaGroupMessage<MediaGroupContent>
 @PreviewFeature
 inline fun Message.asCommonGroupEventMessage(): CommonGroupEventMessage<GroupEvent>? = this as? CommonGroupEventMessage<GroupEvent>
 @PreviewFeature
 inline fun Message.requireCommonGroupEventMessage(): CommonGroupEventMessage<GroupEvent> = this as CommonGroupEventMessage<GroupEvent>
 @PreviewFeature
-inline fun Message.asCommonMediaGroupMessage(): CommonMediaGroupMessage? = this as? CommonMediaGroupMessage
+inline fun Message.asCommonMediaGroupMessage(): CommonMediaGroupMessage<MediaGroupContent>? = this as? CommonMediaGroupMessage<MediaGroupContent>
 @PreviewFeature
-inline fun Message.requireCommonMediaGroupMessage(): CommonMediaGroupMessage = this as CommonMediaGroupMessage
+inline fun Message.requireCommonMediaGroupMessage(): CommonMediaGroupMessage<MediaGroupContent> = this as CommonMediaGroupMessage<MediaGroupContent>
 @PreviewFeature
 inline fun Message.asCommonSupergroupEventMessage(): CommonSupergroupEventMessage<SupergroupEvent>? = this as? CommonSupergroupEventMessage<SupergroupEvent>
 @PreviewFeature
@@ -210,9 +212,9 @@ inline fun Message.asGroupMessage(): GroupMessage<MessageContent>? = this as? Gr
 @PreviewFeature
 inline fun Message.requireGroupMessage(): GroupMessage<MessageContent> = this as GroupMessage<MessageContent>
 @PreviewFeature
-inline fun Message.asMediaGroupMessage(): MediaGroupMessage? = this as? MediaGroupMessage
+inline fun Message.asMediaGroupMessage(): MediaGroupMessage<MediaGroupContent>? = this as? MediaGroupMessage<MediaGroupContent>
 @PreviewFeature
-inline fun Message.requireMediaGroupMessage(): MediaGroupMessage = this as MediaGroupMessage
+inline fun Message.requireMediaGroupMessage(): MediaGroupMessage<MediaGroupContent> = this as MediaGroupMessage<MediaGroupContent>
 @PreviewFeature
 inline fun Message.asPossiblyEditedMessage(): PossiblyEditedMessage? = this as? PossiblyEditedMessage
 @PreviewFeature
@@ -753,3 +755,163 @@ inline fun Poll.requireRegularPoll(): RegularPoll = this as RegularPoll
 inline fun Poll.asUnknownPollType(): UnknownPollType? = this as? UnknownPollType
 @PreviewFeature
 inline fun Poll.requireUnknownPollType(): UnknownPollType = this as UnknownPollType
+@PreviewFeature
+inline fun ResendableContent.asContactContent(): ContactContent? = this as? ContactContent
+@PreviewFeature
+inline fun ResendableContent.requireContactContent(): ContactContent = this as ContactContent
+@PreviewFeature
+inline fun ResendableContent.asDiceContent(): DiceContent? = this as? DiceContent
+@PreviewFeature
+inline fun ResendableContent.requireDiceContent(): DiceContent = this as DiceContent
+@PreviewFeature
+inline fun ResendableContent.asGameContent(): GameContent? = this as? GameContent
+@PreviewFeature
+inline fun ResendableContent.requireGameContent(): GameContent = this as GameContent
+@PreviewFeature
+inline fun ResendableContent.asLocationContent(): LocationContent? = this as? LocationContent
+@PreviewFeature
+inline fun ResendableContent.requireLocationContent(): LocationContent = this as LocationContent
+@PreviewFeature
+inline fun ResendableContent.asPollContent(): PollContent? = this as? PollContent
+@PreviewFeature
+inline fun ResendableContent.requirePollContent(): PollContent = this as PollContent
+@PreviewFeature
+inline fun ResendableContent.asTextContent(): TextContent? = this as? TextContent
+@PreviewFeature
+inline fun ResendableContent.requireTextContent(): TextContent = this as TextContent
+@PreviewFeature
+inline fun ResendableContent.asVenueContent(): VenueContent? = this as? VenueContent
+@PreviewFeature
+inline fun ResendableContent.requireVenueContent(): VenueContent = this as VenueContent
+@PreviewFeature
+inline fun ResendableContent.asAudioMediaGroupContent(): AudioMediaGroupContent? = this as? AudioMediaGroupContent
+@PreviewFeature
+inline fun ResendableContent.requireAudioMediaGroupContent(): AudioMediaGroupContent = this as AudioMediaGroupContent
+@PreviewFeature
+inline fun ResendableContent.asDocumentMediaGroupContent(): DocumentMediaGroupContent? = this as? DocumentMediaGroupContent
+@PreviewFeature
+inline fun ResendableContent.requireDocumentMediaGroupContent(): DocumentMediaGroupContent = this as DocumentMediaGroupContent
+@PreviewFeature
+inline fun ResendableContent.asMediaCollectionContent(): MediaCollectionContent<TelegramMediaFile>? = this as? MediaCollectionContent<TelegramMediaFile>
+@PreviewFeature
+inline fun ResendableContent.requireMediaCollectionContent(): MediaCollectionContent<TelegramMediaFile> = this as MediaCollectionContent<TelegramMediaFile>
+@PreviewFeature
+inline fun ResendableContent.asMediaContent(): MediaContent? = this as? MediaContent
+@PreviewFeature
+inline fun ResendableContent.requireMediaContent(): MediaContent = this as MediaContent
+@PreviewFeature
+inline fun ResendableContent.asMediaGroupContent(): MediaGroupContent? = this as? MediaGroupContent
+@PreviewFeature
+inline fun ResendableContent.requireMediaGroupContent(): MediaGroupContent = this as MediaGroupContent
+@PreviewFeature
+inline fun ResendableContent.asMessageContent(): MessageContent? = this as? MessageContent
+@PreviewFeature
+inline fun ResendableContent.requireMessageContent(): MessageContent = this as MessageContent
+@PreviewFeature
+inline fun ResendableContent.asVisualMediaGroupContent(): VisualMediaGroupContent? = this as? VisualMediaGroupContent
+@PreviewFeature
+inline fun ResendableContent.requireVisualMediaGroupContent(): VisualMediaGroupContent = this as VisualMediaGroupContent
+@PreviewFeature
+inline fun ResendableContent.asAnimationContent(): AnimationContent? = this as? AnimationContent
+@PreviewFeature
+inline fun ResendableContent.requireAnimationContent(): AnimationContent = this as AnimationContent
+@PreviewFeature
+inline fun ResendableContent.asAudioContent(): AudioContent? = this as? AudioContent
+@PreviewFeature
+inline fun ResendableContent.requireAudioContent(): AudioContent = this as AudioContent
+@PreviewFeature
+inline fun ResendableContent.asDocumentContent(): DocumentContent? = this as? DocumentContent
+@PreviewFeature
+inline fun ResendableContent.requireDocumentContent(): DocumentContent = this as DocumentContent
+@PreviewFeature
+inline fun ResendableContent.asPhotoContent(): PhotoContent? = this as? PhotoContent
+@PreviewFeature
+inline fun ResendableContent.requirePhotoContent(): PhotoContent = this as PhotoContent
+@PreviewFeature
+inline fun ResendableContent.asStickerContent(): StickerContent? = this as? StickerContent
+@PreviewFeature
+inline fun ResendableContent.requireStickerContent(): StickerContent = this as StickerContent
+@PreviewFeature
+inline fun ResendableContent.asVideoContent(): VideoContent? = this as? VideoContent
+@PreviewFeature
+inline fun ResendableContent.requireVideoContent(): VideoContent = this as VideoContent
+@PreviewFeature
+inline fun ResendableContent.asVideoNoteContent(): VideoNoteContent? = this as? VideoNoteContent
+@PreviewFeature
+inline fun ResendableContent.requireVideoNoteContent(): VideoNoteContent = this as VideoNoteContent
+@PreviewFeature
+inline fun ResendableContent.asVoiceContent(): VoiceContent? = this as? VoiceContent
+@PreviewFeature
+inline fun ResendableContent.requireVoiceContent(): VoiceContent = this as VoiceContent
+@PreviewFeature
+inline fun ResendableContent.asInvoiceContent(): InvoiceContent? = this as? InvoiceContent
+@PreviewFeature
+inline fun ResendableContent.requireInvoiceContent(): InvoiceContent = this as InvoiceContent
+@PreviewFeature
+inline fun TextSource.asMultilevelTextSource(): MultilevelTextSource? = this as? MultilevelTextSource
+@PreviewFeature
+inline fun TextSource.requireMultilevelTextSource(): MultilevelTextSource = this as MultilevelTextSource
+@PreviewFeature
+inline fun TextSource.asBoldTextSource(): BoldTextSource? = this as? BoldTextSource
+@PreviewFeature
+inline fun TextSource.requireBoldTextSource(): BoldTextSource = this as BoldTextSource
+@PreviewFeature
+inline fun TextSource.asBotCommandTextSource(): BotCommandTextSource? = this as? BotCommandTextSource
+@PreviewFeature
+inline fun TextSource.requireBotCommandTextSource(): BotCommandTextSource = this as BotCommandTextSource
+@PreviewFeature
+inline fun TextSource.asCashTagTextSource(): CashTagTextSource? = this as? CashTagTextSource
+@PreviewFeature
+inline fun TextSource.requireCashTagTextSource(): CashTagTextSource = this as CashTagTextSource
+@PreviewFeature
+inline fun TextSource.asCodeTextSource(): CodeTextSource? = this as? CodeTextSource
+@PreviewFeature
+inline fun TextSource.requireCodeTextSource(): CodeTextSource = this as CodeTextSource
+@PreviewFeature
+inline fun TextSource.asEMailTextSource(): EMailTextSource? = this as? EMailTextSource
+@PreviewFeature
+inline fun TextSource.requireEMailTextSource(): EMailTextSource = this as EMailTextSource
+@PreviewFeature
+inline fun TextSource.asHashTagTextSource(): HashTagTextSource? = this as? HashTagTextSource
+@PreviewFeature
+inline fun TextSource.requireHashTagTextSource(): HashTagTextSource = this as HashTagTextSource
+@PreviewFeature
+inline fun TextSource.asItalicTextSource(): ItalicTextSource? = this as? ItalicTextSource
+@PreviewFeature
+inline fun TextSource.requireItalicTextSource(): ItalicTextSource = this as ItalicTextSource
+@PreviewFeature
+inline fun TextSource.asMentionTextSource(): MentionTextSource? = this as? MentionTextSource
+@PreviewFeature
+inline fun TextSource.requireMentionTextSource(): MentionTextSource = this as MentionTextSource
+@PreviewFeature
+inline fun TextSource.asPhoneNumberTextSource(): PhoneNumberTextSource? = this as? PhoneNumberTextSource
+@PreviewFeature
+inline fun TextSource.requirePhoneNumberTextSource(): PhoneNumberTextSource = this as PhoneNumberTextSource
+@PreviewFeature
+inline fun TextSource.asPreTextSource(): PreTextSource? = this as? PreTextSource
+@PreviewFeature
+inline fun TextSource.requirePreTextSource(): PreTextSource = this as PreTextSource
+@PreviewFeature
+inline fun TextSource.asRegularTextSource(): RegularTextSource? = this as? RegularTextSource
+@PreviewFeature
+inline fun TextSource.requireRegularTextSource(): RegularTextSource = this as RegularTextSource
+@PreviewFeature
+inline fun TextSource.asStrikethroughTextSource(): StrikethroughTextSource? = this as? StrikethroughTextSource
+@PreviewFeature
+inline fun TextSource.requireStrikethroughTextSource(): StrikethroughTextSource = this as StrikethroughTextSource
+@PreviewFeature
+inline fun TextSource.asTextLinkTextSource(): TextLinkTextSource? = this as? TextLinkTextSource
+@PreviewFeature
+inline fun TextSource.requireTextLinkTextSource(): TextLinkTextSource = this as TextLinkTextSource
+@PreviewFeature
+inline fun TextSource.asTextMentionTextSource(): TextMentionTextSource? = this as? TextMentionTextSource
+@PreviewFeature
+inline fun TextSource.requireTextMentionTextSource(): TextMentionTextSource = this as TextMentionTextSource
+@PreviewFeature
+inline fun TextSource.asURLTextSource(): URLTextSource? = this as? URLTextSource
+@PreviewFeature
+inline fun TextSource.requireURLTextSource(): URLTextSource = this as URLTextSource
+@PreviewFeature
+inline fun TextSource.asUnderlineTextSource(): UnderlineTextSource? = this as? UnderlineTextSource
+@PreviewFeature
+inline fun TextSource.requireUnderlineTextSource(): UnderlineTextSource = this as UnderlineTextSource
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt
index bf4c4b8f74..6f6bee5cc5 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/FlowsAggregation.kt
@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.extensions.utils
 
+import dev.inmo.micro_utils.coroutines.safely
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.BroadcastChannel
 import kotlinx.coroutines.flow.*
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt
deleted file mode 100644
index 9aa29a53d2..0000000000
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package dev.inmo.tgbotapi.extensions.utils
-
-import dev.inmo.micro_utils.coroutines.ExceptionHandler
-import dev.inmo.tgbotapi.utils.*
-import kotlinx.coroutines.CoroutineScope
-
-/**
- * Shortcut for [dev.inmo.micro_utils.coroutines.safely]. It was created for more comfortable way of handling different things
- */
-@Deprecated("In future will be used typealias from micro_utils", ReplaceWith("safely", "dev.inmo.micro_utils.coroutines.safely"))
-suspend inline fun <T> safely(
-    noinline onException: ExceptionHandler<T> = { throw it },
-    noinline block: suspend CoroutineScope.() -> T
-): T = dev.inmo.micro_utils.coroutines.safely(
-    onException,
-    block
-)
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt
deleted file mode 100644
index 43504fef31..0000000000
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package dev.inmo.tgbotapi.extensions.utils.chat_events
-
-import dev.inmo.tgbotapi.extensions.utils.shortcuts.*
-import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.mapNotNull
-import kotlin.reflect.KClass
-
-@Deprecated("Refactored, replaced and renamed", ReplaceWith("filterByChatEvent", "dev.inmo.tgbotapi.extensions.utils.shortcuts.filterByChatEvent"))
-fun <T : ChatEventMessage<*>> Flow<ChatEventMessage<*>>.divideBySource(contentType: KClass<T>) = mapNotNull {
-    if (contentType.isInstance(it)) {
-        @Suppress("UNCHECKED_CAST")
-        it as T
-    } else {
-        null
-    }
-}
-
-@Deprecated("Replaced and renamed", ReplaceWith("channelEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.channelEvents"))
-fun Flow<ChatEventMessage<*>>.onlyChannelEvents() = channelEvents()
-@Deprecated("Replaced and renamed", ReplaceWith("groupEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.groupEvents"))
-fun Flow<ChatEventMessage<*>>.onlyGroupEvents() = groupEvents()
-@Deprecated("Replaced and renamed", ReplaceWith("supergroupEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.supergroupEvents"))
-fun Flow<ChatEventMessage<*>>.onlySupergroupEvents() = supergroupEvents()
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/UpdateChatRetriever.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/UpdateChatRetriever.kt
new file mode 100644
index 0000000000..153cbe2600
--- /dev/null
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/UpdateChatRetriever.kt
@@ -0,0 +1,26 @@
+package dev.inmo.tgbotapi.extensions.utils.extensions
+
+import dev.inmo.tgbotapi.extensions.utils.shortcuts.chat
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import dev.inmo.tgbotapi.types.update.*
+import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.*
+import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
+import dev.inmo.tgbotapi.types.update.abstracts.Update
+import dev.inmo.tgbotapi.utils.PreviewFeature
+
+@PreviewFeature
+fun Update.sourceChat(): Chat? = when (this) {
+    is MediaGroupUpdate -> when (this) {
+        is SentMediaGroupUpdate -> data.chat
+        is EditMediaGroupUpdate -> data.chat
+        else -> null
+    }
+    is BaseMessageUpdate -> data.chat
+    is InlineQueryUpdate -> data.from
+    is ChosenInlineResultUpdate -> data.user
+    is CallbackQueryUpdate -> data.user
+    is PreCheckoutQueryUpdate -> data.user
+    is PollAnswerUpdate -> data.user
+    is ShippingQueryUpdate -> data.user
+    else -> null
+}
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt
index d18f6986c6..8d7e2687d6 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt
@@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.extensions.utils.formatting
 
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.link
-import dev.inmo.tgbotapi.types.ParseMode.*
 import dev.inmo.tgbotapi.types.chat.abstracts.*
 import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedPublicChat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
@@ -84,38 +83,3 @@ private const val stickerSetAddingLinkPrefix = "$internalLinkBeginning/addsticke
 
 val StickerSetName.stickerSetLink
     get() = link(this, "$stickerSetAddingLinkPrefix/$this")
-
-/**
- * @return Link for adding of sticker set with name [stickerSetName] with formatting for [MarkdownV2]
- */
-@Deprecated("Use extension `stickerSetLink` + getting of `asMarkdownV2Source` property")
-fun makeLinkToAddStickerSetInMarkdownV2(
-    stickerSetName: StickerSetName
-) = stickerSetName.stickerSetLink.markdownV2
-/**
- * @return Link for adding of sticker set with name [stickerSetName] with formatting for [Markdown]
- */
-@Deprecated("Use extension `stickerSetLink` + getting of `asMarkdownSource` property")
-fun makeLinkToAddStickerSetInMarkdown(stickerSetName: StickerSetName) = stickerSetName.stickerSetLink.markdown
-/**
- * @return Link for adding of sticker set with name [stickerSetName] with formatting for [HTML]
- */
-@Deprecated("Use extension `stickerSetLink` + getting of `asHtmlSource` property")
-fun makeLinkToAddStickerSetInHtml(stickerSetName: StickerSetName) = stickerSetName.stickerSetLink.html
-/**
- * Create a link for adding of sticker set with name [stickerSetName]. Was added thanks to user Djaler and based on
- * https://github.com/Djaler/evil-bot/blob/master/src/main/kotlin/com/github/djaler/evilbot/utils/StickerUtils.kt#L6-L8
- *
- * @see [makeLinkToAddStickerSetInMarkdownV2]
- * @see [makeLinkToAddStickerSetInMarkdown]
- * @see [makeLinkToAddStickerSetInHtml]
- */
-@Deprecated("Use extension `stickerSetLink` + getting of required property")
-fun makeLinkToAddStickerSet(
-    stickerSetName: StickerSetName,
-    parseMode: ParseMode
-) = when (parseMode) {
-    MarkdownParseMode -> makeLinkToAddStickerSetInMarkdown(stickerSetName)
-    MarkdownV2ParseMode -> makeLinkToAddStickerSetInMarkdownV2(stickerSetName)
-    HTMLParseMode -> makeLinkToAddStickerSetInHtml(stickerSetName)
-}
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt
index ab62b4f1aa..9d28d5215e 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt
@@ -4,7 +4,6 @@ import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ParseMode.*
 import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.message.content.fullEntitiesList
 
 fun createFormattedText(
     entities: TextSourcesList,
@@ -56,19 +55,19 @@ fun TextSourcesList.toMarkdownCaptions(): List<String> = createMarkdownText(
     this,
     captionLength.last
 )
-fun CaptionedInput.toMarkdownCaptions(): List<String> = fullEntitiesList().toMarkdownCaptions()
+fun CaptionedInput.toMarkdownCaptions(): List<String> = textSources.toMarkdownCaptions()
 
 fun TextSourcesList.toMarkdownTexts(): List<String> = createMarkdownText(
     this,
     textLength.last
 )
-fun TextContent.toMarkdownTexts(): List<String> = fullEntitiesList().toMarkdownTexts()
+fun TextContent.toMarkdownTexts(): List<String> = textSources.toMarkdownTexts()
 
 fun TextSourcesList.toMarkdownExplanations(): List<String> = createMarkdownText(
     this,
     explanationLimit.last
 )
-fun ExplainedInput.toMarkdownExplanations(): List<String> = fullEntitiesList().toMarkdownTexts()
+fun ExplainedInput.toMarkdownExplanations(): List<String> = textSources.toMarkdownTexts()
 
 
 fun createMarkdownV2Text(
@@ -80,19 +79,19 @@ fun TextSourcesList.toMarkdownV2Captions(): List<String> = createMarkdownV2Text(
     this,
     captionLength.last
 )
-fun CaptionedInput.toMarkdownV2Captions(): List<String> = fullEntitiesList().toMarkdownV2Captions()
+fun CaptionedInput.toMarkdownV2Captions(): List<String> = textSources.toMarkdownV2Captions()
 
 fun TextSourcesList.toMarkdownV2Texts(): List<String> = createMarkdownV2Text(
     this,
     textLength.last
 )
-fun TextContent.toMarkdownV2Texts(): List<String> = fullEntitiesList().toMarkdownV2Texts()
+fun TextContent.toMarkdownV2Texts(): List<String> = textSources.toMarkdownV2Texts()
 
 fun TextSourcesList.toMarkdownV2Explanations(): List<String> = createMarkdownV2Text(
     this,
     explanationLimit.last
 )
-fun ExplainedInput.toMarkdownV2Explanations(): List<String> = fullEntitiesList().toMarkdownV2Texts()
+fun ExplainedInput.toMarkdownV2Explanations(): List<String> = textSources.toMarkdownV2Texts()
 
 
 fun createHtmlText(
@@ -104,18 +103,18 @@ fun TextSourcesList.toHtmlCaptions(): List<String> = createHtmlText(
     this,
     captionLength.last
 )
-fun CaptionedInput.toHtmlCaptions(): List<String> = fullEntitiesList().toHtmlCaptions()
+fun CaptionedInput.toHtmlCaptions(): List<String> = textSources.toHtmlCaptions()
 
 fun TextSourcesList.toHtmlTexts(): List<String> = createHtmlText(
     this,
     textLength.last
 )
-fun TextContent.toHtmlTexts(): List<String> = fullEntitiesList().toHtmlTexts()
+fun TextContent.toHtmlTexts(): List<String> = textSources.toHtmlTexts()
 
 fun TextSourcesList.toHtmlExplanations(): List<String> = createHtmlText(
     this,
     explanationLimit.last
 )
-fun ExplainedInput.toHtmlExplanations(): List<String> = fullEntitiesList().toHtmlTexts()
+fun ExplainedInput.toHtmlExplanations(): List<String> = textSources.toHtmlTexts()
 
 
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt
index f23f1aae33..6df7887dea 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt
@@ -8,7 +8,6 @@ import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.message.content.fullEntitiesList
 import kotlinx.coroutines.flow.*
 
 /**
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/EventsShortcuts.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/EventsShortcuts.kt
index c9f0831301..54df4bdd03 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/EventsShortcuts.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/EventsShortcuts.kt
@@ -9,7 +9,8 @@ import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
 import dev.inmo.tgbotapi.utils.RiskFeature
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.mapNotNull
 
 @RiskFeature("Use with caution")
 inline fun FlowsUpdatesFilter.events(): Flow<ChatEventMessage<*>> {
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/FlowsUpdatesFilter.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/FlowsUpdatesFilter.kt
index 3c5fe89a8a..05b2fc0233 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/FlowsUpdatesFilter.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/FlowsUpdatesFilter.kt
@@ -12,9 +12,12 @@ import dev.inmo.tgbotapi.types.message.payments.InvoiceContent
 import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
+import dev.inmo.tgbotapi.utils.RiskFeature
+import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.*
 
+@RiskFeature(lowLevelRiskFeatureMessage)
 inline fun <reified T : MessageContent> filterForContentMessage(): suspend (ContentMessage<*>) -> ContentMessage<T>? = {
     if (it.content is T) {
         @Suppress("UNCHECKED_CAST")
@@ -25,9 +28,11 @@ inline fun <reified T : MessageContent> filterForContentMessage(): suspend (Cont
 }
 
 @Suppress("UNCHECKED_CAST")
+@RiskFeature(lowLevelRiskFeatureMessage)
 inline fun <reified T: MessageContent> Flow<BaseSentMessageUpdate>.filterContentMessages(
 ): Flow<ContentMessage<T>> = asContentMessagesFlow().mapNotNull(filterForContentMessage())
 
+@RiskFeature("This method is low-level")
 inline fun <reified T : MediaGroupContent> Flow<SentMediaGroupUpdate>.filterMediaGroupMessages(
 ): Flow<List<CommonMessage<T>>> = map {
     it.data.mapNotNull { message ->
@@ -46,6 +51,7 @@ inline fun <reified T : MediaGroupContent> Flow<SentMediaGroupUpdate>.filterMedi
  * [FlowsUpdatesFilter.channelPostFlow]. In case it is null will be used [Flow]s mapping
  */
 @Suppress("UNCHECKED_CAST")
+@RiskFeature(lowLevelRiskFeatureMessage)
 inline fun <reified T: MessageContent> FlowsUpdatesFilter.filterContentMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ): Flow<ContentMessage<T>> {
@@ -64,6 +70,7 @@ inline fun <reified T: MessageContent> FlowsUpdatesFilter.filterContentMessages(
  * [FlowsUpdatesFilter.channelPostFlow]. In case it is null will be used [Flow]s mapping
  */
 @Suppress("UNCHECKED_CAST")
+@RiskFeature(lowLevelRiskFeatureMessage)
 inline fun <reified T: MediaGroupContent> FlowsUpdatesFilter.filterMediaGroupMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ): Flow<List<CommonMessage<T>>> {
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/MediaGroupsShortcuts.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/MediaGroupsShortcuts.kt
index 031d187697..78376ea9ad 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/MediaGroupsShortcuts.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/MediaGroupsShortcuts.kt
@@ -8,13 +8,13 @@ import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
 
-val List<CommonMessage<MediaGroupContent>>.forwardInfo: ForwardInfo?
+val List<CommonMessage<out MediaGroupContent>>.forwardInfo: ForwardInfo?
     get() = firstOrNull() ?.forwardInfo
-val List<CommonMessage<MediaGroupContent>>.replyTo: Message?
+val List<CommonMessage<out MediaGroupContent>>.replyTo: Message?
     get() = firstOrNull() ?.replyTo
-val List<CommonMessage<MediaGroupContent>>.chat: Chat?
+val List<CommonMessage<out MediaGroupContent>>.chat: Chat?
     get() = firstOrNull() ?.chat
-val List<MediaGroupMessage>.mediaGroupId: MediaGroupIdentifier?
+val List<MediaGroupMessage<*>>.mediaGroupId: MediaGroupIdentifier?
     get() = firstOrNull() ?.mediaGroupId
 
 val SentMediaGroupUpdate.forwardInfo: ForwardInfo?
@@ -30,7 +30,7 @@ fun List<CommonMessage<MediaGroupContent>>.createResend(
     chatId: ChatId,
     disableNotification: Boolean = false,
     replyTo: MessageIdentifier? = null
-) = SendMediaGroup(
+) = SendMediaGroup<MediaGroupContent>(
     chatId,
     map { it.content.toMediaGroupMemberInputMedia() },
     disableNotification,
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CommandsFilters.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CommandsFilters.kt
index 6d553cf32e..192b612055 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CommandsFilters.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/CommandsFilters.kt
@@ -7,7 +7,6 @@ import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.message.content.fullEntitiesList
 import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
 import kotlinx.coroutines.flow.Flow
 
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt
index 4ee4c8fc40..29897d31aa 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt
@@ -1,5 +1,8 @@
+@file:Suppress("unused")
+
 package dev.inmo.tgbotapi.extensions.utils.updates
 
+import dev.inmo.tgbotapi.types.message.PassportMessage
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
 import kotlinx.coroutines.flow.Flow
@@ -23,11 +26,11 @@ fun <T : BaseSentMessageUpdate> Flow<T>.asCommonMessagesFlow() = mapNotNull {
 inline fun <T : BaseSentMessageUpdate> Flow<T>.chatEvents() = mapNotNull {
     it.data as? ChatEventMessage<*>
 }
-/**
- * Will map incoming [BaseSentMessageUpdate]s to [ChatEventMessage] from [BaseSentMessageUpdate.data]
- */
-@Deprecated("Renamed", ReplaceWith("chatEvents", "dev.inmo.tgbotapi.extensions.utils.updates.chatEvents"))
-fun <T : BaseSentMessageUpdate> Flow<T>.asChatEventsFlow() = chatEvents()
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun <T : BaseSentMessageUpdate> Flow<T>.passportMessages() = mapNotNull {
+    it.data as? PassportMessage
+}
 
 /**
  * Will map incoming [BaseSentMessageUpdate]s to [UnknownMessageType] from [BaseSentMessageUpdate.data]
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesUtils.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesUtils.kt
index 4d0963708f..63a3983c87 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesUtils.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/UpdatesUtils.kt
@@ -34,7 +34,7 @@ fun List<Update>.convertWithMediaGroupUpdates(): List<Update> {
     val resultUpdates = mutableListOf<Update>()
     val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<BaseSentMessageUpdate>>()
     for (update in this) {
-        val data = (update.data as? MediaGroupMessage)
+        val data = (update.data as? MediaGroupMessage<*>)
         if (data == null) {
             resultUpdates.add(update)
             continue
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
index b22778975d..7519638811 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
@@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.extensions.utils.updates.retrieving
 import dev.inmo.micro_utils.coroutines.ExceptionHandler
 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.RequestsExecutor
+import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.bot.exceptions.RequestException
 import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates
 import dev.inmo.tgbotapi.extensions.utils.updates.lastUpdateIdentifier
@@ -15,7 +16,7 @@ import dev.inmo.tgbotapi.updateshandlers.*
 import dev.inmo.tgbotapi.utils.*
 import kotlinx.coroutines.*
 
-fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
+fun TelegramBot.startGettingOfUpdatesByLongPolling(
     timeoutSeconds: Seconds = 30,
     scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
     exceptionsHandler: (ExceptionHandler<Unit>)? = null,
@@ -65,6 +66,33 @@ fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
     }
 }
 
+/**
+ * Will [startGettingOfUpdatesByLongPolling] using incoming [flowsUpdatesFilter]. It is assumed that you ALREADY CONFIGURE
+ * all updates receivers, because this method will trigger getting of updates and.
+ */
+fun TelegramBot.longPolling(
+    flowsUpdatesFilter: FlowsUpdatesFilter,
+    timeoutSeconds: Seconds = 30,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    exceptionsHandler: ExceptionHandler<Unit>? = null
+): Job = flowsUpdatesFilter.run {
+    startGettingOfUpdatesByLongPolling(timeoutSeconds, scope, exceptionsHandler, allowedUpdates, asUpdateReceiver)
+}
+
+/**
+ * Will enable [longPolling] by creating [FlowsUpdatesFilter] with [flowsUpdatesFilterUpdatesKeeperCount] as an argument
+ * and applied [flowUpdatesPreset]. It is assumed that you WILL CONFIGURE all updates receivers in [flowUpdatesPreset],
+ * because of after [flowUpdatesPreset] method calling will be triggered getting of updates.
+ */
+@Suppress("unused")
+fun TelegramBot.longPolling(
+    timeoutSeconds: Seconds = 30,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    exceptionsHandler: ExceptionHandler<Unit>? = null,
+    flowsUpdatesFilterUpdatesKeeperCount: Int = 100,
+    flowUpdatesPreset: FlowsUpdatesFilter.() -> Unit
+): Job = longPolling(FlowsUpdatesFilter(flowsUpdatesFilterUpdatesKeeperCount).apply(flowUpdatesPreset), timeoutSeconds, scope, exceptionsHandler)
+
 /**
  * This method will create a new one [FlowsUpdatesFilter]. This method could be unsafe due to the fact that it will start
  * getting updates IMMEDIATELY. That means that your bot will be able to skip some of them until you will call
@@ -72,6 +100,7 @@ fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
  * [flowUpdatesPreset] lambda - it will be called BEFORE starting updates getting
  */
 @FlowPreview
+@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
 @Suppress("unused")
 fun RequestsExecutor.startGettingFlowsUpdatesByLongPolling(
     timeoutSeconds: Seconds = 30,
@@ -97,6 +126,7 @@ fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
     updatesFilter.asUpdateReceiver
 )
 
+@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
 fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
     messageCallback: UpdateReceiver<MessageUpdate>? = null,
     messageMediaGroupCallback: UpdateReceiver<MessageMediaGroupUpdate>? = null,
@@ -141,6 +171,7 @@ fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
     )
 }
 
+@Deprecated("Will be removed soon", ReplaceWith("longPolling", "dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling"))
 @Suppress("unused")
 fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
     messageCallback: UpdateReceiver<MessageUpdate>? = null,
diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt
index 75ef278a8d..bae30b47ce 100644
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt
@@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.extensions.utils.updates.retrieving
 
 import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.UpdateReceiver
@@ -32,7 +33,7 @@ fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
         launch {
             for (update in updatesChannel) {
                 when (val data = update.data) {
-                    is MediaGroupMessage -> mediaGroupChannel.send("${data.mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
+                    is MediaGroupMessage<*> -> mediaGroupChannel.send("${data.mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
                     else -> output(update)
                 }
             }
diff --git a/tgbotapi/README.md b/tgbotapi/README.md
index 1732ce73fd..f28a163a68 100644
--- a/tgbotapi/README.md
+++ b/tgbotapi/README.md
@@ -5,6 +5,7 @@ Concentration of all TelegramBotAPI libraries:
 * [TelegramBotAPI Core](../tgbotapi.core/README.md)
 * [TelegramBotAPI Extensions](../tgbotapi.extensions.api/README.md)
 * [TelegramBotAPI Util Extensions](../tgbotapi.extensions.utils/README.md)
+* [TelegramBotAPI Behaviour Builder Extensions](../tgbotapi.extensions.behaviour_builder/README.md)
 
 ## Implementation
 
diff --git a/tgbotapi/build.gradle b/tgbotapi/build.gradle
index 36ee69d99c..29cf75b274 100644
--- a/tgbotapi/build.gradle
+++ b/tgbotapi/build.gradle
@@ -42,6 +42,7 @@ kotlin {
                 api project(":tgbotapi.core")
                 api project(":tgbotapi.extensions.api")
                 api project(":tgbotapi.extensions.utils")
+                api project(":tgbotapi.extensions.behaviour_builder")
             }
         }
     }
diff --git a/tgbotapi/mpp_publish_template.kpsb b/tgbotapi/mpp_publish_template.kpsb
index 1a4e5a3cdd..f41897a8f8 100644
--- a/tgbotapi/mpp_publish_template.kpsb
+++ b/tgbotapi/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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","description":"This project just include all subproject of TelegramBotAPI","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"}]}}
\ No newline at end of file
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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","description":"This project just include all subproject of TelegramBotAPI","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
\ No newline at end of file
diff --git a/tgbotapi/publish.gradle b/tgbotapi/publish.gradle
index c12a0bcb58..c862f41bc1 100644
--- a/tgbotapi/publish.gradle
+++ b/tgbotapi/publish.gradle
@@ -1,8 +1,12 @@
 apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
+task sourceJar (type : Jar) {
+    classifier = 'sources'
+}
 
 afterEvaluate {
     project.publishing.publications.all {
@@ -10,6 +14,7 @@ afterEvaluate {
         groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
             artifactId = "${project.name}"
+            artifact sourceJar
         } else {
             artifactId = "${project.name}-$name"
         }
@@ -62,4 +67,9 @@ publishing {
         }
         
     }
-}
\ No newline at end of file
+}
+
+signing {
+    useGpgCmd()
+    publishing.publications.forEach { sign it }
+}