diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 49eba4e92757d47fbca8aa6601b21771a2b40dfe..ef1122df670b37c268070565c83837bb79de3105 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -391,11 +391,14 @@ module OneM2M_Functions {
 			var charstring v_binding;
 			var charstring v_binding_in;
 			var PrimitiveContent v_cSEBaseResource;
-      var charstring v_host;
+	  		var charstring v_host;
+			
+			//Initialization of component variables
 			vc_config := e_cf04;
 			vc_testSystemRole := e_cse;	
 			vc_cseType := p_cseType;			
-			//Creation of CSEBase
+			
+			////Initialization of local CSEBase
 			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
 			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
 			
@@ -403,6 +406,9 @@ module OneM2M_Functions {
 			map(self:mccPort, system:mccPort) param (PX_TS_CSE1.mccPort);
 			map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
 			map(self:acPort, system:acPort);
+			if(PX_UT_IMPLEMENTED) {
+				map(self:utPort, system:utPort) param (PX_TS_UT);
+			}
 			
 			if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
 			  v_binding := "HTTP";
@@ -417,18 +423,18 @@ module OneM2M_Functions {
 			  v_binding := "WSCK";
 			  v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
 			}
-      if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
-        v_binding_in := "HTTP";
-      } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
-        v_binding_in := "COAP";
-      } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
-        v_binding_in := "MQTT";
-      } else {
-        v_binding_in := "WSCK";
-      }
+		   	if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
+		    	v_binding_in := "HTTP";
+		    } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
+		    	v_binding_in := "COAP";
+		    } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
+		    	v_binding_in := "MQTT";
+		    } else {
+		    	v_binding_in := "WSCK";
+		    }
       
-      vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
-      vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
+      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
       
 			activate(a_default());
 			vc_cseSimu := activate(a_cse_cf04());
@@ -509,6 +515,9 @@ module OneM2M_Functions {
 			unmap(self:mccPort, system:mccPort);
 			unmap(self:mccPortIn, system:mccPortIn);
 			unmap(self:acPort, system:acPort);
+			if(PX_UT_IMPLEMENTED){
+				unmap(self:utPort, system:utPort);
+			}
 		}// end f_cf04Down
 
 	}//end group configFunctions