diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index b60cf5d90e20ab59e5b3c75b820b73111ede4089..1236db7e15de5923a1266d2424f21866897a9c6b 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -96,7 +96,7 @@ module OneM2M_Functions {
 		/**
 		 * @desc Ports mapping and default behaviour activation for Config 02
 		 */
-		function f_cf02Up(in CseTypeID p_cseType := int2) runs on AeSimu system CseSystem {
+		function f_cf02Up(in CseTypeID p_cseType := int2, in boolean p_auxiliaryAe2Required := false) runs on AeSimu system CseSystem {
 				
 			// Variables
 			var charstring v_binding;
@@ -126,6 +126,15 @@ module OneM2M_Functions {
 			vc_aeSimu := activate(a_cse_cf02_ae1());
 			vc_cse1.start(f_cf02UpCse1(p_cseType));
 			vc_cse1.done;
+			
+			// Initialize AE2
+			if(p_auxiliaryAe2Required) {
+				vc_auxiliaryAe2Up := p_auxiliaryAe2Required;
+				vc_ae2 := AeSimu.create("AE2") alive;
+				vc_ae2.start(f_cf02UpAe2());
+				vc_ae2.done;
+				f_connectInfoPort(vc_ae2);
+			}
 				
 			// Connect
 			f_connectInfoPort(vc_cse1);
@@ -288,6 +297,35 @@ module OneM2M_Functions {
 							
 		} // end f_cf02UpAe1
 		
+		/**
+			@desc Ports mapping and default behaviour activation for Config 2 on the auxiliary AE2
+		*/
+		function f_cf02UpAe2() runs on AeSimu system CseSystem {
+			
+			// Variables
+			var charstring v_binding;
+			var charstring v_binding_in;
+			var charstring v_host;
+			
+			//Initialization of component variables
+			vc_config := e_cf02;
+			vc_testSystemRole := e_ae;		
+			vc_aeSimuDesc := PX_TS_AE2;	
+			
+			// Map
+			map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
+			map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
+			map(self:acPort, system:acPort);
+	
+			f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
+		    
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { e_mcaPort, v_host, v_binding, vc_aeSimuDesc.mcaPort.serialization };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { e_mcaPortIn, v_host, v_binding_in, vc_aeSimuDesc.mcaPortIn.serialization };
+      
+			//Initialze the IUT
+							
+		} // end f_cf02UpAe2
+		
 		/**
 		 * @desc Ports mapping and default behaviour activation for Config 03
 		 */