diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 16bba959789a136d27d27c884598f5478abf1e4c..d20143b93e0c7f1493a33be4e4dd582f96eed4d8 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2701,8 +2701,29 @@ module OneM2M_Functions {
 							v_myResource.contentInstance.expirationTime := "20301231T012345";
 						}
 						v_myResource.contentInstance.stateTag := 0;
-						v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
-						v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
+						if(not(ispresent(p_resource.contentInstance.content))) {
+							v_myResource.contentInstance.contentSize := 0;
+							v_myResource.contentInstance.content := omit;
+						} else {
+							v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
+							v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
+						}
+					}
+										
+				} else if(p_resourceType == int23 and ispresent(p_resource)) {//Subscription
+					if(ischosen(p_resource.subscription)){
+						v_myResource.subscription := valueof(p_resource.subscription);
+						v_myResource.subscription.resourceID := "sub" & int2str(v_resourceIndex);
+						if(not(ispresent(p_resource.subscription.resourceName))) {
+							v_myResource.subscription.resourceName := "subscription" & int2str(v_resourceIndex);
+						}
+						v_myResource.subscription.resourceType := p_resourceType;
+						v_myResource.subscription.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
+						v_myResource.subscription.creationTime := fx_generateTimestamp();
+						v_myResource.subscription.lastModifiedTime := v_myResource.subscription.creationTime;											
+						if(not(ispresent(p_resource.subscription.expirationTime))) {
+							v_myResource.subscription.expirationTime := "20301231T012345";
+						}
 					}
 										
 				} else if(p_resourceType == int23 and ispresent(p_resource)) { //Subscription
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index decec6f046600eff73b5e7dfaa611adf86b6eb9e..6b6bbbf0db9f6f58a07f73a848a7f25603a8ff40 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -861,7 +861,7 @@ module OneM2M_Templates {
 				to_ := p_to,
 				from_ := p_from,
 				resourceType := int10001,
-				primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnnc(-)}
+				primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnncBase(-)}
 			};
         	
 			/**
@@ -942,19 +942,11 @@ module OneM2M_Templates {
 			};
 			
 			/**
-			 * @desc Reception template for CREATE RemoteCSE
+			 * @desc Base reception template for CREATE RemoteCSE
 			 */
 			template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int16,
-				primitiveContent := {remoteCSE := ?}	//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
-			};			
-			
-			/**
-			 * @desc CREATE request primitive for remoteCSE resource
-			 */
-			template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int16,
-				primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
+				primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
 			};
 			
 			/**
@@ -976,13 +968,13 @@ module OneM2M_Templates {
 			 */
 			template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int3,
-				primitiveContent := {container := ?}
+				primitiveContent := {container := mw_contentCreateContainerBase}
 			};  
 			
 			/**
 			 * @desc Base Reception template for CREATE ContainerAnnc
 			 */
-			template RequestPrimitive mw_createContainerAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+			template RequestPrimitive mw_createContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10003,
 				primitiveContent := {containerAnnc := mw_contentCreateContainerAnncBase}
 			};
@@ -1032,7 +1024,7 @@ module OneM2M_Templates {
 			 */
 			template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10004,
-				primitiveContent := {contentInstanceAnnc := ?}
+				primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
 			};  
 			
 			/**
@@ -1040,17 +1032,9 @@ module OneM2M_Templates {
 			 */
 			template RequestPrimitive mw_createContentInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int4,
-				primitiveContent := {contentInstance := ?}
+				primitiveContent := {contentInstance := mw_contentCreateContentInstanceBase}
 			}; 
 			
-			/**
-			 * @desc Base Reception template for CREATE ContentInstanceAnnc
-			 */
-			template RequestPrimitive mw_createContentInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int10014,
-				primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
-			};  
-			
 			/**
 			 * @desc Base CREATE request primitive for Delivery resource
 			 */
@@ -1096,17 +1080,9 @@ module OneM2M_Templates {
 			 */
 			template RequestPrimitive mw_createGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10009,
-				primitiveContent := {groupAnnc := ?}
+				primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
 			};  
 			
-			/**
-			 * @desc Base Reception template for CREATE GroupAnnc
-			 */
-			template RequestPrimitive mw_createGroupAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int10009,
-				primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
-			};
-        	
 			/**
 			 * @desc Base CREATE request primitive for MgmtCmd resource
 			 */
@@ -1138,14 +1114,6 @@ module OneM2M_Templates {
 			 * @desc Reception template for CREATE MgmtObjAnnc
 			 */
 			template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int10013,
-				primitiveContent := {announcedMgmtResource := ?}
-			};  
-			
-			/**
-			 * @desc Base Reception template for CREATE MgmtObjAnnc
-			 */
-			template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10013,
 				primitiveContent := {announcedMgmtResource := mw_contentCreateMgmtObjAnncBase}
 			};  
@@ -1173,7 +1141,7 @@ module OneM2M_Templates {
 			 */
 			template RequestPrimitive mw_createNodeAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10014,
-				primitiveContent := {nodeAnnc := ?}
+				primitiveContent := {nodeAnnc := mw_contentCreateNodeAnncBase}
 			};  
        	
 			/**
@@ -1219,18 +1187,10 @@ module OneM2M_Templates {
 			 * @desc Reception template for CREATE ScheduleAnnc
 			 */
 			template RequestPrimitive mw_createScheduleAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int10018,
-				primitiveContent := {scheduleAnnc := ?}
-			};  
-			
-			/**
-			 * @desc Base Reception template for CREATE ScheduleAnnc
-			 */
-			template RequestPrimitive mw_createScheduleAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10018,
 				primitiveContent := {scheduleAnnc := mw_contentCreateScheduleAnncBase}
 			};  
-        	
+			
 			template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
 				resourceType := int19,//FIXME Is this the correct value?
@@ -1267,7 +1227,7 @@ module OneM2M_Templates {
 			 */
 			template RequestPrimitive mw_createSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int23,
-				primitiveContent := {subscription := ?}
+				primitiveContent := {subscription := mw_contentCreateSubscriptionBase}
 			};
         	
 			template (value) RequestPrimitive m_createSubscriptionAdvanced(	XSD.ID p_parentResourceAddress, 
@@ -1304,14 +1264,6 @@ module OneM2M_Templates {
 			 * @desc Reception template for CREATE LocationPolicyAnnc
 			 */
 			template RequestPrimitive mw_createLocationPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int10010,
-				primitiveContent := {locationPolicyAnnc := ?}
-			}; 
-			
-			/**
-			 * @desc Base Reception template for CREATE LocationPolicyAnnc
-			 */
-			template RequestPrimitive mw_createLocationPolicyAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10010,
 				primitiveContent := {locationPolicyAnnc := mw_contentCreateLocationPolicyAnncBase}
 			}; 
@@ -1413,13 +1365,13 @@ module OneM2M_Templates {
 			 */
 			template RequestPrimitive mw_createTimeSeriesInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int30,
-				primitiveContent := {timeSeriesInstance := ?}
+				primitiveContent := {timeSeriesInstance := mw_contentCreateTimeSeriesInstanceBase}
 			};
 			
 			/**
 			 * @desc Base Reception template for CREATE TimeSeriesAnnc
 			 */
-			template RequestPrimitive mw_createTimeSeriesAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+			template RequestPrimitive mw_createTimeSeriesAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10029,
 				primitiveContent := {timeSeriesAnnc := mw_contentCreateTimeSeriesAnncBase}
 			};  
@@ -1427,7 +1379,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base Reception template for CREATE TimeSeriesInstanceAnnc
 			 */
-			template RequestPrimitive mw_createTimeSeriesInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+			template RequestPrimitive mw_createTimeSeriesInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10030,
 				primitiveContent := {timeSeriesInstanceAnnc := mw_contentCreateTimeSeriesInstanceAnncBase}
 			};  
@@ -1854,7 +1806,7 @@ module OneM2M_Templates {
 		 * @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
 		 * @param p_labels Labels
 		 */
-		template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template Labels p_labels := *) := {
+		template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnncBase (in template (omit)  Labels p_labels := omit) := {
 			resourceName := omit,//NA M
 			resourceType := omit,//NA M
 			resourceID := omit,//NA M
@@ -2155,7 +2107,53 @@ module OneM2M_Templates {
 			mgmtClientAddress := omit,//O
 			choice := omit//O
 		};	  	
+
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for Node resource
+		 * @param p_name Resource name
+		 */
+		template Node_optional mw_contentCreateNodeBase (template XSD.String p_name := *) := {
+			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			nodeID := ?,//M
+			hostedCSELink := *,//O
+			mgmtClientAddress := omit,//O
+			choice := *//O
+		};	
 		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for NodeAnnc resource
+		 * @param p_name Resource name
+		 */
+		template NodeAnnc_optional mw_contentCreateNodeAnncBase := {
+			
+			resourceName := omit,//NP
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := ?,//M
+			accessControlPolicyIDs := ?,//M
+			expirationTime := ?,//M
+			dynamicAuthorizationConsultationIDs := *, //O
+			link := ?,//M
+			nodeID := ?,//M
+			hostedCSELink := *,//O
+			mgmtClientAddress := *,//O
+			choice := omit//NP
+		};	
     	
     	/**
     	 * @desc Base primitiveContent for CREATE operation for PollingChannel resource
@@ -2299,6 +2297,40 @@ module OneM2M_Templates {
 			choice := omit//NP
     	};   	
     	
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for Subscription resource
+		 * @param p_notificationURI Notification URI
+		 * @param p_name Resource name
+		 */
+		template Subscription_optional mw_contentCreateSubscriptionBase (template XSD.String p_name := *) := {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+    		dynamicAuthorizationConsultationIDs := *, //O
+			creator := *,//O
+			eventNotificationCriteria := *,//O
+			expirationCounter := *,//O
+			notificationURI := ?,//M
+			groupID := *,//O
+			notificationForwardingURI := *,//O
+			batchNotify := *,//O
+			rateLimit := *,//O
+			preSubscriptionNotify := *,//O
+			pendingNotification := *,//O
+			notificationStoragePriority := *,//O
+			latestNotify := *,//O
+			notificationContentType := *, //O
+			notificationEventCat := *,//O
+			subscriberURI := *,//O
+			choice := *//O
+		};   	
+
 		template (value) Subscription_optional m_contentCreateSubscriptionAdvanced (in template (value) ListOfURIs p_notificationURI,
 																					in template (omit)  XSD.String p_name := c_defaultSubscriptionResourceName,
 																					in template (omit) EventNotificationCriteria p_eventNotificationCriteria,
@@ -2367,7 +2399,32 @@ module OneM2M_Templates {
 			content := p_primitiveContent,//M
 			choice := omit //O
 		};
-		
+
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for ContentInstance resource
+		 * @param p_primitiveContent Content for the ContentInstance
+		 */
+		template ContentInstance_optional mw_contentCreateContentInstanceBase(template XSD.String p_name := *) := {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			expirationTime := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			contentInfo := *,//O
+			contentSize := omit,//NP
+			contentRef := *, //O
+			ontologyRef := *,//O
+			content := ?,//M
+			choice := * //O
+		};
+					
 		/**
 		 * @desc Base primitiveContent for CREATE operation for ContentInstanceAnnc resource
 		 * @param p_primitiveContent Content for the ContentInstanceAnnc
@@ -2447,6 +2504,36 @@ module OneM2M_Templates {
 			disableRetrieval := omit, //O
 			choice := omit//NP
 		};
+		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for Container resource
+		 * @param p_name Resource name
+		 */
+		template Container_optional mw_contentCreateContainerBase (template XSD.String p_name := *):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			locationID := *,//O
+			ontologyRef := *,//O
+			disableRetrieval := *, //O
+			choice := *//NP
+		};
     	
 		/**
 		 * @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
@@ -2541,6 +2628,36 @@ module OneM2M_Templates {
 			choice := omit//O
 		};
 		
+		/**
+		* @desc Base reception template of primitiveContent for CREATE operation for remoteCSE resource
+		*/
+		template RemoteCSE_optional mw_contentCreateRemoteCSEBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := omit,
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			cseType := *,//O
+			pointOfAccess := *,//O
+			cSEBase := ?,//M
+			cSE_ID := ?,//M
+			m2M_Ext_ID := *,//O
+			trigger_Recipient_ID := *,//O
+			requestReachability := ?,//M
+			nodeLink := *,//O
+			triggerReferenceNumber := omit,//O
+			e2eSecInfo := omit,//O
+			supportedReleaseVersions := {"2a"}, //M
+			choice := omit//O
+		};
+		
 		/**
 		* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
 		*/
@@ -2831,7 +2948,41 @@ module OneM2M_Templates {
 			ontologyRef := omit,//O
 			choice := omit//NP
 		};
-		
+
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for timeSeries resource 
+		 * @param p_name Resource name
+		 */
+		template TimeSeries_optional mw_contentCreateTimeSeriesBase (template XSD.String p_name := *):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := *,//O
+			missingDataDetect := *,//O
+			missingDataMaxNr := *,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := *,//O
+			ontologyRef := *,//O
+			choice := *//NP
+		};
+				
 		/**
 		 * @desc Base primitiveContent for CREATE operation for timeSeriesAnnc resource 
 		 * @param p_name Resource name
@@ -2986,6 +3137,27 @@ module OneM2M_Templates {
 			contentSize  := omit//NP
 		};
 		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for Container resource
+		 * @param p_name Resource name
+		 */
+		template TimeSeriesInstance_optional mw_contentCreateTimeSeriesInstanceBase (template XSD.String p_name := *):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			expirationTime := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			dataGenerationTime := ?,//M
+			content := ?,//M
+			sequenceNr := *,//O
+			contentSize  := omit//NP
+		};
+
 		template (value) MissingData m_missingData( in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration) := {
 			number := p_number,
 			duration := p_duration
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 4c07ff21992e7170944fc0b2a69320b8be80bbd8..2b3ac6ef667e666f604bd93d39af346c97570f0c 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -1679,7 +1679,7 @@ module OneM2M_PermutationFunctions {
 						// Test adapter configuration
 
 						// Preamble
-						vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+						vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 						
 						//Send Trigger Message
 					    v_utRequest.requestPrimitive.to_ := f_getResourceAddress();
@@ -3036,7 +3036,7 @@ module OneM2M_PermutationFunctions {
 						// Preamble
 						
 						if (PX_MN_CSE) {
-							vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
+							vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
 						}else if (PX_IN_CSE) {
 							vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
 						}	
@@ -7300,7 +7300,7 @@ module OneM2M_PermutationFunctions {
 					// Test adapter configuration
 
 					//Register the CSE
-				  	f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+				  	f_cse_registrationRemoteCse(mw_createRemoteCSE);
 				  
 					//Preamble
 					vc_ae1.start(f_cse_preamble_registerAe());
@@ -7399,7 +7399,7 @@ module OneM2M_PermutationFunctions {
 	
 					//Preamble
 					v_aeIndex := f_cse_preamble_registerAe();
-					vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createContainerAnncBase(-, -)));
+					vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createContainerAnnc(-, -)));
 					v_resourceIndex := f_cse_createResource(int3,v_createContainer, v_aeIndex);
 					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 	
@@ -7501,7 +7501,7 @@ module OneM2M_PermutationFunctions {
 
 					// Test adapter configuration
 					// Register the CSE
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 				  
 					f_checkCseSimuStatus();
 					
@@ -7520,7 +7520,7 @@ module OneM2M_PermutationFunctions {
 					
 					tc_ac.start;
 					alt {
-						[] mccPortIn.receive(mw_request(mw_createContainerAnncBase(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
+						[] mccPortIn.receive(mw_request(mw_createContainerAnnc(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
 							
@@ -7633,7 +7633,7 @@ module OneM2M_PermutationFunctions {
 
 					// Test adapter configuration
 					// Register the CSE
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 				  
 					f_checkCseSimuStatus();
 					
@@ -7652,7 +7652,7 @@ module OneM2M_PermutationFunctions {
 					
 					tc_ac.start;
 					alt {
-						[] mccPortIn.receive(mw_request(mw_createContainerAnncBase(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
+						[] mccPortIn.receive(mw_request(mw_createContainerAnnc(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
 							
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index f5abe420ec2db3985b9b91acc36357112146e3cb..e1c45e11bea5d1a8b0b1134937dedba81dbfabd6 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -1844,7 +1844,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					tc_ac.start;
 					alt {
-						[not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) -> value v_request {
+						[not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSE)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__&":INFO: CREATE remoteCSE request received");
 							v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
@@ -2742,7 +2742,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 // Test adapter configuration
 	
 					 // Preamble
-					 vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					 vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					 
 					 //Send Trigger Message
 					 v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 42b1fc6eab743885a556a3a8eef2ee203148ebaf..b76fc37ce6ae623d4c55e8d46f93c65dd89084cc 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2247,7 +2247,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 					
-						v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnncBase));//Container
+						v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnnc));//Container
 						v_ae1.done;
 					}
 					
@@ -2259,7 +2259,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						
-						v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
+						v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnnc));//ContentInstance
 						v_ae1.done;
 					}
 				
@@ -2272,7 +2272,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						
-						v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnncBase));//Group
+						v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnnc));//Group
 						v_ae1.done;
 					}
 					
@@ -2285,7 +2285,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
 						
-						v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
+						v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnnc));//LocationPolicy
 						v_ae1.done;
 					}
 					
@@ -2298,7 +2298,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
 
-						v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
+						v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnnc));//MgmtObj
 						v_ae1.done;
 					}
 					
@@ -2324,7 +2324,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
 
-						v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
+						v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnnc));//Schedule
 						v_ae1.done;
 					}
 					
@@ -2337,7 +2337,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeries.announceTo := {f_getCompletePoA()};
 	
-						v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnncBase));//TimeSeries
+						v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnnc));//TimeSeries
 						v_ae1.done;
 					}
 					
@@ -2350,7 +2350,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getCompletePoA()};
 
-						v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase));//TimeSeriesInstance
+						v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc));//TimeSeriesInstance
 						v_ae1.done;
 					}
 				
@@ -2374,7 +2374,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;						
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 	
-						v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnncBase()));//Container
+						v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnnc()));//Container
 						v_ae1.done;
 						
 						if(getverdict == pass){ 
@@ -2404,7 +2404,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
 						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"};
 		
-						v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnncBase()));//ContentInstance
+						v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnnc()));//ContentInstance
 						v_ae1.done;
 						
 						if(getverdict == pass){ 
@@ -2434,7 +2434,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
 		
-						v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnncBase()));//Group
+						v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnnc()));//Group
 						v_ae1.done;
 						
 						if(getverdict == pass){ 
@@ -2464,7 +2464,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
 						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
 		
-						v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnncBase()));//LocationPolicy
+						v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnnc()));//LocationPolicy
 						v_ae1.done;
 						
 						if(getverdict == pass){ 
@@ -2494,7 +2494,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.mgmtResource.description := v_description;			
 						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
 
-						v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnncBase()));//MgmtObj
+						v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnnc()));//MgmtObj
 						v_ae1.done;
 						
 						if(getverdict == pass){ 
@@ -2539,7 +2539,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
 						v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
 						
-						v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnncBase()));//Schedule
+						v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnnc()));//Schedule
 						v_ae1.done;
 						
 						if(getverdict == pass){ 
@@ -2570,7 +2570,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;						
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 
-						v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnncBase()));//TimeSeries
+						v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnnc()));//TimeSeries
 						v_ae1.done;
 	
 						if(getverdict == pass){ 
@@ -2601,7 +2601,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr;						
 						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"snr"};
 
-						v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase()));//TimeSeriesInstance
+						v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc()));//TimeSeriesInstance
 						v_ae1.done;
 
 						if(getverdict == pass){ 
@@ -7359,7 +7359,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -7375,7 +7375,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -7390,7 +7390,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createScheduleAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createScheduleAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -7405,7 +7405,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
@@ -7420,7 +7420,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
@@ -7439,7 +7439,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
@@ -7463,7 +7463,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var MemberType v_memberType := int3;
@@ -7487,7 +7487,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 
@@ -7507,7 +7507,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
@@ -10202,7 +10202,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
@@ -10216,7 +10216,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
@@ -10230,7 +10230,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
@@ -10244,7 +10244,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
@@ -10258,7 +10258,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
@@ -10271,7 +10271,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
   
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -10285,7 +10285,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
   
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -10299,7 +10299,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
   
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -10325,7 +10325,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 											
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;	
@@ -10363,7 +10363,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10378,7 +10378,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10393,7 +10393,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10451,7 +10451,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10479,7 +10479,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10493,7 +10493,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10529,7 +10529,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
   
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10558,7 +10558,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
   
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10572,7 +10572,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10586,7 +10586,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10622,7 +10622,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
   
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10651,7 +10651,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
   
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10665,7 +10665,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 	  
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10679,7 +10679,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -10715,7 +10715,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 	  
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
@@ -10744,7 +10744,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 	  
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
@@ -10758,7 +10758,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
   
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
@@ -10772,7 +10772,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
 						 
@@ -10794,7 +10794,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
   
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
@@ -10826,7 +10826,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
   
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
@@ -10843,7 +10843,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
 						 
@@ -10859,7 +10859,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
 	  
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
@@ -10883,7 +10883,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 	    				 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						 v_cse1.done;
 						 
@@ -10921,7 +10921,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 	  
 						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -10945,7 +10945,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
   
 						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -10957,7 +10957,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
   
 						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -10969,7 +10969,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
   
 						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -11001,7 +11001,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 	  
 						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -11025,7 +11025,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
   
 						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -11037,7 +11037,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 	  
 						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -11049,7 +11049,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 //Local variables
 						 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
-						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
+						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
   
 						 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -11088,7 +11088,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 			
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -11103,7 +11103,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 			
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -11118,7 +11118,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -11163,7 +11163,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
@@ -11183,7 +11183,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
@@ -11203,7 +11203,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
@@ -11276,7 +11276,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -11319,7 +11319,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -11361,7 +11361,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -11428,7 +11428,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -11445,7 +11445,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -11462,7 +11462,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -11488,7 +11488,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var RequestPrimitive v_requestPrimitive;	
@@ -11547,7 +11547,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 	
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -11562,7 +11562,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -11577,7 +11577,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -11616,7 +11616,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -11631,7 +11631,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
@@ -11646,7 +11646,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -11667,7 +11667,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -11715,7 +11715,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -11763,7 +11763,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -11818,7 +11818,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
@@ -11842,7 +11842,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var MemberType v_memberType := int3;
@@ -11866,7 +11866,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
@@ -11925,7 +11925,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var Timestamp v_expirationTime_1 := "21001231T012345";
@@ -11950,7 +11950,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var Timestamp v_expirationTime_1 := "21001231T012345";
@@ -11975,7 +11975,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var Timestamp v_expirationTime_1 := "21001231T012345";
@@ -12010,7 +12010,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
@@ -12036,7 +12036,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var MemberType v_memberType_1 := int3;
@@ -12062,7 +12062,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
@@ -12098,7 +12098,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var RequestPrimitive v_requestPrimitive;	
@@ -12138,7 +12138,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var RequestPrimitive v_requestPrimitive;	
@@ -12177,7 +12177,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
 						var RequestPrimitive v_requestPrimitive;	
@@ -12227,7 +12227,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -12273,7 +12273,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -12318,7 +12318,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						var AttributeAux_list v_nullFields;
@@ -12372,7 +12372,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						 
@@ -12423,7 +12423,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
   
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -12437,7 +12437,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
   
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -12451,7 +12451,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
   
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
@@ -12487,7 +12487,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -12501,7 +12501,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
   
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;
@@ -12515,7 +12515,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						// Local variables
 						var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
-						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
+						var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
 						v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
 						v_cse1.done;