diff --git a/contracts/feature-tests/basic-features/src/managed_vec_features.rs b/contracts/feature-tests/basic-features/src/managed_vec_features.rs
index 196c211cf4..7b396e0044 100644
--- a/contracts/feature-tests/basic-features/src/managed_vec_features.rs
+++ b/contracts/feature-tests/basic-features/src/managed_vec_features.rs
@@ -76,4 +76,11 @@ pub trait ManagedVecFeatures {
         mv.push(item);
         mv
     }
+
+    #[endpoint]
+    fn managed_ref_explicit(&self, mv: ManagedVec<BigUint>, index: usize) -> BigUint {
+        let value: ManagedRef<BigUint> = mv.get(index);
+        let with_explicit_lifetime: ManagedRef<'_, BigUint> = value;
+        (*with_explicit_lifetime).clone()
+    }
 }
diff --git a/elrond-wasm-derive/src/preprocessing/substitution_list.rs b/elrond-wasm-derive/src/preprocessing/substitution_list.rs
index 0090cb96ab..13eb215272 100644
--- a/elrond-wasm-derive/src/preprocessing/substitution_list.rs
+++ b/elrond-wasm-derive/src/preprocessing/substitution_list.rs
@@ -36,32 +36,51 @@ fn add_managed_type_with_generics(
 }
 
 fn add_managed_types(substitutions: &mut SubstitutionsMap) {
+    // types::io
+    add_managed_type(substitutions, &quote!(ManagedSCError));
+
+    // types::interaction
+    add_managed_type(substitutions, &quote!(AsyncCall));
+
+    // types::managed::basic
+    add_managed_type(substitutions, &quote!(BigFloat));
     add_managed_type(substitutions, &quote!(BigInt));
     add_managed_type(substitutions, &quote!(BigUint));
-    add_managed_type(substitutions, &quote!(BigFloat));
-    add_managed_type(substitutions, &quote!(ManagedBuffer));
+    add_managed_type(substitutions, &quote!(EllipticCurveComponents));
     add_managed_type(substitutions, &quote!(EllipticCurve));
-    add_managed_type(substitutions, &quote!(ManagedAddress));
-    add_managed_type(substitutions, &quote!(TokenIdentifier));
-    add_managed_type(substitutions, &quote!(EgldOrEsdtTokenIdentifier));
-    add_managed_type(substitutions, &quote!(ManagedSCError));
-    add_managed_type(substitutions, &quote!(AsyncCall));
+    add_managed_type(substitutions, &quote!(ManagedBuffer));
+
+    // types::managed::multi-value
     add_managed_type(substitutions, &quote!(ManagedAsyncCallError));
-    add_managed_type(substitutions, &quote!(EsdtTokenPayment));
+    add_managed_type_with_generics(substitutions, &quote!(ManagedAsyncCallResult));
+    add_managed_type(substitutions, &quote!(EsdtTokenPaymentMultiArg));
     add_managed_type(substitutions, &quote!(EsdtTokenPaymentMultiValue));
-
-    add_managed_type_with_generics(substitutions, &quote!(ManagedOption));
-    add_managed_type_with_generics(substitutions, &quote!(ManagedVec));
-    add_managed_type_with_generics(substitutions, &quote!(ManagedVecOwnedIterator));
-    add_managed_type_with_generics(substitutions, &quote!(ManagedMultiValue));
+    add_managed_type_with_generics(substitutions, &quote!(MultiValueEncodedIterator));
+    add_managed_type_with_generics(substitutions, &quote!(MultiValueEncoded));
     add_managed_type_with_generics(substitutions, &quote!(ManagedVarArgs));
     add_managed_type_with_generics(substitutions, &quote!(ManagedMultiResultVec));
-    add_managed_type_with_generics(substitutions, &quote!(ManagedAsyncCallResult));
-    add_managed_type_with_generics(substitutions, &quote!(MultiValueEncoded));
-    add_managed_type_with_generics(substitutions, &quote!(MultiValueManagedVec));
     add_managed_type_with_generics(substitutions, &quote!(MultiValueManagedVecCounted));
     add_managed_type_with_generics(substitutions, &quote!(ManagedCountedVarArgs));
     add_managed_type_with_generics(substitutions, &quote!(ManagedCountedMultiResultVec));
+    add_managed_type_with_generics(substitutions, &quote!(MultiValueManagedVec));
+
+    // types::managed::wrapped
+    add_managed_type(substitutions, &quote!(EgldOrEsdtTokenIdentifier));
+    add_managed_type(substitutions, &quote!(EgldOrEsdtTokenPayment));
+    add_managed_type(substitutions, &quote!(EsdtTokenData));
+    add_managed_type(substitutions, &quote!(EsdtTokenPayment));
+    add_managed_type(substitutions, &quote!(ManagedAddress));
+    add_managed_type(substitutions, &quote!(ManagedBufferCachedBuilder));
+    add_managed_type_with_generics(substitutions, &quote!(ManagedByteArray));
+    add_managed_type_with_generics(substitutions, &quote!(ManagedOption));
+    add_managed_type_with_generics(substitutions, &quote!(ManagedRef));
+    add_managed_type_with_generics(substitutions, &quote!(ManagedVecOwnedIterator));
+    add_managed_type_with_generics(substitutions, &quote!(ManagedVecRefIterator));
+    add_managed_type_with_generics(substitutions, &quote!(ManagedVecRef));
+    add_managed_type_with_generics(substitutions, &quote!(ManagedVec));
+    add_managed_type_with_generics(substitutions, &quote!(PreloadedManagedBuffer));
+    add_managed_type_with_generics(substitutions, &quote!(RandomnessSource));
+    add_managed_type(substitutions, &quote!(TokenIdentifier));
 }
 
 fn add_storage_mapper_single_generic_arg(
diff --git a/elrond-wasm/src/types/managed/multi_value/multi_value_managed_vec_counted.rs b/elrond-wasm/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
index 5d13ac3772..8f0b7bf5e8 100644
--- a/elrond-wasm/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
+++ b/elrond-wasm/src/types/managed/multi_value/multi_value_managed_vec_counted.rs
@@ -10,7 +10,7 @@ use elrond_codec::{
 
 /// Argument or result that is made up of the argument count, followed by the arguments themselves.
 /// Think of it as a `VarArgs` preceded by the count.
-/// Unlike `ManagedMultiValue` it deserializes eagerly.
+/// Unlike `MultiValueManagedVec` it deserializes eagerly.
 #[derive(Clone, Default)]
 pub struct MultiValueManagedVecCounted<M, T>
 where