diff --git a/contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs b/contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs
index 7d18e22e3b..26cc9eb679 100644
--- a/contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs
+++ b/contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs
@@ -81,7 +81,7 @@ pub trait ProxyTestFirst {
             .to(other_contract)
             .raw_upgrade()
             .argument(&456)
-            .egld(payment.clone_value())
+            .egld(payment)
             .upgrade_contract(&code, CodeMetadata::UPGRADEABLE);
     }
 
diff --git a/contracts/modules/src/esdt.rs b/contracts/modules/src/esdt.rs
index fa02cfd263..f39e5fe650 100644
--- a/contracts/modules/src/esdt.rs
+++ b/contracts/modules/src/esdt.rs
@@ -66,7 +66,7 @@ pub trait EsdtModule {
                 let egld_returned = self.call_value().egld_value();
                 self.tx()
                     .to(&initial_caller)
-                    .egld(&*egld_returned)
+                    .egld(egld_returned)
                     .transfer_if_not_empty();
             },
         }
diff --git a/framework/base/src/types/interaction/annotated.rs b/framework/base/src/types/interaction/annotated.rs
index 8571b4669b..f3187d08ce 100644
--- a/framework/base/src/types/interaction/annotated.rs
+++ b/framework/base/src/types/interaction/annotated.rs
@@ -1,116 +1,37 @@
-use crate::types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer};
+mod annotated_impl_big_uint;
+mod annotated_impl_managed_address;
+mod annotated_impl_managed_buffer;
+
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+};
 
 use super::TxEnv;
 
-pub trait AnnotatedValue<Env, T>
+pub trait AnnotatedValue<Env, T>: Sized
 where
     Env: TxEnv,
 {
     fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api>;
 
-    fn into_value(self, env: &Env) -> T;
-}
-
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ManagedAddress<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.hex_expr()
-    }
-
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
-        self
-    }
-}
-
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ManagedAddress<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.hex_expr()
-    }
-
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
-        self.clone()
-    }
-}
-
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for Address
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        ManagedAddress::from(self).hex_expr()
-    }
-
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
-        self.into()
-    }
-}
-
-impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &Address
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        ManagedAddress::from(*self).hex_expr()
-    }
+    /// Produces the value from a reference of the annotated type. Might involve a `.clone()` in some cases.
+    fn to_value(&self, env: &Env) -> T;
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
-        self.into()
-    }
-}
-
-impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for ManagedBuffer<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.hex_expr()
-    }
-
-    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self
-    }
-}
-
-impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for BigUint<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.to_display()
-    }
-
-    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
-        self
-    }
-}
-
-impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for &BigUint<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.to_display()
-    }
-
-    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
-        self.clone()
-    }
-}
-
-impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for u64
-where
-    Env: TxEnv,
-{
-    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
-        self.into_value(env).to_display()
+    /// Consumes annotated value to produce actual value.
+    ///
+    /// Override whenever it helps to avoid an unnecessary clone.
+    fn into_value(self, env: &Env) -> T {
+        self.to_value(env)
     }
 
-    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
-        BigUint::<Env::Api>::from(self)
+    /// Can be used when working with references only.
+    ///
+    /// Override whenever it helps to avoid an unnecessary clone.
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&T) -> R,
+    {
+        f(&self.to_value(env))
     }
 }
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
new file mode 100644
index 0000000000..29f41042aa
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_big_uint.rs
@@ -0,0 +1,104 @@
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+};
+
+use super::{AnnotatedValue, TxEnv};
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for BigUint<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for &BigUint<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        (*self).clone()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone()
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<'a, Env> AnnotatedValue<Env, BigUint<Env::Api>> for ManagedRef<'a, Env::Api, BigUint<Env::Api>>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        (*self).clone_value()
+    }
+
+    fn into_value(self, _env: &Env) -> BigUint<Env::Api> {
+        self.clone_value()
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for u64
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        self.to_value(env).to_display()
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::from(*self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, BigUint<Env::Api>> for ()
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedBuffer::from("0")
+    }
+
+    fn to_value(&self, _env: &Env) -> BigUint<Env::Api> {
+        BigUint::zero()
+    }
+}
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
new file mode 100644
index 0000000000..87aebbb82e
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_address.rs
@@ -0,0 +1,80 @@
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+};
+
+use super::{AnnotatedValue, TxEnv};
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for ManagedAddress<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.hex_expr()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        self.clone()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+        self
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &ManagedAddress<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.hex_expr()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        (*self).clone()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+        self.clone()
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for Address
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedAddress::from(self).hex_expr()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from(self)
+    }
+}
+
+impl<Env> AnnotatedValue<Env, ManagedAddress<Env::Api>> for &Address
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        ManagedAddress::from(*self).hex_expr()
+    }
+
+    fn to_value(&self, env: &Env) -> ManagedAddress<Env::Api> {
+        ManagedAddress::from(*self)
+    }
+}
diff --git a/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
new file mode 100644
index 0000000000..bf15a3a262
--- /dev/null
+++ b/framework/base/src/types/interaction/annotated/annotated_impl_managed_buffer.rs
@@ -0,0 +1,30 @@
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{heap::Address, BigUint, ManagedAddress, ManagedBuffer},
+};
+
+use super::{AnnotatedValue, TxEnv};
+
+impl<Env> AnnotatedValue<Env, ManagedBuffer<Env::Api>> for ManagedBuffer<Env::Api>
+where
+    Env: TxEnv,
+{
+    fn annotation(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.hex_expr()
+    }
+
+    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.clone()
+    }
+
+    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
+    where
+        F: FnOnce(&ManagedBuffer<Env::Api>) -> R,
+    {
+        f(self)
+    }
+}
diff --git a/framework/base/src/types/interaction/expr/address_expr.rs b/framework/base/src/types/interaction/expr/address_expr.rs
index ce2fa10fb5..dddfa5b53c 100644
--- a/framework/base/src/types/interaction/expr/address_expr.rs
+++ b/framework/base/src/types/interaction/expr/address_expr.rs
@@ -20,11 +20,12 @@ where
         result
     }
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 }
+
 impl<Env> TxFrom<Env> for AddressExpr
 where
     Env: TxEnv,
@@ -36,19 +37,7 @@ where
 }
 impl<Env> TxFromSpecified<Env> for AddressExpr where Env: TxEnv {}
 impl<Env> TxTo<Env> for AddressExpr where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for AddressExpr
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let expr: [u8; 32] = self.eval_to_array();
-        let ma = expr.into();
-        f(&ma)
-    }
-}
+impl<Env> TxToSpecified<Env> for AddressExpr where Env: TxEnv {}
 
 impl AddressExpr {
     pub const fn eval_to_array(&self) -> [u8; 32] {
diff --git a/framework/base/src/types/interaction/expr/sc_expr.rs b/framework/base/src/types/interaction/expr/sc_expr.rs
index 1613587402..c84f8df02f 100644
--- a/framework/base/src/types/interaction/expr/sc_expr.rs
+++ b/framework/base/src/types/interaction/expr/sc_expr.rs
@@ -22,11 +22,12 @@ where
         result
     }
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         let expr: [u8; 32] = self.eval_to_array();
         expr.into()
     }
 }
+
 impl<'a, Env> TxFrom<Env> for ScExpr<'a>
 where
     Env: TxEnv,
@@ -38,19 +39,7 @@ where
 }
 impl<'a, Env> TxFromSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
 impl<'a, Env> TxTo<Env> for ScExpr<'a> where Env: TxEnv {}
-impl<'a, Env> TxToSpecified<Env> for ScExpr<'a>
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let expr: [u8; 32] = self.eval_to_array();
-        let ma = expr.into();
-        f(&ma)
-    }
-}
+impl<'a, Env> TxToSpecified<Env> for ScExpr<'a> where Env: TxEnv {}
 
 impl<'a> ScExpr<'a> {
     pub const fn eval_to_array(&self) -> [u8; 32] {
diff --git a/framework/base/src/types/interaction/tx_call_deploy.rs b/framework/base/src/types/interaction/tx_call_deploy.rs
index 1b41ccb406..53814cd128 100644
--- a/framework/base/src/types/interaction/tx_call_deploy.rs
+++ b/framework/base/src/types/interaction/tx_call_deploy.rs
@@ -33,7 +33,7 @@ where
     fn execute_deploy_raw(self) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
 
-        let (new_address, raw_results) = self.payment.with_egld_value(|egld_value| {
+        let (new_address, raw_results) = self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().deploy_contract(
                 gas_limit,
                 egld_value,
@@ -71,7 +71,7 @@ where
     ) -> (ManagedAddress<Api>, ManagedVec<Api, ManagedBuffer<Api>>, RH) {
         let gas_limit = self.gas.resolve_gas(&self.env);
 
-        let (new_address, raw_results) = self.payment.with_egld_value(|egld_value| {
+        let (new_address, raw_results) = self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().deploy_from_source_contract(
                 gas_limit,
                 egld_value,
diff --git a/framework/base/src/types/interaction/tx_call_te.rs b/framework/base/src/types/interaction/tx_call_te.rs
index 5cb81a6f0f..6e81e7b8bb 100644
--- a/framework/base/src/types/interaction/tx_call_te.rs
+++ b/framework/base/src/types/interaction/tx_call_te.rs
@@ -25,7 +25,7 @@ where
     pub fn transfer_execute(self) {
         let gas_limit: u64;
         if self.data.is_no_call() {
-            if self.payment.is_no_payment() {
+            if self.payment.is_no_payment(&self.env) {
                 return;
             } else {
                 gas_limit = 0;
@@ -54,7 +54,7 @@ where
     ///
     /// Can only used for simple transfers.
     pub fn transfer_if_not_empty(self) {
-        if self.payment.is_no_payment() {
+        if self.payment.is_no_payment(&self.env) {
             return;
         }
 
diff --git a/framework/base/src/types/interaction/tx_call_upgrade.rs b/framework/base/src/types/interaction/tx_call_upgrade.rs
index 2d6af25fab..24438da3c3 100644
--- a/framework/base/src/types/interaction/tx_call_upgrade.rs
+++ b/framework/base/src/types/interaction/tx_call_upgrade.rs
@@ -33,7 +33,7 @@ where
     /// TODO: change return type to `!`.
     pub fn upgrade_async_call_and_exit(self) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
+        self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().upgrade_contract(
                 &self.to,
                 gas,
@@ -68,7 +68,7 @@ where
     /// TODO: change return type to `!`.
     pub fn upgrade_async_call_and_exit(self) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
+        self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().upgrade_from_source_contract(
                 &self.to,
                 gas,
@@ -98,7 +98,7 @@ where
     /// If another one was previously set in the `Tx` object, that one will be ignored.
     pub fn upgrade_contract(self, code: &ManagedBuffer<Api>, code_metadata: CodeMetadata) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
+        self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().upgrade_contract(
                 &self.to,
                 gas,
@@ -123,7 +123,7 @@ where
         code_metadata: CodeMetadata,
     ) {
         let gas = self.gas.explicit_or_gas_left(&self.env);
-        self.payment.with_egld_value(|egld_value| {
+        self.payment.with_egld_value(&self.env, |egld_value| {
             SendRawWrapper::<Api>::new().upgrade_from_source_contract(
                 &self.to,
                 gas,
diff --git a/framework/base/src/types/interaction/tx_payment.rs b/framework/base/src/types/interaction/tx_payment.rs
index 4b2f54e29f..978190a67a 100644
--- a/framework/base/src/types/interaction/tx_payment.rs
+++ b/framework/base/src/types/interaction/tx_payment.rs
@@ -18,7 +18,7 @@ use crate::{
     },
 };
 
-use super::{FunctionCall, TxEnv, TxFrom, TxToSpecified};
+use super::{AnnotatedValue, FunctionCall, TxEnv, TxFrom, TxToSpecified};
 
 /// Describes a payment that is part of a transaction.
 pub trait TxPayment<Env>
@@ -26,7 +26,7 @@ where
     Env: TxEnv,
 {
     /// Returns true if payment indicates transfer of either non-zero EGLD or ESDT amounts.
-    fn is_no_payment(&self) -> bool;
+    fn is_no_payment(&self, env: &Env) -> bool;
 
     /// Transfer-execute calls have different APIs for different payments types.
     /// This method selects between them.
@@ -57,15 +57,20 @@ where
 }
 
 /// Marks a payment object that only contains EGLD or nothing at all.
-pub trait TxPaymentEgldOnly<Env>: TxPayment<Env>
+pub trait TxPaymentEgldOnly<Env>: TxPayment<Env> + AnnotatedValue<Env, BigUint<Env::Api>>
 where
     Env: TxEnv,
 {
-    fn with_egld_value<F, R>(&self, f: F) -> R
+    fn with_egld_value<F, R>(&self, env: &Env, f: F) -> R
     where
-        F: FnOnce(&BigUint<Env::Api>) -> R;
+        F: FnOnce(&BigUint<Env::Api>) -> R,
+    {
+        self.with_value_ref(env, f)
+    }
 
-    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api>;
+    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api> {
+        self.into_value(env)
+    }
 }
 
 #[derive(Clone)]
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
index a4881bda05..2c730591cd 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld.rs
@@ -1,5 +1,6 @@
 use crate::{
     contract_base::SendRawWrapper,
+    proxy_imports::{AnnotatedValue, ManagedBuffer},
     types::{BigUint, ManagedAddress, ManagedVec, TxFrom, TxToSpecified},
 };
 
@@ -18,18 +19,18 @@ where
     Env: TxEnv,
     EgldValue: TxEgldValue<Env>,
 {
-    fn is_no_payment(&self) -> bool {
-        self.0.with_egld_value(|egld_value| egld_value == &0u32)
+    fn is_no_payment(&self, env: &Env) -> bool {
+        self.0.with_value_ref(env, |egld_value| egld_value == &0u32)
     }
 
     fn perform_transfer_execute(
         self,
-        _env: &Env,
+        env: &Env,
         to: &ManagedAddress<Env::Api>,
         gas_limit: u64,
         fc: FunctionCall<Env::Api>,
     ) {
-        self.0.with_egld_value(|egld_value| {
+        self.0.with_value_ref(env, |egld_value| {
             let _ = SendRawWrapper::<Env::Api>::new().direct_egld_execute(
                 to,
                 egld_value,
@@ -55,7 +56,7 @@ where
     {
         to.with_address_ref(env, |to_addr| {
             self.0
-                .with_egld_value(|egld_value| f(to_addr, egld_value, &fc))
+                .with_value_ref(env, |egld_value| f(to_addr, egld_value, &fc))
         })
     }
 
@@ -67,19 +68,34 @@ where
     }
 }
 
-impl<Env, EgldValue> TxPaymentEgldOnly<Env> for Egld<EgldValue>
+impl<Env, EgldValue> AnnotatedValue<Env, BigUint<Env::Api>> for Egld<EgldValue>
 where
     Env: TxEnv,
     EgldValue: TxEgldValue<Env>,
 {
-    fn with_egld_value<F, R>(&self, f: F) -> R
+    fn annotation(&self, env: &Env) -> ManagedBuffer<Env::Api> {
+        self.0.annotation(env)
+    }
+
+    fn to_value(&self, env: &Env) -> BigUint<Env::Api> {
+        self.0.to_value(env)
+    }
+
+    fn into_value(self, env: &Env) -> BigUint<Env::Api> {
+        self.0.into_value(env)
+    }
+
+    fn with_value_ref<F, R>(&self, env: &Env, f: F) -> R
     where
         F: FnOnce(&BigUint<Env::Api>) -> R,
     {
-        self.0.with_egld_value(f)
+        self.0.with_value_ref(env, f)
     }
+}
 
-    fn into_egld_payment(self, env: &Env) -> BigUint<Env::Api> {
-        self.0.into_value(env)
-    }
+impl<Env, EgldValue> TxPaymentEgldOnly<Env> for Egld<EgldValue>
+where
+    Env: TxEnv,
+    EgldValue: TxEgldValue<Env>,
+{
 }
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
index 561235eef2..b047e584b2 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_egld_value.rs
@@ -1,4 +1,7 @@
-use crate::types::{AnnotatedValue, BigUint};
+use crate::{
+    proxy_imports::ManagedRef,
+    types::{AnnotatedValue, BigUint},
+};
 
 use super::TxEnv;
 
@@ -6,43 +9,9 @@ pub trait TxEgldValue<Env>: AnnotatedValue<Env, BigUint<Env::Api>>
 where
     Env: TxEnv,
 {
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R;
 }
 
-impl<Env> TxEgldValue<Env> for BigUint<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
-
-impl<Env> TxEgldValue<Env> for &BigUint<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(*self)
-    }
-}
-
-impl<Env> TxEgldValue<Env> for u64
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(&BigUint::<Env::Api>::from(*self))
-    }
-}
+impl<Env> TxEgldValue<Env> for BigUint<Env::Api> where Env: TxEnv {}
+impl<Env> TxEgldValue<Env> for &BigUint<Env::Api> where Env: TxEnv {}
+impl<'a, Env> TxEgldValue<Env> for ManagedRef<'a, Env::Api, BigUint<Env::Api>> where Env: TxEnv {}
+impl<Env> TxEgldValue<Env> for u64 where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
index 39f0e6a64c..78acfd87f7 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_multi_esdt.rs
@@ -9,7 +9,7 @@ impl<Env> TxPayment<Env> for &MultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.is_empty()
     }
 
@@ -64,7 +64,7 @@ impl<Env> TxPayment<Env> for MultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.is_empty()
     }
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
index d97143a2ad..54c82b3a3c 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_none.rs
@@ -12,7 +12,7 @@ impl<Env> TxPayment<Env> for ()
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         true
     }
 
@@ -47,18 +47,4 @@ where
     }
 }
 
-impl<Env> TxPaymentEgldOnly<Env> for ()
-where
-    Env: TxEnv,
-{
-    fn with_egld_value<F, R>(&self, f: F) -> R
-    where
-        F: FnOnce(&BigUint<Env::Api>) -> R,
-    {
-        f(&BigUint::zero())
-    }
-
-    fn into_egld_payment(self, _env: &Env) -> BigUint<Env::Api> {
-        BigUint::zero()
-    }
-}
+impl<Env> TxPaymentEgldOnly<Env> for () where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
index 5a28d80902..01d1c3a6bb 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_other.rs
@@ -12,7 +12,7 @@ impl<Env> TxPayment<Env> for EgldOrEsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.amount == 0u32
     }
 
@@ -63,7 +63,7 @@ impl<Env> TxPayment<Env> for EgldOrMultiEsdtPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.is_empty()
     }
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
index f5bf61c0f1..547ff12ba0 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt.rs
@@ -12,7 +12,7 @@ impl<Env> TxPayment<Env> for EsdtTokenPayment<Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.amount == 0u32
     }
 
diff --git a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
index c0d568e11b..7128b0fc2b 100644
--- a/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
+++ b/framework/base/src/types/interaction/tx_payment/tx_payment_single_esdt_ref.rs
@@ -13,7 +13,7 @@ impl<'a, Env> TxPayment<Env> for EsdtTokenPaymentRefs<'a, Env::Api>
 where
     Env: TxEnv,
 {
-    fn is_no_payment(&self) -> bool {
+    fn is_no_payment(&self, _env: &Env) -> bool {
         self.amount == &0u32
     }
 
diff --git a/framework/base/src/types/interaction/tx_to.rs b/framework/base/src/types/interaction/tx_to.rs
index 6d964bd0b5..03f3105858 100644
--- a/framework/base/src/types/interaction/tx_to.rs
+++ b/framework/base/src/types/interaction/tx_to.rs
@@ -24,60 +24,21 @@ where
     ///
     /// Other than that, does thesame as `AnnotatedValue::into_value`.
     fn with_address_ref<F, R>(&self, env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R;
-}
-
-impl<Env> TxTo<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Env::Api>) -> R,
     {
-        f(self)
+        self.with_value_ref(env, f)
     }
 }
 
+impl<Env> TxTo<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
+impl<Env> TxToSpecified<Env> for ManagedAddress<Env::Api> where Env: TxEnv {}
+
 impl<Env> TxTo<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api>
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        f(self)
-    }
-}
+impl<Env> TxToSpecified<Env> for &ManagedAddress<Env::Api> where Env: TxEnv {}
 
 impl<Env> TxTo<Env> for Address where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for Address
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let managed_address = ManagedAddress::from(self);
-        f(&managed_address)
-    }
-}
+impl<Env> TxToSpecified<Env> for Address where Env: TxEnv {}
 
 impl<Env> TxTo<Env> for &Address where Env: TxEnv {}
-impl<Env> TxToSpecified<Env> for &Address
-where
-    Env: TxEnv,
-{
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let managed_address = ManagedAddress::from(*self);
-        f(&managed_address)
-    }
-}
+impl<Env> TxToSpecified<Env> for &Address where Env: TxEnv {}
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs b/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
index 1e3b59db73..7217f47c8b 100644
--- a/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
+++ b/framework/base/src/types/interaction/tx_to/tx_to_caller.rs
@@ -17,17 +17,11 @@ where
         self.with_address_ref(env, |addr_ref| addr_ref.hex_expr())
     }
 
-    fn into_value(self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
+    fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
         BlockchainWrapper::<Api>::new().get_caller()
     }
-}
 
-impl<Api> TxTo<TxScEnv<Api>> for ToCaller where Api: CallTypeApi + BlockchainApi {}
-impl<Api> TxToSpecified<TxScEnv<Api>> for ToCaller
-where
-    Api: CallTypeApi + BlockchainApi,
-{
-    fn with_address_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
+    fn with_value_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
@@ -36,3 +30,6 @@ where
         f(&ManagedAddress::from_handle(caller_handle))
     }
 }
+
+impl<Api> TxTo<TxScEnv<Api>> for ToCaller where Api: CallTypeApi + BlockchainApi {}
+impl<Api> TxToSpecified<TxScEnv<Api>> for ToCaller where Api: CallTypeApi + BlockchainApi {}
diff --git a/framework/base/src/types/interaction/tx_to/tx_to_self.rs b/framework/base/src/types/interaction/tx_to/tx_to_self.rs
index 87e068ae6f..72350c312e 100644
--- a/framework/base/src/types/interaction/tx_to/tx_to_self.rs
+++ b/framework/base/src/types/interaction/tx_to/tx_to_self.rs
@@ -17,17 +17,11 @@ where
         self.with_address_ref(env, |addr_ref| addr_ref.hex_expr())
     }
 
-    fn into_value(self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
+    fn to_value(&self, _env: &TxScEnv<Api>) -> ManagedAddress<Api> {
         BlockchainWrapper::<Api>::new().get_sc_address()
     }
-}
 
-impl<Api> TxTo<TxScEnv<Api>> for ToSelf where Api: CallTypeApi + BlockchainApi {}
-impl<Api> TxToSpecified<TxScEnv<Api>> for ToSelf
-where
-    Api: CallTypeApi + BlockchainApi,
-{
-    fn with_address_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
+    fn with_value_ref<F, R>(&self, env: &TxScEnv<Api>, f: F) -> R
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
@@ -37,3 +31,6 @@ where
         f(&ManagedAddress::from_handle(sc_address_handle))
     }
 }
+
+impl<Api> TxTo<TxScEnv<Api>> for ToSelf where Api: CallTypeApi + BlockchainApi {}
+impl<Api> TxToSpecified<TxScEnv<Api>> for ToSelf where Api: CallTypeApi + BlockchainApi {}
diff --git a/framework/base/src/types/managed/wrapped/managed_ref.rs b/framework/base/src/types/managed/wrapped/managed_ref.rs
index 748c704956..143d79e1d4 100644
--- a/framework/base/src/types/managed/wrapped/managed_ref.rs
+++ b/framework/base/src/types/managed/wrapped/managed_ref.rs
@@ -54,6 +54,7 @@ where
     M: ManagedTypeApi,
     T: ManagedType<M> + Clone,
 {
+    /// Syntactic sugar for dereferencing and cloning the object.
     pub fn clone_value(&self) -> T {
         self.deref().clone()
     }
diff --git a/framework/scenario/src/facade/contract_info.rs b/framework/scenario/src/facade/contract_info.rs
index 56095208e6..2652732494 100644
--- a/framework/scenario/src/facade/contract_info.rs
+++ b/framework/scenario/src/facade/contract_info.rs
@@ -117,7 +117,7 @@ where
         self.scenario_address_expr.original.as_str().into()
     }
 
-    fn into_value(self, _env: &Env) -> ManagedAddress<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedAddress<Env::Api> {
         (&self.scenario_address_expr.value).into()
     }
 }
@@ -148,11 +148,4 @@ where
     Env: TxEnv,
     P: ProxyObjNew,
 {
-    fn with_address_ref<F, R>(&self, _env: &Env, f: F) -> R
-    where
-        F: FnOnce(&ManagedAddress<Env::Api>) -> R,
-    {
-        let ma: ManagedAddress<Env::Api> = (&self.scenario_address_expr.value).into();
-        f(&ma)
-    }
 }
diff --git a/framework/scenario/src/facade/world_tx/expr/file_expr.rs b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
index f42f6e84e0..d9d3c77756 100644
--- a/framework/scenario/src/facade/world_tx/expr/file_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/file_expr.rs
@@ -23,7 +23,7 @@ impl<'a> AnnotatedValue<ScenarioTxEnvData, ManagedBuffer<StaticApi>> for FileExp
         result
     }
 
-    fn into_value(self, env: &ScenarioTxEnvData) -> ManagedBuffer<StaticApi> {
+    fn to_value(&self, env: &ScenarioTxEnvData) -> ManagedBuffer<StaticApi> {
         let context = InterpreterContext::new().with_dir(env.context_path.clone());
         let value = interpret_string(&format!("{FILE_PREFIX}{}", self.0), &context);
         value.into()
diff --git a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
index 6f95cf2b7a..c0f574e8cd 100644
--- a/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
+++ b/framework/scenario/src/facade/world_tx/expr/mxsc_expr.rs
@@ -26,7 +26,7 @@ where
         result
     }
 
-    fn into_value(self, env: &Env) -> ManagedBuffer<Env::Api> {
+    fn to_value(&self, env: &Env) -> ManagedBuffer<Env::Api> {
         let context = InterpreterContext::new()
             .with_dir(env.env_data().context_path.clone())
             .with_allowed_missing_files();
diff --git a/framework/scenario/src/scenario/model/value/value_set_bytes.rs b/framework/scenario/src/scenario/model/value/value_set_bytes.rs
index eaed19cea0..627f2ace9c 100644
--- a/framework/scenario/src/scenario/model/value/value_set_bytes.rs
+++ b/framework/scenario/src/scenario/model/value/value_set_bytes.rs
@@ -145,8 +145,8 @@ where
         self.original.to_concatenated_string().into()
     }
 
-    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
-        self.value.into()
+    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
+        self.value.clone().into()
     }
 }
 
@@ -160,7 +160,7 @@ where
         self.original.to_concatenated_string().into()
     }
 
-    fn into_value(self, _env: &Env) -> ManagedBuffer<Env::Api> {
+    fn to_value(&self, _env: &Env) -> ManagedBuffer<Env::Api> {
         self.value.clone().into()
     }
 }