diff --git a/bridge-proxy/wasm/Cargo.lock b/bridge-proxy/wasm/Cargo.lock
index ef9e2b07..db1fc988 100644
--- a/bridge-proxy/wasm/Cargo.lock
+++ b/bridge-proxy/wasm/Cargo.lock
@@ -129,7 +129,7 @@ dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -142,7 +142,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -212,17 +212,6 @@ version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
-[[package]]
-name = "syn"
-version = "2.0.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.39"
diff --git a/multi-transfer-esdt/wasm/Cargo.lock b/multi-transfer-esdt/wasm/Cargo.lock
index f64879dc..e8fc44b3 100644
--- a/multi-transfer-esdt/wasm/Cargo.lock
+++ b/multi-transfer-esdt/wasm/Cargo.lock
@@ -68,6 +68,20 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
+[[package]]
+name = "esdt-safe"
+version = "0.0.0"
+dependencies = [
+ "eth-address",
+ "fee-estimator-module",
+ "max-bridged-amount-module",
+ "multiversx-sc",
+ "multiversx-sc-modules",
+ "token-module",
+ "transaction",
+ "tx-batch-module",
+]
+
 [[package]]
 name = "eth-address"
 version = "0.0.0"
@@ -75,6 +89,13 @@ dependencies = [
  "multiversx-sc",
 ]
 
+[[package]]
+name = "fee-estimator-module"
+version = "0.0.0"
+dependencies = [
+ "multiversx-sc",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.14.3"
@@ -110,9 +131,12 @@ version = "0.0.0"
 dependencies = [
  "bridge-proxy",
  "bridged-tokens-wrapper",
+ "esdt-safe",
  "eth-address",
  "max-bridged-amount-module",
  "multiversx-sc",
+ "multiversx-sc-modules",
+ "token-module",
  "transaction",
  "tx-batch-module",
 ]
@@ -127,15 +151,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-<<<<<<< HEAD
-version = "0.45.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11b51d6a2ab0218585ed58e100c5ac2218de09490fbfc4243b5ecd0ca7f5cbc"
-=======
 version = "0.45.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2bdb196b3ff2b9f8c744ec2e026c22c8e02bc91e5c6ed09951415c47fef6b8"
->>>>>>> origin/mintBurn-or-locking
 dependencies = [
  "bitflags",
  "hashbrown",
@@ -147,15 +165,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-<<<<<<< HEAD
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327b0ad1c3477cab0d7c84391439ba302238f738ef3c6e1fcd18e247fba84875"
-=======
 version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19908153158c03df4582af08f47c0eb39fb52a7dff4736b301a66acbbb9955d3"
->>>>>>> origin/mintBurn-or-locking
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -163,15 +175,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-<<<<<<< HEAD
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f444038e0043b8eda816b26952479c2aca3c4a643580f4337f71fb362a586db5"
-=======
 version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3b03b43f9cad320992f54ed162de2ed63e3ec83ed01361e57ee9c1865fba5a2"
->>>>>>> origin/mintBurn-or-locking
 dependencies = [
  "hex",
  "proc-macro2",
@@ -181,15 +187,9 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-<<<<<<< HEAD
-version = "0.45.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784f0fc505806102fe6f808b368e12fcb13096dd73c5678f09c5663230724d6f"
-=======
 version = "0.45.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e60b5dce707f61376f74d713218f75326121d9f6a5f09a3a63de7aea2a92be9"
->>>>>>> origin/mintBurn-or-locking
 dependencies = [
  "hex",
  "proc-macro2",
@@ -200,30 +200,18 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-<<<<<<< HEAD
-version = "0.45.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cc759dda52661f2fc776dfd810a6e90e681d4697a8c866d0f23f3e068f1b29"
-=======
 version = "0.45.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5833f8bc88104357d38a8952d2a16c3e66080e2e512c0e7001c0c003006c475"
->>>>>>> origin/mintBurn-or-locking
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-<<<<<<< HEAD
-version = "0.45.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5afb8b8cc380eabd82dc8f9b02afbab3dce16fc2b5de1dbc601fcfcf261278ba"
-=======
 version = "0.45.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4299660d5413d9f120bfddda8105b1f9d28f0345a72f53e5dc90732c4983e45"
->>>>>>> origin/mintBurn-or-locking
 dependencies = [
  "multiversx-sc",
 ]
@@ -297,6 +285,14 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "token-module"
+version = "0.0.0"
+dependencies = [
+ "fee-estimator-module",
+ "multiversx-sc",
+]
+
 [[package]]
 name = "transaction"
 version = "0.0.0"
diff --git a/multi-transfer-esdt/wasm/src/lib.rs b/multi-transfer-esdt/wasm/src/lib.rs
index 3d0b6ff9..6f0baa97 100644
--- a/multi-transfer-esdt/wasm/src/lib.rs
+++ b/multi-transfer-esdt/wasm/src/lib.rs
@@ -5,12 +5,12 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           18
+// Endpoints:                           20
 // Async Callback (empty):               1
-// Total number of exported functions:  20
+// Total number of exported functions:  22
 
 #![no_std]
-#![allow(internal_features)]
+
 // Configuration that works with rustc < 1.73.0.
 // TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
diff --git a/multisig/wasm/Cargo.lock b/multisig/wasm/Cargo.lock
index fdbb3e19..28af16f8 100644
--- a/multisig/wasm/Cargo.lock
+++ b/multisig/wasm/Cargo.lock
@@ -131,9 +131,12 @@ version = "0.0.0"
 dependencies = [
  "bridge-proxy",
  "bridged-tokens-wrapper",
+ "esdt-safe",
  "eth-address",
  "max-bridged-amount-module",
  "multiversx-sc",
+ "multiversx-sc-modules",
+ "token-module",
  "transaction",
  "tx-batch-module",
 ]