diff --git a/common/sc-proxies/src/esdt_safe_proxy.rs b/common/sc-proxies/src/esdt_safe_proxy.rs
index 3b29e253..3501f54b 100644
--- a/common/sc-proxies/src/esdt_safe_proxy.rs
+++ b/common/sc-proxies/src/esdt_safe_proxy.rs
@@ -239,14 +239,17 @@ where
     /// Useful for knowing which token IDs to pass to the claimRefund endpoint. 
     pub fn get_refund_amounts<
         Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<OptionalValue<MultiValueEncoded<Env::Api, TokenIdentifier<Env::Api>>>>,
     >(
         self,
         address: Arg0,
+        opt_tokens: Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, MultiValue2<TokenIdentifier<Env::Api>, BigUint<Env::Api>>>> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call("getRefundAmounts")
             .argument(&address)
+            .argument(&opt_tokens)
             .original_result()
     }
 
@@ -374,14 +377,17 @@ where
     /// where percentages must add up to the PERCENTAGE_TOTAL constant 
     pub fn distribute_fees<
         Arg0: ProxyArg<ManagedVec<Env::Api, token_module::AddressPercentagePair<Env::Api>>>,
+        Arg1: ProxyArg<OptionalValue<MultiValueEncoded<Env::Api, TokenIdentifier<Env::Api>>>>,
     >(
         self,
         address_percentage_pairs: Arg0,
+        opt_tokens_to_distribute: Arg1,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call("distributeFees")
             .argument(&address_percentage_pairs)
+            .argument(&opt_tokens_to_distribute)
             .original_result()
     }
 
@@ -568,6 +574,19 @@ where
             .original_result()
     }
 
+    pub fn supply_mint_burn_initialized<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getsupplyMintBurnInitialized")
+            .argument(&token_id)
+            .original_result()
+    }
+
     pub fn set_max_tx_batch_size<
         Arg0: ProxyArg<usize>,
     >(
diff --git a/common/sc-proxies/src/mock_multisig_proxy.rs b/common/sc-proxies/src/mock_multisig_proxy.rs
new file mode 100644
index 00000000..8f23fa83
--- /dev/null
+++ b/common/sc-proxies/src/mock_multisig_proxy.rs
@@ -0,0 +1,156 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct MockMultisigProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for MockMultisigProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = MockMultisigProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        MockMultisigProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct MockMultisigProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> MockMultisigProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg2: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg3: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg4: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg5: ProxyArg<BigUint<Env::Api>>,
+        Arg6: ProxyArg<BigUint<Env::Api>>,
+        Arg7: ProxyArg<usize>,
+        Arg8: ProxyArg<MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        esdt_safe_sc_address: Arg0,
+        multi_transfer_sc_address: Arg1,
+        proxy_sc_address: Arg2,
+        bridged_tokens_wrapper_sc_address: Arg3,
+        price_aggregator_sc_address: Arg4,
+        _required_stake: Arg5,
+        _slash_amount: Arg6,
+        _quorum: Arg7,
+        _board: Arg8,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .argument(&esdt_safe_sc_address)
+            .argument(&multi_transfer_sc_address)
+            .argument(&proxy_sc_address)
+            .argument(&bridged_tokens_wrapper_sc_address)
+            .argument(&price_aggregator_sc_address)
+            .argument(&_required_stake)
+            .argument(&_slash_amount)
+            .argument(&_quorum)
+            .argument(&_board)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MockMultisigProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade(
+        self,
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> MockMultisigProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn esdt_safe_address(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getEsdtSafeAddress")
+            .original_result()
+    }
+
+    pub fn multi_transfer_esdt_address(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getMultiTransferEsdtAddress")
+            .original_result()
+    }
+
+    pub fn proxy_address(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getProxyAddress")
+            .original_result()
+    }
+
+    pub fn bridged_tokens_wrapper_address(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getBridgedTokensWrapperAddress")
+            .original_result()
+    }
+
+    pub fn fee_estimator_address(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getFeeEstimatorAddress")
+            .original_result()
+    }
+}
diff --git a/common/sc-proxies/src/multisig_proxy.rs b/common/sc-proxies/src/multisig_proxy.rs
index 80334b47..8a92e992 100644
--- a/common/sc-proxies/src/multisig_proxy.rs
+++ b/common/sc-proxies/src/multisig_proxy.rs
@@ -315,21 +315,18 @@ where
     pub fn upgrade_child_contract_from_source<
         Arg0: ProxyArg<ManagedAddress<Env::Api>>,
         Arg1: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg2: ProxyArg<bool>,
-        Arg3: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg2: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
     >(
         self,
         child_sc_address: Arg0,
         source_address: Arg1,
-        is_payable: Arg2,
-        init_args: Arg3,
+        init_args: Arg2,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call("upgradeChildContractFromSource")
             .argument(&child_sc_address)
             .argument(&source_address)
-            .argument(&is_payable)
             .argument(&init_args)
             .original_result()
     }
@@ -887,8 +884,6 @@ where
             .original_result()
     }
 
-    /// Actions are cleared after execution, so an empty entry means the action was executed already 
-    /// Returns "false" if the action ID is invalid 
     pub fn was_action_executed<
         Arg0: ProxyArg<usize>,
     >(
diff --git a/common/token-module/src/lib.rs b/common/token-module/src/lib.rs
index a795a4b8..a162afa7 100644
--- a/common/token-module/src/lib.rs
+++ b/common/token-module/src/lib.rs
@@ -240,7 +240,7 @@ pub trait TokenModule:
     ) {
         self.require_token_in_whitelist(token_id);
         require!(
-            self.supply_mint_burn_initialized(token_id).get() == false,
+            !self.supply_mint_burn_initialized(token_id).get(),
             "Token already initialized"
         );
         require!(
diff --git a/esdt-safe/tests/esdt_safe_blackbox_test.rs b/esdt-safe/tests/esdt_safe_blackbox_test.rs
index 2cd1a3ad..2e69849b 100644
--- a/esdt-safe/tests/esdt_safe_blackbox_test.rs
+++ b/esdt-safe/tests/esdt_safe_blackbox_test.rs
@@ -1123,12 +1123,14 @@ fn claim_refund_test() {
     state.single_transaction_should_work(MINT_BURN_TOKEN, 1000u64);
     state.set_transaction_batch_status_should_work(1, tx_statuses.clone());
 
+    let opt_tokens: OptionalValue<MultiValueEncoded<StaticApi, TokenIdentifier<StaticApi>>> =
+        OptionalValue::None;
     let refund = state
         .world
         .query()
         .to(ESDT_SAFE_ADDRESS)
         .typed(esdt_safe_proxy::EsdtSafeProxy)
-        .get_refund_amounts(MULTISIG_ADDRESS)
+        .get_refund_amounts(MULTISIG_ADDRESS, opt_tokens.clone())
         .returns(ReturnsResult)
         .run();
 
@@ -1150,7 +1152,7 @@ fn claim_refund_test() {
         .query()
         .to(ESDT_SAFE_ADDRESS)
         .typed(esdt_safe_proxy::EsdtSafeProxy)
-        .get_refund_amounts(OWNER_ADDRESS)
+        .get_refund_amounts(OWNER_ADDRESS, opt_tokens)
         .returns(ReturnsResult)
         .run();
     assert!(refund_after.is_empty());
diff --git a/esdt-safe/wasm/src/lib.rs b/esdt-safe/wasm/src/lib.rs
index 283851b2..3f1f6eaa 100644
--- a/esdt-safe/wasm/src/lib.rs
+++ b/esdt-safe/wasm/src/lib.rs
@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           44
+// Endpoints:                           45
 // Async Callback (empty):               1
-// Total number of exported functions:  47
+// Total number of exported functions:  48
 
 #![no_std]
 
@@ -51,6 +51,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         getTotalBalances => total_balances
         getMintBalances => mint_balances
         getBurnBalances => burn_balances
+        getsupplyMintBurnInitialized => supply_mint_burn_initialized
         setMaxTxBatchSize => set_max_tx_batch_size
         setMaxTxBatchBlockDuration => set_max_tx_batch_block_duration
         getCurrentTxBatch => get_current_tx_batch
diff --git a/multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs b/multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs
index 8f00b06c..3d5d822b 100644
--- a/multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs
+++ b/multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs
@@ -151,7 +151,7 @@ impl MultiTransferTestState {
             .account(USER2_ADDRESS)
             .nonce(1);
 
-        let roles = vec![
+        let roles = [
             "ESDTRoleLocalMint".to_string(),
             "ESDTRoleLocalBurn".to_string(),
         ];
diff --git a/multisig/src/esdt_safe_proxy.rs b/multisig/src/esdt_safe_proxy.rs
deleted file mode 100644
index 59e564f3..00000000
--- a/multisig/src/esdt_safe_proxy.rs
+++ /dev/null
@@ -1,828 +0,0 @@
-// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
-
-////////////////////////////////////////////////////
-////////////////// AUTO-GENERATED //////////////////
-////////////////////////////////////////////////////
-
-#![allow(dead_code)]
-#![allow(clippy::all)]
-
-use multiversx_sc::proxy_imports::*;
-
-pub struct EsdtSafeProxy;
-
-impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for EsdtSafeProxy
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    type TxProxyMethods = EsdtSafeProxyMethods<Env, From, To, Gas>;
-
-    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
-        EsdtSafeProxyMethods { wrapped_tx: tx }
-    }
-}
-
-pub struct EsdtSafeProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
-}
-
-#[rustfmt::skip]
-impl<Env, From, Gas> EsdtSafeProxyMethods<Env, From, (), Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    Gas: TxGas<Env>,
-{
-    /// fee_estimator_contract_address - The address of a Price Aggregator contract, 
-    /// which will get the price of token A in token B 
-    ///  
-    /// eth_tx_gas_limit - The gas limit that will be used for transactions on the ETH side. 
-    /// Will be used to compute the fees for the transfer 
-    pub fn init<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg2: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        fee_estimator_contract_address: Arg0,
-        multi_transfer_contract_address: Arg1,
-        eth_tx_gas_limit: Arg2,
-    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_deploy()
-            .argument(&fee_estimator_contract_address)
-            .argument(&multi_transfer_contract_address)
-            .argument(&eth_tx_gas_limit)
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> EsdtSafeProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg2: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg3: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        fee_estimator_contract_address: Arg0,
-        multi_transfer_contract_address: Arg1,
-        bridge_proxy_contract_address: Arg2,
-        eth_tx_gas_limit: Arg3,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&fee_estimator_contract_address)
-            .argument(&multi_transfer_contract_address)
-            .argument(&bridge_proxy_contract_address)
-            .argument(&eth_tx_gas_limit)
-            .original_result()
-    }
-}
-
-#[rustfmt::skip]
-impl<Env, From, To, Gas> EsdtSafeProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    /// Sets the statuses for the transactions, after they were executed on the Ethereum side. 
-    ///  
-    /// Only TransactionStatus::Executed (3) and TransactionStatus::Rejected (4) values are allowed. 
-    /// Number of provided statuses must be equal to number of transactions in the batch. 
-    pub fn set_transaction_batch_status<
-        Arg0: ProxyArg<u64>,
-        Arg1: ProxyArg<MultiValueEncoded<Env::Api, transaction::transaction_status::TransactionStatus>>,
-    >(
-        self,
-        batch_id: Arg0,
-        tx_statuses: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setTransactionBatchStatus")
-            .argument(&batch_id)
-            .argument(&tx_statuses)
-            .original_result()
-    }
-
-    /// Converts failed Ethereum -> MultiversX transactions to MultiversX -> Ethereum transaction. 
-    /// This is done every now and then to refund the tokens. 
-    ///  
-    /// As with normal MultiversX -> Ethereum transactions, a part of the tokens will be 
-    /// subtracted to pay for the fees 
-    pub fn add_refund_batch<
-        Arg0: ProxyArg<ManagedVec<Env::Api, transaction::Transaction<Env::Api>>>,
-    >(
-        self,
-        refund_transactions: Arg0,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("addRefundBatch")
-            .argument(&refund_transactions)
-            .original_result()
-    }
-
-    /// Create an MultiversX -> Ethereum transaction. Only fungible tokens are accepted. 
-    ///  
-    /// Every transfer will have a part of the tokens subtracted as fees. 
-    /// The fee amount depends on the global eth_tx_gas_limit 
-    /// and the current GWEI price, respective to the bridged token 
-    ///  
-    /// fee_amount = price_per_gas_unit * eth_tx_gas_limit 
-    pub fn create_transaction<
-        Arg0: ProxyArg<eth_address::EthAddress<Env::Api>>,
-        Arg1: ProxyArg<OptionalValue<RefundInfo<Env::Api>>>,
-    >(
-        self,
-        to: Arg0,
-        opt_refund_info: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("createTransaction")
-            .argument(&to)
-            .argument(&opt_refund_info)
-            .original_result()
-    }
-
-    pub fn create_transaction_sc_call<
-        Arg0: ProxyArg<eth_address::EthAddress<Env::Api>>,
-        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
-        Arg2: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
-    >(
-        self,
-        to: Arg0,
-        data: Arg1,
-        opt_refund_address: Arg2,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("createTransactionSCCall")
-            .argument(&to)
-            .argument(&data)
-            .argument(&opt_refund_address)
-            .original_result()
-    }
-
-    /// Claim funds for failed MultiversX -> Ethereum transactions. 
-    /// These are not sent automatically to prevent the contract getting stuck. 
-    /// For example, if the receiver is a SC, a frozen account, etc. 
-    pub fn claim_refund<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, EsdtTokenPayment<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("claimRefund")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn set_bridged_tokens_wrapper_contract_address<
-        Arg0: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
-    >(
-        self,
-        opt_address: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setBridgedTokensWrapperAddress")
-            .argument(&opt_address)
-            .original_result()
-    }
-
-    pub fn set_bridge_proxy_contract_address<
-        Arg0: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
-    >(
-        self,
-        opt_new_address: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setBridgeProxyContractAddress")
-            .argument(&opt_new_address)
-            .original_result()
-    }
-
-    pub fn withdraw_refund_fees_for_ethereum<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        multisig_owner: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("withdrawRefundFeesForEthereum")
-            .argument(&token_id)
-            .argument(&multisig_owner)
-            .original_result()
-    }
-
-    pub fn withdraw_transaction_fees<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<ManagedAddress<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        multisig_owner: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("withdrawTransactionFees")
-            .argument(&token_id)
-            .argument(&multisig_owner)
-            .original_result()
-    }
-
-    pub fn compute_total_amounts_from_index<
-        Arg0: ProxyArg<u64>,
-        Arg1: ProxyArg<u64>,
-    >(
-        self,
-        start_index: Arg0,
-        end_index: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("computeTotalAmmountsFromIndex")
-            .argument(&start_index)
-            .argument(&end_index)
-            .original_result()
-    }
-
-    /// Query function that lists all refund amounts for a user. 
-    /// Useful for knowing which token IDs to pass to the claimRefund endpoint. 
-    pub fn get_refund_amounts<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-    >(
-        self,
-        address: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, MultiValue2<TokenIdentifier<Env::Api>, BigUint<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getRefundAmounts")
-            .argument(&address)
-            .original_result()
-    }
-
-    pub fn get_total_refund_amounts(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, MultiValue2<TokenIdentifier<Env::Api>, BigUint<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getTotalRefundAmounts")
-            .original_result()
-    }
-
-    pub fn get_refund_fees_for_ethereum<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getRefundFeesForEthereum")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn get_transaction_fees<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getTransactionFees")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn bridged_tokens_wrapper_address(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getBridgedTokensWrapperAddress")
-            .original_result()
-    }
-
-    pub fn bridge_proxy_contract_address(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getBridgeProxyContractAddress")
-            .original_result()
-    }
-
-    pub fn set_fee_estimator_contract_address<
-        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
-    >(
-        self,
-        new_address: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setFeeEstimatorContractAddress")
-            .argument(&new_address)
-            .original_result()
-    }
-
-    pub fn set_eth_tx_gas_limit<
-        Arg0: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        new_limit: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setEthTxGasLimit")
-            .argument(&new_limit)
-            .original_result()
-    }
-
-    /// Default price being used if the aggregator lacks a mapping for this token 
-    /// or the aggregator address is not set 
-    pub fn set_default_price_per_gas_unit<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        default_price_per_gas_unit: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setDefaultPricePerGasUnit")
-            .argument(&token_id)
-            .argument(&default_price_per_gas_unit)
-            .original_result()
-    }
-
-    /// Token ticker being used when querying the aggregator for GWEI prices 
-    pub fn set_token_ticker<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        ticker: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setTokenTicker")
-            .argument(&token_id)
-            .argument(&ticker)
-            .original_result()
-    }
-
-    /// Returns the fee for the given token ID (the fee amount is in the given token) 
-    pub fn calculate_required_fee<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("calculateRequiredFee")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn fee_estimator_contract_address(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getFeeEstimatorContractAddress")
-            .original_result()
-    }
-
-    pub fn default_price_per_gas_unit<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getDefaultPricePerGasUnit")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn eth_tx_gas_limit(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getEthTxGasLimit")
-            .original_result()
-    }
-
-    /// Distributes the accumulated fees to the given addresses. 
-    /// Expected arguments are pairs of (address, percentage), 
-    /// where percentages must add up to the PERCENTAGE_TOTAL constant 
-    pub fn distribute_fees<
-        Arg0: ProxyArg<ManagedVec<Env::Api, token_module::AddressPercentagePair<Env::Api>>>,
-    >(
-        self,
-        address_percentage_pairs: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("distributeFees")
-            .argument(&address_percentage_pairs)
-            .original_result()
-    }
-
-    pub fn add_token_to_whitelist<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
-        Arg2: ProxyArg<bool>,
-        Arg3: ProxyArg<bool>,
-        Arg4: ProxyArg<BigUint<Env::Api>>,
-        Arg5: ProxyArg<BigUint<Env::Api>>,
-        Arg6: ProxyArg<BigUint<Env::Api>>,
-        Arg7: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        token_id: Arg0,
-        ticker: Arg1,
-        mint_burn_token: Arg2,
-        native_token: Arg3,
-        total_balance: Arg4,
-        mint_balance: Arg5,
-        burn_balance: Arg6,
-        opt_default_price_per_gas_unit: Arg7,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("addTokenToWhitelist")
-            .argument(&token_id)
-            .argument(&ticker)
-            .argument(&mint_burn_token)
-            .argument(&native_token)
-            .argument(&total_balance)
-            .argument(&mint_balance)
-            .argument(&burn_balance)
-            .argument(&opt_default_price_per_gas_unit)
-            .original_result()
-    }
-
-    pub fn remove_token_from_whitelist<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("removeTokenFromWhitelist")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn get_tokens<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        amount: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getTokens")
-            .argument(&token_id)
-            .argument(&amount)
-            .original_result()
-    }
-
-    pub fn init_supply<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        amount: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("initSupply")
-            .argument(&token_id)
-            .argument(&amount)
-            .original_result()
-    }
-
-    pub fn init_supply_mint_burn<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-        Arg2: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        mint_amount: Arg1,
-        burn_amount: Arg2,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("initSupplyMintBurn")
-            .argument(&token_id)
-            .argument(&mint_amount)
-            .argument(&burn_amount)
-            .original_result()
-    }
-
-    pub fn set_multi_transfer_contract_address<
-        Arg0: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
-    >(
-        self,
-        opt_new_address: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setMultiTransferContractAddress")
-            .argument(&opt_new_address)
-            .original_result()
-    }
-
-    pub fn token_whitelist(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, TokenIdentifier<Env::Api>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getAllKnownTokens")
-            .original_result()
-    }
-
-    pub fn native_token<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("isNativeToken")
-            .argument(&token)
-            .original_result()
-    }
-
-    pub fn mint_burn_token<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("isMintBurnToken")
-            .argument(&token)
-            .original_result()
-    }
-
-    pub fn multi_transfer_contract_address(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getMultiTransferContractAddress")
-            .original_result()
-    }
-
-    pub fn accumulated_transaction_fees<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getAccumulatedTransactionFees")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn total_balances<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getTotalBalances")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn mint_balances<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getMintBalances")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn burn_balances<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getBurnBalances")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn set_max_tx_batch_size<
-        Arg0: ProxyArg<usize>,
-    >(
-        self,
-        new_max_tx_batch_size: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setMaxTxBatchSize")
-            .argument(&new_max_tx_batch_size)
-            .original_result()
-    }
-
-    pub fn set_max_tx_batch_block_duration<
-        Arg0: ProxyArg<u64>,
-    >(
-        self,
-        new_max_tx_batch_block_duration: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setMaxTxBatchBlockDuration")
-            .argument(&new_max_tx_batch_block_duration)
-            .original_result()
-    }
-
-    pub fn get_current_tx_batch(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OptionalValue<MultiValue2<u64, MultiValueEncoded<Env::Api, MultiValue6<u64, u64, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, TokenIdentifier<Env::Api>, BigUint<Env::Api>>>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getCurrentTxBatch")
-            .original_result()
-    }
-
-    pub fn get_first_batch_any_status(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OptionalValue<MultiValue2<u64, MultiValueEncoded<Env::Api, MultiValue6<u64, u64, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, TokenIdentifier<Env::Api>, BigUint<Env::Api>>>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getFirstBatchAnyStatus")
-            .original_result()
-    }
-
-    pub fn get_batch<
-        Arg0: ProxyArg<u64>,
-    >(
-        self,
-        batch_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OptionalValue<MultiValue2<u64, MultiValueEncoded<Env::Api, MultiValue6<u64, u64, ManagedBuffer<Env::Api>, ManagedBuffer<Env::Api>, TokenIdentifier<Env::Api>, BigUint<Env::Api>>>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getBatch")
-            .argument(&batch_id)
-            .original_result()
-    }
-
-    pub fn get_batch_status<
-        Arg0: ProxyArg<u64>,
-    >(
-        self,
-        batch_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, tx_batch_module::batch_status::BatchStatus<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getBatchStatus")
-            .argument(&batch_id)
-            .original_result()
-    }
-
-    pub fn first_batch_id(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getFirstBatchId")
-            .original_result()
-    }
-
-    pub fn last_batch_id(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getLastBatchId")
-            .original_result()
-    }
-
-    pub fn set_max_bridged_amount<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-        Arg1: ProxyArg<BigUint<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-        max_amount: Arg1,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("setMaxBridgedAmount")
-            .argument(&token_id)
-            .argument(&max_amount)
-            .original_result()
-    }
-
-    pub fn max_bridged_amount<
-        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
-    >(
-        self,
-        token_id: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("getMaxBridgedAmount")
-            .argument(&token_id)
-            .original_result()
-    }
-
-    pub fn pause_endpoint(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("pause")
-            .original_result()
-    }
-
-    pub fn unpause_endpoint(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("unpause")
-            .original_result()
-    }
-
-    pub fn paused_status(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("isPaused")
-            .original_result()
-    }
-}
-
-#[type_abi]
-#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone, ManagedVecItem, PartialEq)]
-pub struct RefundInfo<Api>
-where
-    Api: ManagedTypeApi,
-{
-    pub address: ManagedAddress<Api>,
-    pub initial_batch_id: u64,
-    pub initial_nonce: u64,
-}
diff --git a/multisig/src/lib.rs b/multisig/src/lib.rs
index e03db58f..d42b14d7 100644
--- a/multisig/src/lib.rs
+++ b/multisig/src/lib.rs
@@ -189,10 +189,12 @@ pub trait Multisig:
             INVALID_PERCENTAGE_SUM_OVER_ERR_MSG
         );
         let esdt_safe_addr = self.esdt_safe_address().get();
+        let opt_tokens_to_distribute: OptionalValue<MultiValueEncoded<TokenIdentifier<Self::Api>>> =
+            OptionalValue::None;
         self.tx()
             .to(esdt_safe_addr)
             .typed(esdt_safe_proxy::EsdtSafeProxy)
-            .distribute_fees(args)
+            .distribute_fees(args, opt_tokens_to_distribute)
             .sync_call();
     }
 
diff --git a/multisig/tests/multisig_blackbox_test.rs b/multisig/tests/multisig_blackbox_test.rs
index b297eaf1..94085287 100644
--- a/multisig/tests/multisig_blackbox_test.rs
+++ b/multisig/tests/multisig_blackbox_test.rs
@@ -133,7 +133,7 @@ impl MultiTransferTestState {
             .account(NON_BOARD_MEMEBER_ADDRESS)
             .nonce(1);
 
-        let roles = vec![
+        let roles = [
             "ESDTRoleLocalMint".to_string(),
             "ESDTRoleLocalBurn".to_string(),
         ];