diff --git a/Cargo.lock b/Cargo.lock
index 9ad711c8..c2445f48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3291,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3346,7 +3346,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3354,7 +3354,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "serde",
  "tracing",
@@ -3366,12 +3366,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "flume",
  "json5",
@@ -3393,7 +3393,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3405,7 +3405,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "aes",
  "hmac",
@@ -3418,7 +3418,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -3432,7 +3432,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3450,7 +3450,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "flume",
@@ -3474,7 +3474,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3505,7 +3505,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3523,7 +3523,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3553,7 +3553,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3574,7 +3574,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "futures",
@@ -3594,7 +3594,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3615,7 +3615,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3626,7 +3626,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "libloading",
  "serde",
@@ -3641,7 +3641,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "const_format",
  "rand",
@@ -3672,7 +3672,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "anyhow",
 ]
@@ -3680,7 +3680,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "futures",
  "lazy_static",
@@ -3695,7 +3695,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -3709,7 +3709,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "futures",
  "tokio",
@@ -3722,7 +3722,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-trait",
  "flume",
@@ -3754,7 +3754,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#a6d117be3cbe62b337a44d5e43de5b11ac7cf188"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#fc18f90310cd451a2f3d6e579dd9cfd9dba4bda6"
 dependencies = [
  "async-std",
  "async-trait",
diff --git a/src/encoding.rs b/src/encoding.rs
index bc624aa7..120b12ed 100644
--- a/src/encoding.rs
+++ b/src/encoding.rs
@@ -52,11 +52,29 @@ impl Encoding {
     #[classattr]
     const ZENOH_BYTES: Self = Self(zenoh::encoding::Encoding::ZENOH_BYTES);
     #[classattr]
-    const ZENOH_INT: Self = Self(zenoh::encoding::Encoding::ZENOH_INT);
+    const ZENOH_INT8: Self = Self(zenoh::encoding::Encoding::ZENOH_INT8);
     #[classattr]
-    const ZENOH_UINT: Self = Self(zenoh::encoding::Encoding::ZENOH_UINT);
+    const ZENOH_INT16: Self = Self(zenoh::encoding::Encoding::ZENOH_INT16);
     #[classattr]
-    const ZENOH_FLOAT: Self = Self(zenoh::encoding::Encoding::ZENOH_FLOAT);
+    const ZENOH_INT32: Self = Self(zenoh::encoding::Encoding::ZENOH_INT32);
+    #[classattr]
+    const ZENOH_INT64: Self = Self(zenoh::encoding::Encoding::ZENOH_INT64);
+    #[classattr]
+    const ZENOH_INT128: Self = Self(zenoh::encoding::Encoding::ZENOH_INT128);
+    #[classattr]
+    const ZENOH_UINT8: Self = Self(zenoh::encoding::Encoding::ZENOH_UINT8);
+    #[classattr]
+    const ZENOH_UINT16: Self = Self(zenoh::encoding::Encoding::ZENOH_UINT16);
+    #[classattr]
+    const ZENOH_UINT32: Self = Self(zenoh::encoding::Encoding::ZENOH_UINT32);
+    #[classattr]
+    const ZENOH_UINT64: Self = Self(zenoh::encoding::Encoding::ZENOH_UINT64);
+    #[classattr]
+    const ZENOH_UINT128: Self = Self(zenoh::encoding::Encoding::ZENOH_UINT128);
+    #[classattr]
+    const ZENOH_FLOAT32: Self = Self(zenoh::encoding::Encoding::ZENOH_FLOAT32);
+    #[classattr]
+    const ZENOH_FLOAT64: Self = Self(zenoh::encoding::Encoding::ZENOH_FLOAT64);
     #[classattr]
     const ZENOH_BOOL: Self = Self(zenoh::encoding::Encoding::ZENOH_BOOL);
     #[classattr]