diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 6a23c61ccb24abc655f9f760e84bfe51915fea26..14bd53e18c0a54de48237a99e4e9386fbd1ac614 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -14,6 +14,7 @@ module OneM2M_Functions {
 	import from XSD all;
 	import from OneM2M_Templates all;
 	import from OneM2M_Types all;
+    import from OneM2M_Ports all;
 	import from OneM2M_TypesAndValues all;
 	import from OneM2M_TestSystem all;
 	import from OneM2M_Pixits all;
@@ -61,8 +62,8 @@ module OneM2M_Functions {
         v_binding_in := "WSCK";
       }
 			
-			vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
-      vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+      vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
 			
 			activate(a_default());
 			vc_aeSimu := activate(a_cse_cf01());
@@ -119,8 +120,8 @@ module OneM2M_Functions {
         v_binding_in := "WSCK";
       }
       
-      vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
-      vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
+      vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
+      vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
 
 			//Initialze the IUT
 							
@@ -156,7 +157,7 @@ module OneM2M_Functions {
         v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
       }
       
-      vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+      vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
 			
 			if(PX_UT_IMPLEMENTED) {
 				map(self:utPort, system:utPort) param (PX_TS_UT);
@@ -214,8 +215,8 @@ module OneM2M_Functions {
         v_binding_in := "WSCK";
       }
       
-      vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
-      vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding, 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, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
       
 			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
 			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
@@ -271,8 +272,8 @@ module OneM2M_Functions {
         v_binding_in := "WSCK";
       }
       
-			vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
-			vc_myInterfaces[enum2int(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_cf02_cse1());
@@ -325,8 +326,8 @@ module OneM2M_Functions {
 			  v_binding_in := "WSCK";
 			}
       
-			vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
-			vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
       
 			//Initialze the IUT
 							
@@ -367,7 +368,7 @@ module OneM2M_Functions {
 			  v_host := PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
 			}
       
-			vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
 			
 			if(PX_UT_IMPLEMENTED) {
 				map(self:utPort, system:utPort) param (PX_TS_UT);
@@ -426,8 +427,8 @@ module OneM2M_Functions {
         v_binding_in := "WSCK";
       }
       
-      vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
-      vc_myInterfaces[enum2int(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());
@@ -1922,7 +1923,7 @@ module OneM2M_Functions {
 				 * @param p_responsePrimitive Expected responsePrimitive in the notification
 				 * @verdict 
 				 */
-				function f_cse_notifyProcedure_responsePrimitiveHandler(template ResponsePrimitive p_responsePrimitive) runs on AeSimu {
+				function f_cse_notifyProcedure_responsePrimitiveHandler(template  ResponsePrimitive p_responsePrimitive) runs on AeSimu {
 					// Local variables
 					var ResponsePrimitive v_responsePrimitive;
 	
@@ -2022,7 +2023,7 @@ module OneM2M_Functions {
 				 * @param p_notification Expected notification
 				 * @verdict 
 				 */
-				function f_cse_notifyProcedure_subscriptionDeletionHandler( template Notification p_notification) runs on AeSimu {
+				function f_cse_notifyProcedure_subscriptionDeletionHandler( template  Notification p_notification) runs on AeSimu {
 					var ResponsePrimitive v_responsePrimitive;
 					
 					//Activate defaults when running on a PTC
@@ -2124,7 +2125,7 @@ module OneM2M_Functions {
 				 * @param p_expectedResourceIndex Expected target parent resource of the announcemnet
 				 * @verdict 
 				 */
-				function f_cse_announcementProcedure_createHandler(template RequestPrimitive p_requestprimitive := ?, in ResponseStatusCode p_responseStatusCode := int2001, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu return integer{
+				function f_cse_announcementProcedure_createHandler(template  RequestPrimitive p_requestprimitive := ?, in ResponseStatusCode p_responseStatusCode := int2001, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu return integer{
 					// Local variables
 					var MsgIn v_request;
 					var integer v_parentIndex := vc_localRemoteCseIndex;
@@ -2238,7 +2239,7 @@ module OneM2M_Functions {
 				 * @verdict 
 				 */
 				//TODO TO BE FINALIZED
-				function f_cse_announcementProcedure_updateHandler(template RequestPrimitive p_requestprimitive := mw_update, in ResponseStatusCode p_responseStatusCode := int2004, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
+				function f_cse_announcementProcedure_updateHandler(template  RequestPrimitive p_requestprimitive := mw_update, in ResponseStatusCode p_responseStatusCode := int2004, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
 
 					// Local variables
 					var MsgIn v_request;
@@ -2280,7 +2281,7 @@ module OneM2M_Functions {
 				 * @verdict 
 				 */
 				 //TODO To finalize this function
-				function f_cse_announcementProcedure_deleteHandler(template RequestPrimitive p_requestprimitive := mw_delete, in ResponseStatusCode p_responseStatusCode := int2002, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
+				function f_cse_announcementProcedure_deleteHandler(template  RequestPrimitive p_requestprimitive := mw_delete, in ResponseStatusCode p_responseStatusCode := int2002, template(omit) integer p_expectedResourceIndex := omit) runs on CseSimu {
 					// Local variables
 					var MsgIn v_request;
 					var integer v_parentIndex := vc_localRemoteCseIndex;
@@ -2696,7 +2697,7 @@ module OneM2M_Functions {
 			 * @param p_requestPrimitive Template request primitive
 			 * @return Internal resource index of the created resource
 			 */
-			function f_cse_registrationRemoteCse(in template RequestPrimitive p_requestPrimitive := ?) runs on CseSimu return integer {
+			function f_cse_registrationRemoteCse(in template (present) RequestPrimitive p_requestPrimitive := ?) runs on CseSimu return integer {
     			
 				var MsgIn v_request;
 				var ResponsePrimitive v_response;
@@ -2750,7 +2751,7 @@ module OneM2M_Functions {
 			 * @desc Receive a request from the CSE IUT to the Test System (simulating a CSE) 
 			 * @param p_requestPrimitive Expected CREATE request primitive
 			 */
-			function f_cse_receiveCreateRequest_cseSimu(in template RequestPrimitive p_requestPrimitive := ?) runs on CseSimu {
+			function f_cse_receiveCreateRequest_cseSimu(in template (present) RequestPrimitive p_requestPrimitive := ?) runs on CseSimu {
 				var ResponsePrimitive v_responsePrimitive;
     			
     			//Activate defaults when running on a PTC
@@ -5670,9 +5671,9 @@ module OneM2M_Functions {
 		
 		function f_send(
 		                in InterfaceIds p_interfaceIds, 
-		                in MsgOut p_msgOut
+		                in template MsgOut p_msgOut
 		) runs on Tester {
-			log(">>> f_send: ", p_interfaceIds);
+            log(">>> f_send: ", p_interfaceIds);
 			
 			p_msgOut.host := vc_myInterfaces[enum2int(p_interfaceIds)].myHost;
 			p_msgOut.protocolBinding := vc_myInterfaces[enum2int(p_interfaceIds)].myProtocolBinding;
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 0e2046d26e9f2f0c0704b094e95b88a66900e315..72354360c35019a2aca84cfdc217d488d05fa5ce 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -73,7 +73,7 @@ module OneM2M_Templates {
 			forcedFields := p_forcedFields
 		};
 		
-		template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive, template AttributeList_1 p_nullFields := *) := {
+		template MsgIn mw_request(in template  RequestPrimitive p_requestPrimitive, template AttributeList_1 p_nullFields := *) := {
 			primitive := { requestPrimitive := p_requestPrimitive}, 
 			nullFields := p_nullFields
 		};
@@ -82,7 +82,7 @@ module OneM2M_Templates {
 		 * @desc Base template for response receiving operations
 		 * @param p_responsePrimitive
 		 */
-		template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive := ?, template AttributeList_1 p_nullFields := *) := {
+		template MsgIn mw_response(in template  ResponsePrimitive p_responsePrimitive := ?, template AttributeList_1 p_nullFields := *) := {
 			primitive := { responsePrimitive := p_responsePrimitive}, 
 			nullFields := p_nullFields
 		};
@@ -517,7 +517,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Reception template for update Ae resource
 			 */
-			template RequestPrimitive mw_updateAe(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+			template  RequestPrimitive mw_updateAe(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
 				resourceType := int2,
 				primitiveContent:= {aE := ?}
 			};
@@ -730,7 +730,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base Reception template for create operation
 			 */
-			template RequestPrimitive mw_create(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
+			template  RequestPrimitive mw_create(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
 				operation := int1,
 				to_ := p_to,
 				from_ := p_from,
@@ -830,7 +830,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Reception template for AE registration
 			 */
-			template RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?, template AE_optional p_ae := ?) modifies mw_create := {
+			template  RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?, template AE_optional p_ae := ?) modifies mw_create := {
 				resourceType := int2,
 				primitiveContent := {aE := p_ae}
 			};  
@@ -979,7 +979,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Reception template for CREATE Container
 			 */
-			template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+			template  RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int3,
 				primitiveContent := {container := mw_contentCreateContainerBase}
 			};  
@@ -1183,7 +1183,7 @@ module OneM2M_Templates {
         		primitiveContent := {pollingChannel := m_contentCreatePollingChannel ()}
         	};
         	
-			template RequestPrimitive mw_createPollingChannel(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+			template  RequestPrimitive mw_createPollingChannel(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				to_ := p_to,
 				from_ := p_from,
 				primitiveContent := {pollingChannel := mw_contentCreatePollingChannel}
@@ -1300,7 +1300,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Reception template for SemanticDescriptor creation
 			 */
-			template RequestPrimitive mw_createSemanticDescriptor(template XSD.ID p_from := *, template XSD.ID p_to := ?, template (present) SemanticDescriptor_optional p_semanticDescriptor := mw_contentCreateSemanticDescriptor) modifies mw_create := {
+			template RequestPrimitive mw_createSemanticDescriptor(template XSD.ID p_from := *, template XSD.ID p_to := ?, template SemanticDescriptor_optional p_semanticDescriptor := mw_contentCreateSemanticDescriptor) modifies mw_create := {
 				resourceType := int24,
 				primitiveContent := {semanticDescriptor := p_semanticDescriptor}
 			};
@@ -1438,7 +1438,7 @@ module OneM2M_Templates {
 				vendorInformation := omit
 			};
 
-			template RequestPrimitive mw_delete(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := *) := {
+			template  RequestPrimitive mw_delete(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := *) := {
 				operation := int4,
 				to_ := p_resourceAddress,
 				from_ := ?,
@@ -1481,7 +1481,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base NOTIFY request primitive
 			 */
-			template RequestPrimitive m_notify(XSD.ID p_resourceAddress) := {
+			template (value) RequestPrimitive m_notify(XSD.ID p_resourceAddress) := {
 				operation := int5,
 				to_ := p_resourceAddress,
 				from_ := "NotInitialized",
@@ -1513,7 +1513,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base NOTIFY request primitive
 			 */
-			template RequestPrimitive m_notifyNotification(XSD.ID p_resourceAddress, template (value) Notification p_notification, template (omit) AbsRelTimestamp p_requestExpirationTimestamp := omit) modifies m_notify := {
+			template (value) RequestPrimitive m_notifyNotification(XSD.ID p_resourceAddress, template (value) Notification p_notification, template (omit) AbsRelTimestamp p_requestExpirationTimestamp := omit) modifies m_notify := {
 				primitiveContent := {notification := p_notification},
 				requestExpirationTimestamp := p_requestExpirationTimestamp//Needed for polling
 			};
@@ -1521,14 +1521,14 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base NOTIFY request primitive carrying a responsePrimitive
 			 */
-			template RequestPrimitive m_notifyResponsePrimitive(XSD.ID p_resourceAddress, ResponsePrimitive p_responsePrimitive) modifies m_notify := {
+			template (value) RequestPrimitive m_notifyResponsePrimitive(XSD.ID p_resourceAddress, ResponsePrimitive p_responsePrimitive) modifies m_notify := {
 				primitiveContent := {responsePrimitive := p_responsePrimitive}
 			};
 			
 			/**
 			 * @desc Base NOTIFY Aggregated request primitive
 			 */
-			template RequestPrimitive m_notifyAggregatedNotification := {
+			template (value) RequestPrimitive m_notifyAggregatedNotification := {
 				operation := int5,
 				to_ := "NotInitialized",
 				from_ := omit,
@@ -1590,7 +1590,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base NOTIFY request primitive
 			 */
-			template RequestPrimitive mw_notifyAggregatedNotification (in template (present) AggregatedNotification p_aggregatedNotification := ?) modifies mw_notify := {
+			template  RequestPrimitive mw_notifyAggregatedNotification (in template  AggregatedNotification p_aggregatedNotification := ?) modifies mw_notify := {
 				primitiveContent := { aggregatedNotification := p_aggregatedNotification}
 			};
 			
@@ -1598,7 +1598,7 @@ module OneM2M_Templates {
 			 * @desc Base NOTIFY request primitive
 			 */
 			
-			template RequestPrimitive mw_notifyNotification(in template (present) Notification p_notification) modifies mw_notify := {
+			template  RequestPrimitive mw_notifyNotification(in template  Notification p_notification) modifies mw_notify := {
 				primitiveContent := {notification := p_notification}
 			};
 			
@@ -1606,7 +1606,7 @@ module OneM2M_Templates {
 			 * @desc Base NOTIFY request primitive for ResponsePrimitive
 			 */
 
-			template RequestPrimitive mw_notifyResponsePrimitive(in template (present) ResponsePrimitive p_responsePrimitive) modifies mw_notify := {
+			template  RequestPrimitive mw_notifyResponsePrimitive(in template  ResponsePrimitive p_responsePrimitive) modifies mw_notify := {
 				primitiveContent := {responsePrimitive := p_responsePrimitive}
 			};		
 
@@ -1617,28 +1617,28 @@ module OneM2M_Templates {
 	
 	group ContentCreate {
 		
-		template PrimitiveContent m_primitiveContentAe(template AE_optional p_ae) := {
-			aE := p_ae
+		template (value) PrimitiveContent m_primitiveContentAe(template AE_optional p_ae) := {
+			aE := valueof(p_ae)
 		}
 		
-		template PrimitiveContent m_primitiveContentContainer(template Container_optional p_container) := {
-			container := p_container
+		template (value) PrimitiveContent m_primitiveContentContainer(template Container_optional p_container) := {
+			container := valueof(p_container)
 		}
 		
-		template PrimitiveContent m_primitiveContentContentInstance(template ContentInstance_optional p_contentInstance) := {
-			contentInstance := p_contentInstance
+		template (value) PrimitiveContent m_primitiveContentContentInstance(template ContentInstance_optional p_contentInstance) := {
+			contentInstance := valueof(p_contentInstance)
 		}
 		            
-        template PrimitiveContent m_primitiveContentCSEBase(template CSEBase_optional p_cSEBase) := {
-	        cSEBase := p_cSEBase
+        template (value) PrimitiveContent m_primitiveContentCSEBase(template CSEBase_optional p_cSEBase) := {
+	        cSEBase := valueof(p_cSEBase)
 		}
 
-		template PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
-			remoteCSE := p_remoteCSE
+		template (value) PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
+			remoteCSE := valueof(p_remoteCSE)
 		}
 		
-		template PrimitiveContent m_primitiveContentResponsePrimitive(template ResponsePrimitive p_responsePrimitive) := {
-			responsePrimitive := p_responsePrimitive
+		template (value) PrimitiveContent m_primitiveContentResponsePrimitive(template ResponsePrimitive p_responsePrimitive) := {
+			responsePrimitive := valueof(p_responsePrimitive)
 		}		
 				
 		template PrimitiveContent mw_primitiveContent := ?;
@@ -1654,7 +1654,7 @@ module OneM2M_Templates {
 		 * @param p_appId App ID
 		 * @param p_nodeLink Node link
 		 */
-		template AEAnnc_optional m_contentCreateAEAnnc (in template (omit)  Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_APP_ID, in template (omit) XSD.AnyURI p_link := omit) := {
+		template (value) AEAnnc_optional m_contentCreateAEAnnc (in template (omit)  Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_APP_ID, in template (omit) XSD.AnyURI p_link := omit) := {
 			resourceName := omit,//O TODO 
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -2757,7 +2757,7 @@ module OneM2M_Templates {
     	  	announcedAttribute		:= omit, 			      //O
     		locationSource 			:= p_locationSource, //M
     		locationInformationType := omit,//O
-    		locationUpdatePeriod 		:= {p_locationUpdatePeriod}, //O
+    		locationUpdatePeriod 		:= {valueof(p_locationUpdatePeriod)}, //O
     		locationTargetID 			:= p_locationTargetID, 	//O
     		locationServer 			:= p_locationServerAddress,//O
     		locationContainerID		:= omit,    		   //NP
@@ -2883,7 +2883,7 @@ module OneM2M_Templates {
 			 * @desc Base primitiveContent for CREATE operation for StatConfig resource
 			 * @param p_primitiveConten t Content for the StatConfig
 			 */
-		template StatsConfig_optional m_contentCreateStatsConfigBase := {
+		template (value) StatsConfig_optional m_contentCreateStatsConfigBase := {
 			resourceName 				:= c_defaultStatsConfigResourceName, //O
 			resourceType				:= omit, //NP
 			resourceID					:= omit, //NP
@@ -2902,7 +2902,7 @@ module OneM2M_Templates {
 			 * @desc Base primitiveContent for CREATE operation for StatCollect resource
 			 * @param p_primitiveContent Content for the StatCollect
 			 */
-		template StatsCollect_optional m_contentCreateStatCollectBase := {
+		template (value) StatsCollect_optional m_contentCreateStatCollectBase := {
 			resourceName 				:= c_defaultStatsCollectResourceName, //O
 			resourceType				:= omit, //NP
 			resourceID					:= omit, //NP
@@ -2928,7 +2928,7 @@ module OneM2M_Templates {
 			 * @desc Base primitiveContent for CREATE operation for M2mServiceSubscriptionProfile resource
 			 * @param p_primitiveContent Content for the M2mServiceSubscriptionProfile
 			 */
-		template M2mServiceSubscriptionProfile_optional m_contentCreatem2mServiceSubscriptionProfileBase := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentCreatem2mServiceSubscriptionProfileBase := {
 			resourceName 				:= c_defaultm2mServiceSubscriptionProfileResourceName, //O
 			resourceType				:= omit, //NP
 			resourceID					:= omit, //NP
@@ -2946,7 +2946,7 @@ module OneM2M_Templates {
 		  * @desc Base primitiveContent for CREATE operation for ServiceSubscribedAppRule_optional resource
 		  * @param p_primitiveContent Content for the ServiceSubscribedAppRule_optional
 		 */
-		template ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRuleBase := {
+		template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRuleBase := {
 			resourceName 				:= c_defaultServiceSubscribedAppRuleResourceName, //O
 			resourceType				:= omit, //NP
 			resourceID					:= omit, //NP
@@ -2964,7 +2964,7 @@ module OneM2M_Templates {
 			choice 					:= omit  	         //NP   
 		};
 		
-		template ServiceSubscribedNode_optional m_contentServiceSubscribedNode := {
+		template (value) ServiceSubscribedNode_optional m_contentServiceSubscribedNode := {
 			resourceName 			:= "MyServiceServiceSubscribedNodeResource", //O
 			resourceType 			:= omit, //M
 			resourceID 				:= omit, //M
@@ -3804,7 +3804,7 @@ module OneM2M_Templates {
 			choice := *//O
 		};
     	
-		template AE_optional m_contentAe_allOmit := {
+		template (value) AE_optional m_contentAe_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -3938,7 +3938,7 @@ module OneM2M_Templates {
 			choice := *//O
 		}
 		
-		template AccessControlPolicy_optional m_contentAcp_allOmit := {
+		template AccessControlPolicy_optional mw_contentAcp_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -3954,7 +3954,7 @@ module OneM2M_Templates {
 			choice := omit//O
 		}
 		
-		template LocationPolicy_optional m_contentLocationPolicy_allOmit := {
+		template (value) LocationPolicy_optional m_contentLocationPolicy_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4020,7 +4020,7 @@ module OneM2M_Templates {
 			
 		}
 		
-		template AccessControlPolicy_optional mw_contentAcp_rc8 modifies m_contentAcp_allOmit := {
+		template AccessControlPolicy_optional mw_contentAcp_rc8 modifies mw_contentAcp_allOmit := {
 			choice := {choice_list := ?}	//O
 		}
     	
@@ -4078,7 +4078,7 @@ module OneM2M_Templates {
 			choice := *//O
 		}
 		
-		template Group_optional m_contentGroup_allOmit := {
+		template Group_optional mw_contentGroup_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4155,11 +4155,11 @@ module OneM2M_Templates {
 			
 		}
 		
-		template Group_optional mw_contentGroup_rc8 modifies m_contentGroup_allOmit := {
+		template Group_optional mw_contentGroup_rc8 modifies mw_contentGroup_allOmit := {
 			choice := {choice_list := ?}	//O
 		}
 		
-		template MgmtCmd_optional m_contentMgmtCmd_allOmit := {
+		template (value) MgmtCmd_optional m_contentMgmtCmd_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4204,7 +4204,7 @@ module OneM2M_Templates {
 			expirationTime := *//M
 		};
 		
-		template PollingChannel_optional m_contentPollingChannel_allOmit := {
+		template (value) PollingChannel_optional m_contentPollingChannel_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4242,7 +4242,7 @@ module OneM2M_Templates {
 			expirationTime := *//M
 		}
 		
-		template RemoteCSE_optional m_contentRemoteCSE_allOmit := {
+		template (value) RemoteCSE_optional m_contentRemoteCSE_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4269,7 +4269,7 @@ module OneM2M_Templates {
 			choice := omit//O
 		};
 		
-		template RemoteCSE_optional m_contentMyRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
+		template (value) RemoteCSE_optional m_contentMyRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
 			resourceName := PX_CSE1_NAME,//M
 			resourceType := int16,//M
 			resourceID := PX_CSE1_RESOURCE_ID,//M
@@ -4279,7 +4279,7 @@ module OneM2M_Templates {
 			requestReachability := true//M
 		};
 		
-		template RemoteCSE_optional m_contentLocalRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
+		template (value) RemoteCSE_optional m_contentLocalRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
 			resourceName := PX_CSE_NAME,//M
 			resourceType := int16,//M
 			resourceID := PX_CSE_RESOURCE_ID,//M
@@ -4368,7 +4368,7 @@ module OneM2M_Templates {
 			choice := *//O
 		}
 		
-		template Schedule_optional m_contentSchedule_allOmit := {
+		template Schedule_optional mw_contentSchedule_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4421,11 +4421,11 @@ module OneM2M_Templates {
 			
 		}
 		
-		template Schedule_optional mw_contentSchedule_rc8 modifies m_contentSchedule_allOmit := {
+		template Schedule_optional mw_contentSchedule_rc8 modifies mw_contentSchedule_allOmit := {
 			choice := {choice_list := ?}	//O
 		}
 		
-		template StatsCollect_optional m_contentStatsCollect_allOmit := {
+		template (value) StatsCollect_optional m_contentStatsCollect_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4447,7 +4447,7 @@ module OneM2M_Templates {
 			choice := omit//M
 		}
 		
-		template StatsConfig_optional m_contentStatsConfig_allOmit := {
+		template (value) StatsConfig_optional m_contentStatsConfig_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4519,7 +4519,7 @@ module OneM2M_Templates {
 			choice := *//O
 		}
 		
-		template Subscription_optional m_contentSubscription_allOmit := {
+		template Subscription_optional mw_contentSubscription_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4548,7 +4548,7 @@ module OneM2M_Templates {
 			choice := omit//O
 		}
 		
-		template Subscription_optional m_contentSubscription modifies m_contentSubscription_allOmit := {
+		template (value) Subscription_optional m_contentSubscription modifies mw_contentSubscription_allOmit := {
 			resourceType := int23	//M
 		}
 		
@@ -4604,7 +4604,7 @@ module OneM2M_Templates {
 			
 		}
 		
-		template Subscription_optional mw_contentSubscription_rc8 modifies m_contentSubscription_allOmit := {
+		template Subscription_optional mw_contentSubscription_rc8 modifies mw_contentSubscription_allOmit := {
 			choice := {choice_list := ?}	//O
 		}
     	
@@ -4634,7 +4634,7 @@ module OneM2M_Templates {
 			choice := omit	//O
 		}
 		
-		template ContentInstance_optional m_contentContentInstance_allOmit := {
+		template (value) ContentInstance_optional m_contentContentInstance_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4707,7 +4707,7 @@ module OneM2M_Templates {
 			choice := *//O
 		}
 		
-		template Container_optional m_contentContainer_allOmit := {
+		template Container_optional mw_contentContainer_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -4733,7 +4733,7 @@ module OneM2M_Templates {
 			choice := omit//O
 		}
 		
-		template Delivery_optional m_contentDelivery_allOmit := {
+		template (value) Delivery_optional m_contentDelivery_allOmit := {
 	
 			resourceName := omit,//M
 			resourceType := omit,//M
@@ -4804,11 +4804,11 @@ module OneM2M_Templates {
 		
 		}
 		
-		template Container_optional mw_contentContainer_rc8 modifies m_contentContainer_allOmit := {
+		template Container_optional mw_contentContainer_rc8 modifies mw_contentContainer_allOmit := {
 			choice := {choice_list := ?}	//O
 		}
 		
-		template Notification m_contentNotification_allOmit := {
+		template (value) Notification m_contentNotification_allOmit := {
 			notificationEvent:= omit,
 			verificationRequest := omit,
 			subscriptionDeletion := omit,
@@ -4821,12 +4821,12 @@ module OneM2M_Templates {
 			iPEDiscoveryRequest := omit
 		};
 		
-		template Notification m_contentNotification_subscriptionVerification(XSD.ID p_creator) modifies m_contentNotification_allOmit:= {
+		template (value) Notification m_contentNotification_subscriptionVerification(XSD.ID p_creator) modifies m_contentNotification_allOmit:= {
 			verificationRequest := true,
 			creator := p_creator
 		};
 		
-		template Notification mw_contentNotification_any := {
+		template  Notification mw_contentNotification_any := {
 			notificationEvent := *,
 			verificationRequest := *,
 			subscriptionDeletion := *,
@@ -4840,7 +4840,7 @@ module OneM2M_Templates {
 		};
 		
 
-		template Notification mw_contentNotificationBase := {
+		template  Notification mw_contentNotificationBase := {
 			notificationEvent := *,//O
 			verificationRequest := *,//O
 			subscriptionDeletion := *,//O
@@ -4853,13 +4853,13 @@ module OneM2M_Templates {
 			iPEDiscoveryRequest := *//O
 		};
 		
-		template Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := {
+		template  Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := {
 			verificationRequest := true,
 			creator := ?
 		}
 
 
-		template Notification mw_contentNotification (in template (present) Representation p_representation) modifies mw_contentNotificationBase := {
+		template  Notification mw_contentNotification (in template  Representation p_representation) modifies mw_contentNotificationBase := {
 			notificationEvent := {
 				representation := p_representation,
 				operationMonitor := *,
@@ -4867,7 +4867,7 @@ module OneM2M_Templates {
 			}
 		};
 		
-		template Node_optional m_contentNode_allOmit := {
+		template (value) Node_optional m_contentNode_allOmit := {
 			
 			resourceName := omit,
 			resourceType := omit,
@@ -4912,7 +4912,7 @@ module OneM2M_Templates {
 			choice := omit	//O
 		}
 		
-		template TimeSeries_optional m_contentTimeSeries_allOmit := {
+		template TimeSeries_optional mw_contentTimeSeries_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -5023,7 +5023,7 @@ module OneM2M_Templates {
 			choice := {childResource_list := ?}//O
 		}
 		
-		template TimeSeries_optional mw_contentTimeSeries_rc8 modifies m_contentTimeSeries_allOmit := {
+		template TimeSeries_optional mw_contentTimeSeries_rc8 modifies mw_contentTimeSeries_allOmit := {
 			choice := {choice_list := ?}	//O
 		}
 
@@ -5343,7 +5343,7 @@ module OneM2M_Templates {
 		
 		template RequestPrimitive mw_requestPrimitiveforInfoPort := ?;
 		
-		template ResponsePrimitive mw_responsePrimitive(in template (present) ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
+		template ResponsePrimitive mw_responsePrimitive(in template  ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
 			responseStatusCode := p_statusCode,
 			requestIdentifier := ?,
 			primitiveContent := p_content,
@@ -5379,7 +5379,7 @@ module OneM2M_Templates {
 			
 		};
     	
-    	template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
+    	template  ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
 			responseStatusCode := (int2000, int2001, int2002, int2004),
 			requestIdentifier := ?,
 			primitiveContent := p_content,
@@ -5447,7 +5447,7 @@ module OneM2M_Templates {
 			vendorInformation := *
 		};
     	
-		template ResponsePrimitive m_responseNotification(ResponseStatusCode p_statusCode, in template(omit) PrimitiveContent p_notification := omit) := {
+		template (value) ResponsePrimitive m_responseNotification(ResponseStatusCode p_statusCode, in template(omit) PrimitiveContent p_notification := omit) := {
 			responseStatusCode := p_statusCode,
 			requestIdentifier := testcasename() & "-m_responseNotification" & f_rnd(1, 1000000),
 			primitiveContent := p_notification,
@@ -5535,7 +5535,7 @@ module OneM2M_Templates {
 			requestPrimitive := {
 				requestIdentifier := testcasename() & "-m_utCreateContainer" & f_rnd(1, 1000000),
 				resourceType := int3,
-				primitiveContent := {container := m_contentContainer_allOmit}
+				primitiveContent := {container := valueof(mw_contentContainer_allOmit)}
 			}
 		}
 		
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 275bd1a5a86762b53e521ad202a63e7901dadf5e..c1518eb5b6e654a13d30c37918453fe2e661ccbb 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -8395,8 +8395,8 @@ group InvalidTypes {
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
-	  variant (choice.subscription_list) "untagged";
-	  variant (choice.subscription_list[-]) "name as 'subscription'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
     	
 	type record Container_update_invalid {
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 1c6333e961eb58de3b53a7484b7dd775905a7c42..de918eeca6ca473367b6756073d2d90138c94981 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -27,7 +27,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Create {
 						
-					function f_AE_GEN_CRE_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
+					function f_AE_GEN_CRE_001(PrimitiveScope p_primitiveScope) runs on CseSimu system AeSystem {
 						
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var integer v_resourceIndex := -1;
@@ -68,7 +68,7 @@ module OneM2M_PermutationFunctions {
 						// Postamble
 						f_cf03Down();
 					}
-					function f_AE_GEN_CRE_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
+					function f_AE_GEN_CRE_002(PrimitiveScope p_primitiveScope) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var Integer v_resourceIndex := -1;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
@@ -116,7 +116,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Update {
 						
-					function f_AE_GEN_UPD_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
+					function f_AE_GEN_UPD_001(PrimitiveScope p_primitiveScope) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var integer v_resourceIndex;
@@ -160,7 +160,7 @@ module OneM2M_PermutationFunctions {
 						// Postamble
 						f_cf03Down();
 					}
-					function f_AE_GEN_UPD_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
+					function f_AE_GEN_UPD_002(PrimitiveScope p_primitiveScope) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var integer v_resourceIndex := -1;
@@ -208,7 +208,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Retrieve {
 						
-					function f_AE_GEN_RET_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
+					function f_AE_GEN_RET_001(PrimitiveScope p_primitiveScope) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var template UtTriggerPrimitive v_utRequest;
                         var integer v_resourceIndex := -1;
@@ -251,7 +251,7 @@ module OneM2M_PermutationFunctions {
 						// Postamble
 						f_cf03Down();
 					}
-					function f_AE_GEN_RET_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
+					function f_AE_GEN_RET_002(PrimitiveScope p_primitiveScope) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var template UtTriggerPrimitive v_utRequest;
                         var integer v_resourceIndex := -1;
@@ -299,7 +299,7 @@ module OneM2M_PermutationFunctions {
 						
 			group Delete {
 						
-					function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
+					function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var template UtTriggerPrimitive v_utRequest := m_utDelete;
 						var integer v_auxInteger;
@@ -342,7 +342,7 @@ module OneM2M_PermutationFunctions {
 						// Postamble
 						f_cf03Down();
 					}
-					function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
+					function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var template UtTriggerPrimitive v_utRequest := m_utDelete;
 						var integer v_auxInteger;
@@ -395,7 +395,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Create {
 						
-				   function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
+				   function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu system AeSystem {
 	
 						//primitives for mcaPortIn
 					    var MsgIn v_request;
@@ -449,7 +449,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Create {
 			
-					function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
+					function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var integer v_resourceIndex := -1;
 						var PrimitiveContent v_localResource;
@@ -491,7 +491,7 @@ module OneM2M_PermutationFunctions {
 						// Postamble
 						f_cf03Down();
 					}
-					function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
+					function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var integer v_resourceIndex := -1;
 						
@@ -533,7 +533,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Update {
 				
-				   function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequest, in universal charstring p_action, template RequestPrimitive p_expectedUpdateRequest) runs on CseSimu {
+				   function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequest, in universal charstring p_action, template RequestPrimitive p_expectedUpdateRequest) runs on CseSimu system AeSystem {
 	
 						//primitives for mcaPortIn
 					   	var MsgIn v_request;
@@ -575,7 +575,7 @@ module OneM2M_PermutationFunctions {
 					   f_cf03Down();
 					}
 	
-					function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
+					function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu system AeSystem {
 						var MsgIn v_request;
 						var PrimitiveContent v_localResource;
 						var integer v_resourceIndex := -1;
@@ -618,7 +618,7 @@ module OneM2M_PermutationFunctions {
 
 			group Retrieve {
 				
-					function f_AE_DMR_RET_001(ResourceType p_resourceType, in template (omit) PrimitiveContent p_primitiveContent, in universal charstring p_action) runs on CseSimu {
+					function f_AE_DMR_RET_001(ResourceType p_resourceType, in template (omit) PrimitiveContent p_primitiveContent, in universal charstring p_action) runs on CseSimu system AeSystem {
 		
 						//variables
 						var template UtTriggerPrimitive v_utRequest;
@@ -676,7 +676,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Create {
 				
-					function f_AE_SUB_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
+					function f_AE_SUB_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu system AeSystem {
 	
 						var MsgIn v_request;
 						var integer v_parentIndex := -1;
@@ -738,7 +738,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Create {
 								
-					function f_CSE_GEN_CRE_001(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_CRE_001(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -799,7 +799,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_CRE_001				
 				
-					function f_CSE_GEN_CRE_002(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_CRE_002(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -859,7 +859,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_CRE_002		
 					
-					function f_CSE_GEN_CRE_003(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_CRE_003(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -921,7 +921,7 @@ module OneM2M_PermutationFunctions {
 					}//end f_CSE_GEN_CRE_003		
 
 					
-					function f_CSE_GEN_CRE_004(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_CRE_004(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -986,7 +986,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Retrieve {
 
-					function f_CSE_GEN_RET_001(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_RET_001(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var integer v_aeIndex := -1;
@@ -1043,7 +1043,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_RET_001				
 				
-					function f_CSE_GEN_RET_002(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_RET_002(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var integer v_aeIndex := -1;
@@ -1100,7 +1100,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_RET_002				
 				
-					function f_CSE_GEN_RET_003(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_RET_003(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var integer v_aeIndex := -1;
@@ -1157,7 +1157,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_RET_003				
 
-					function f_CSE_GEN_RET_004(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_RET_004(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var integer v_aeIndex := -1;
@@ -1218,7 +1218,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Update {
 								
-					function f_CSE_GEN_UPD_001(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_UPD_001(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
@@ -1281,7 +1281,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_UPD_001				
 				
-					function f_CSE_GEN_UPD_002(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_UPD_002(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
@@ -1344,7 +1344,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_UPD_002				
 				
-					function f_CSE_GEN_UPD_003(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_UPD_003(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
@@ -1407,7 +1407,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_UPD_003				
 
-					function f_CSE_GEN_UPD_004(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_UPD_004(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
@@ -1474,7 +1474,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Delete {
 
-					function f_CSE_GEN_DEL_001(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_DEL_001(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -1534,7 +1534,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_DEL_001				
 				
-					function f_CSE_GEN_DEL_002(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_DEL_002(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -1594,7 +1594,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_DEL_002				
 				
-					function f_CSE_GEN_DEL_003(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_DEL_003(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -1654,7 +1654,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_GEN_DEL_003				
 
-					function f_CSE_GEN_DEL_004(in PrimitiveScope p_primitiveScope) runs on AeSimu {
+					function f_CSE_GEN_DEL_004(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -1722,7 +1722,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Create{
 				
-				function f_CSE_REG_CRE_001(in XSD.ID v_aeIdStem) runs on AeSimu {
+				function f_CSE_REG_CRE_001(in XSD.ID v_aeIdStem) runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1778,7 +1778,7 @@ module OneM2M_PermutationFunctions {
 						
 				}
 
-				function f_CSE_REG_CRE_002(in XSD.ID v_aeIdStem) runs on AeSimu {
+				function f_CSE_REG_CRE_002(in XSD.ID v_aeIdStem) runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1830,7 +1830,7 @@ module OneM2M_PermutationFunctions {
 						
 				}
 
-				function f_CSE_REG_CRE_012(in template RequestPrimitive p_createAe) runs on AeSimu {
+				function f_CSE_REG_CRE_012(in template RequestPrimitive p_createAe) runs on AeSimu system CseSystem {
 				
 					//Local variables
 					var MsgIn v_response;
@@ -1874,7 +1874,7 @@ module OneM2M_PermutationFunctions {
 					f_cf01Down();
 				}
 								
-				function f_CSE_REG_CRE_013(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu {
+				function f_CSE_REG_CRE_013(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu system CseSystem {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1929,7 +1929,7 @@ module OneM2M_PermutationFunctions {
 				}//end f_CSE_REG_CRE_BV_013
 				
 				
-				function f_CSE_REG_CRE_017(template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
+				function f_CSE_REG_CRE_017(template RequestPrimitive p_createRequestPrimitive) runs on AeSimu system CseSystem {
 					
 					//Local variables
 					var ResourceType v_resourceType := int2;   
@@ -1975,7 +1975,7 @@ module OneM2M_PermutationFunctions {
 					
 				}
 
-				function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
+				function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu system CseSystem {
   
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
@@ -2024,7 +2024,7 @@ module OneM2M_PermutationFunctions {
 
 				}
 				
-				function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu {
+				function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu system CseSystem {
 					//Local variables
 					var ResourceType v_resourceType := int16;	//remoteCSE	
 					// Test control
@@ -2059,7 +2059,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Retrieve{
 				
-					function f_CSE_REG_RET_002(template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_REG_RET_002(template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
 						//Local variables
 						 var MsgIn v_response;
 						 var integer v_aeIndex := -1;
@@ -2074,7 +2074,7 @@ module OneM2M_PermutationFunctions {
 						 // Preamble
 						 v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 						 
-						 f_send(InterfaceIds:e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
+						 f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
 						 tc_ac.start;
 						 alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2105,7 +2105,7 @@ module OneM2M_PermutationFunctions {
 						f_cf01Down();
 					} //end f_CSE_REG_RET_002
 					
-					function f_CSE_REG_RET_004(template RequestPrimitive p_createRequestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_REG_RET_004(template RequestPrimitive p_createRequestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
 						//Local variables
 						 var MsgIn v_response;
 						 var integer v_aeIndex := -1;
@@ -2120,7 +2120,7 @@ module OneM2M_PermutationFunctions {
 						 // Preamble
 						 v_aeIndex := f_cse_createResource(int2, p_createRequestPrimitive, -1);
 		 
-             f_send(InterfaceIds:e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+             f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
 						 tc_ac.start;
 						 alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2151,7 +2151,7 @@ module OneM2M_PermutationFunctions {
 						f_cf01Down();
 					} //end f_CSE_REG_RET_004
 	
-					function f_CSE_REG_RET_007(template RequestPrimitive p_createRequestPrimitive, template PrimitiveContent p_contentResponse) runs on CseSimu {
+					function f_CSE_REG_RET_007(template RequestPrimitive p_createRequestPrimitive, template PrimitiveContent p_contentResponse) runs on CseSimu system CseSystem {
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
 						var ResourceType v_resourceType := int16;	//remoteCSE
@@ -2201,7 +2201,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Update{
 			
-					function f_CSE_REG_UPD_002(template RequestPrimitive p_requestPrimitive) runs on CseSimu {
+					function f_CSE_REG_UPD_002(template RequestPrimitive p_requestPrimitive) runs on CseSimu system CseSystem {
 						//Local variables
 					    var MsgIn v_response;
 					    var RequestPrimitive v_request;
@@ -2251,7 +2251,7 @@ module OneM2M_PermutationFunctions {
 
 					}//end f_CSE_REG_UPD_002
 	
-					function f_CSE_REG_UPD_003(template RequestPrimitive p_requestPrimitive, in AttributeList p_attribute) runs on CseSimu {
+					function f_CSE_REG_UPD_003(template RequestPrimitive p_requestPrimitive, in AttributeList p_attribute) runs on CseSimu system CseSystem {
 						// Local variables
 						//Local variables
 						var MsgIn v_response;
@@ -2314,7 +2314,7 @@ module OneM2M_PermutationFunctions {
 		
 		group Data_Management_and_Repository {
 						
-			function f_CSE_DMR_001(template RequestPrimitive p_requestPrimitive) runs on CseSimu {
+			function f_CSE_DMR_001(template RequestPrimitive p_requestPrimitive) runs on CseSimu system CseSystem {
     				
 				// Local variables
 				var integer v_aeIndex, v_remoteCseIndex, v_targetResourceIndex := -1;
@@ -2402,7 +2402,7 @@ module OneM2M_PermutationFunctions {
 				
 			}//end f_CSE_DMR_001
 
-			function f_CSE_DMR_002(template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+			function f_CSE_DMR_002(template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 				// Local variables
 				var integer v_aeIndex, v_cseBaseIndex, v_targetResourceIndex := -1;
@@ -2483,7 +2483,7 @@ module OneM2M_PermutationFunctions {
 
 			group Create {	
 				
-				function f_CSE_DMR_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu return ResponsePrimitive {
+				function f_CSE_DMR_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu system CseSystem return ResponsePrimitive {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -2596,7 +2596,7 @@ module OneM2M_PermutationFunctions {
 					    				
 				}//end f_CSE_DMR_CRE_001
 					
-					function f_CSE_DMR_CRE_001_cseSimu(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResourceType p_parentResourceType := int2, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on CseSimu{
+					function f_CSE_DMR_CRE_001_cseSimu(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResourceType p_parentResourceType := int2, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on CseSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -2676,7 +2676,7 @@ module OneM2M_PermutationFunctions {
 					    				
 					}//end f_CSE_DMR_CRE_001_cseSimu
     									
-					function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive {
+					function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive {
 				
 						// Local variables
 						var MsgIn v_response;
@@ -2740,7 +2740,7 @@ module OneM2M_PermutationFunctions {
 				
 					}//end f_CSE_DMR_CRE_002
 					
-					function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -2805,7 +2805,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_003
     				
-					function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -2873,7 +2873,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_004
     				
-					function f_CSE_DMR_CRE_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeAux p_invalidAttribute) runs on AeSimu {
+					function f_CSE_DMR_CRE_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeAux p_invalidAttribute) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -2931,7 +2931,7 @@ module OneM2M_PermutationFunctions {
 					    				
 					}//end f_CSE_DMR_CRE_005
 						
-					function f_CSE_DMR_CRE_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive {
+					function f_CSE_DMR_CRE_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -2993,7 +2993,7 @@ module OneM2M_PermutationFunctions {
 					    				
 					}//end f_CSE_DMR_CRE_006
 					
-					function f_CSE_DMR_CRE_007(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild1, template RequestPrimitive p_requestPrimitiveChild2, XSD.String p_resourceName) runs on AeSimu {
+					function f_CSE_DMR_CRE_007(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild1, template RequestPrimitive p_requestPrimitiveChild2, XSD.String p_resourceName) runs on AeSimu system CseSystem {
 						//Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
@@ -3055,7 +3055,7 @@ module OneM2M_PermutationFunctions {
 	
 					}//end f_CSE_DMR_CRE_007
 					
-					function f_CSE_DMR_CRE_008(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild1, template RequestPrimitive p_requestPrimitiveChild2, XSD.String p_resourceName) runs on AeSimu {
+					function f_CSE_DMR_CRE_008(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild1, template RequestPrimitive p_requestPrimitiveChild2, XSD.String p_resourceName) runs on AeSimu system CseSystem {
 						//Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
@@ -3117,7 +3117,7 @@ module OneM2M_PermutationFunctions {
 
 					}//end f_CSE_DMR_CRE_008
 						
-					function f_CSE_DMR_CRE_012(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeList p_optionalAttribute) runs on AeSimu {
+					function f_CSE_DMR_CRE_012(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeList p_optionalAttribute) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3208,7 +3208,7 @@ module OneM2M_PermutationFunctions {
 					    					    				
 					}//end f_CSE_DMR_CRE_012
 					
-					function f_CSE_DMR_CRE_013(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu {
+					function f_CSE_DMR_CRE_013(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
@@ -3258,7 +3258,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_CRE_013
 					
-					function f_CSE_DMR_CRE_014(ResourceType p_parentResourceType, template RequestPrimitive p_parentResourceRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_CRE_014(ResourceType p_parentResourceType, template RequestPrimitive p_parentResourceRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
@@ -3331,7 +3331,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_CRE_014
 
-					function f_CSE_DMR_CRE_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_CRE_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3387,7 +3387,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_015
     				
-					function f_CSE_DMR_CRE_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_CRE_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3448,7 +3448,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_016
     				
-					function f_CSE_DMR_CRE_017(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_CRE_017(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3508,7 +3508,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_017
 						
-					function f_CSE_DMR_CRE_018(ResultContent p_resultContent) runs on AeSimu {
+					function f_CSE_DMR_CRE_018(ResultContent p_resultContent) runs on AeSimu system CseSystem {
 			
 						// Local variables
 						var MsgIn v_response;
@@ -3557,7 +3557,7 @@ module OneM2M_PermutationFunctions {
 			
 					}//end f_CSE_DMR_CRE_018
 
-					function f_CSE_DMR_CRE_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_CRE_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3614,7 +3614,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_019
 
-					function f_CSE_DMR_CRE_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_CRE_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3671,7 +3671,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_020
 
-					function f_CSE_DMR_CRE_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseSimu{
+					function f_CSE_DMR_CRE_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseSimu system CseSystem {
 	    				
 						// Local variables
 						var MsgIn v_response;
@@ -3735,7 +3735,7 @@ module OneM2M_PermutationFunctions {
 	    				
 					}//end f_CSE_DMR_CRE_021
     				
-					function f_CSE_DMR_CRE_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu {
+					function f_CSE_DMR_CRE_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3774,7 +3774,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_022
     				
-					function f_CSE_DMR_CRE_023(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu{
+					function f_CSE_DMR_CRE_023(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu system CseSystem{
 	
 						// Local variables
 						var MsgIn v_anncRequest;
@@ -3833,7 +3833,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Retrieve {
 				
-					function f_CSE_DMR_RET_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu return ResponsePrimitive {
+					function f_CSE_DMR_RET_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem return ResponsePrimitive {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3899,7 +3899,7 @@ module OneM2M_PermutationFunctions {
 						return v_response.primitive.responsePrimitive;
     				
 					}//end f_CSE_DMR_RET_001
-					function f_CSE_DMR_RET_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -3961,7 +3961,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_003
     				
-					function f_CSE_DMR_RET_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_RET_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4018,7 +4018,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_004
     				
-					function f_CSE_DMR_RET_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_RET_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4074,7 +4074,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_005
     				
-					function f_CSE_DMR_RET_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_RET_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4131,7 +4131,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_006
     				
-					function f_CSE_DMR_RET_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4184,7 +4184,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_007
     				
-					function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, AttributeList_1 p_attributeList) runs on AeSimu {
+					function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, AttributeList_1 p_attributeList) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4237,7 +4237,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_008
     				
-					function f_CSE_DMR_RET_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_RET_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4328,7 +4328,7 @@ module OneM2M_PermutationFunctions {
 						
 					}//end f_CSE_DMR_RET_013
     				
-					function f_CSE_DMR_RET_014(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_014(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4416,7 +4416,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_014
     				
-					function f_CSE_DMR_RET_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_RET_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4499,7 +4499,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_015
     				
-					function f_CSE_DMR_RET_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_RET_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4580,7 +4580,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_016
     				
-					function f_CSE_DMR_RET_017(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_DMR_RET_017(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4662,7 +4662,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_017
     				
-					function f_CSE_DMR_RET_018(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_018(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4740,7 +4740,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_018
     				
-					function f_CSE_DMR_RET_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -4818,7 +4818,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_RET_019
     				
-				function f_CSE_DMR_RET_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on AeSimu {
+				function f_CSE_DMR_RET_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on AeSimu system CseSystem {
 		
 					// Local variables
 					var MsgIn v_response;
@@ -4869,7 +4869,7 @@ module OneM2M_PermutationFunctions {
 		
 				}//end f_CSE_DMR_RET_020
 		
-				function f_CSE_DMR_RET_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+				function f_CSE_DMR_RET_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -4938,7 +4938,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_RET_021
 		
-					function f_CSE_DMR_RET_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -5007,7 +5007,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_RET_022
 		
-					function f_CSE_DMR_RET_023(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_023(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -5077,7 +5077,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_RET_023
 		
-					function f_CSE_DMR_RET_024(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_024(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -5146,7 +5146,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_RET_024
 		
-					function f_CSE_DMR_RET_025(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_RET_025(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -5218,7 +5218,7 @@ module OneM2M_PermutationFunctions {
 			}//end group Retrieve
 			
 			group Update {
-					function f_CSE_DMR_UPD_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu return ResponsePrimitive{
+					function f_CSE_DMR_UPD_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive{
     				
 						// Local variables
 						var MsgIn v_response;
@@ -5279,7 +5279,7 @@ module OneM2M_PermutationFunctions {
     					    				
 					}//end f_CSE_DMR_UPD_001
     				
-					function f_CSE_DMR_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu return ResponsePrimitive {
+					function f_CSE_DMR_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem return ResponsePrimitive {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -5338,7 +5338,7 @@ module OneM2M_PermutationFunctions {
     					    				
 					}//end f_CSE_DMR_UPD_002
     				
-					function f_CSE_DMR_UPD_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu return ResponsePrimitive {
+					function f_CSE_DMR_UPD_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu system CseSystem return ResponsePrimitive {
     				
 						// Local variables
 						var RequestPrimitive v_request;
@@ -5397,7 +5397,7 @@ module OneM2M_PermutationFunctions {
     					    				
 					}//end f_CSE_DMR_UPD_003
     				
-					function f_CSE_DMR_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu return ResponsePrimitive {
+					function f_CSE_DMR_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu system CseSystem return ResponsePrimitive {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -5455,7 +5455,7 @@ module OneM2M_PermutationFunctions {
     					    				
 					}//end f_CSE_DMR_UPD_004
     				
-					function f_CSE_DMR_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -5518,7 +5518,7 @@ module OneM2M_PermutationFunctions {
     					    				
 					}//end f_CSE_DMR_UPD_006
     				
-					function f_CSE_DMR_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -5574,7 +5574,7 @@ module OneM2M_PermutationFunctions {
     					    				
 					}//end f_CSE_DMR_UPD_007
     				
-					function f_CSE_DMR_UPD_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu {
+					function f_CSE_DMR_UPD_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu system CseSystem {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -5630,7 +5630,7 @@ module OneM2M_PermutationFunctions {
     					    				
 					}//end f_CSE_DMR_UPD_008
 					
-					function f_CSE_DMR_UPD_009(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_UPD_009(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
 	    				
 						// Local variables
 						var MsgIn v_response;
@@ -5685,7 +5685,7 @@ module OneM2M_PermutationFunctions {
 	    					    				
 					}//end f_CSE_DMR_UPD_009
 					
-					function f_CSE_DMR_UPD_010(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_UPD_010(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
 	    				
 						// Local variables
 						var MsgIn v_response;
@@ -5734,7 +5734,7 @@ module OneM2M_PermutationFunctions {
 		    				
 					}//end f_CSE_DMR_UPD_010
 					
-					function f_CSE_DMR_UPD_011(ResourceType p_resourceTypeParent, template RequestPrimitive p_createParentRequestPrimitive, ResourceType p_resourceTypeChild, template RequestPrimitive p_createChildRequestPrimitive,template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_UPD_011(ResourceType p_resourceTypeParent, template RequestPrimitive p_createParentRequestPrimitive, ResourceType p_resourceTypeChild, template RequestPrimitive p_createChildRequestPrimitive,template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
 						//Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
@@ -5789,7 +5789,7 @@ module OneM2M_PermutationFunctions {
 		    			
 					}//end f_CSE_DMR_UPD_011
     				
-					function f_CSE_DMR_UPD_014(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_UPD_014(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
 	
 						// Local variables
 						var MsgIn v_response;
@@ -5839,7 +5839,7 @@ module OneM2M_PermutationFunctions {
 				
 					}//end f_CSE_DMR_UPD_014
 	
-					function f_CSE_DMR_UPD_015(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, boolean p_secondAcp := false) runs on AeSimu {
+					function f_CSE_DMR_UPD_015(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, boolean p_secondAcp := false) runs on AeSimu system CseSystem {
 						//Local variables
 						var MsgIn v_response;
 						var AcpType v_acpi;
@@ -5930,7 +5930,7 @@ module OneM2M_PermutationFunctions {
 					  
 					} // end function f_CSE_DMR_UPD_015
 			  		
-					function f_CSE_DMR_UPD_016(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_UPD_016(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
 						 //Local variables
 						 var MsgIn v_response;
 						 var RequestPrimitive v_request;
@@ -6029,7 +6029,7 @@ module OneM2M_PermutationFunctions {
 						
 					} //end function f_CSE_DMR_UPD_016
 					
-				function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu {
+				function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -6094,7 +6094,7 @@ module OneM2M_PermutationFunctions {
 	
 				}//end f_CSE_DMR_UPD_017
 					
-				function f_CSE_DMR_UPD_018(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu {
+				function f_CSE_DMR_UPD_018(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -6159,7 +6159,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_DMR_UPD_018
 				
-				function f_CSE_DMR_UPD_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on AeSimu {
+				function f_CSE_DMR_UPD_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on AeSimu system CseSystem {
 		
 					// Local variables
 					var MsgIn v_response;
@@ -6211,7 +6211,7 @@ module OneM2M_PermutationFunctions {
 		
 				}//end f_CSE_DMR_UPD_019
 			  	
-				function f_CSE_DMR_UPD_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+				function f_CSE_DMR_UPD_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -6280,7 +6280,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_UPD_020
 
-				function f_CSE_DMR_UPD_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+				function f_CSE_DMR_UPD_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -6349,7 +6349,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_UPD_021
 
-				function f_CSE_DMR_UPD_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
+				function f_CSE_DMR_UPD_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -6422,7 +6422,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Delete {
 			
-					function f_CSE_DMR_DEL_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_DEL_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
@@ -6493,7 +6493,7 @@ module OneM2M_PermutationFunctions {
                 							
 					};//end f_CSE_DMR_DEL_001
                 
-					function f_CSE_DMR_DEL_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
+					function f_CSE_DMR_DEL_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
@@ -6583,7 +6583,7 @@ module OneM2M_PermutationFunctions {
                 							
 					};//end f_CSE_DMR_DEL_002
                 	
-					function f_CSE_DMR_DEL_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_createRequestPrimitiveChildResource) runs on AeSimu {
+					function f_CSE_DMR_DEL_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_createRequestPrimitiveChildResource) runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -6647,7 +6647,7 @@ module OneM2M_PermutationFunctions {
                 						
 					};//end f_CSE_DMR_DEL_004
 					
-					function f_CSE_DMR_DEL_005(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu {
+					function f_CSE_DMR_DEL_005(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu system CseSystem {
 						//Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
@@ -6701,7 +6701,7 @@ module OneM2M_PermutationFunctions {
 						
 					};//end f_CSE_DMR_DEL_005
 					
-					function f_CSE_DMR_DEL_006(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu {
+					function f_CSE_DMR_DEL_006(ResourceType p_resourceTypeParent, template RequestPrimitive p_requestPrimitiveParent, ResourceType p_resourceTypeChild, template RequestPrimitive p_requestPrimitiveChild) runs on AeSimu system CseSystem {
 						//Local variables
 						var integer v_aeIndex := -1;
 						var integer v_parentIndex := -1;
@@ -6776,7 +6776,7 @@ module OneM2M_PermutationFunctions {
 						f_cf01Down();
 					};//end f_CSE_DMR_DEL_006
 					
-				function f_CSE_DMR_DEL_011(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on AeSimu {
+				function f_CSE_DMR_DEL_011(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on AeSimu system CseSystem {
 		
 					// Local variables
 					var MsgIn v_response;
@@ -6828,7 +6828,7 @@ module OneM2M_PermutationFunctions {
 		
 				}//end f_CSE_DMR_DEL_011
 			  	
-				function f_CSE_DMR_DEL_012(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+				function f_CSE_DMR_DEL_012(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -6898,7 +6898,7 @@ module OneM2M_PermutationFunctions {
 		
 					}//end f_CSE_DMR_DEL_012
 
-				function f_CSE_DMR_DEL_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+				function f_CSE_DMR_DEL_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 		
 						// Local variables
 						var MsgIn v_response;
@@ -6972,7 +6972,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Notify {
 			
-				function f_CSE_DMR_NTF_001(ResultContent p_resultContent) runs on AeSimu {
+				function f_CSE_DMR_NTF_001(ResultContent p_resultContent) runs on AeSimu system CseSystem {
 		
 					// Local variables
 					var MsgIn v_response;
@@ -7061,7 +7061,7 @@ module OneM2M_PermutationFunctions {
   			
 			group Basic_Operations {
 			
-					function f_CSE_GMG_001(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+					function f_CSE_GMG_001(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -7139,7 +7139,7 @@ module OneM2M_PermutationFunctions {
 	
 					} // end f_CSE_GMG_001
 	
-					function f_CSE_GMG_002(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on AeSimu {
+					function f_CSE_GMG_002(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on AeSimu system CseSystem {
 					   // Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -7205,7 +7205,7 @@ module OneM2M_PermutationFunctions {
 	
 					} // end f_CSE_GMG_002
 	
-					function f_CSE_GMG_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+					function f_CSE_GMG_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -7283,7 +7283,7 @@ module OneM2M_PermutationFunctions {
 	
 					} // end f_CSE_GMG_003
 	
-					function f_CSE_GMG_004(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on AeSimu {
+					function f_CSE_GMG_004(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on AeSimu system CseSystem {
 					   // Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -7349,7 +7349,7 @@ module OneM2M_PermutationFunctions {
 	
 					} // end f_CSE_GMG_004
 	
-					function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
 						//Local constants
 						const integer c_numberOfResponsePrimitive := 2;
 						
@@ -7428,7 +7428,7 @@ module OneM2M_PermutationFunctions {
 	
 					} // end f_CSE_GMG_005
 	
-					function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
+					function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
 						//Local constants
 						const integer c_numberOfResponsePrimitive := 2;
 			
@@ -7521,7 +7521,7 @@ module OneM2M_PermutationFunctions {
 		
 		group Discovery {
 			
-			function f_CSE_DIS_008(in FilterCriteria p_filterCriteria) runs on AeSimu {
+			function f_CSE_DIS_008(in FilterCriteria p_filterCriteria) runs on AeSimu system CseSystem {
 			
 				//Local variables
 				var MsgIn v_response;
@@ -7579,7 +7579,7 @@ module OneM2M_PermutationFunctions {
 	
 			group Create {
 				
-				function f_CSE_SUB_CRE_001(ResourceType p_parentResourceType, template RequestPrimitive p_parentResourceRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
+				function f_CSE_SUB_CRE_001(ResourceType p_parentResourceType, template RequestPrimitive p_parentResourceRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu system CseSystem {
 					//Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -7684,7 +7684,7 @@ module OneM2M_PermutationFunctions {
 				
 				group Basic_Operations {
 				
-						function f_CSE_SEC_ACP_001(template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+						function f_CSE_SEC_ACP_001(template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -7747,7 +7747,7 @@ module OneM2M_PermutationFunctions {
 	
 						} //end f_CSE_SEC_ACP_001
 	
-						function f_CSE_SEC_ACP_002(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+						function f_CSE_SEC_ACP_002(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem {
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -7814,7 +7814,7 @@ module OneM2M_PermutationFunctions {
 	
 						} //end f_CSE_SEC_ACP_002
 						
-						function f_CSE_SEC_ACP_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+						function f_CSE_SEC_ACP_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -7891,7 +7891,7 @@ module OneM2M_PermutationFunctions {
 	
 						}//end f_CSE_SEC_ACP_003
 			
-						function f_CSE_SEC_ACP_004(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+						function f_CSE_SEC_ACP_004(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -7945,7 +7945,7 @@ module OneM2M_PermutationFunctions {
 	
 						}//end f_CSE_SEC_ACP_004
 	
-						function f_CSE_SEC_ACP_005(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+						function f_CSE_SEC_ACP_005(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -8008,7 +8008,7 @@ module OneM2M_PermutationFunctions {
 	
 						}//end f_CSE_SEC_ACP_005
 	
-						function f_CSE_SEC_ACP_006(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+						function f_CSE_SEC_ACP_006(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 							// Local variables
 							var MsgIn v_response;
 							var integer v_month;
@@ -8078,7 +8078,7 @@ module OneM2M_PermutationFunctions {
 	
 						}//end f_CSE_SEC_ACP_006
 	
-						function f_CSE_SEC_ACP_007(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+						function f_CSE_SEC_ACP_007(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -8136,7 +8136,7 @@ module OneM2M_PermutationFunctions {
 	
 						}//end f_CSE_SEC_ACP_007
 	
-						function f_CSE_SEC_ACP_008(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+						function f_CSE_SEC_ACP_008(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -8194,7 +8194,7 @@ module OneM2M_PermutationFunctions {
 	
 						}//end f_CSE_SEC_ACP_008
 	
-						function f_CSE_SEC_ACP_009(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+						function f_CSE_SEC_ACP_009(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -8255,7 +8255,7 @@ module OneM2M_PermutationFunctions {
 	
 						}//end f_CSE_SEC_ACP_009
 	
-						function f_CSE_SEC_ACP_010(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+						function f_CSE_SEC_ACP_010(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -8316,7 +8316,7 @@ module OneM2M_PermutationFunctions {
 	
 						}//end f_CSE_SEC_ACP_010
 	
-						function f_CSE_SEC_ACP_011(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+						function f_CSE_SEC_ACP_011(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem {
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -8366,7 +8366,7 @@ module OneM2M_PermutationFunctions {
 	
 						} //end f_CSE_SEC_ACP_011
 	
-						function f_CSE_SEC_ACP_012(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_acor) runs on AeSimu {
+						function f_CSE_SEC_ACP_012(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_acor) runs on AeSimu system CseSystem {
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
@@ -8441,7 +8441,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Basic {
 		
-				function f_CSE_ANNC_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu {
+				function f_CSE_ANNC_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu system CseSystem {
 
 					// Local variables
 					var MsgIn v_response;
@@ -8518,7 +8518,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Create {
 				
-				function f_CSE_ANNC_CRE_001(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on AeSimu {
+				function f_CSE_ANNC_CRE_001(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on AeSimu system CseSystem {
 				  //Local variables
 				  var MsgIn v_response;
 				  var integer v_aeIndex := -1;
@@ -8553,7 +8553,7 @@ module OneM2M_PermutationFunctions {
 				  f_cf02Down();
 				} //end f_CSE_ANNC_CRE_001
 				
-				function f_CSE_ANNC_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_createRequest, in template RequestPrimitive p_updateRequest := omit, in template RequestPrimitive p_createRequestAnnc) runs on CseSimu {
+				function f_CSE_ANNC_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_createRequest, in template RequestPrimitive p_updateRequest := omit, in template RequestPrimitive p_createRequestAnnc) runs on CseSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var MsgIn v_request;
@@ -8644,7 +8644,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_CRE_002
 				
-				function f_CSE_ANNC_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu {
+				function f_CSE_ANNC_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu system CseSystem {
 
 					// Local variables
 					var MsgIn v_response;
@@ -8712,7 +8712,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_CRE_003
 				
-				function f_CSE_ANNC_CRE_004_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+				function f_CSE_ANNC_CRE_004_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var MsgIn v_request;
 					var integer v_aeIndex := -1;
@@ -8754,7 +8754,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_CRE_004
 				
-				function f_CSE_ANNC_CRE_005_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+				function f_CSE_ANNC_CRE_005_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var MsgIn v_request;
 					var integer v_parentIndex := -1;
@@ -8847,7 +8847,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_CRE_005
 				
-				function f_CSE_ANNC_CRE_006_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+				function f_CSE_ANNC_CRE_006_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var MsgIn v_request;
 					var integer v_parentIndex := -1;
@@ -8887,7 +8887,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_CRE_006
 				
-				function f_CSE_ANNC_CRE_007_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+				function f_CSE_ANNC_CRE_007_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var MsgIn v_request;
 					var integer v_parentIndex := -1;
@@ -8979,7 +8979,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_CRE_007
 				
-				function f_CSE_ANNC_CRE_008_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+				function f_CSE_ANNC_CRE_008_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var MsgIn v_request;
 					var integer v_aeIndex := -1;
@@ -9018,7 +9018,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_CRE_008
 				
-				function f_CSE_ANNC_CRE_009_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+				function f_CSE_ANNC_CRE_009_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var MsgIn v_request;
 					var integer v_parentIndex := -1;
@@ -9062,7 +9062,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Retrieve {
 			
-				function f_CSE_ANNC_RET_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu {
+				function f_CSE_ANNC_RET_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu system CseSystem {
 
 					// Local variables
 					var MsgIn v_response;
@@ -9125,7 +9125,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_RET_001
 				
-				function f_CSE_ANNC_RET_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu {
+				function f_CSE_ANNC_RET_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu system CseSystem {
 					
 					//Local variables
 					var MsgIn v_response;
@@ -9175,7 +9175,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Update{
 			
-				function f_CSE_ANNC_UPD_001(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu {
+				function f_CSE_ANNC_UPD_001(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -9241,7 +9241,7 @@ module OneM2M_PermutationFunctions {
 	
 				}//end f_CSE_ANNC_UPD_001
 	
-				function f_CSE_ANNC_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on CseSimu {
+				function f_CSE_ANNC_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -9306,7 +9306,7 @@ module OneM2M_PermutationFunctions {
 	
 				}//end f_CSE_ANNC_UPD_002
 	
-				function f_CSE_ANNC_UPD_003(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, template RequestPrimitive p_requestUpdatePrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu {
+				function f_CSE_ANNC_UPD_003(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, template RequestPrimitive p_requestUpdatePrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu system CseSystem {
 					//Local variables
 					var RequestPrimitive v_updateRequest;
 					var integer v_aeIndex := -1;
@@ -9369,7 +9369,7 @@ module OneM2M_PermutationFunctions {
 					f_cf02Down();
 				} //end f_CSE_ANNC_UPD_003
 				
-				function f_CSE_ANNC_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu {
+				function f_CSE_ANNC_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -9412,7 +9412,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_UPD_004
 	
-				function f_CSE_ANNC_UPD_005(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc, template (omit) AttributeAux_list p_nullFields := omit) runs on CseSimu {
+				function f_CSE_ANNC_UPD_005(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc, template (omit) AttributeAux_list p_nullFields := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var RequestPrimitive v_requestUpdatePrimitive;
@@ -9476,7 +9476,7 @@ module OneM2M_PermutationFunctions {
 	
 				}//end f_CSE_ANNC_UPD_005
 				
-				function f_CSE_ANNC_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu {
+				function f_CSE_ANNC_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -9535,7 +9535,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_UPD_006
 				
-				function f_CSE_ANNC_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu {
+				function f_CSE_ANNC_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -9594,7 +9594,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_UPD_007
 				
-				function f_CSE_ANNC_UPD_008(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, template RequestPrimitive p_requestUpdatePrimitive) runs on AeSimu {
+				function f_CSE_ANNC_UPD_008(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, template RequestPrimitive p_requestUpdatePrimitive) runs on AeSimu system CseSystem {
 					//Local variables
 					var RequestPrimitive v_updateRequest;
 					var integer v_aeIndex := -1;
@@ -9657,7 +9657,7 @@ module OneM2M_PermutationFunctions {
 					f_cf02Down();
 				} //end f_CSE_ANNC_UPD_008
 				
-				function f_CSE_ANNC_UPD_009(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu {
+				function f_CSE_ANNC_UPD_009(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -9722,7 +9722,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_UPD_009
 				
-				function f_CSE_ANNC_UPD_010(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu {
+				function f_CSE_ANNC_UPD_010(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -9787,7 +9787,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_UPD_010
 				
-				function f_CSE_ANNC_UPD_011(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu {
+				function f_CSE_ANNC_UPD_011(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -9852,7 +9852,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_UPD_011
 				
-				function f_CSE_ANNC_UPD_012(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc, template (omit) AttributeAux_list p_nullFields := omit) runs on CseSimu {
+				function f_CSE_ANNC_UPD_012(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc, template (omit) AttributeAux_list p_nullFields := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var RequestPrimitive v_requestUpdatePrimitive;
@@ -9916,7 +9916,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_ANNC_UPD_012
 				
-				function f_CSE_ANNC_UPD_013(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, template RequestPrimitive p_requestUpdatePrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu {
+				function f_CSE_ANNC_UPD_013(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, template RequestPrimitive p_requestUpdatePrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu system CseSystem {
 					//Local variables
 					var RequestPrimitive v_updateRequest;
 					var integer v_aeIndex := -1;
@@ -9979,7 +9979,7 @@ module OneM2M_PermutationFunctions {
 					f_cf02Down();
 				} //end f_CSE_ANNC_UPD_013
 				
-				function f_CSE_ANNC_UPD_014(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, template RequestPrimitive p_requestUpdatePrimitive) runs on AeSimu {
+				function f_CSE_ANNC_UPD_014(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, template RequestPrimitive p_requestUpdatePrimitive) runs on AeSimu system CseSystem {
 					//Local variables
 					var RequestPrimitive v_updateRequest;
 					var integer v_aeIndex := -1;
@@ -10046,7 +10046,7 @@ module OneM2M_PermutationFunctions {
 			
 			group Delete{
 				
-				function f_CSE_ANNC_DEL_001(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on AeSimu {
+				function f_CSE_ANNC_DEL_001(ResourceType p_resourceType,template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on AeSimu system CseSystem {
 					//Local variables
 					var RequestPrimitive v_request;
 				  	var integer v_aeIndex := -1;
@@ -10112,7 +10112,7 @@ module OneM2M_PermutationFunctions {
 				  	f_cf02Down();
 				} //end f_CSE_ANNC_DEL_001
 			
-				function f_CSE_ANNC_DEL_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+				function f_CSE_ANNC_DEL_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu system CseSystem {
 					// Local variables
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					var MsgIn v_request;
@@ -10184,7 +10184,7 @@ module OneM2M_PermutationFunctions {
 			 * @desc Check that the IUT rejects a <pollingChannel> OPERATION of the AE when AE-ID is not same as the AE-ID of the parent resource
 			 * 
 			*/			
-			function f_CSE_PCH_005(template RequestPrimitive p_requestPrimitive) runs on AeSimu {
+			function f_CSE_PCH_005(template RequestPrimitive p_requestPrimitive) runs on AeSimu system CseSystem {
 		
 				//Local variables
 				var integer v_aeIndex1 := -1;
@@ -10246,7 +10246,7 @@ module OneM2M_PermutationFunctions {
 
 			group Synchronous{
 
-				function f_CSE_NBR_SYN_001(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu{
+				function f_CSE_NBR_SYN_001(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu system CseSystem{
 			
 					// Local variables
 					var MsgIn v_response;
@@ -10311,7 +10311,7 @@ module OneM2M_PermutationFunctions {
 						
 				}//end f_CSE_NBR_SYN_001
 		
-				function f_CSE_NBR_SYN_002(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu{
+				function f_CSE_NBR_SYN_002(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu system CseSystem{
 			
 					// Local variables
 					var MsgIn v_response;
@@ -10406,7 +10406,7 @@ module OneM2M_PermutationFunctions {
 		
 				}//end f_CSE_NBR_SYN_002
 		
-				function f_CSE_NBR_SYN_003(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in Operation p_operation) runs on AeSimu{
+				function f_CSE_NBR_SYN_003(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in Operation p_operation) runs on AeSimu system CseSystem{
 			
 					// Local variables
 					var MsgIn v_response;
@@ -10553,7 +10553,7 @@ module OneM2M_PermutationFunctions {
 
 			group Asynchronous{
 		
-				function f_CSE_NBR_ASY_001(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu{
+				function f_CSE_NBR_ASY_001(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu system CseSystem{
 			
 					// Local variables
 					var MsgIn v_response;
@@ -10628,7 +10628,7 @@ module OneM2M_PermutationFunctions {
 		
 				}//end f_CSE_NBR_ASY_001
 				
-				function f_CSE_NBR_ASY_002(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu{
+				function f_CSE_NBR_ASY_002(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu system CseSystem{
 			
 					// Local variables
 					var MsgIn v_response;
@@ -10723,7 +10723,7 @@ module OneM2M_PermutationFunctions {
 		
 				}//end f_CSE_NBR_ASY_002
 				
-				function f_CSE_NBR_ASY_003(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+				function f_CSE_NBR_ASY_003(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 			
 					// Local variables
 					var MsgIn v_response;
@@ -10797,7 +10797,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_NBR_ASY_003
 				
-				function f_CSE_NBR_ASY_004(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu{
+				function f_CSE_NBR_ASY_004(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu system CseSystem{
 			
 					// Local variables
 					var MsgIn v_response;
@@ -10874,7 +10874,7 @@ module OneM2M_PermutationFunctions {
 
 				}//end f_CSE_NBR_ASY_004
 				
-				function f_CSE_NBR_ASY_005(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
+				function f_CSE_NBR_ASY_005(template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in ResponseStatusCode p_responseStatusCode) runs on AeSimu system CseSystem{
 			
 					// Local variables
 					var MsgIn v_response;
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index fb42edf72c7fc135f9d86bb34e60eed009d9f453..346f114608a5b560ae036c46cf68a50bacffeaf8 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -455,7 +455,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 					
-				function f_AE_REG_CRE_001() runs on CseSimu {
+				function f_AE_REG_CRE_001() runs on CseSimu system AeSystem {
 
 					//primitives for utPort
 					var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
@@ -661,7 +661,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					
 				}
 					
-				function f_AE_REG_DEL_001() runs on CseSimu {
+				function f_AE_REG_DEL_001() runs on CseSimu system AeSystem {
 	
 					//variables
 					var MsgIn v_request;
@@ -726,7 +726,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_CRE_001() runs on CseSimu {
+				function f_AE_DMR_CRE_001() runs on CseSimu system AeSystem {
 	
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
@@ -778,7 +778,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_CRE_002() runs on CseSimu {
+				function f_AE_DMR_CRE_002() runs on CseSimu system AeSystem {
 	
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 					var MsgIn v_request;
@@ -1279,7 +1279,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_RET_002() runs on CseSimu {
+				function f_AE_DMR_RET_002() runs on CseSimu system AeSystem {
 	
 					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
@@ -1338,7 +1338,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_RET_003() runs on CseSimu {
+				function f_AE_DMR_RET_003() runs on CseSimu system AeSystem {
 	
 					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
@@ -1398,7 +1398,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_RET_004() runs on CseSimu {
+				function f_AE_DMR_RET_004() runs on CseSimu system AeSystem {
 					
 					var integer v_resourceIndex := -1;
 					var PrimitiveContent v_localResource;
@@ -1454,7 +1454,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_RET_005() runs on CseSimu {
+				function f_AE_DMR_RET_005() runs on CseSimu system AeSystem {
 	
 					var integer v_resourceIndex := -1;
 					var PrimitiveContent v_localResource;
@@ -1516,7 +1516,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_DEL_001() runs on CseSimu {
+				function f_AE_DMR_DEL_001() runs on CseSimu system AeSystem {
 
 					var integer v_resourceIndex := -1;
 					var PrimitiveContent v_localResource;
@@ -1577,7 +1577,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_DEL_002() runs on CseSimu {
+				function f_AE_DMR_DEL_002() runs on CseSimu system AeSystem {
 
 					var integer v_resourceIndex := -1;
 					var PrimitiveContent v_localResource;
@@ -1638,7 +1638,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_DEL_003() runs on CseSimu {
+				function f_AE_DMR_DEL_003() runs on CseSimu system AeSystem {
 	
 					var integer v_resourceIndex := -1;
 					var PrimitiveContent v_localResource;
@@ -1699,7 +1699,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_DMR_DEL_004() runs on CseSimu {
+				function f_AE_DMR_DEL_004() runs on CseSimu system AeSystem {
 
 					var integer v_resourceIndex, v_containerResourceIndex := -1;
 					var PrimitiveContent v_localResource;
@@ -1771,7 +1771,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_SUB_CRE_001() runs on CseSimu {
+				function f_AE_SUB_CRE_001() runs on CseSimu system AeSystem {
 				
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
@@ -1958,7 +1958,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_SUB_NTF_001() runs on CseSimu {
+				function f_AE_SUB_NTF_001() runs on CseSimu system AeSystem {
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
@@ -2067,7 +2067,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_cse1.done;
 				}
 
-				function f_AE_SUB_NTF_002() runs on CseSimu {
+				function f_AE_SUB_NTF_002() runs on CseSimu system AeSystem {
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
@@ -2180,7 +2180,7 @@ module OneM2M_Testcases_AE_Release_1 {
 				v_cse1.done;
 			}
 			
-			function f_AE_PCH_001() runs on CseSimu {
+			function f_AE_PCH_001() runs on CseSimu system AeSystem {
 			//Local variables
 			  var integer v_pollingChannelIndex := -1;
 			  var integer v_aeIndex := -1;
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 078f93b157cd0dde6a41329349e88ef3a7d62ec9..afd9c5d85b0309819ffd80891cc11334779a6f33 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -448,7 +448,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_REG_CRE_003() runs on CseSimu {
+				function f_CSE_REG_CRE_003() runs on CseSimu system CseSystem {
 					
 					//Local variables
 					var MsgIn v_request;
@@ -513,7 +513,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_REG_CRE_004() runs on AeSimu {
+				function f_CSE_REG_CRE_004() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -581,7 +581,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_REG_CRE_005() runs on CseSimu {
+				function f_CSE_REG_CRE_005() runs on CseSimu system CseSystem {
 		  	  	
 		  	  		//Local variables
 		  	  		var MsgIn v_request;
@@ -644,7 +644,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_006() runs on CseSimu {
+				function f_CSE_REG_CRE_006() runs on CseSimu system CseSystem {
 
 					var MsgIn v_request;
 					var template RequestPrimitive v_requestPrimitive;
@@ -711,7 +711,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_REG_CRE_007() runs on AeSimu {
+				function f_CSE_REG_CRE_007() runs on AeSimu system CseSystem {
 
 					var MsgIn v_response;
 					var template RequestPrimitive v_requestPrimitive;
@@ -786,7 +786,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_008() runs on CseSimu {
+				function f_CSE_REG_CRE_008() runs on CseSimu system CseSystem {
 		  	  	
 					var RequestPrimitive v_request;
 					var template RequestPrimitive v_updateAeAnnc := mw_updateAEAnnc;
@@ -870,7 +870,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_009() runs on CseSimu {
+				function f_CSE_REG_CRE_009() runs on CseSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -946,7 +946,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_REG_CRE_010() runs on AeSimu {
+				function f_CSE_REG_CRE_010() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1035,7 +1035,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_REG_CRE_011() runs on AeSimu {
+				function f_CSE_REG_CRE_011() runs on AeSimu system CseSystem {
 
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1195,7 +1195,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_016() runs on AeSimu {
+				function f_CSE_REG_CRE_016() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1292,7 +1292,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_018() runs on CseSimu {
+				function f_CSE_REG_CRE_018() runs on CseSimu system CseSystem {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1356,7 +1356,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_019() runs on CseSimu {
+				function f_CSE_REG_CRE_019() runs on CseSimu system CseSystem {
 				
 					// Local variables
 					var MsgIn v_response;
@@ -1415,7 +1415,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		  	  		
 				}
 				
-				function f_CSE_REG_CRE_020() runs on AeSimu {
+				function f_CSE_REG_CRE_020() runs on AeSimu system CseSystem {
 		  	  	
 					//Local variables
 					var RequestPrimitive v_request;
@@ -1490,7 +1490,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_021() runs on AeSimu {
+				function f_CSE_REG_CRE_021() runs on AeSimu system CseSystem {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -1550,7 +1550,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_022() runs on AeSimu {				
+				function f_CSE_REG_CRE_022() runs on AeSimu system CseSystem {				
 					
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1616,7 +1616,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_023() runs on AeSimu {
+				function f_CSE_REG_CRE_023() runs on AeSimu system CseSystem {
 				  
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -1676,7 +1676,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_024() runs on CseSimu {
+				function f_CSE_REG_CRE_024() runs on CseSimu system CseSystem {
   
 					// Local variables
 					var ResponsePrimitive v_response;
@@ -1756,7 +1756,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_025() runs on CseSimu {
+				function f_CSE_REG_CRE_025() runs on CseSimu system CseSystem {
 	  
 					// Local variables
 					var MsgIn v_response;
@@ -1896,7 +1896,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_027() runs on CseSimu {
+				function f_CSE_REG_CRE_027() runs on CseSimu system CseSystem {
 					//Local variables
 					var ResourceType v_resourceType := int16;	//remoteCSE	
 					var RequestPrimitive v_request;
@@ -2015,7 +2015,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_029() runs on CseSimu {
+				function f_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -2088,7 +2088,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_REG_CRE_030() runs on AeSimu {
+				function f_CSE_REG_CRE_030() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -2158,7 +2158,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_CRE_031() runs on CseSimu {
+				function f_CSE_REG_CRE_031() runs on CseSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -2242,7 +2242,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_REG_RET_001() runs on AeSimu {
+				function f_CSE_REG_RET_001() runs on AeSimu system CseSystem {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -2343,7 +2343,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  	  		
 				}
 								
-				function f_CSE_REG_RET_003() runs on AeSimu {
+				function f_CSE_REG_RET_003() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -2466,7 +2466,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  	  		
 				}
 								
-				function f_CSE_REG_RET_005() runs on AeSimu {
+				function f_CSE_REG_RET_005() runs on AeSimu system CseSystem {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -2549,7 +2549,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_RET_006() runs on CseSimu {
+				function f_CSE_REG_RET_006() runs on CseSimu system CseSystem {
 					//Local variables
 					 //Local variables
 					 var MsgIn v_response;
@@ -2569,7 +2569,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				    
 					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
  
-					 f_send(InterfaceIds:e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+					 f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
 					 tc_ac.start;
 					 alt {
 						 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2688,7 +2688,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  	  		
 				}
 								
-				function f_CSE_REG_RET_008() runs on AeSimu {
+				function f_CSE_REG_RET_008() runs on AeSimu system CseSystem {
     				
 					// Local variables
 					var MsgIn v_response;
@@ -2765,7 +2765,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_cse1.done;
 				}
 							
-				function f_CSE_REG_RET_009() runs on CseSimu {
+				function f_CSE_REG_RET_009() runs on CseSimu system CseSystem {
 					 //Local variables
 					 var MsgIn v_request;
 					 var ResourceType v_resourceType := int16;	//remoteCSE
@@ -2843,7 +2843,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_REG_RET_010() runs on CseSimu {
+				function f_CSE_REG_RET_010() runs on CseSimu system CseSystem {
 					 //Local variables
 					 var MsgIn v_response;
 					 var RequestPrimitive v_request;
@@ -2863,7 +2863,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 
  					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 	 
-					 f_send(InterfaceIds:e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+					 f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
 					 tc_ac.start;
 					 alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2912,7 +2912,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  	  		
 				}
 								
-				function f_CSE_REG_UPD_001() runs on AeSimu {
+				function f_CSE_REG_UPD_001() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -3099,7 +3099,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  	  		
 				}
 								
-				function f_CSE_REG_DEL_001() runs on AeSimu {
+				function f_CSE_REG_DEL_001() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -3154,7 +3154,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_REG_DEL_002() runs on CseSimu {
+				function f_CSE_REG_DEL_002() runs on CseSimu system CseSystem {
 					//Local variables	
 					var RequestPrimitive v_request;
 					// Test control
@@ -3219,7 +3219,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  	  		
 				}
 								
-				function f_CSE_REG_DEL_003() runs on AeSimu {
+				function f_CSE_REG_DEL_003() runs on AeSimu system CseSystem {
 					//Local variables
 					var RequestPrimitive v_request;
 					var integer v_aeIndex := -1;	
@@ -3279,7 +3279,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_REG_DEL_004() runs on CseSimu {
+				function f_CSE_REG_DEL_004() runs on CseSimu system CseSystem {
 					//Local variables
 					var MsgIn v_request;
 					var template UtTriggerPrimitive v_utRequest := m_utDelete;
@@ -3358,7 +3358,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  	  		
 				}
 								
-				function f_CSE_REG_DEL_005() runs on AeSimu {
+				function f_CSE_REG_DEL_005() runs on AeSimu system CseSystem {
 					//Local variables
 					var RequestPrimitive v_request;
 					var integer v_aeIndex := -1;	
@@ -3422,7 +3422,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 						
-				function f_CSE_REG_DEL_006() runs on CseSimu {
+				function f_CSE_REG_DEL_006() runs on CseSimu system CseSystem {
 		  	  	
 					var RequestPrimitive v_request;
 					var template RequestPrimitive v_updateAeAnnc := mw_updateAEAnnc;
@@ -3498,7 +3498,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_REG_DEL_007() runs on AeSimu {
+				function f_CSE_REG_DEL_007() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -4145,7 +4145,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 				
-				function f_CSE_DMR_CRE_007() runs on AeSimu {
+				function f_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
 					// Local variables
 					var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
 					var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
@@ -4227,7 +4227,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 					  	  		
 				}		
-				function f_CSE_DMR_CRE_008() runs on AeSimu {
+				function f_CSE_DMR_CRE_008() runs on AeSimu system CseSystem {
 					//Local variables
 					var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
 					var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
@@ -4313,7 +4313,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 				
-				function f_CSE_DMR_CRE_009() runs on AeSimu {
+				function f_CSE_DMR_CRE_009() runs on AeSimu system CseSystem {
 					// Local variables
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					var MsgIn v_response;
@@ -4391,7 +4391,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}					
 				
-				function f_CSE_DMR_CRE_010() runs on AeSimu {
+				function f_CSE_DMR_CRE_010() runs on AeSimu system CseSystem {
 					// Local variables
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					var MsgIn v_response;
@@ -4469,7 +4469,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 				
-				function f_CSE_DMR_CRE_011() runs on AeSimu {
+				function f_CSE_DMR_CRE_011() runs on AeSimu system CseSystem {
 					// Local variables
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					var MsgIn v_response;
@@ -4709,7 +4709,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 				
-				function f_CSE_DMR_CRE_013() runs on AeSimu {
+				function f_CSE_DMR_CRE_013() runs on AeSimu system CseSystem {
 					// Local variables
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					var MsgIn v_response;
@@ -4916,7 +4916,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 				
-				function f_CSE_DMR_RET_010() runs on AeSimu {
+				function f_CSE_DMR_RET_010() runs on AeSimu system CseSystem {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -4991,7 +4991,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 
-				function f_CSE_DMR_RET_012() runs on AeSimu {
+				function f_CSE_DMR_RET_012() runs on AeSimu system CseSystem {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -6021,7 +6021,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 			  	  		
 				}
 					
-				function f_CSE_DMR_UPD_005() runs on AeSimu {
+				function f_CSE_DMR_UPD_005() runs on AeSimu system CseSystem {
 					//Local variables
 					var RequestPrimitive v_request;
 					var integer v_aeIndex := -1;
@@ -6441,7 +6441,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 				  	  		
 				}
-				function f_CSE_DMR_UPD_010() runs on AeSimu {
+				function f_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -6514,7 +6514,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 				  	  		
 				}
-				function f_CSE_DMR_UPD_011() runs on AeSimu {
+				function f_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -6595,7 +6595,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 				  	  		
 				}
-				function f_CSE_DMR_UPD_012() runs on AeSimu {
+				function f_CSE_DMR_UPD_012() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -6678,7 +6678,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 				  	  		
 				}
-				function f_CSE_DMR_UPD_013() runs on AeSimu {
+				function f_CSE_DMR_UPD_013() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -8191,7 +8191,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 
-				function f_CSE_DMR_DEL_005() runs on AeSimu {
+				function f_CSE_DMR_DEL_005() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -8289,7 +8289,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 				
-				function f_CSE_DMR_DEL_006() runs on AeSimu {
+				function f_CSE_DMR_DEL_006() runs on AeSimu system CseSystem {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -8356,7 +8356,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 				
-				function f_CSE_DMR_DEL_007() runs on AeSimu {
+				function f_CSE_DMR_DEL_007() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -8448,7 +8448,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 
-				function f_CSE_DMR_DEL_009() runs on AeSimu {
+				function f_CSE_DMR_DEL_009() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -8548,7 +8548,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_SUB_CRE_002() runs on AeSimu {
+				function f_CSE_SUB_CRE_002() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -8626,7 +8626,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_SUB_CRE_003() runs on AeSimu {
+				function f_CSE_SUB_CRE_003() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -8698,7 +8698,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_SUB_CRE_004() runs on AeSimu {
+				function f_CSE_SUB_CRE_004() runs on AeSimu system CseSystem {
 					//Local variables
 					 var template RequestPrimitive v_request := m_createSubscriptionBase;
 					 var RequestPrimitive v_notificationRequest;
@@ -8760,7 +8760,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_SUB_CRE_005() runs on AeSimu {
+				function f_CSE_SUB_CRE_005() runs on AeSimu system CseSystem {
 					
 					// Local variables
 					var MsgIn v_response;
@@ -8843,7 +8843,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 							
-				function f_CSE_SUB_UPD_001() runs on AeSimu {
+				function f_CSE_SUB_UPD_001() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -8929,7 +8929,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  	  		
 				}
 								
-				function f_CSE_SUB_DEL_001() runs on AeSimu {
+				function f_CSE_SUB_DEL_001() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -9029,7 +9029,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  	  		
 					}
 								
-					function f_CSE_SEC_ACP_CRE_001() runs on AeSimu {
+					function f_CSE_SEC_ACP_CRE_001() runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -9112,7 +9112,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  	  		
 					}
 									
-					function f_CSE_SEC_ACP_CRE_002() runs on AeSimu {
+					function f_CSE_SEC_ACP_CRE_002() runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -9196,7 +9196,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  	  		
 					}
 									
-					function f_CSE_SEC_ACP_CRE_003() runs on AeSimu {
+					function f_CSE_SEC_ACP_CRE_003() runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_acpIndex := -1;
@@ -9279,7 +9279,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  	  		
 					}
 									
-					function f_CSE_SEC_ACP_CRE_004() runs on AeSimu {
+					function f_CSE_SEC_ACP_CRE_004() runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_acpIndex := -1;
@@ -9356,7 +9356,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  	  		
 					}
 									
-					function f_CSE_SEC_ACP_UPD_001() runs on AeSimu {
+					function f_CSE_SEC_ACP_UPD_001() runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -9448,7 +9448,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  	  		
 					}
 									
-					function f_CSE_SEC_ACP_UPD_002() runs on AeSimu {
+					function f_CSE_SEC_ACP_UPD_002() runs on AeSimu system CseSystem {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
@@ -10022,7 +10022,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							  	  		
 			}
 									
-			function f_CSE_DIS_001() runs on AeSimu {
+			function f_CSE_DIS_001() runs on AeSimu system CseSystem {
 				// Local variables
 				var integer v_aeIndex := -1;
 				var integer v_resourceIndex := -1;
@@ -10084,7 +10084,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 								  	  		
 			}
 										
-			function f_CSE_DIS_002() runs on AeSimu {
+			function f_CSE_DIS_002() runs on AeSimu system CseSystem {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -10156,7 +10156,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 								  	  		
 			}
 										
-			function f_CSE_DIS_003() runs on AeSimu {
+			function f_CSE_DIS_003() runs on AeSimu system CseSystem {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -10227,7 +10227,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 								  	  		
 			}
 										
-			function f_CSE_DIS_004() runs on AeSimu {
+			function f_CSE_DIS_004() runs on AeSimu system CseSystem {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -10298,9 +10298,9 @@ module OneM2M_Testcases_CSE_Release_1 {
 								  	  		
 			}
 										
-			function f_CSE_DIS_005() runs on AeSimu {
+			function f_CSE_DIS_005() runs on AeSimu system CseSystem {
 				// Local variables
-				var RequestPrimitive v_requestPrimitive := m_createContainerBase;
+				var RequestPrimitive v_requestPrimitive := valueof(m_createContainerBase);
 				var integer v_aeIndex := -1;
 				var integer v_resourceIndex := -1;
 				var RequestPrimitive v_request;
@@ -10370,7 +10370,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 								  	  		
 			}
 										
-			function f_CSE_DIS_006() runs on AeSimu {
+			function f_CSE_DIS_006() runs on AeSimu system CseSystem {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -10436,7 +10436,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 								  	  		
 			}
 										
-			function f_CSE_DIS_007() runs on AeSimu {
+			function f_CSE_DIS_007() runs on AeSimu system CseSystem {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -10576,7 +10576,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 								  	  		
 			}
 										
-			function f_CSE_DIS_009() runs on AeSimu {
+			function f_CSE_DIS_009() runs on AeSimu system CseSystem {
 				// Local variables
 				var MsgIn v_response;
 				var integer v_aeIndex := -1;
@@ -10660,7 +10660,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 								  	  		
 				}
 										
-				function f_CSE_GMG_CRE_001() runs on AeSimu {
+				function f_CSE_GMG_CRE_001() runs on AeSimu system CseSystem {
 					// Local constants
 					const XSD.NonNegativeInteger c_maxNrOfMembers := 1;
 					
@@ -10747,7 +10747,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 									  	  		
 				}
 											
-				function f_CSE_GMG_CRE_002() runs on AeSimu {
+				function f_CSE_GMG_CRE_002() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -10831,7 +10831,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 									  	  		
 				}
 											
-				function f_CSE_GMG_CRE_003() runs on AeSimu {                   
+				function f_CSE_GMG_CRE_003() runs on AeSimu system CseSystem {                   
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -10898,7 +10898,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 									  	  		
 				}
 											
-				function f_CSE_GMG_CRE_004() runs on AeSimu {
+				function f_CSE_GMG_CRE_004() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -10965,7 +10965,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 									  	  		
 				}
 											
-				function f_CSE_GMG_CRE_005() runs on AeSimu {
+				function f_CSE_GMG_CRE_005() runs on AeSimu system CseSystem {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -11043,7 +11043,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 									  	  		
 				}
 											
-				function f_CSE_GMG_CRE_006() runs on AeSimu {
+				function f_CSE_GMG_CRE_006() runs on AeSimu system CseSystem {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -11125,7 +11125,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 									  	  		
 				}
 											
-				function f_CSE_GMG_CRE_007() runs on AeSimu {
+				function f_CSE_GMG_CRE_007() runs on AeSimu system CseSystem {
 					//Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_createRequest;
@@ -11196,7 +11196,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 									  	  		
 				}
 											
-				function f_CSE_GMG_RET_001() runs on AeSimu {
+				function f_CSE_GMG_RET_001() runs on AeSimu system CseSystem {
 					//Local constants
 					const integer c_numberOfResponsePrimitive := 2;
 
@@ -11301,7 +11301,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 									  	  		
 				}
 											
-				function f_CSE_GMG_UPD_001() runs on AeSimu {
+				function f_CSE_GMG_UPD_001() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -11381,7 +11381,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 			  }
 												
-			  function f_CSE_GMG_UPD_002() runs on AeSimu {
+			  function f_CSE_GMG_UPD_002() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -11475,7 +11475,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 				}
 												
-				function f_CSE_GMG_UPD_003() runs on AeSimu {
+				function f_CSE_GMG_UPD_003() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -11561,7 +11561,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 				}
 												
-				function f_CSE_GMG_UPD_004() runs on AeSimu {
+				function f_CSE_GMG_UPD_004() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -11667,7 +11667,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 				}
 												
-				function f_CSE_GMG_UPD_005() runs on AeSimu {
+				function f_CSE_GMG_UPD_005() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -11776,7 +11776,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 				}
 												
-				function f_CSE_GMG_UPD_006() runs on AeSimu {
+				function f_CSE_GMG_UPD_006() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -11847,7 +11847,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 				}
 												
-				function f_CSE_GMG_UPD_007() runs on AeSimu {
+				function f_CSE_GMG_UPD_007() runs on AeSimu system CseSystem {
 					
 					//Local constants
 					const integer c_maxNrOfMembers := 2;
@@ -11939,7 +11939,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 				}
 												
-				function f_CSE_GMG_UPD_008() runs on AeSimu {
+				function f_CSE_GMG_UPD_008() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -12021,7 +12021,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 				}
 												
-				function f_CSE_GMG_UPD_009() runs on AeSimu {
+				function f_CSE_GMG_UPD_009() runs on AeSimu system CseSystem {
 					//Local constants
 					const integer c_maxNrOfMembers := 2;
 					const ResourceType c_ResourceTypeGroup := int9;  
@@ -12133,7 +12133,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 										  	  		
 				}
 												
-				function f_CSE_GMG_UPD_010() runs on AeSimu {
+				function f_CSE_GMG_UPD_010() runs on AeSimu system CseSystem {
 					//Local constants
 					const ResourceType c_ResourceTypeGroup := int9;  
 					const integer c_maxNrOfMembers := 2;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 0eac251d5dcbb49142210407447de87b5c00f85b..baad91bf61bc612e9ab9a833617e130e8c20d6fe 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2464,7 +2464,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
 						var template PrimitiveContent v_contentResponse;
 						
-												v_contentResponse.container := m_contentContainer_allOmit;
+												v_contentResponse.container := mw_contentContainer_allOmit;
 						v_contentResponse.container.lastModifiedTime := ?;
 						v_contentResponse.container.stateTag := ?; 
 						v_updateRequest.primitiveContent.container.labels := {"VALUE_1"};
@@ -2478,7 +2478,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
 						var template PrimitiveContent v_contentResponse;
-												v_contentResponse.group_ := m_contentGroup_allOmit;
+												v_contentResponse.group_ := mw_contentGroup_allOmit;
 						v_contentResponse.group_.lastModifiedTime := ?;
 						v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"};
 					
@@ -2492,7 +2492,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var RequestPrimitive v_updateRequest := valueof(m_updateAcpBase);
 						var template PrimitiveContent v_contentResponse;
 	
-												v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
+												v_contentResponse.accessControlPolicy := mw_contentAcp_allOmit;
 						v_contentResponse.accessControlPolicy.lastModifiedTime := ?;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
 	
@@ -2744,7 +2744,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_ae1.done;
 			}
 																
-				function f_CSE_DMR_NTF_002() runs on AeSimu {
+				function f_CSE_DMR_NTF_002() runs on AeSimu system CseSystem {
 		     
 					// Local variables
 					var MsgIn v_response;
@@ -2893,7 +2893,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 											  	  		
 				}
 													
-				function f_CSE_SUB_NTF_001() runs on AeSimu {
+				function f_CSE_SUB_NTF_001() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -2968,7 +2968,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												  	  		
 				}
 														
-				function f_CSE_SUB_NTF_002() runs on AeSimu {
+				function f_CSE_SUB_NTF_002() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -3043,7 +3043,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												  	  		
 				}
 														
-				function f_CSE_SUB_NTF_003() runs on AeSimu {
+				function f_CSE_SUB_NTF_003() runs on AeSimu system CseSystem {
 					// Local variables
 					timer t_batchNotificationTimer := PX_TAC * 2.0;
 					var float v_elapsedTime;
@@ -3127,7 +3127,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 												  	  		
 				}
 														
-				function f_CSE_SUB_UPD_002() runs on AeSimu {
+				function f_CSE_SUB_UPD_002() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -3214,7 +3214,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_UPD_003() runs on AeSimu {
+				function f_CSE_SUB_UPD_003() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -3297,7 +3297,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_UPD_004() runs on AeSimu {
+				function f_CSE_SUB_UPD_004() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -3391,7 +3391,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_UPD_005() runs on AeSimu {
+				function f_CSE_SUB_UPD_005() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -3477,7 +3477,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_UPD_006() runs on AeSimu {
+				function f_CSE_SUB_UPD_006() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -3560,7 +3560,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_UPD_007() runs on AeSimu {
+				function f_CSE_SUB_UPD_007() runs on AeSimu system CseSystem {
 					// Local variables
 					const integer numberOfAggregatedNotification := 3;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -3632,7 +3632,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_UPD_008() runs on AeSimu {
+				function f_CSE_SUB_UPD_008() runs on AeSimu system CseSystem {
 					// Local variables
 					const integer numberOfAggregatedNotification := 3;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -3708,7 +3708,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_UPD_009() runs on AeSimu {
+				function f_CSE_SUB_UPD_009() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var Labels v_labels_1:= {"VALUE_1"};
@@ -3799,7 +3799,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_DEL_002() runs on AeSimu {
+				function f_CSE_SUB_DEL_002() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -3882,7 +3882,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 													  	  		
 				}
 															
-				function f_CSE_SUB_DEL_003() runs on AeSimu {
+				function f_CSE_SUB_DEL_003() runs on AeSimu system CseSystem {
 					// Local variables
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
@@ -4016,7 +4016,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							  	  		
 			}
 									
-			function f_CSE_PCH_001() runs on AeSimu {
+			function f_CSE_PCH_001() runs on AeSimu system CseSystem {
 				// Local variables
 				var integer v_aeIndex := -1;
 				var integer v_resourceIndex := -1;
@@ -4126,7 +4126,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							  	  		
 			}
 									
-			function f_CSE_PCH_002() runs on AeSimu {
+			function f_CSE_PCH_002() runs on AeSimu system CseSystem {
 				// Local variables
 				var integer v_aeIndex, v_acpAuxIndex := -1;
 				var integer v_resourceIndex := -1;
@@ -4231,7 +4231,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				  	  		
 			}
 			
-			function f_CSE_PCH_003() runs on AeSimu {
+			function f_CSE_PCH_003() runs on AeSimu system CseSystem {
 				//Local variables
 				var integer v_aeIndex, v_acpAuxIndex := -1;
 				var integer v_resourceIndex := -1;
@@ -4339,7 +4339,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				v_cse1.done;
 			}
 			
-			function f_CSE_PCH_004() runs on CseSimu {
+			function f_CSE_PCH_004() runs on CseSimu system CseSystem {
 				//Local variables
 			   	var integer v_localResourceIndex := -1;
 			   	var MsgIn v_request_req1, v_request_req3;
@@ -4462,7 +4462,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				 v_ae1.done;
 			 }
 					
-			function f_CSE_PCH_006() runs on AeSimu {
+			function f_CSE_PCH_006() runs on AeSimu system CseSystem {
 				 // Local variables
 				 var integer v_aeIndex, v_acpAuxIndex := -1;
 				 var integer v_resourceIndex := -1;
@@ -4966,11 +4966,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 								  	  		
 				}
 										
-				function f_CSE_FLXC_CRE_001() runs on AeSimu {
+				function f_CSE_FLXC_CRE_001() runs on AeSimu system CseSystem {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
-					var RequestPrimitive v_request := m_create;
+					var RequestPrimitive v_request := valueof(m_create);
 					// Test control
 		
 					// Test component configuration
@@ -4981,7 +4981,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(-, -);//AE1 is registred;
 					
-					v_request.primitiveContent := { genericInterworkingService_invalid := m_contentCreateGenericInterworkingService_invalid }; 
+					v_request.primitiveContent := { genericInterworkingService_invalid := valueof(m_contentCreateGenericInterworkingService_invalid) }; 
 					v_request := f_getCreateRequestPrimitive(int28, v_request, v_aeIndex);
 						
 					f_send(e_mca_port, m_request(v_request));
@@ -5031,7 +5031,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 								  	  		
 				}
 										
-				function f_CSE_FLXC_CRE_002() runs on AeSimu {
+				function f_CSE_FLXC_CRE_002() runs on AeSimu system CseSystem {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
@@ -5046,7 +5046,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe(-, -);//AE1 is registred;
 					
-					v_request := m_createGenericInterworkingServiceBase;
+					v_request := valueof(m_createGenericInterworkingServiceBase);
 					v_request.primitiveContent.genericInterworkingService.containerDefinition := "urn:m2m:nonExistingSchemaDefinition.xsd";
 					v_request := f_getCreateRequestPrimitive(int28, v_request, v_aeIndex);
 						
@@ -5101,11 +5101,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					  	  		
 				}
 				
-				function f_CSE_FLXC_UPD_001() runs on AeSimu {
+				function f_CSE_FLXC_UPD_001() runs on AeSimu system CseSystem {
 					//Local variables
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
-					var RequestPrimitive v_request := m_create;
+					var RequestPrimitive v_request := valueof(m_create);
 					var RequestPrimitive v_updateRequest := valueof(m_updateGenericInterworkingServiceBase);
 					v_updateRequest.primitiveContent.genericInterworkingService.inputDataPointLinks := {
 							dataLinkEntry_list := {
@@ -5181,11 +5181,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_ae1.done;
 				}
 				
-				function f_CSE_FLXC_UPD_002() runs on AeSimu {
+				function f_CSE_FLXC_UPD_002() runs on AeSimu system CseSystem {
 					//Local variables
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
-					var RequestPrimitive v_request := m_create;
+					var RequestPrimitive v_request := valueof(m_create);
 					var RequestPrimitive v_updateRequest := valueof(m_updateGenericInterworkingServiceBase);
 					var Labels v_labels_1:= {"VALUE_1"};
 					v_updateRequest.primitiveContent.genericInterworkingService.labels := v_labels_1;
@@ -5254,11 +5254,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_ae1.done;
 				}
 				
-				function f_CSE_FLXC_UPD_003() runs on AeSimu {
+				function f_CSE_FLXC_UPD_003() runs on AeSimu system CseSystem {
 					//Local variables
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
-					var RequestPrimitive v_request := m_create;
+					var RequestPrimitive v_request := valueof(m_create);
 					var RequestPrimitive v_updateRequest := valueof(m_updateGenericInterworkingServiceBase_invalid);
 					v_updateRequest.primitiveContent.genericInterworkingService_invalid.expirationCounter := 1;