diff --git a/Cargo.lock b/Cargo.lock
index 1202ca1..6dfdfc9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -901,18 +901,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
 
 [[package]]
 name = "crypto-common"
@@ -1997,11 +1997,11 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "libc",
 ]
 
@@ -2280,7 +2280,7 @@ dependencies = [
 [[package]]
 name = "mtp"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "mtp-client",
  "mtp-codec",
@@ -2294,7 +2294,7 @@ dependencies = [
 [[package]]
 name = "mtp-client"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "mtp-codec",
  "mtp-common",
@@ -2307,7 +2307,7 @@ dependencies = [
 [[package]]
 name = "mtp-codec"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "base64",
  "byteorder",
@@ -2320,7 +2320,7 @@ dependencies = [
 [[package]]
 name = "mtp-common"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "quinn",
  "rustls",
@@ -2331,7 +2331,7 @@ dependencies = [
 [[package]]
 name = "mtp-crypto"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "base64",
  "chacha20poly1305",
@@ -2350,7 +2350,7 @@ dependencies = [
 [[package]]
 name = "mtp-files"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "mtp-crypto",
  "thiserror 1.0.69",
@@ -2359,7 +2359,7 @@ dependencies = [
 [[package]]
 name = "mtp-host"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "mtp-codec",
  "mtp-common",
@@ -2372,11 +2372,12 @@ dependencies = [
 [[package]]
 name = "mtp-transport"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "log",
  "mtp-codec",
  "mtp-common",
+ "rcgen",
  "rustls",
  "rustls-native-certs",
  "tokio",
@@ -2386,7 +2387,7 @@ dependencies = [
 [[package]]
 name = "mtp-type-map"
 version = "0.1.0"
-source = "git+https://git.methanium.net/methanium/mtp#515244ce6664b355f0a89b00c8c18c26c8b95dbd"
+source = "git+https://git.methanium.net/methanium/mtp#2126a142f44634ccfdcaa297633fdb63b1d9b46d"
 dependencies = [
  "serde",
  "serde_yaml",
@@ -2445,11 +2446,10 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -2898,6 +2898,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57f6d249aad744e274e682777a50283a225a32705394ee6d5fcc01efa25e4055"
 dependencies = [
  "aws-lc-rs",
+ "pem",
+ "ring",
  "rustls-pki-types",
  "time",
  "x509-parser",
@@ -3168,9 +3170,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "ryu"
@@ -4580,6 +4582,7 @@ dependencies = [
  "lazy_static",
  "nom",
  "oid-registry",
+ "ring",
  "rusticata-macros",
  "thiserror 2.0.18",
  "time",
@@ -4620,18 +4623,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.52"
+version = "0.8.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
+checksum = "75726053136156d419e285b9b7eddaaea9e3fea6ce32eed44a89901f0bd98de1"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.52"
+version = "0.8.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
+checksum = "4714fd92cf900833d49538023a9b3915155210801d1c1169eba513b2addefd71"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/type-maps.yaml b/type-maps.yaml
index 0eebb7f..dddd7a2 100644
--- a/type-maps.yaml
+++ b/type-maps.yaml
@@ -1,8 +1,46 @@
-# The version a Client should use
 protocol_version: "1.0"
 
+# Note that markers 0 to 31 are reserved for default use, manually working with them is not recommended
+
+# Fixed CommunicationType markers are:
+#   Error: 0
+#   ErrorParsing: 1
+#   ErrorBadVersion: 2
+#   Disconnect: 3
+#   Redirect: 4
+#   Shutdown: 5
+#   BadRequest: 6
+#   Unauthorized: 7
+#   Forbidden: 8
+#   NotFound: 9
+#   TooManyRequests: 10
+#   InternalServerError: 11
+#   BadGateway: 12
+#   ServiceUnavailable: 13
+#   GatewayTimeout: 14
+#   Identification: 15
+#   IdentificationResponse: 16
+#   Register: 17
+#   RegisterResponse: 18
+#   Ping: 19
+#   Pong: 20
+
+# Fixed Data Type markers are:
+#   Error: 0
+#   ErrorParsing: 1
+#   ErrorMessage: 2
+#   Version: 3
+#   Description: 4
+#   Timestamp: 5
+#   Id: 6
+#   ClientNonce: 7
+#   ServerNonce: 8
+#   PublicKeys: 9
+#   Signature: 10
+#   Connected: 11
+
 type_maps:
-  "1.0": # Protocol version 1.0
+  "1.0":
     CommunicationTypes:
       ErrorProtocol: 33
       ErrorAnonymous: 34
@@ -33,6 +71,7 @@ type_maps:
       MessageLive: 59
       MessageOtherIota: 60
       MessageChunk: 61
+      MessageGet: 143
       MessagesGet: 62
       PushNotification: 63
       ReadNotification: 64
@@ -104,6 +143,11 @@ type_maps:
       GetChatSecret: 140
       ChatSecretResponse: 141
       ChatSecretForward: 142
+      MessageEditLive: 144
+      MessageEdit: 145
+      MessageReactionAdd: 146
+      MessageReactionRemove: 147
+      MessageReactionLive: 148
     DataTypes:
       ErrorType: 32
       ErrorProtocol: 33
@@ -218,4 +262,7 @@ type_maps:
       SenderUserId: 152
       RecipientUserId: 153
       Recipients: 154
-      ReplyId: 155
+      Edited: 155
+      Reactions: 156
+      Reaction: 157
+      ReplyId: 158