diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 2bfb9b0fbc12830e5b99bff6925987576208d0b5..a1cba152d0d0f5d8125f7df8dff9e9c799bac41a 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1589,7 +1589,7 @@ module OneM2M_Functions {
 				v_subscribedProfileIndex := f_cse_createResource(int52, p_createServiceSubscribedUserProfile, v_subscriptionProfileIndex);
 				
 				if (p_allowedUsers == true) {
-					v_allowedUsers := {p_createServiceSubscribedUserProfile.primitiveContent.serviceSubscribedUserProfile.M2M_User_ID};
+					v_allowedUsers := {p_createServiceSubscribedUserProfile.primitiveContent.serviceSubscribedUserProfile.m2M_User_ID};
 				}
 				
 				v_createServiceSubscribedAppRule :=  m_createServiceSubscribedAppRule({"None"}, {vc_aeSimuDesc.appId}, p_allowedAEs, valueof(v_allowedUsers));
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 61dc20980a280a554bc35a366e8bbcefe4c2763a..cd184c4fbf186992474ed386d93097824ed6e826 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -113,10 +113,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -154,10 +156,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -198,10 +202,11 @@ module OneM2M_Templates {
 					filterOperation := omit,
 					contentFilterSyntax := omit,
 					contentFilterQuery := omit,
-					geoQuery := omit,
 					level := omit,
 					offset := omit,
-					applyRelativePath := omit
+					applyRelativePath := omit,
+					geoQuery := omit,
+					operations := omit
 				}
 			};
 			
@@ -234,10 +239,12 @@ module OneM2M_Templates {
 				localTokenIDs := *,
 				tokenRequestIndicator := *,
 				groupRequestTargetMembers := *,
+				groupSomecastTargetNumber := *,
 				authorSignIndicator := *,
 				authorSigns := *,
 				authorRelIndicator := *,
 				semanticQueryIndicator := *,
+				ontologyMappingResources := *,
 				releaseVersionIndicator := ?,
 				vendorInformation := *,
 				primitiveProfileIdentifier := *,
@@ -281,10 +288,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -322,10 +331,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -368,10 +379,11 @@ module OneM2M_Templates {
 					filterOperation := omit,
 					contentFilterSyntax := omit,
 					contentFilterQuery := omit,
-					geoQuery := omit,
 					level := omit,
 					offset := omit,
-					applyRelativePath := omit
+					applyRelativePath := omit,
+					geoQuery := omit,
+					operations := omit
 				}
 			};
 			
@@ -423,10 +435,11 @@ module OneM2M_Templates {
 					filterOperation := omit,
 					contentFilterSyntax := omit,
 					contentFilterQuery := omit,
-					geoQuery := omit,
 					level := omit,
 					offset := omit,
-					applyRelativePath := omit
+					applyRelativePath := omit,
+					geoQuery := omit, 
+					operations := omit
 				}
 			};
 			/**
@@ -465,10 +478,11 @@ module OneM2M_Templates {
 					filterOperation := omit,
 					contentFilterSyntax := omit,
 					contentFilterQuery := omit,
-					geoQuery := omit,
 					level := omit,
 					offset := omit,
-					applyRelativePath := omit
+					applyRelativePath := omit,
+					geoQuery := omit, 
+					operations := omit
 				},
 				desiredIdentifierResultType := p_desIdResType
 			};
@@ -509,10 +523,11 @@ module OneM2M_Templates {
 					filterOperation := omit,
 					contentFilterSyntax := omit,
 					contentFilterQuery := omit,
-					geoQuery := omit,
 					level := omit,
 					offset := omit,
-					applyRelativePath := omit
+					applyRelativePath := omit,
+					geoQuery := omit, 
+					operations := omit
 				}
 			};
 			
@@ -557,10 +572,11 @@ module OneM2M_Templates {
 				filterOperation := omit,
 				contentFilterSyntax := omit,
 				contentFilterQuery := omit,
-				geoQuery := omit,
 				level := omit,
 				offset := omit,
-				applyRelativePath := omit
+				applyRelativePath := omit,
+				geoQuery := omit, 
+				operations := omit
 			}
 			
 			
@@ -596,10 +612,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -632,10 +650,12 @@ module OneM2M_Templates {
 				localTokenIDs := *,
 				tokenRequestIndicator := *,
 				groupRequestTargetMembers := *,
+				groupSomecastTargetNumber := *,
 				authorSignIndicator := *,
 				authorSigns := *,
 				authorRelIndicator := *,
 				semanticQueryIndicator := *,
+				ontologyMappingResources := *,
 				releaseVersionIndicator := ?,
 				vendorInformation := *,
 				primitiveProfileIdentifier := *,
@@ -1173,10 +1193,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -1212,10 +1234,12 @@ module OneM2M_Templates {
 				localTokenIDs := *,
 				tokenRequestIndicator := *,
 				groupRequestTargetMembers := *,
+				groupSomecastTargetNumber := *,
 				authorSignIndicator := *,
 				authorSigns := *,
 				authorRelIndicator := *,
 				semanticQueryIndicator := *,
+				ontologyMappingResources := *,
 				releaseVersionIndicator := ?,
 				vendorInformation := *,
 				primitiveProfileIdentifier := *,
@@ -1226,7 +1250,7 @@ module OneM2M_Templates {
 			 * @desc Base Reception template for create operation for announced resources
 			 */
 			template RequestPrimitive mw_createAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := (int10001,int10002,int10003,int10004,int10005, int10009,int10010,int10013,int10014,int10016,int10018,int10024,int10028,int10029,int10030,int10034,int10038,int10039,int10040,int10041,int10042)
+				resourceType := (int10001,int10002,int10003,int10004,int10005, int10009,int10010,int10013,int10014,int10016,int10018,int10024,int10028,int10029,int10030,int10038,int10039,int10040,int10041,int10042)
 			}
 			
 			/**
@@ -1306,7 +1330,7 @@ module OneM2M_Templates {
 				primitiveContent := {accessControlPolicyAnnc := m_contentCreateAcpAnnc ()}
 			};
 				
-        	template (value) RequestPrimitive m_createAcp(in template (omit)  XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
+        	template (value) RequestPrimitive m_createAcp(in template (omit)  ResourceName p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createAcp",
         		resourceType := int1,
         		primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
@@ -1369,7 +1393,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base CREATE request primitive for DynamicAuthorizationConsultation resource
 			 */
-			template (value) RequestPrimitive m_createDynamicAuthorizationConsultationBase(in template (omit) XSD.String p_name, in template (value) XSD.Boolean p_dyn_auth_enabled) modifies m_create := {
+			template (value) RequestPrimitive m_createDynamicAuthorizationConsultationBase(in template (omit) ResourceName p_name, in template (value) XSD.Boolean p_dyn_auth_enabled) modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createDynamicAuthorizationConsultation",
 				resourceType := int34,
 				primitiveContent := {dynamicAuthorizationConsultation := m_contentDynamicAuthorizationConsultation(p_dyn_auth_enabled, p_name)}
@@ -1572,7 +1596,7 @@ module OneM2M_Templates {
 															in template (omit) MemberType p_memberType := omit,
 															in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
 															in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
-															in template (omit) XSD.String p_name := "MyGroup") modifies m_create := {
+															in template (omit) ResourceName p_name := "MyGroup") modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createGroup",
         		resourceType := int9,
         		primitiveContent := {group_ := m_contentCreateGroup (p_maxNrOfMembers, p_memberIds, p_accessControlPolicyIds, p_memberType, p_consistencyStrategy, p_membersAccessControlPolicyIDs, p_name)}	//TODO: p_resourceId
@@ -1899,7 +1923,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base CREATE request primitive for Dependency resource
 			 */
-			template (value) RequestPrimitive m_createDependencyBase(in template (omit)  XSD.String p_name := "MyDependency") modifies m_create := {
+			template (value) RequestPrimitive m_createDependencyBase(in template (omit)  ResourceName p_name := "MyDependency") modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createDependency",
 				resourceType := int64,
 				primitiveContent := {dependency := m_contentDependency (p_name)}
@@ -1908,7 +1932,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base CREATE request primitive for State resource including stateTransitions attribute
 			 */
-			template (value) RequestPrimitive m_createStateBase(in template (omit)  XSD.String p_name := "MyState") modifies m_create := {
+			template (value) RequestPrimitive m_createStateBase(in template (omit)  ResourceName p_name := "MyState") modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createStateBase",
 				resourceType := int65,
 				primitiveContent := {state := m_contentCreateState (p_name)}
@@ -1917,7 +1941,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base CREATE request primitive for Action resource
 			 */
-			template (value) RequestPrimitive m_createActionBase(in template (omit)  XSD.String p_name := "MyAction", template (omit) XSD.AnyURI p_subjectresourceID := omit, template (omit) XSD.AnyURI p_objectresourceID := omit) modifies m_create := {
+			template (value) RequestPrimitive m_createActionBase(in template (omit)  ResourceName p_name := "MyAction", template (omit) XSD.AnyURI p_subjectresourceID := omit, template (omit) XSD.AnyURI p_objectresourceID := omit) modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createAction",
 				resourceType := int63,
 				primitiveContent := {action_ := m_contentAction (p_name, p_subjectresourceID, p_objectresourceID)}
@@ -1926,7 +1950,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc CREATE request primitive for State resource including stateTransitions attribute
 			 */
-			template (value) RequestPrimitive m_createState(in template (omit) XSD.String p_name := "MyState",
+			template (value) RequestPrimitive m_createState(in template (omit) ResourceName p_name := "MyState",
                                                             in template (omit) State_optional p_state := m_contentCreateState) modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createState",
 				resourceType := int65,
@@ -1936,7 +1960,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Base CREATE request primitive for ProcessManagement resource
 			 */
-			template (value) RequestPrimitive m_createProcessManagementBase(in template (omit)  XSD.String p_name := c_defaultProcessManagementName) modifies m_create := {
+			template (value) RequestPrimitive m_createProcessManagementBase(in template (omit)  ResourceName p_name := c_defaultProcessManagementName) modifies m_create := {
 				requestIdentifier := testcasename() & "-m_createProcessManagement",
 				resourceType := int66,
 				primitiveContent := {processManagement := m_contentProcessManagement (p_name)}
@@ -1951,7 +1975,7 @@ module OneM2M_Templates {
 				primitiveContent := {scheduleAnnc := m_contentCreateScheduleAnnc (omit, {{"* * * * * * *"}})}
         	};
 
-        	template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit)  XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
+        	template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit)  ResourceName p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
         		to_ := p_parentResourceAddress,
 				requestIdentifier := testcasename() & "-m_createSchedule",
         		resourceType := int18,
@@ -2008,7 +2032,7 @@ module OneM2M_Templates {
 				primitiveContent := {subscription := m_contentCreateSubscription ({"NotInitialized"})}
 			};
         	
-        	template (value) RequestPrimitive m_createSubscription(template (omit) XSD.ID p_to := omit, in template (omit)  XSD.String p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
+        	template (value) RequestPrimitive m_createSubscription(template (omit) XSD.ID p_to := omit, in template (omit)  ResourceName p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
         		to_ := p_to,
 				requestIdentifier := testcasename() & "-m_createSubscription",
         		resourceType := int23,
@@ -2085,7 +2109,7 @@ module OneM2M_Templates {
 			};
         	
 			template (value) RequestPrimitive m_createSubscriptionAdvanced(	template (omit) XSD.ID p_to := "NotInitialized", 
-																		   in template (omit)  XSD.String p_name := omit,
+																		   in template (omit)  ResourceName p_name := omit,
 																		   in template (value) ListOfURIs p_notificationURI := {"NotInitialized"},
 																		   in template (omit) EventNotificationCriteria p_eventNotificationCriteria := omit,
 																		   in template (omit) XSD.PositiveInteger p_expirationCounter := omit,
@@ -2270,7 +2294,7 @@ module OneM2M_Templates {
 				primitiveContent := {timeSeriesAnnc := m_contentCreateTimeSeriesAnnc}
 			};
         	
-			template (value) RequestPrimitive m_createTimeSeries(in template (omit)  XSD.String p_name := c_defaultTimeSeriesResourceName,
+			template (value) RequestPrimitive m_createTimeSeries(in template (omit)  ResourceName p_name := c_defaultTimeSeriesResourceName,
 																 in XSD.Boolean p_missingDataDetect := true,
 																 in XSD.NonNegativeInteger p_periodicInterval := 5000,
 																 in XSD.NonNegativeInteger p_missingDataMaxNr := 5, 
@@ -2295,7 +2319,7 @@ module OneM2M_Templates {
 				primitiveContent := {timeSeriesInstance := m_contentCreateTimeSeriesInstance()}
 			};
         	
-			template (value) RequestPrimitive m_createTimeSeriesInstance(XSD.ID p_parentResourceAddress, in template (omit)  XSD.String p_name := c_defaultTimeSeriesInstanceResourceName) modifies m_create := {
+			template (value) RequestPrimitive m_createTimeSeriesInstance(XSD.ID p_parentResourceAddress, in template (omit)  ResourceName p_name := c_defaultTimeSeriesInstanceResourceName) modifies m_create := {
 				to_ := p_parentResourceAddress,
 				requestIdentifier := testcasename() & "-m_createTimeSeriesInstance",
 				resourceType := int30,
@@ -2771,8 +2795,8 @@ module OneM2M_Templates {
 				primitiveContent := {crossResourceSubscription := m_contentCreateCrossResourceSubscription ({"NotInitialized"}, -, -, omit)}
 			};*/
         	
-			template (value) RequestPrimitive m_createCrossResourceSubscription(XSD.ID p_parentResourceAddress, in template (omit)  XSD.String p_name := c_defaultCrossResourceSubscriptionResourceName, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"},
-				in template (omit) TimeWindowType p_timeWindowType, in template (value) AbsRelTimestamp p_timeWindowSize, in template (value) XSD.ID p_creator) modifies m_create := {
+			template (value) RequestPrimitive m_createCrossResourceSubscription(XSD.ID p_parentResourceAddress, in template (omit)  ResourceName p_name := c_defaultCrossResourceSubscriptionResourceName, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"},
+				in template (omit) TimeWindowType p_timeWindowType, in template (value) XSD.Duration p_timeWindowSize, in template (value) XSD.ID p_creator) modifies m_create := {
 				to_ := p_parentResourceAddress,
 				requestIdentifier := testcasename() & "-m_createCrossResourceSubscription",
 				resourceType := int48,
@@ -2808,10 +2832,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -2849,10 +2875,12 @@ module OneM2M_Templates {
 				localTokenIDs := *,
 				tokenRequestIndicator := *,
 				groupRequestTargetMembers := *,
+				groupSomecastTargetNumber := *,
 				authorSignIndicator := *,
 				authorSigns := *,
 				authorRelIndicator := *,
 				semanticQueryIndicator := *,
+				ontologyMappingResources := *,
 				releaseVersionIndicator := ?,
 				vendorInformation := *,
 				primitiveProfileIdentifier := *,
@@ -2899,10 +2927,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -2953,10 +2983,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -2991,10 +3023,12 @@ module OneM2M_Templates {
 				localTokenIDs := *,
 				tokenRequestIndicator := *,
 				groupRequestTargetMembers := *,
-				authorSignIndicator := *,
-				authorSigns := *,
-				authorRelIndicator := *,
-				semanticQueryIndicator := *,
+				groupSomecastTargetNumber := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := ?,
 				vendorInformation := *,
 				primitiveProfileIdentifier := *,
@@ -3134,6 +3168,7 @@ module OneM2M_Templates {
 			expirationTime := "20301231T012345",//MA
 			link := p_link,//M
 			dynamicAuthorizationConsultationIDs := omit, //OA			
+			location := omit,//OA
 			appName := omit,//OA
 			app_ID := p_appId,//OA
 			aE_ID := omit,//OA
@@ -3171,6 +3206,7 @@ module OneM2M_Templates {
     		expirationTime := ?,//MA M
 			link := p_link,//M
     		dynamicAuthorizationConsultationIDs := *, //OA O			
+			location := *,//OA O
 			appName := *,//OA O
 			app_ID := *,//OA M
 			aE_ID := *,//OA M
@@ -3208,6 +3244,7 @@ module OneM2M_Templates {
 			expirationTime := ?,//MA M
 			link := p_link,//M
 			dynamicAuthorizationConsultationIDs := omit, //OA O
+			location := *,//OA O
 			cseType := *,//OA O
 			pointOfAccess := *,//OA O
 			cSEBase := *,//OA M
@@ -3230,8 +3267,7 @@ module OneM2M_Templates {
     	 * @param p_name Resource name
     	 * @param p_accessControlPolicyIds ACP IDs for the AE
     	 */
-    	template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit)  XSD.String p_name := c_defaultAe1ResourceName, in XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
-
+    	template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit)  ResourceName p_name := c_defaultAe1ResourceName, in XSD.String p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -3242,9 +3278,12 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
     		dynamicAuthorizationConsultationIDs := omit, //O
-    		announceTo := omit,//O
+			custodian := omit,//O
+			announceTo := omit,//O
     		announcedAttribute := omit,//O
-    		appName := omit,//O
+			announceSyncType := omit,//O
+			location := omit,//O
+			appName := omit,//O
 			app_ID := p_appId,//M
     		aE_ID := omit,//NP
     		pointOfAccess := p_poaList, //O {"http://127.0.0.1:1400/monitor"},//{"http://192.168.1.92:18080/notifications/AE"},
@@ -3260,6 +3299,7 @@ module OneM2M_Templates {
 			sessionCapabilities := omit, //O
 			triggerEnable := omit, //O
 			activityPatternElements := omit, //O
+			enableTimeCompensation := omit,//O
     		choice := omit//NP
     	};	
     	
@@ -3278,9 +3318,12 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
     		dynamicAuthorizationConsultationIDs := *, //O
-    		announceTo := *,//O
-    		announcedAttribute := *,//O
-    		appName := *,//O
+			custodian := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			announceSyncType := *,//O
+			location := *,//O
+			appName := *,//O
 			app_ID := ?,//M
     		aE_ID := omit,//NP
     		pointOfAccess := *, //O {"http://127.0.0.1:1400/monitor"},//{"http://192.168.1.92:18080/notifications/AE"},
@@ -3296,6 +3339,7 @@ module OneM2M_Templates {
 			sessionCapabilities := *, //O
 			triggerEnable := *, //O
 			activityPatternElements := *, //O
+			enableTimeCompensation := *,//O
 			choice := *//NP
     	};	
     	
@@ -3305,7 +3349,7 @@ module OneM2M_Templates {
     	 * @param p_acor Allowed originators
     	 * @param p_allowedOperations Allowed operations
     	 */
-    	template (value) AccessControlPolicy_optional m_contentCreateAcp (in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
+    	template (value) AccessControlPolicy_optional m_contentCreateAcp (in template (omit) ResourceName p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -3316,6 +3360,7 @@ module OneM2M_Templates {
 			expirationTime := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			privileges := {
 				accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
 			},//M
@@ -3383,7 +3428,8 @@ module OneM2M_Templates {
 			accessControlOperations := p_allowedOperations,
 			accessControlContexts_list := omit,
 			accessControlAuthenticationFlag := omit, 
-			accessControlObjectDetails_list := omit
+			accessControlObjectDetails_list := omit,
+			accessControlAttributes := omit
 		}
     	
 		/*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
@@ -3427,9 +3473,11 @@ module OneM2M_Templates {
 			pointOfAccess := {"NotInitialized"},
 			nodeLink := omit,
 			dynamicAuthorizationConsultationIDs := omit,
+			location := omit,
 			contentSerialization := omit,
 			e2eSecInfo := omit, 
 			supportedReleaseVersions := {"1", "2", "2a", "3"},
+			currentTime := omit,
 			choice := omit
 		};
 
@@ -3437,7 +3485,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for CSEBase resource
 		 * @param p_name Resource name
 		 */
-		template (value) CSEBase_optional m_contentCreateCSEBase (in template (omit) XSD.String p_name := c_defaultResourceName):= {
+		template (value) CSEBase_optional m_contentCreateCSEBase (in template (omit) ResourceName p_name := c_defaultResourceName):= {
 			resourceName := p_name,//O
 			resourceType := omit,
 			resourceID := omit,
@@ -3452,9 +3500,11 @@ module OneM2M_Templates {
 			pointOfAccess := omit,
 			nodeLink := omit,
 			dynamicAuthorizationConsultationIDs := omit,
+			location := omit,
 			contentSerialization := omit,
 			e2eSecInfo := omit, 
 			supportedReleaseVersions := {"1", "2", "2a", "3"},
+			currentTime := omit,
 			choice := omit
 		};
 		
@@ -3470,16 +3520,10 @@ module OneM2M_Templates {
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
 			labels := p_labels,//MA O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
 			expirationTime := "29991231T235959",//MA M
 			link := p_link,//M
-			accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
-			cseType := omit,//OA O
-			cSE_ID := omit,//OA M
-			supportedResourceType := omit,//OA M
-			pointOfAccess := omit,//OA O
-			nodeLink := omit,//OA O
 			dynamicAuthorizationConsultationIDs := omit,//OA O
-			contentSerialization := omit,//OA O
 			e2eSecInfo := omit,//OA O
 			supportedReleaseVersions := {"1", "2", "2a", "3"}, //MA M Mandatory for RemoteCSE from Release 2
 			choice := omit//NA
@@ -3497,16 +3541,10 @@ module OneM2M_Templates {
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
 			labels := p_labels,//MA O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
 			expirationTime := ?,//MA M
 			link := p_link,//M
-			accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
-			cseType := *,//OA O
-			cSE_ID := *,//OA M
-			supportedResourceType := ?,//OA M
-			pointOfAccess := *,//OA O
-			nodeLink := *,//OA O
 			dynamicAuthorizationConsultationIDs := *,//OA O
-			contentSerialization := *,//OA O
 			e2eSecInfo := ?,//OA O
 			supportedReleaseVersions := ?, //MA M Mandatory for RemoteCSE from Release 2
 			choice := omit//NA
@@ -3517,7 +3555,7 @@ module OneM2M_Templates {
 		 * @param p_accessControlPolicyIds ACP IDs for the PollingChannel
 		 * @param p_name Resource name
 		 */
-		template (value) Delivery_optional m_contentCreateDelivery (in template (omit) XSD.String p_name := c_defaultDeliveryResourceName, 
+		template (value) Delivery_optional m_contentCreateDelivery (in template (omit) ResourceName p_name := c_defaultDeliveryResourceName, 
 																	in template (omit) AcpType p_accessControlPolicyIds,
 																	in template (value) XSD.ID p_source,
 																	in template (value) XSD.ID p_target,
@@ -3535,6 +3573,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			source := p_source,//M
 			target := p_target,//M
 			lifespan := p_lifespan,//M
@@ -3550,7 +3589,7 @@ module OneM2M_Templates {
 		 * @param p_accessControlPolicyIds ACP IDs for the PollingChannel
 		 * @param p_name Resource name
 		 */
-		template (value) GenericInterworkingService_optional m_contentCreateGenericInterworkingService (in template (omit) XSD.String p_name := c_defaultGenericInterworkingServiceResourceName, 
+		template (value) GenericInterworkingService_optional m_contentCreateGenericInterworkingService (in template (omit) ResourceName p_name := c_defaultGenericInterworkingServiceResourceName, 
 																	in template (omit) AcpType p_accessControlPolicyIds := omit) := {
 			
 			resourceName := p_name,//O
@@ -3590,7 +3629,7 @@ module OneM2M_Templates {
     															in template (omit) MemberType p_memberType := omit,
     															in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
     															in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
-																in template (omit) XSD.String p_name := c_defaultGroupResourceName,
+																in template (omit) ResourceName p_name := c_defaultGroupResourceName,
 																in template (omit) XSD.Boolean p_semanticSupportIndicator := true) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
@@ -3602,8 +3641,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
     		dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			creator := omit,//O
 			memberType := p_memberType,//O
 			specializationType := omit,//O
@@ -3616,6 +3657,8 @@ module OneM2M_Templates {
 			groupName := omit,//O
 			semanticSupportIndicator := omit,//O
 			notifyAggregation := omit,//O
+			somecastEnable := omit,//O
+			somecastAlgorithm := omit,//O
 			choice := omit//NP
     	};  
     	
@@ -3638,8 +3681,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			creator := *,//O
 			memberType := *,//O
 			specializationType := *,//O
@@ -3652,6 +3697,8 @@ module OneM2M_Templates {
 			groupName := *,//O
 			semanticSupportIndicator := *,//O
 			notifyAggregation := *,//O
+			somecastEnable := *,//O
+			somecastAlgorithm := *,//O
 			choice := omit//NP
 		};  
     	
@@ -3691,6 +3738,8 @@ module OneM2M_Templates {
 			groupName := omit,//O
 			semanticSupportIndicator := omit,//O
 			notifyAggregation := omit,//O
+			somecastEnable := omit,//O
+			somecastAlgorithm := omit,//O
 			choice := omit//NP
 		};  
     	
@@ -3720,6 +3769,8 @@ module OneM2M_Templates {
 			  groupName := *,//OA O
 			  semanticSupportIndicator := *,//OA O
 			  notifyAggregation := *,//OA O
+			  somecastEnable := omit,//O
+			  somecastAlgorithm := omit,//O
 			  choice := omit //NA
 		  };
     	
@@ -3728,7 +3779,7 @@ module OneM2M_Templates {
 		 * @param p_name Resource name
 		 * @param p_accessControlPolicyIds ACP IDs for the AE
 		 */
-		template (value) MgmtResource_optional m_contentCreateMgmtObj (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit)  XSD.String p_name := c_defaultMgmtObjResourceName) := {
+		template (value) MgmtResource_optional m_contentCreateMgmtObj (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit)  ResourceName p_name := c_defaultMgmtObjResourceName) := {
 			
 			resourceName := p_name,//O
 			resourceType := omit,//NP
@@ -3740,8 +3791,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			mgmtDefinition := omit,//O
 			objectIDs := omit,//O
 			objectPaths := omit,//O
@@ -3754,7 +3807,7 @@ module OneM2M_Templates {
 		 * @param p_name Resource name
 		 * @param p_accessControlPolicyIds ACP IDs for the AE
 		 */
-		template (value) MgmtResource_optional m_contentCreateMgmtCmd (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit)  XSD.String p_name := c_defaultMgmtCmdResourceName) := {
+		template (value) MgmtResource_optional m_contentCreateMgmtCmd (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit)  ResourceName p_name := c_defaultMgmtCmdResourceName) := {
 			
 			resourceName := p_name,//O
 			resourceType := omit,//NP
@@ -3766,8 +3819,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			mgmtDefinition := omit,//O
 			objectIDs := omit,//O
 			objectPaths := omit,//O
@@ -3802,7 +3857,7 @@ module OneM2M_Templates {
 		 * @param p_name Resource name
 		 * @param p_accessControlPolicyIds ACP IDs for the AE
 		 */
-		template (value) Node_optional m_contentCreateNode (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit)  XSD.String p_name := c_defaultNodeResourceName, in template (omit) XSD.ID p_nodeId := "NodeID") := {//TODO Create PX for NodeID
+		template (value) Node_optional m_contentCreateNode (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit)  ResourceName p_name := c_defaultNodeResourceName, in template (omit) NodeID p_nodeId := "NodeID") := {//TODO Create PX for NodeID
 			
 			resourceName := p_name,//O
 			resourceType := omit,//NP
@@ -3814,9 +3869,12 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			nodeID := p_nodeId,//M
+			nodeType := omit,//O
 			hostedCSELink := omit,//O
 			hostedAELinks := omit,//O
 			hostedServiceLinks := omit,//O
@@ -3830,7 +3888,7 @@ module OneM2M_Templates {
 		 * @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 := *) := {
+		template Node_optional mw_contentCreateNodeBase (template ResourceName p_name := *) := {
 			
 			resourceName := p_name,//O
 			resourceType := omit,//NP
@@ -3842,9 +3900,12 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			nodeID := ?,//M
+			nodeType := *,//O
 			hostedCSELink := *,//O
 			hostedAELinks := *,//O
 			hostedServiceLinks := *,//O
@@ -3887,7 +3948,7 @@ module OneM2M_Templates {
     	 * @param p_accessControlPolicyIds ACP IDs for the PollingChannel
     	 * @param p_name Resource name
     	 */
-    	template (value) PollingChannel_optional m_contentCreatePollingChannel (in template (omit) XSD.String p_name := c_defaultPollingChannelResourceName) := {
+    	template (value) PollingChannel_optional m_contentCreatePollingChannel (in template (omit) ResourceName p_name := c_defaultPollingChannelResourceName) := {
 			resourceName := p_name,//O
             resourceType := omit,//NP
             resourceID := omit,//NP
@@ -3922,7 +3983,7 @@ module OneM2M_Templates {
 		 * @param p_name Resource name
 		 */
 		template (value) TransactionMgmt_optional m_contentCreateTransactionMgmt (	in template (omit) AggregatedRequest p_requestPrimitives,
-																					in template (omit) XSD.String p_name := c_defaultTransactionMgmtResourceName,
+																					in template (omit) ResourceName p_name := c_defaultTransactionMgmtResourceName,
 																					in template (omit) TransactionState p_transactionState := int1) := {
 			resourceName := p_name,//O  p_name
 			resourceType := omit,//NP
@@ -3934,6 +3995,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator := omit, //O
 			transactionLockTime := omit, //O
 			transactionExecuteTime := omit, //O
@@ -3957,7 +4019,7 @@ module OneM2M_Templates {
 		 * @param p_name Resource name
 		 */
 		template (value) Transaction_optional m_contentCreateTransaction (	in template (value) RequestPrimitive p_requestPrimitive ,
-																			in template (omit) XSD.String p_name := c_defaultTransactionMgmtResourceName,
+																			in template (omit) ResourceName p_name := c_defaultTransactionMgmtResourceName,
 																			in template (omit) TransactionControl p_transactionControl := int2) := {
 			resourceName := p_name,//O  p_name
 			resourceType := omit,//NP
@@ -3969,6 +4031,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator := omit, //O
 			transactionID := omit,
 			transactionControl := p_transactionControl,
@@ -3990,23 +4053,23 @@ module OneM2M_Templates {
 			resourceType := omit,//NP
 			resourceID := omit,//NP
 			parentID := omit,//NP
-			accessControlPolicyIDs := omit,//O
 			creationTime := omit,//NP
-			expirationTime := omit,//O
 			lastModifiedTime := omit,//NP
 			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			dynamicAuthorizationConsultationIDs := omit,//O
-			creator := omit,//O
-			IDList := omit,//M
+			announceSyncType := omit,//O
+			iDList := omit,//M
 			resourceTypes := omit,//O
 			operations := omit,//O
 			resourceIDs := omit,//O
 			releaseVersions := omit,//O
 			additions := omit,//O
 			deletions := omit,//O
-			modifications := omit,//O
 			applicability := omit,//O
 			choice := omit//NP
 		};  
@@ -4016,11 +4079,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddContainerMaxByte100(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"maxByteSize", "100"}}, //O
-			applicability := REQUESTS_TO_CSE
+			additions := {{{"maxByteSize", "100"}}}, //O
+			applicability := int1
 		};
 		
         /**
@@ -4028,11 +4091,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"maxByteSize", "-100"}}, //O
-			applicability := REQUESTS_TO_CSE
+			additions := {{{"maxByteSize", "-100"}}}, //O
+			applicability := int1
 		};
 
         /**
@@ -4040,11 +4103,11 @@ module OneM2M_Templates {
 		 */
         template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddgmty(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-            additions := {{"geoCoordinates", "type_:=1, coordinates:={-4.4216366, 36.7213028}"}},//6.3.5.69	m2m:geoCoordinates
-			applicability := REQUESTS_TO_CSE        
+            additions := {{{"geoCoordinates", "type_:=1, coordinates:={-4.4216366, 36.7213028}"}}},//6.3.5.69	m2m:geoCoordinates
+			applicability := int1        
         }; 
             
 		/**
@@ -4052,11 +4115,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddContainerMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"maxByteSize", "100"}}, //O
-			applicability := RESPONSES_FROM_CSE
+			additions := {{{"maxByteSize", "100"}}}, //O
+			applicability := int2
 		};
         
 		/**
@@ -4064,11 +4127,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo4(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"resultContent", "4"}}, //O
-			applicability := REQUESTS_TO_CSE
+			additions := {{{"resultContent", "4"}}}, //O
+			applicability := int1
 		};
         
 		/**
@@ -4076,11 +4139,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"resultContent", "4"}}, //O
-			applicability := RESPONSES_FROM_CSE
+			additions := {{{"resultContent", "4"}}}, //O
+			applicability := int2
 		};
         
 		/**
@@ -4088,11 +4151,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			modifications := {{"resultContent", "4"}}, //O
-			applicability := RESPONSES_FROM_CSE
+			additions := {{{"resultContent", "4"}}}, //O
+			applicability := int2
 		};        
 		
 		/**
@@ -4100,11 +4163,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo1(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"resultContent", "1"}}, //O
-			applicability := REQUESTS_TO_CSE
+			additions := {{{"resultContent", "1"}}}, //O
+			applicability := int1
 		};
         
 		/**
@@ -4112,11 +4175,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo1ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"resultContent", "1"}}, //O
-			applicability := RESPONSES_FROM_CSE
+			additions := {{{"resultContent", "1"}}}, //O
+			applicability := int2
 		};
 
 		/**
@@ -4124,11 +4187,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteResultContent(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"resultContent"}}, //O
-			applicability := REQUESTS_TO_CSE
+			additions := {{{"resultContent"}}}, //O
+			applicability := int1
 		};
 		
 		/**
@@ -4136,11 +4199,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"releaseVersionIndicator", "3"}}, //O
-			applicability := REQUESTS_TO_CSE
+			additions := {{{"releaseVersionIndicator", "3"}}}, //O
+			applicability := int1
 		};
 		
 		/**
@@ -4148,11 +4211,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
 			deletions := {"requestIdentifier"}, //O
-			applicability := REQUESTS_TO_CSE
+			applicability := int1
 		};
 		
 		/**
@@ -4160,12 +4223,12 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddNonMutuallyExclusive(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"maxByteSize", "100"}}, //O
+			additions := {{{"maxByteSize", "100"}}}, //O
 			deletions := {"maxByteSize"}, //O
-			applicability := REQUESTS_TO_CSE
+			applicability := int1
 		};
 		
 		/**
@@ -4173,11 +4236,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteContainerMaxByte(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
 			deletions := {"maxByteSize"}, //O
-			applicability := REQUESTS_TO_CSE
+			applicability := int1
 		};
 		
 		/**
@@ -4185,11 +4248,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
 			deletions := {"maxByteSize"}, //O
-			applicability := RESPONSES_FROM_CSE
+			applicability := int2
 		};
 		
 		/**
@@ -4197,11 +4260,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileDeletePrimitiveContentFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
 			deletions := {"primitiveContent"}, //O
-			applicability := RESPONSES_FROM_CSE
+			applicability := int2
 		};
 		
 		/**
@@ -4209,11 +4272,11 @@ module OneM2M_Templates {
 		 */
 		template PrimitveProfile_optional m_contentCreatePrimitveProfileAddMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
 			resourceName := c_defaultPrimitiveProfileceResourceName, //O
-			IDList := p_IDList, //M
+			iDList := p_IDList, //M
 			resourceTypes := {int3}, //O
 			operations := {int1, int2, int3, int4, int5},//O
-			additions := {{"maxByteSize", "100"}}, //O
-			applicability := RESPONSES_FROM_CSE
+			additions := {{{"maxByteSize", "100"}}}, //O
+			applicability := int2
 		};
     	
         /**
@@ -4221,11 +4284,11 @@ module OneM2M_Templates {
 		 */
         template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
             resourceName := c_defaultPrimitiveProfileceResourceName, //O
-            IDList := p_IDList, //M
+            iDList := p_IDList, //M
             resourceTypes := {int3}, //O
             operations := {int1, int2, int3, int4, int5},//O
-            additions := {{"resultContent", "1"}}, //O
-            applicability := RESPONSES_FROM_CSE
+            additions := {{{"resultContent", "1"}}}, //O
+            applicability := int2
         };
         
         /**
@@ -4233,11 +4296,11 @@ module OneM2M_Templates {
 		 */
         template PrimitveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
             resourceName := c_defaultPrimitiveProfileceResourceName, //O
-            IDList := p_IDList, //M
+            iDList := p_IDList, //M
             resourceTypes := {int3}, //O
             operations := {int1, int2, int3, int4, int5},//O
             deletions := {"resultContent"}, //O
-            applicability := RESPONSES_FROM_CSE
+            applicability := int2
         };        
         
     	/**
@@ -4246,7 +4309,7 @@ module OneM2M_Templates {
     	 * @param p_name Resource name
     	 */
     	template (value) Schedule_optional m_contentCreateSchedule (in template (value) ScheduleEntries p_scheduleElement := {{"* * * * * * *"}},
-																	in template (omit) XSD.String p_name := c_defaultScheduleResourceName) := {
+																	in template (omit) ResourceName p_name := c_defaultScheduleResourceName) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -4257,8 +4320,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			scheduleElement := p_scheduleElement,//M
 			networkCoordinated := omit,//O
 			choice := omit//NP
@@ -4268,7 +4333,7 @@ module OneM2M_Templates {
     	 * @desc Base primitiveContent for CREATE operation for State_optional resource
     	 * @param p_scheduleElement Schedule
     	 */
-    	template (value) State_optional m_contentCreateState (in template (omit) XSD.String p_name := "MyState") := {
+    	template (value) State_optional m_contentCreateState (in template (omit) ResourceName p_name := "MyState") := {
             resourceName := p_name,//O,
             resourceType := omit,//NP,
             resourceID := omit,//NP,
@@ -4279,11 +4344,10 @@ module OneM2M_Templates {
             accessControlPolicyIDs := omit,//O,
             expirationTime := omit,//O
             dynamicAuthorizationConsultationIDs := omit,//O
-            holder := omit,//O
-            announceTo := omit,//O
+			custodian := omit,//O
+			announceTo := omit,//O
             announcedAttribute := omit,//O
             announceSyncType := omit,//O
-            creator := omit,//O
             stateActive := omit,//NP
             stateAction := omit,//NP
             stateTransitions := omit,//O
@@ -4295,20 +4359,19 @@ module OneM2M_Templates {
     	 * @param EvalCriteria p_evalCriteria
     	 * @param XSD.AnyURI p_nextState         
     	 */
-    	template (value) StateTransitions_optional m_stateTransitions (in template (value) EvalCriteria p_evalCriteria,
+    	template (value) ListOfStateTransitions m_stateTransitions (in template (value) EvalCriteria p_evalCriteria,
                                                                        in template (value) XSD.AnyURI p_nextState) := {
-            evalCriteria := p_evalCriteria,
-            nextState    := p_nextState
+			stateTransition_list := {{evalCriteria := p_evalCriteria, nextState := p_nextState}}
     	};
     
         
     	/**
     	 * @desc  Fields for State_optional resource 
-    	 * @param XSD.String p_name
+    	 * @param ResourceName p_name
     	 * @param StateTransitions_optional p_stateTransitions
     	 */
-    	template (value) State_optional m_contentCreateStateWithStateTransitions (in template (omit) XSD.String p_name := "MyState",
-                                                                                  in template (omit) StateTransitions_optional p_stateTransitions := omit) := {
+    	template (value) State_optional m_contentCreateStateWithStateTransitions (in template (omit) ResourceName p_name := "MyState",
+                                                                                  in template (omit) ListOfStateTransitions p_stateTransitions := omit) := {
             resourceName := p_name,//O,
             resourceType := omit,//NP,
             resourceID := omit,//NP,
@@ -4319,40 +4382,38 @@ module OneM2M_Templates {
             accessControlPolicyIDs := omit,//O,
             expirationTime := omit,//O
             dynamicAuthorizationConsultationIDs := omit,//O
-            holder := omit,//O
-            announceTo := omit,//O
+			custodian := omit,//O
+			announceTo := omit,//O
             announcedAttribute := omit,//O
             announceSyncType := omit,//O
-            creator := omit,//O
             stateActive := omit,//NP
             stateAction := omit,//NP
-            stateTransitions := {p_stateTransitions},//O
+			stateTransitions := p_stateTransitions,//O
             choice := omit//O
     	};
         
     	/**
     	 * @desc Base primitiveContent for CREATE operation for ProcessManagement_optional including a State resource
-    	 * @param XSD.String p_name
+    	 * @param ResourceName p_name
     	 * @param StateTransitions_optional p_stateTransitions    
     	 */
-    	template (value) ProcessManagement_optional m_contentProcessManagement_WithState (in template (omit) XSD.String p_name := "MyState",
-                                                                                          in template (omit) State_optional p_state := m_contentCreateState) := {
+    	template (value) ProcessManagement_optional m_contentProcessManagement_WithState (in template (omit) ResourceName p_name := "MyState",
+                                                                                          in template (value) State_optional p_state := m_contentCreateState) := {
             resourceName := p_name,//O,
             resourceType := omit,//NP,
             resourceID := omit,//NP,
             parentID := omit,//NP,
-            accessControlPolicyIDs := omit,//NP,
             creationTime := omit,//NP,
-            expirationTime := omit,//O
             lastModifiedTime := omit,//NP,
             labels := omit,//O
-            announceTo := omit,//O
-            announcedAttribute := omit,//O
+            accessControlPolicyIDs := omit,//NP,
+            expirationTime := omit,//O
             dynamicAuthorizationConsultationIDs := omit,//O
-            creator := omit,//O
-            holder := omit,//O
-            announceSyncType := omit,//O
-            processStatus := omit,//NP,
+			custodian := omit,//O
+			announceTo := omit,//O
+            announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			processStatus := omit,//NP,
             processControl := omit,//NP,
             currentState := omit,//NP,
             activateConditions:= omit,//NP,
@@ -4363,25 +4424,24 @@ module OneM2M_Templates {
         
     	/**
     	 * @desc Base primitiveContent for CREATE operation for ProcessManagement_optional resource
-    	 * @param  XSD.String p_name
+    	 * @param  ResourceName p_name
     	 */
-    	template (value) ProcessManagement_optional m_contentProcessManagement (in template (omit) XSD.String p_name := c_defaultProcessManagementName) := {
+    	template (value) ProcessManagement_optional m_contentProcessManagement (in template (omit) ResourceName p_name := c_defaultProcessManagementName) := {
             resourceName := p_name,//O,
             resourceType := omit,//NP,
             resourceID := omit,//NP,
             parentID := omit,//NP,
-            accessControlPolicyIDs := omit,//NP,
             creationTime := omit,//NP,
-            expirationTime := omit,//O
             lastModifiedTime := omit,//NP,
             labels := omit,//O
-            announceTo := omit,//O
-            announcedAttribute := omit,//O
+            accessControlPolicyIDs := omit,//NP,
+            expirationTime := omit,//O
             dynamicAuthorizationConsultationIDs := omit,//O
-            creator := omit,//O
-            holder := omit,//O
-            announceSyncType := omit,//O
-            processStatus := omit,//NP,
+			custodian := omit,//O
+			announceTo := omit,//O
+            announcedAttribute := omit,//O
+		    announceSyncType := omit,//O
+			processStatus := omit,//NP,
             processControl := omit,//NP,
             currentState := omit,//NP,
             activateConditions:= omit,//NP,
@@ -4392,9 +4452,9 @@ module OneM2M_Templates {
         
     	/**
     	 * @desc Base primitiveContent for CREATE operation for Action resource
-    	 * @param  XSD.String p_name
+    	 * @param  ResourceName p_name
     	 */
-    	template (value) Action_optional m_contentAction (in template (omit) XSD.String p_name := "MyAction", in template (omit) XSD.AnyURI p_subjectresourceID := omit, in template (omit) XSD.AnyURI p_objectresourceID := omit) := {
+    	template (value) Action_optional m_contentAction (in template (omit) ResourceName p_name := "MyAction", in template (omit) XSD.AnyURI p_subjectresourceID := omit, in template (omit) XSD.AnyURI p_objectresourceID := omit) := {
             resourceName := p_name,//O,
             resourceType := omit,//NP,
             resourceID := omit,//NP,
@@ -4405,12 +4465,11 @@ module OneM2M_Templates {
 		    accessControlPolicyIDs := omit,//NP,
 		    expirationTime := omit,//O,
             dynamicAuthorizationConsultationIDs := omit,//O,
-            holder := omit,//O,          
-		    announceTo := omit,//O,
-            announceSyncType := omit,//O,
+			custodian := omit,//O
+			announceTo := omit,//O,
             announcedAttribute := omit,//O,
-            creator := omit,//O,
-            actionPriority := omit,//O,
+			announceSyncType := omit,//O
+			actionPriority := omit,//O,
             subjectResourceID := p_subjectresourceID,//O,
             evalCriteria := omit,//O,
             evalMode := omit,//O,
@@ -4425,9 +4484,9 @@ module OneM2M_Templates {
 
     	/**
     	 * @desc Base primitiveContent for CREATE operation for Dependency_optional resource
-    	 * @param  XSD.String p_name
+    	 * @param  ResourceName p_name
     	 */
-    	template (value) Dependency_optional m_contentDependency (in template (omit) XSD.String p_name := "MyDependency") := {
+    	template (value) Dependency_optional m_contentDependency (in template (omit) ResourceName p_name := "MyDependency") := {
             resourceName := p_name,//O
             resourceType := omit,//NP
             resourceID := omit,//NP
@@ -4438,11 +4497,10 @@ module OneM2M_Templates {
 		    accessControlPolicyIDs := omit,//NP
 		    expirationTime := omit,//O
             dynamicAuthorizationConsultationIDs := omit,//O
-            holder := omit,//O
-		    announceTo := omit,//O
+			custodian := omit,//O
+			announceTo := omit,//O
             announcedAttribute := omit,//O
             announceSyncType := omit,//O
-            creator := omit,//O
             sufficient := omit,//O
             evalCriteria := omit,//O
             referencedResourceID := omit,//O
@@ -4463,8 +4521,8 @@ module OneM2M_Templates {
 			labels := omit,//MA O
 			accessControlPolicyIDs := omit,//NA O
 			expirationTime := "29991231T235959",//MA M
-			dynamicAuthorizationConsultationIDs := omit,//NA O
 			link := "NotInitialized",//M
+			dynamicAuthorizationConsultationIDs := omit,//NA O
 			scheduleElement := p_scheduleEntries,//OA M
 			networkCoordinated := omit,//OA O
 			choice := omit//NP
@@ -4483,8 +4541,8 @@ module OneM2M_Templates {
 			labels := *,//MA O
 			accessControlPolicyIDs := omit,//NA O
 			expirationTime := ?,//MA M
-			dynamicAuthorizationConsultationIDs := omit,//NA O
 			link := ?,//M
+			dynamicAuthorizationConsultationIDs := omit,//NA O
 			scheduleElement := * ,//OA M
 			networkCoordinated := *,//OA O
 			choice := omit//NP
@@ -4501,6 +4559,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
     		dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			applicableCredIDs := p_applicableCredIDs,//O
 			allowedApp_IDs := p_allowedAppIDs,//O
 			allowedAEs := p_allowedAEs,//O
@@ -4514,7 +4573,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for StatsConfig resource
 		 * @param p_name Resource name
 		 */
-		template (value) StatsConfig_optional m_contentCreateStatsConfig (in template (omit) XSD.String p_name := c_defaultStatsConfigResourceName) := {
+		template (value) StatsConfig_optional m_contentCreateStatsConfig (in template (omit) ResourceName p_name := c_defaultStatsConfigResourceName) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -4525,6 +4584,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			creator := omit,//O
 			choice := omit//O
 		};  
@@ -4536,7 +4596,7 @@ module OneM2M_Templates {
     	 * @param p_name Resource name
     	 */
     	template (value) Subscription_optional m_contentCreateSubscription (in template (value) ListOfURIs p_notificationURI,
-																			in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName) := {
+																			in template (omit) ResourceName p_name := c_defaultSubscriptionResourceName) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -4547,6 +4607,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
     		dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator := omit,//O
 			eventNotificationCriteria := omit,//O
 			expirationCounter := omit,//O
@@ -4563,6 +4624,9 @@ module OneM2M_Templates {
 			notificationEventCat := omit,//O
 			subscriberURI := omit,//O
 			associatedCrossResourceSub := omit,//O
+			notificationStatsEnable := omit,//O
+			notificationStatsInfo := omit,//O
+			primitiveProfileID := omit,//O
 			choice := omit//NP
     	};   	
     	
@@ -4578,8 +4642,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,	//O
 			expirationTime := omit,	//O
 			dynamicAuthorizationConsultationIDs := omit,	//O
+			custodian := omit,//O
 			announceTo := omit,	//O
 			announcedAttribute := omit,	//O
+			announceSyncType := omit,//O
 			stateTag := omit,	//NP
 			creator := omit,	//O
 			choice := omit	//NP
@@ -4598,8 +4664,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,	//O
 			expirationTime := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,	//O
 			announcedAttribute := omit,	//O
+			announceSyncType := omit,//O
+			stateTag := omit,//O
 			creator := omit,	//O
             description := omit, //O
             ontologyFormat := p_ontologyFormat, //M
@@ -4624,8 +4693,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,                 //O
 			expirationTime := omit,                         //O
 			dynamicAuthorizationConsultationIDs := omit,    //O
+			custodian := omit,//O
 			announceTo := omit,                             //O
 			announcedAttribute := omit,                     //O
+			announceSyncType := omit,//O
 			creator := omit,                                //O
 			descriptorRepresentation := p_descriptorRepresentation,               //M
 			semanticOpExec := omit,                         //NP
@@ -4652,8 +4723,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,                 //O
 			expirationTime := *,                         //O
 			dynamicAuthorizationConsultationIDs := *,    //O
+			custodian := *,//O
 			announceTo := *,                             //O
 			announcedAttribute := *,                     //O
+			announceSyncType := *,//O
 			creator := *,                                //O
 			descriptorRepresentation := ?,               //M
 			semanticOpExec := omit,                         //NP
@@ -4683,14 +4756,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,	//O
 			expirationTime := omit,	//O
 			dynamicAuthorizationConsultationIDs := omit,	//O
+			custodian := omit,//O
 			announceTo := omit,	//O
 			announcedAttribute := omit,	//O
+			announceSyncType := omit,//O
+			stateTag := omit,//O
 			creator := omit,	//O
 			memberFilter := p_memberFilter,	//M
 			smiID := omit,	//O
 			inputDescriptor := omit,	//O
 			outputDescriptor := p_outputDescriptor,	//M
-			functionDescriptor := p_functionDescriptor	//M
+			functionDescriptor := p_functionDescriptor,	//M
+			choice := omit//O
+		
 		}
 		
 		/**
@@ -4708,14 +4786,18 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,	//O
 			expirationTime := *,	//O
 			dynamicAuthorizationConsultationIDs := *,	//O
+			custodian := *,//O
 			announceTo := *,	//O
 			announcedAttribute := *,	//O
+			announceSyncType := omit,//O
+			stateTag := *,//O
 			creator := *,	//O
 			memberFilter := ?,	//M
 			smiID := *,	//O
 			inputDescriptor := *,	//O
 			outputDescriptor := ?,	//M
-			functionDescriptor := ?	//M
+			functionDescriptor := ?,	//M
+			choice := *//O
 		}
     	
     	
@@ -4737,15 +4819,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,	//O
 			expirationTime := omit,	//O
 			dynamicAuthorizationConsultationIDs := omit,	//O
+			custodian := omit,//O
 			announceTo := omit,	//O
 			announcedAttribute := omit,	//O
+			announceSyncType := omit,//O
+			stateTag := omit,//O
 			creator := omit,	//O
 			smjpID := p_smjpID,	//M
 			smjpInputParameter := p_smjpInputParameter,	//M
 			memberStoreType := p_memberStoreType,	//M
 			mashupMember := omit,	//O
 			resultGenType := p_mashupMember,   //M
-			periodForResultGen := omit	//O
+			periodForResultGen := omit,	//O
+			choice := omit//O
 		}   	
     	
 		/**
@@ -4763,15 +4849,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,	//O
 			expirationTime := *,	//O
 			dynamicAuthorizationConsultationIDs := *,	//O
+			custodian := *,//O
 			announceTo := *,	//O
 			announcedAttribute := *,	//O
+			announceSyncType := omit,//O
+			stateTag := *,//O
 			creator := *,	//O
 			smjpID := ?,	//M
 			smjpInputParameter := ?,	//M
 			memberStoreType := ?,	//M
 			mashupMember := *,	//O
 			resultGenType := ?,	//M
-			periodForResultGen := *	//O
+			periodForResultGen := *,	//O
+			choice := *//O
 		}   	
 
 
@@ -4790,12 +4880,13 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,	//NP
 			expirationTime := omit,	//NP
 			dynamicAuthorizationConsultationIDs := omit,	//NP
-			announceTo := omit,	//NP
-			announcedAttribute := omit,	//NP
+			custodian := omit,//O
+			stateTag := omit,//O
 			creator := omit,	//NP
 			smjpInputParameter := omit,	//NP
 			mashupResultFormat := omit,	//NP
-			mashupResult := omit	//NP
+			mashupResult := omit,	//NP
+			choice := omit//O
 		}
 		
 		/**
@@ -4813,12 +4904,13 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,	//NP
 			expirationTime := omit,	//NP
 			dynamicAuthorizationConsultationIDs := omit,	//NP
-			announceTo := omit,	//NP
-			announcedAttribute := omit,	//NP
+			custodian := omit,//O
+			stateTag := omit,//O
 			creator := omit,	//NP
 			smjpInputParameter := omit,	//NP
 			mashupResultFormat := omit,	//NP
-			mashupResult := omit	//NP
+			mashupResult := omit,	//NP
+			choice := omit//O
 		}
 		
 		
@@ -4827,7 +4919,7 @@ module OneM2M_Templates {
 		 * @param p_notificationURI Notification URI
 		 * @param p_name Resource name
 		 */
-		template Subscription_optional mw_contentCreateSubscriptionBase (template XSD.String p_name := *) := {
+		template Subscription_optional mw_contentCreateSubscriptionBase (template ResourceName p_name := *) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -4838,6 +4930,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
     		dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			creator := *,//O
 			eventNotificationCriteria := *,//O
 			expirationCounter := *,//O
@@ -4854,11 +4947,14 @@ module OneM2M_Templates {
 			notificationEventCat := *,//O
 			subscriberURI := *,//O
 			associatedCrossResourceSub := *,//O
+			notificationStatsEnable := *,//O
+			notificationStatsInfo := *,//O
+			primitiveProfileID := *,//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)  ResourceName p_name := c_defaultSubscriptionResourceName,
 																					in template (omit) EventNotificationCriteria p_eventNotificationCriteria,
 																					in template (omit) XSD.PositiveInteger p_expirationCounter,
 																					in template (omit) BatchNotify p_batchNotify,
@@ -4941,7 +5037,7 @@ module OneM2M_Templates {
     	 * @desc Base primitiveContent for CREATE operation for ContentInstance resource
     	 * @param p_primitiveContent Content for the ContentInstance
     	 */
-    	template (value) ContentInstance_optional m_contentCreateContentInstance(in template (omit) XSD.String p_name := c_defaultContentInstanceResourceName, XSD.String p_primitiveContent := "AnyValue") := {
+    	template (value) ContentInstance_optional m_contentCreateContentInstance(in template (omit) ResourceName p_name := c_defaultContentInstanceResourceName, XSD.String p_primitiveContent := "AnyValue") := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -4952,6 +5048,7 @@ module OneM2M_Templates {
 			expirationTime := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			contentInfo := "text/strings:0",//O
@@ -4959,6 +5056,7 @@ module OneM2M_Templates {
 			contentRef := omit, //O
 			ontologyRef := omit,//O
 			content := p_primitiveContent,//M
+			deletionCnt := omit,//O
 			choice := omit //O
 		};
 
@@ -4966,7 +5064,7 @@ module OneM2M_Templates {
 		 * @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 := *) := {
+		template ContentInstance_optional mw_contentCreateContentInstanceBase(template ResourceName p_name := *) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -4977,6 +5075,7 @@ module OneM2M_Templates {
 			expirationTime := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			contentInfo := *,//O
@@ -4984,6 +5083,7 @@ module OneM2M_Templates {
 			contentRef := *, //O
 			ontologyRef := *,//O
 			content := ?,//M
+			deletionCnt := *,//O
 			choice := * //O
 		};
 					
@@ -5045,8 +5145,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			location := omit,//O
@@ -5066,7 +5168,7 @@ module OneM2M_Templates {
     	 * @desc Base primitiveContent for CREATE operation for Container resource
     	 * @param p_name Resource name
     	 */
-    	template (value) Container_optional m_contentCreateContainer (in template (omit) XSD.String p_name := c_defaultContainerResourceName) modifies m_contentCreateContainerBase:= {
+    	template (value) Container_optional m_contentCreateContainer (in template (omit) ResourceName p_name := c_defaultContainerResourceName) modifies m_contentCreateContainerBase:= {
 			resourceName := p_name//O
     	};
     	
@@ -5082,7 +5184,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for DynamicAuthorizationConsultation resource
 		 * @param p_name Resource name
 		 */
-		template (value) DynamicAuthorizationConsultation_optional m_contentDynamicAuthorizationConsultation (in template (value) XSD.Boolean p_dyn_auth_enabled, in template (omit) XSD.String p_name := c_dynamicAuthorizationConsultationName):= {
+		template (value) DynamicAuthorizationConsultation_optional m_contentDynamicAuthorizationConsultation (in template (value) XSD.Boolean p_dyn_auth_enabled, in template (omit) ResourceName p_name := c_dynamicAuthorizationConsultationName):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -5093,6 +5195,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			dynamicAuthorizationEnabled := p_dyn_auth_enabled,//M
 			dynamicAuthorizationPoA := omit,//O
 			dynamicAuthorizationLifetime := omit,//O	
@@ -5118,6 +5221,7 @@ module OneM2M_Templates {
 			link := "NotInitialized",//M
 			dynamicAuthorizationConsultationIDs := omit, //O
 			stateTag := omit,//NP
+			location := omit, //O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
@@ -5133,7 +5237,7 @@ module OneM2M_Templates {
 		 * @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 := *):= {
+		template Container_optional mw_contentCreateContainerBase (template ResourceName p_name := *):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -5144,8 +5248,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			location := *,//O
@@ -5164,7 +5270,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
 		 * @param p_name Resource name
 		 */
-		template (value) Container_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
+		template (value) Container_invalid m_contentCreateContainerInvalid (in template (omit) ResourceName p_name := c_defaultContainerResourceName):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -5176,10 +5282,13 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
+			location := omit, //O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
@@ -5195,7 +5304,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for RemoteCSE resource
 		 * @param p_name Resource name
 		 */
-		template (value) RemoteCSE_optional m_contentCreateRemoteCSE (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId):= {
+		template (value) RemoteCSE_optional m_contentCreateRemoteCSE (in template (omit) ResourceName p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -5206,8 +5315,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit,
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			location := omit,//O
 			cseType := omit,//O
 			pointOfAccess := omit,//O
 			cSEBase := valueof(p_cSEBase),//M
@@ -5225,6 +5337,7 @@ module OneM2M_Templates {
 			externalGroupID := omit,//O
 			triggerEnable := omit,//O
 			activityPatternElements := omit,//O
+			enableTimeCompensation := omit,//O
 			choice := omit//O
 		};
     	
@@ -5232,7 +5345,7 @@ module OneM2M_Templates {
 		 * @desc PrimitiveContent for CREATE operation for RemoteCSE resource with poa
 		 * @param p_name Resource name
 		 */
-		template (value) RemoteCSE_optional m_contentCreateRemoteCSE_poa (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName, in PoaList p_poaList):= {
+		template (value) RemoteCSE_optional m_contentCreateRemoteCSE_poa (in template (omit) ResourceName p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName, in PoaList p_poaList):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -5243,8 +5356,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit,
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			location := omit,//O
 			cseType := omit,//O
 			pointOfAccess := p_poaList,//O
 			cSEBase := valueof(p_cSEBase),//M
@@ -5262,6 +5378,7 @@ module OneM2M_Templates {
 			externalGroupID := omit,//O
 			triggerEnable := omit,//O
 			activityPatternElements := omit,//O
+			enableTimeCompensation := omit,//O
 			choice := omit//O
 		};
 		
@@ -5279,8 +5396,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
+			location := *,//O
 			cseType := *,//O
 			pointOfAccess := *,//O
 			cSEBase := ?,//M
@@ -5298,6 +5418,7 @@ module OneM2M_Templates {
 			externalGroupID := *,//O
 			triggerEnable := *,//O
 			activityPatternElements := *,//O
+			enableTimeCompensation := *,//O
 			choice := *//O
 		};
 		
@@ -5317,6 +5438,7 @@ module OneM2M_Templates {
 			expirationTime := "29991231T235959",//MA M
 			link := "NotInitialized",//M
 			dynamicAuthorizationConsultationIDs := omit,//OA O 
+			location := omit,//O
 			cseType := omit,//OA O
 			pointOfAccess := omit,//OA O
 			cSEBase := omit,//OA O
@@ -5350,6 +5472,7 @@ module OneM2M_Templates {
 			link := ?, //M
 			dynamicAuthorizationConsultationIDs := *,//OA O
 			stateTag := *,//OA M
+			location := *,//O
 			maxNrOfInstances := *,//OA O
 			maxByteSize := *, //OA O
 			maxInstanceAge := *, //OA O
@@ -5372,9 +5495,11 @@ module OneM2M_Templates {
     	  	accessControlPolicyIDs 	:= p_accessControlPolicyIds, //O
  	  	  	expirationTime 			:= omit, //O
       		dynamicAuthorizationConsultationIDs := omit, //O
-    	  	announceTo 				:= omit, 				   //O
+			custodian := omit,//O
+			announceTo 				:= omit, 				   //O
     	  	announcedAttribute		:= omit, 			      //O
-    		locationSource 			:= p_locationSource, //M
+			announceSyncType := omit,//O
+			locationSource 			:= p_locationSource, //M
     		locationInformationType := omit,//O
     		locationUpdatePeriod 		:= p_locationUpdatePeriod, //O
     		locationTargetID 			:= p_locationTargetID, 	//O
@@ -5402,8 +5527,10 @@ module OneM2M_Templates {
 				accessControlPolicyIDs 	:= omit, //O
 				expirationTime 			:= omit, //O
 				dynamicAuthorizationConsultationIDs := omit, //O
-				announceTo 				:= omit, 				   //O
+				custodian := omit,//O
+			announceTo 				:= omit, 				   //O
 				announcedAttribute		:= omit, 			      //O
+				announceSyncType := omit,//O
 				locationSource 			:= int1, //M
 				locationInformationType := omit,//O
 				locationUpdatePeriod 		:= omit, //O
@@ -5477,6 +5604,23 @@ module OneM2M_Templates {
 		  trackingID1 := omit,
 		  trackingID2 := omit
     	};
+    	
+		template (value) Notification m_contentNotificationEmpty := {
+		  notificationEvent := omit,
+		  verificationRequest := omit,
+		  subscriptionDeletion := omit,
+		  subscriptionReference := omit,
+		  creator := omit,
+		  notificationForwardingURI := omit,
+		  notificationTarget := omit,
+		  targetRemovalRequest := omit,
+		  targetRemovalAllowance := omit,
+		  iPEDiscoveryRequest := omit,
+		  aERegistrationPointChange := omit,
+		  aEReferenceIDChange := omit,
+		  trackingID1 := omit,
+		  trackingID2 := omit
+		};
     			
 		/**
 		 * @desc  primitiveContent for CREATE operation for SemanticDescriptor resource, with specific OntologyRef
@@ -5501,6 +5645,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs 	:= omit, //O
 			expirationTime 			:= omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator                 := omit,
 			choice 					:= omit  	         //NP
 		};
@@ -5520,7 +5665,8 @@ module OneM2M_Templates {
 	        accessControlPolicyIDs              := omit, //O
 	        expirationTime                      := omit, //O
 	        dynamicAuthorizationConsultationIDs := omit, //O
-	        creator                             := omit, //O
+			custodian := omit,//O
+			creator                             := omit, //O
 	        eventID                             := omit, //NP
 	        eventType                           := omit, //M
 	        eventStart                          := omit, //O
@@ -5547,6 +5693,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs              := omit, //O
 			expirationTime                      := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator                             := omit, //O
 			eventID                             := omit, //NP
 			eventType                           := int3, //M  TIMERBASED
@@ -5573,6 +5720,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs              := omit, //O
 			expirationTime                      := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator                             := omit, //O
 			eventID                             := omit, //NP
 			eventType                           := int2, //M  STORAGEBASED
@@ -5599,6 +5747,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs              := omit, //O
 			expirationTime                      := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator                             := omit, //O
 			eventID                             := omit, //NP
 			eventType                           := int1, //M  DATAOPERATION
@@ -5628,6 +5777,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs 	:= omit, //O
 			expirationTime 			:= omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator                 := omit,
 			statsCollectID          := omit,
 			collectingEntityID      := omit, // //collect all Entities
@@ -5654,6 +5804,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  	:= omit, //O
 			expirationTime 			    := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			m2M_Sub_ID                          := PX_M2M_SUB_ID, //M
 		    m2M_SS_ID                           := PX_M2M_SS_ID, //O
 		    status                              := omit,   //NP	default INACTIVE
@@ -5663,8 +5814,10 @@ module OneM2M_Templates {
 		    serviceSubscriptionDuration         := omit,  //O
 		    currentNumAEs                       := omit, //NP
 		    maxNumAEs                           := 1,  //O
-		    maxNumNodes                         := 1,  //O
+			currentNumNodes := omit,//O
+			maxNumNodes                         := 1,  //O
 		    maxNumBytes                         := 1,  //O
+		    maxNumUsers							:= 1, //O
 		    maxRequestRate                      := 1, //O
 		    maxNumContainers                    := 1, //O
 		    maxNumInstancesPerContainer         := 1, //O
@@ -5674,7 +5827,6 @@ module OneM2M_Templates {
 			maxNotificationRate                 := omit, //O
 		    maxNumFlexContainers                := omit, //O
 		    maxNumInstancesPerFlexContainer     := omit, //O
-		    maxNumUsers							:= 1, //O
 		    defaultAccessControlPrivileges      := omit, //O
 		    choice 					            := omit  //NP
 		};
@@ -5694,6 +5846,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  	:= omit, //O
 			expirationTime 			    := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			m2M_Sub_ID                          := PX_M2M_SUB_ID, //M
 			m2M_SS_ID                           := PX_M2M_SS_ID, //O
 			status                              := omit,   //NP default INACTIVE
@@ -5703,9 +5856,11 @@ module OneM2M_Templates {
 			serviceSubscriptionDuration         := omit,  //O
 			currentNumAEs                       := omit, //NP
 			maxNumAEs                           := omit,  //O
+			currentNumNodes := omit,//O
 			maxNumNodes                         := omit,  //O
 			maxNumBytes                         := omit,  //O
-			maxRequestRate                      := omit, //O
+			maxNumUsers							:= omit, //O
+		   	maxRequestRate                      := omit, //O
 			maxNumContainers                    := omit, //O
 			maxNumInstancesPerContainer         := omit, //O
 			maxNumTimeSeries                    := omit, //O
@@ -5714,7 +5869,6 @@ module OneM2M_Templates {
 			maxNotificationRate                 := omit, //O
 		    maxNumFlexContainers                := omit, //O
 		    maxNumInstancesPerFlexContainer     := omit, //O
-		    maxNumUsers							:= omit, //O
 		    defaultAccessControlPrivileges      := omit, //O
 		    choice 					            := omit  //NP
 		};
@@ -5734,6 +5888,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  	:= omit, //O
 			expirationTime 			    := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			m2M_Sub_ID                          := PX_M2M_SUB_ID, //M
 			m2M_SS_ID                           := PX_M2M_SS_ID, //O
 			status                              := omit,   //NP
@@ -5743,8 +5898,10 @@ module OneM2M_Templates {
 			serviceSubscriptionDuration         := omit,  //O
 			currentNumAEs                       := omit, //NP
 			maxNumAEs                           := 2,  //O
+			currentNumNodes := omit,//O
 			maxNumNodes                         := 2,  //O
 			maxNumBytes                         := 2,  //O
+			maxNumUsers							:= 2, //O
 			maxRequestRate                      := 2, //O
 			maxNumContainers                    := 2, //O
 			maxNumInstancesPerContainer         := 2, //O
@@ -5754,7 +5911,6 @@ module OneM2M_Templates {
 			maxNotificationRate                 := omit, //O
 			maxNumFlexContainers                := omit, //O
 			maxNumInstancesPerFlexContainer     := omit, //O
-			maxNumUsers							:= 2, //O
 			defaultAccessControlPrivileges      := omit, //O
 			choice 					            := omit  //NP
 		};
@@ -5774,6 +5930,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  	:= omit, //O
 			expirationTime 			    := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			m2M_Sub_ID                          := PX_M2M_SUB_ID, //M
 			m2M_SS_ID                           := PX_M2M_SS_ID, //O
 			status                              := omit,   //NP
@@ -5783,8 +5940,10 @@ module OneM2M_Templates {
 			serviceSubscriptionDuration         := omit,  //O
 			currentNumAEs                       := omit, //NP
 			maxNumAEs                           := omit,  //O
+			currentNumNodes := omit,//O
 			maxNumNodes                         := omit,  //O
 			maxNumBytes                         := 200,  //O
+			maxNumUsers							:= omit, //O
 			maxRequestRate                      := omit, //O
 			maxNumContainers                    := omit, //O
 			maxNumInstancesPerContainer         := omit, //O
@@ -5794,7 +5953,6 @@ module OneM2M_Templates {
 			maxNotificationRate                 := omit, //O
 			maxNumFlexContainers                := omit, //O
 			maxNumInstancesPerFlexContainer     := omit, //O
-			maxNumUsers							:= omit, //O
 			defaultAccessControlPrivileges      := omit, //O
 			choice 					            := omit  //NP
 		};
@@ -5814,6 +5972,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  	:= omit, //O
 			expirationTime 			    := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			m2M_Sub_ID                          := PX_M2M_SUB_ID, //M
 			m2M_SS_ID                           := PX_M2M_SS_ID, //O
 			status                              := omit,   //NP
@@ -5823,8 +5982,10 @@ module OneM2M_Templates {
 			serviceSubscriptionDuration         := omit,  //O
 			currentNumAEs                       := omit, //NP
 			maxNumAEs                           := omit,  //O
+			currentNumNodes := omit,//O
 			maxNumNodes                         := omit,  //O
 			maxNumBytes                         := 100,  //O
+			maxNumUsers							:= omit, //O
 			maxRequestRate                      := omit, //O
 			maxNumContainers                    := omit, //O
 			maxNumInstancesPerContainer         := omit, //O
@@ -5834,7 +5995,6 @@ module OneM2M_Templates {
 			maxNotificationRate                 := omit, //O
 			maxNumFlexContainers                := omit, //O
 			maxNumInstancesPerFlexContainer     := omit, //O
-			maxNumUsers							:= omit, //O
 			defaultAccessControlPrivileges      := omit, //O
 			choice 					            := omit  //NP
 		};
@@ -5854,6 +6014,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs 	:= omit, //O
 			expirationTime 			:= omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			applicableCredIDs       := omit,
 			allowedApp_IDs          := omit,
 			allowedAEs              := omit,
@@ -5873,6 +6034,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs 	:= omit, //O
 			expirationTime 			:= omit, //M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			nodeID 					:= omit, //M
 			cSE_ID 					:= omit, //O
 			deviceIdentifier 		:= omit, //M
@@ -5892,6 +6054,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs 	:= omit, //O
 			expirationTime 			:= omit, //M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			nodeID 					:= p_nodeID, //M
 			cSE_ID 					:= p_cseId, //O
 			deviceIdentifier 		:= omit, //M
@@ -5915,7 +6078,8 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  	:= omit, //O
 			expirationTime 			    := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
-		    M2M_User_ID                         := PX_M2M_USER_ID, // M
+			custodian := omit,//O
+			m2M_User_ID                         := PX_M2M_USER_ID, // M
 		    maxNumAEs                           := 1, // O
 		    maxNumNodes                         := 1, // O
 		    maxNumBytes                         := 1, // O
@@ -5928,7 +6092,8 @@ module OneM2M_Templates {
 		    maxNotificationRate                 := 1, // O
 		    maxNumFlexContainers                := 1, // O
 		    maxNumInstancesPerFlexContainer     := 1, // O
-		    defaultAccessControlPrivileges      := omit // O
+		    defaultAccessControlPrivileges      := omit, // O
+			choice 					:= omit //O
 		};
 		
 		/**
@@ -5947,7 +6112,8 @@ module OneM2M_Templates {
 		    maxMembersPerGroup                  := 2, // O
 		    maxNotificationRate                 := 2, // O
 		    maxNumFlexContainers                := 2, // O
-		    maxNumInstancesPerFlexContainer     := 2 // O
+		    maxNumInstancesPerFlexContainer     := 2, // O
+			choice 					:= omit //O
 		};
 		
 
@@ -5955,7 +6121,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for timeSeries resource 
 		 * @param p_name Resource name
 		 */
-		template (value) TimeSeries_optional m_contentCreateTimeSeries (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName):= {
+		template (value) TimeSeries_optional m_contentCreateTimeSeries (in template (omit) ResourceName p_name := c_defaultTimeSeriesResourceName):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -5966,15 +6132,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			creator := omit,//O
+			location := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
 			currentNrOfInstances := omit,//NP
 			currentByteSize := omit,//NP
 			periodicInterval := omit,//O
+			periodicIntervalDelta := omit,//O
 			missingDataDetect := omit,//O
 			missingDataMaxNr := omit,//O
 			missingDataList := omit,//NP
@@ -5989,7 +6159,7 @@ module OneM2M_Templates {
 		 * @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 := *):= {
+		template TimeSeries_optional mw_contentCreateTimeSeriesBase (template ResourceName p_name := *):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -6000,15 +6170,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			creator := *,//O
+			location := *,//O
 			maxNrOfInstances := *,//O
 			maxByteSize := *,//O
 			maxInstanceAge := *,//O
 			currentNrOfInstances := omit,//NP
 			currentByteSize := omit,//NP
 			periodicInterval := *,//O
+			periodicIntervalDelta := *,//O
 			missingDataDetect := *,//O
 			missingDataMaxNr := *,//O
 			missingDataList := omit,//NP
@@ -6035,12 +6209,14 @@ module OneM2M_Templates {
 			expirationTime := omit,//O
 			link := "NotInitialized",//M
 			dynamicAuthorizationConsultationIDs := omit, //O
+			location := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
 			currentNrOfInstances := omit,//NP
 			currentByteSize := omit,//NP
 			periodicInterval := omit,//O
+			periodicIntervalDelta := omit,//O
 			missingDataMaxNr := omit,//O
 			missingDataList := omit,//NP
 			missingDataCurrentNr := omit,//NP
@@ -6066,12 +6242,14 @@ module OneM2M_Templates {
 			expirationTime := ?,//MA M
 			link := ?, //M NA
 			dynamicAuthorizationConsultationIDs := *, //OA			
+			location := *,//O
 			maxNrOfInstances := *,//O OA		
 			maxByteSize := *,//O OA	
 			maxInstanceAge := *,//O OA	
 			currentNrOfInstances := *,//M OA
 			currentByteSize := *,//M OA
 			periodicInterval := *,//O OA
+			periodicIntervalDelta := *,//O
 			missingDataMaxNr := *,//O OA
 			missingDataList := *,//O OA
 			missingDataCurrentNr := *,//O OA
@@ -6106,7 +6284,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for timeSeries resource
 		 * @param p_name Resource name
 		 */
-		template (value) TimeSeries_optional m_contentCreateTimeSeriesAttributes (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName,
+		template (value) TimeSeries_optional m_contentCreateTimeSeriesAttributes (in template (omit) ResourceName p_name := c_defaultTimeSeriesResourceName,
 																		in template (omit) XSD.Boolean p_missingDataDetect := omit,
 																		in template (omit) XSD.NonNegativeInteger p_periodicInterval := omit,
 																		in template (omit) XSD.NonNegativeInteger p_missingDataMaxNr := omit, 
@@ -6122,7 +6300,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for invalid CREATE operation for timeSeries resource (using Container_update_invalid)
 		 * @param p_name Resource name
 		 */
-		template (value) TimeSeries_invalid m_contentCreateTimeSeriesInvalid (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName):= {
+		template (value) TimeSeries_invalid m_contentCreateTimeSeriesInvalid (in template (omit) ResourceName p_name := c_defaultTimeSeriesResourceName):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -6134,16 +6312,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			stateTag := omit,//NP
+			announceSyncType := omit,//O
 			creator := omit,//O
+			location := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
 			currentNrOfInstances := omit,//NP
 			currentByteSize := omit,//NP
 			periodicInterval := omit,//O
+			periodicIntervalDelta := omit,//O
 			missingDataDetect := omit,//O
 			missingDataMaxNr := omit,//O
 			missingDataList := omit,//NP
@@ -6158,7 +6339,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for Container resource
 		 * @param p_name Resource name
 		 */
-		template (value) TimeSeriesInstance_optional m_contentCreateTimeSeriesInstance (in template (omit) XSD.String p_name := c_defaultTimeSeriesInstanceResourceName):= {
+		template (value) TimeSeriesInstance_optional m_contentCreateTimeSeriesInstance (in template (omit) ResourceName p_name := c_defaultTimeSeriesInstanceResourceName):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -6169,6 +6350,7 @@ module OneM2M_Templates {
 			expirationTime := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			dataGenerationTime := {alt_ := "00000101T000000"},//M
 			content := "AnyValue",//M
 			sequenceNr := omit,//O
@@ -6180,7 +6362,7 @@ module OneM2M_Templates {
 		 * @desc Base reception template primitiveContent for CREATE operation for TimeSeriesInstance resource
 		 * @param p_name Resource name
 		 */
-		template TimeSeriesInstance_optional mw_contentCreateTimeSeriesInstanceBase (template XSD.String p_name := *):= {
+		template TimeSeriesInstance_optional mw_contentCreateTimeSeriesInstanceBase (template ResourceName p_name := *):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -6191,6 +6373,7 @@ module OneM2M_Templates {
 			expirationTime := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			dataGenerationTime := ?,//M
 			content := ?,//M
 			sequenceNr := *,//O
@@ -6228,7 +6411,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for Role resource
 		 * @param p_name Resource name
 		 */
-		template (value) Role_optional m_contentCreateRole (in template (omit) XSD.String p_name := c_defaultRoleResourceName):= {
+		template (value) Role_optional m_contentCreateRole (in template (omit) ResourceName p_name := c_defaultRoleResourceName):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -6239,6 +6422,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			roleID := "roleID@a.b", //M
 			issuer := "issuer", //M
 			holder := "holder", //M
@@ -6253,7 +6437,7 @@ module OneM2M_Templates {
 		 * @desc Base reception template primitiveContent for CREATE operation for Role resource
 		 * @param p_name Resource name
 		 */
-		template Role_optional mw_contentCreateRoleBase (template XSD.String p_name := *):= {
+		template Role_optional mw_contentCreateRoleBase (template ResourceName p_name := *):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -6264,6 +6448,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			roleID := ?, //M
 			issuer := ?, //M
 			holder := ?, //M
@@ -6278,7 +6463,7 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for CREATE operation for Token resource
 		 * @param p_name Resource name
 		 */
-		template (value) Token_optional m_contentCreateToken (in template (omit) XSD.String p_name := c_defaultRoleResourceName):= {
+		template (value) Token_optional m_contentCreateToken (in template (omit) ResourceName p_name := c_defaultRoleResourceName):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -6289,6 +6474,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			tokenID := "roleID@a.b", //M
 			tokenObject := {alt_ := "oneM2M.oneM2M.oneM2M"}, //M
 			version := omit, //O
@@ -6307,7 +6493,7 @@ module OneM2M_Templates {
 		 * @desc Base reception template primitiveContent for CREATE operation for Token resource
 		 * @param p_name Resource name
 		 */
-		template Token_optional mw_contentCreateTokenBase (template XSD.String p_name := *):= {
+		template Token_optional mw_contentCreateTokenBase (template ResourceName p_name := *):= {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
 			resourceID := omit,//NP
@@ -6318,6 +6504,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			tokenID := ?, //M
 			tokenObject := ?, //M
 			version := omit, //O
@@ -6347,8 +6534,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6374,8 +6563,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6403,8 +6594,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6435,8 +6628,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6471,8 +6666,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6500,8 +6697,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6535,8 +6734,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6567,8 +6768,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := omit,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6594,8 +6797,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6628,8 +6833,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6655,8 +6862,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6682,8 +6891,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6712,8 +6923,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6739,8 +6952,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6768,8 +6983,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6795,8 +7012,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6824,8 +7043,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6851,8 +7072,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6882,8 +7105,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6912,8 +7137,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6939,8 +7166,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6968,8 +7197,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := omit,//NP
 			creator := *,//O
 			containerDefinition := ?,//M
@@ -6986,9 +7217,9 @@ module OneM2M_Templates {
 		 * @param p_name Resource name
 		 */
 		template (value) CrossResourceSubscription_optional m_contentCreateCrossResourceSubscription (in template (value) ListOfURIs p_notificationURI,
-																			in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName,
+																			in template (omit) ResourceName p_name := c_defaultSubscriptionResourceName,
 																			in template (omit) TimeWindowType p_timeWindowType := int1,
-																			in template (value) AbsRelTimestamp p_timeWindowSize,
+																			in template (value) XSD.Duration p_timeWindowSize,
 																			in template (value) XSD.ID p_creator) := {
 			resourceName := p_name,//O
 			resourceType := omit,//NP
@@ -7000,6 +7231,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//NP
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			creator := p_creator,//M
 			regularResourcesAsTarget := omit,//O
 			subscriptionResourcesAsTarget := omit,//O
@@ -7010,6 +7242,8 @@ module OneM2M_Templates {
 			expirationCounter := omit,//O
 			notificationURI := p_notificationURI,//M
 			subscriberURI := omit,//O
+			notificationStatsEnable := omit,//O
+			notificationStatsInfo := omit,//O
 			choice := omit//NP
 		};
 	
@@ -7031,8 +7265,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
     		dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			location := omit,//O
 			appName := omit,//O
 			app_ID := omit,//NP
 			aE_ID := omit,//NP
@@ -7049,6 +7286,7 @@ module OneM2M_Templates {
 			sessionCapabilities := omit, //O
 			triggerEnable := omit, //O
 			activityPatternElements := omit, //O
+			enableTimeCompensation := omit,//O
 			choice := omit //NP
 		};	
     	
@@ -7080,6 +7318,7 @@ module OneM2M_Templates {
 			expirationTime := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			privileges := omit,//O
 			selfPrivileges := omit,//O
 			authorizationDecisionResourceIDs := omit,//O
@@ -7162,8 +7401,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 	    	dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			creator := omit,//NP
 			memberType := omit,//NP
 			specializationType := omit,//NP
@@ -7176,6 +7417,8 @@ module OneM2M_Templates {
 			groupName := omit,//O
 			semanticSupportIndicator := omit,//O
 			notifyAggregation := omit,//O
+			somecastEnable := omit,//O
+			somecastAlgorithm := omit,//O
 			choice := omit//NP
 
 		};
@@ -7198,9 +7441,11 @@ module OneM2M_Templates {
 			pointOfAccess := omit,
 			nodeLink := omit,
 			dynamicAuthorizationConsultationIDs := omit,
+			location := omit,//O
 			contentSerialization := omit,
 			e2eSecInfo := omit, 
 			supportedReleaseVersions := omit,
+			currentTime := omit,
 			choice := omit
 
 		};
@@ -7234,8 +7479,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 	    	dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			scheduleElement := omit,//O
 			networkCoordinated := omit,//O
 			choice := omit//NP
@@ -7255,6 +7502,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
     		dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator := omit,//NP
 			eventNotificationCriteria := omit,//O
 			expirationCounter := omit,//O
@@ -7271,6 +7519,9 @@ module OneM2M_Templates {
 			notificationEventCat := omit,//O
 			subscriberURI := omit,//NP
 			associatedCrossResourceSub := omit,//O
+			notificationStatsEnable := omit,//O
+			notificationStatsInfo := omit,//O
+			primitiveProfileID := omit,//O
 			choice := omit//NP
 		};
 				
@@ -7288,8 +7539,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
     		dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//NP
 			location := omit, //O
@@ -7326,6 +7579,7 @@ module OneM2M_Templates {
 			expirationTime := omit,
 			announceTo := omit,
 			announcedAttribute := omit,
+			announceSyncType := omit,//O
 			stateTag := omit,
 			creator := omit,
 			contentInfo := omit,
@@ -7333,6 +7587,7 @@ module OneM2M_Templates {
 			contentRef := omit,
 			ontologyRef := omit,
 			content := omit,
+			deletionCnt := omit,
 			choice := omit
 		};
 		
@@ -7347,9 +7602,11 @@ module OneM2M_Templates {
     	  	accessControlPolicyIDs 	:= p_accessControlPolicyIds,//O
     	  	expirationTime 			:= omit,//O    	  	
     		dynamicAuthorizationConsultationIDs := omit, //O
-    	  	announceTo 				:= omit,//O
+			custodian := omit,//O
+			announceTo 				:= omit,//O
     	  	announcedAttribute		:= omit,//O
-    		locationSource 			:= omit,//NP
+			announceSyncType := omit,//O
+			locationSource 			:= omit,//NP
 			locationInformationType := omit,//O
 			locationUpdatePeriod 	:= {p_locationUpdatePeriod}, //O
     		locationTargetID 		:= omit, //NP
@@ -7376,9 +7633,12 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			nodeID := omit,//O
+			nodeType := omit,//O
 			hostedCSELink := omit,//NP
 			hostedAELinks := omit,//O
 			hostedServiceLinks := omit,//O
@@ -7399,8 +7659,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			location := omit,//O
 			cseType := omit,//NP
 			pointOfAccess := omit,//O
 			cSEBase := omit,//NP
@@ -7418,6 +7681,7 @@ module OneM2M_Templates {
 			externalGroupID := omit,//O
 			triggerEnable := omit,//O
 			activityPatternElements := omit,//O
+			enableTimeCompensation := omit,//O
 			choice := omit
     	}
     	
@@ -7426,38 +7690,38 @@ module OneM2M_Templates {
 			resourceType := omit,//NP
 			resourceID := omit,//NP
 			parentID := omit,//NP
-			accessControlPolicyIDs := omit,//O
 			creationTime := omit,//NP
-			expirationTime := omit,//O
 			lastModifiedTime := omit,//NP
 			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			dynamicAuthorizationConsultationIDs := omit,//O
-			creator := omit,//O
-			IDList := omit,//M
+			announceSyncType := omit,//O
+			iDList := omit,//M
 			resourceTypes := omit,//O
 			operations := omit,//O
 			resourceIDs := omit,//O
 			releaseVersions := omit,//O
 			additions := omit,//O
 			deletions := omit,//O
-			modifications := omit,//O
 			applicability := omit,//O
 			choice := omit//NP
     	}
     	
 		template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNonMutuallyExclusive modifies m_contentUpdatePrimitiveProfile := {
-			additions := {{"maxByteSize", "100"}}, //O
+			additions := {{{"maxByteSize", "100"}}}, //O
 			deletions := {"maxByteSize"} //O
 		}
 		
 		template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNonPermissibleParameters modifies m_contentUpdatePrimitiveProfile := {
-			additions := {{"releaseVersionIndicator", "3"}} //O
+			additions := {{{"releaseVersionIndicator", "3"}}} //O
 		}
         
 		template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNegativeMaxByteSize modifies m_contentUpdatePrimitiveProfile := {
-			additions := {{"maxByteSize", "-10"}}
+			additions := {{{"maxByteSize", "-10"}}}
 		}        
     	
 		template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
@@ -7472,6 +7736,7 @@ module OneM2M_Templates {
 			expirationTime := omit,
 			link := omit,
 			dynamicAuthorizationConsultationIDs := omit,
+			location := omit,//O
 			appName := omit,
 			app_ID := omit,
 			aE_ID := omit,
@@ -7503,6 +7768,7 @@ module OneM2M_Templates {
 			link := omit,
 			dynamicAuthorizationConsultationIDs := omit,
 			stateTag := omit,
+			location := omit,//O
 			maxNrOfInstances := omit,
 			maxByteSize := omit,
 			maxInstanceAge := omit,
@@ -7537,7 +7803,9 @@ module OneM2M_Templates {
 		  	groupName := omit, 
 		  	semanticSupportIndicator := omit,
 		  	notifyAggregation := omit,
-		  	choice := omit
+			somecastEnable := omit,
+			somecastAlgorithm := omit,
+			choice := omit
 		};	
 		
     			
@@ -7555,8 +7823,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,                 //O
 			expirationTime := omit,                         //O
 			dynamicAuthorizationConsultationIDs := omit,    //O
+			custodian := omit,//O
 			announceTo := omit,                             //O
 			announcedAttribute := omit,                     //O
+			announceSyncType := omit,//O
 			creator := omit,                                //O
 			descriptorRepresentation := omit,               //M
 			semanticOpExec := omit,                         //NP
@@ -7582,15 +7852,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			creator := omit,//O
+			location := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
 			currentNrOfInstances := omit,//NP
 			currentByteSize := omit,//NP
 			periodicInterval := omit,//O
+			periodicIntervalDelta := omit,//O
 			missingDataDetect := omit,//O
 			missingDataMaxNr := omit,//O
 			missingDataList := omit,//NP
@@ -7615,6 +7889,7 @@ module OneM2M_Templates {
 			expirationTime := omit,
 			announceTo := omit,
 			announcedAttribute := omit,
+			announceSyncType := omit,//O
 			dataGenerationTime := omit,
 			content := omit,
 			sequenceNr := omit,
@@ -7636,6 +7911,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,
 			expirationTime := omit,
 			dynamicAuthorizationConsultationIDs := omit,
+			custodian := omit,//O
 			roleID := omit,
 			issuer := omit,
 			holder := omit,
@@ -7659,14 +7935,18 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,	//O
 			expirationTime := omit,	//O
 			dynamicAuthorizationConsultationIDs := omit,	//O
+			custodian := omit,//O
 			announceTo := omit,	//O
 			announcedAttribute := omit,	//O
+			announceSyncType := omit,//O
+			stateTag := omit,//O
 			creator := omit,	//O
 			memberFilter := omit,	//M
 			smiID := omit,	//O
 			inputDescriptor := omit,	//O
 			outputDescriptor := omit,	//O
-			functionDescriptor := omit	//O
+			functionDescriptor := omit,	//O
+			choice := omit
 		}
 		
 		/**
@@ -7683,15 +7963,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,	//O
 			expirationTime := omit,	//O
 			dynamicAuthorizationConsultationIDs := omit,	//O
+			custodian := omit,//O
 			announceTo := omit,	//O
 			announcedAttribute := omit,	//O
+			announceSyncType := omit,//O
+			stateTag := omit,//O
 			creator := omit,	//O
 			smjpID := omit,	//O
 			smjpInputParameter := omit,	//O
 			memberStoreType := omit,	//O
 			mashupMember := omit,	//O
 			resultGenType := omit,   //O
-			periodForResultGen := omit	//O
+			periodForResultGen := omit,	//O
+			choice := omit
 		} 
 		
 		/**
@@ -7710,7 +7994,8 @@ module OneM2M_Templates {
 			maxMembersPerGroup                  := 1, // O
 			maxNotificationRate                 := 1, // O
 			maxNumFlexContainers                := 1, // O
-			maxNumInstancesPerFlexContainer     := 1 // O
+			maxNumInstancesPerFlexContainer     := 1, // O
+			choice := omit
 		};
 		
 		/**
@@ -7729,7 +8014,8 @@ module OneM2M_Templates {
 			maxMembersPerGroup                  := 2, // O
 			maxNotificationRate                 := 2, // O
 			maxNumFlexContainers                := 2, // O
-			maxNumInstancesPerFlexContainer     := 2 // O
+			maxNumInstancesPerFlexContainer     := 2, // O
+			choice := omit
 		};
 		
 		/**
@@ -7744,31 +8030,32 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for UPDATE operation for SoftwareCampaign resource
 		 */
 		template (value) SoftwareCampaign_optional m_contentUpdateSoftwareCampaign := {
-                resourceName := omit,//O
-                resourceType := omit,//NP
-                resourceID := omit,//NP
-                parentID := omit,//NP
-                creationTime := omit,//NP
-                lastModifiedTime := omit,//NP
-                labels := omit,//O
-                accessControlPolicyIDs := omit, //O
-                expirationTime := omit,//O
-                dynamicAuthorizationConsultationIDs := omit, //O
-                holder := omit,//O           
-                announceTo := omit,//O
-                announceSyncType := omit,//O
-                announcedAttribute := omit,//O
-                campaignEnabled := omit,//O
-                campaignStatus := omit,//NP
-                version := omit,//O
-                softwareName := omit,//O
-                uRL := omit,            //O
-                softwareTargets := omit,//O
-                softwareTriggerCriteria := omit,//O
-                softwareOperation := omit,//O
-                softwareLinks := omit,//NP
-                aggregatedSoftwareStatus := omit,//NP
-                individualSoftwareStatus := omit//NP
+            resourceName := omit,//O
+            resourceType := omit,//NP
+            resourceID := omit,//NP
+            parentID := omit,//NP
+            creationTime := omit,//NP
+            lastModifiedTime := omit,//NP
+            labels := omit,//O
+            accessControlPolicyIDs := omit, //O
+            expirationTime := omit,//O
+            dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
+			announceTo := omit,//O
+            announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			campaignEnabled := omit,//O
+            campaignStatus := omit,//NP
+            version := omit,//O
+            softwareName := omit,//O
+            uRL := omit,            //O
+            softwareTargets := omit,//O
+            softwareTriggerCriteria := omit,//O
+            softwareOperation := omit,//O
+            softwareLinks := omit,//NP
+            aggregatedSoftwareStatus := omit,//NP
+            individualSoftwareStatuses := omit,//NP
+			choice := omit
 		};
 		template (value) TransactionMgmt_optional m_contentUpdateTransactionMgmt := {
 			resourceName := omit, //NP
@@ -7781,6 +8068,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //NP
 			expirationTime := omit, //NP
 			dynamicAuthorizationConsultationIDs := omit, //NP
+			custodian := omit,//O
 			creator := omit, //NP
 			transactionLockTime := omit, //NP
 			transactionExecuteTime := omit, //NP
@@ -7816,6 +8104,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //NP
 			expirationTime := omit, //NP
 			dynamicAuthorizationConsultationIDs := omit, //NP
+			custodian := omit,//O
 			creator := omit, //NP
 			transactionID := omit, //NP
 			transactionControl := omit, //NP
@@ -7844,6 +8133,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  	:= omit, //O
 			expirationTime 			    := omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			m2M_Sub_ID                          := omit, //NP
 			m2M_SS_ID                           := omit, //O
 			status                              := omit,   //NP
@@ -7853,8 +8143,10 @@ module OneM2M_Templates {
 			serviceSubscriptionDuration         := omit,  //O
 			currentNumAEs                       := omit, //NP
 			maxNumAEs                           := 2,  //O
+			currentNumNodes                       := omit, //NP
 			maxNumNodes                         := 2,  //O
 			maxNumBytes                         := 2,  //O
+			maxNumUsers						    := omit, //O
 			maxRequestRate                      := 2, //O
 			maxNumContainers                    := 2, //O
 			maxNumInstancesPerContainer         := 2, //O
@@ -7864,7 +8156,6 @@ module OneM2M_Templates {
 			maxNotificationRate                 := omit, //O
 			maxNumFlexContainers                := omit, //O
 			maxNumInstancesPerFlexContainer     := omit, //O
-			maxNumUsers						    := omit, //O
 			defaultAccessControlPrivileges      := omit, //O
 			choice 					            := omit  //NP
 
@@ -7888,6 +8179,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  				:= omit, //O
 			expirationTime 			   				:= omit, //O
 			dynamicAuthorizationConsultationIDs 	:= omit, //O
+			custodian := omit,//O
 			applicableCredIDs 						:= omit,//O
 			allowedApp_IDs 							:= {"*"},//O
 			allowedAEs 								:= omit,//O
@@ -7914,6 +8206,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  				:= omit, //O
 			expirationTime 			   				:= omit, //O
 			dynamicAuthorizationConsultationIDs 	:= omit, //O
+			custodian := omit,//O
 			nodeID 									:= omit, //NP
 			cSE_ID 									:= omit, //NP
 			deviceIdentifier 						:= omit, //NP
@@ -7938,6 +8231,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs  			:= omit, //O
 			expirationTime 			    		:= omit, //O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			m2M_Sub_ID                          := omit, //NP
 			m2M_SS_ID                           := omit, //O
 			status                              := omit, //NP
@@ -7947,8 +8241,10 @@ module OneM2M_Templates {
 			serviceSubscriptionDuration         := omit, //O
 			currentNumAEs                       := omit, //NP
 			maxNumAEs                           := omit, //O
+			currentNumNodes                       := omit, //NP
 			maxNumNodes                         := omit, //O
 			maxNumBytes                         := omit, //O
+			maxNumUsers							:= omit, //O
 			maxRequestRate                      := omit, //O
 			maxNumContainers                    := omit, //O
 			maxNumInstancesPerContainer         := omit, //O
@@ -7958,7 +8254,6 @@ module OneM2M_Templates {
 			maxNotificationRate                 := omit, //O
 			maxNumFlexContainers                := omit, //O
 			maxNumInstancesPerFlexContainer     := omit, //O
-			maxNumUsers							:= omit, //O
 			defaultAccessControlPrivileges      := omit, //O
 			choice 					            := omit  //NP
 
@@ -8213,8 +8508,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
     		dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := omit,//O
+			location := omit,//O
 			appName := *,//O
 			app_ID := ?,//M
 			aE_ID := ?,//M
@@ -8231,6 +8529,7 @@ module OneM2M_Templates {
 			sessionCapabilities := *, //O
 			triggerEnable := *, //O
 			activityPatternElements := *, //O			
+			enableTimeCompensation := *,//O
 			choice := *//O
 		};
     	
@@ -8245,8 +8544,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			location := omit,//O
 			appName := omit,//O
 			app_ID := omit,//M
 			aE_ID := omit,//M
@@ -8263,6 +8565,7 @@ module OneM2M_Templates {
 			sessionCapabilities := omit,//O
 			triggerEnable := omit,//O
 			activityPatternElements := omit,//O
+			enableTimeCompensation := omit,//O
 			choice := omit//O
 		};
 		
@@ -8277,8 +8580,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//M
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
+			location := *,//O
 			appName := *,//O
 			app_ID := *,//M
 			aE_ID := *,//M
@@ -8295,6 +8601,7 @@ module OneM2M_Templates {
 			sessionCapabilities := *, //O
 			triggerEnable := *, //O
 			activityPatternElements := *, //O
+			enableTimeCompensation := *,//O
 			choice := *//O
 		};
     	
@@ -8310,6 +8617,7 @@ module OneM2M_Templates {
 			expirationTime := ?,//M MA
 			link := ?,//M,
 			dynamicAuthorizationConsultationIDs := *, //O OA
+			location := omit,//O
 			appName := *,//O OA
 			app_ID := *,//M OA
 			aE_ID := *,//M OA
@@ -8341,6 +8649,7 @@ module OneM2M_Templates {
 			expirationTime := *,//M
 			link := *,//M,
 			dynamicAuthorizationConsultationIDs := *, //O
+			location := *,//O
 			appName := *,//O
 			app_ID := *,//M
 			aE_ID := *,//M
@@ -8370,6 +8679,7 @@ module OneM2M_Templates {
 			expirationTime := ?,//M
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			privileges := ?,//M
 			selfPrivileges := ?,//M
 			authorizationDecisionResourceIDs := *,//O
@@ -8389,6 +8699,7 @@ module OneM2M_Templates {
 			expirationTime := *,//M
 			announceTo := *,//O
 			announcedAttribute := *,//M
+			announceSyncType := *,//O
 			privileges := *,//M
 			selfPrivileges := *,//M
 			authorizationDecisionResourceIDs := *,//O
@@ -8408,6 +8719,7 @@ module OneM2M_Templates {
 			expirationTime := omit,//M
 			announceTo := omit,//O
 			announcedAttribute := omit,//M
+			announceSyncType := omit,//O
 			privileges := omit,//M
 			selfPrivileges := omit,//M
 			authorizationDecisionResourceIDs := omit,//O
@@ -8427,8 +8739,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			locationSource := omit,//M
 			locationInformationType := omit,//O
 			locationUpdatePeriod := omit,//O
@@ -8505,8 +8819,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
     		dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			creator := *,//O
 			memberType := ?,//M
 			specializationType := *,//O
@@ -8519,6 +8835,8 @@ module OneM2M_Templates {
 			groupName := *,//O
 			semanticSupportIndicator := *,//O
 			notifyAggregation := *,//O
+			somecastEnable := *,//O
+			somecastAlgorithm := *,//O
 			choice := *//O
 		};
 		
@@ -8533,8 +8851,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//M
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//M
+			announceSyncType := *,//O
 			creator := *,//O
 			memberType := *,//M
 			specializationType := *,//O
@@ -8547,6 +8867,8 @@ module OneM2M_Templates {
 			groupName := *,//O
 			semanticSupportIndicator := *,//O
 			notifyAggregation := *,//O
+			somecastEnable := *,//O
+			somecastAlgorithm := *,//O
 			choice := *//O
 		}
 		
@@ -8561,8 +8883,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//M
+			announceSyncType := omit,//O
 			creator := omit,//O
 			memberType := omit,//M
 			specializationType := omit,//O
@@ -8575,6 +8899,8 @@ module OneM2M_Templates {
 			groupName := omit,//O
 			semanticSupportIndicator := omit,//O
 			notifyAggregation := omit,//O
+			somecastEnable := *,//O
+			somecastAlgorithm := *,//O
 			choice := omit//O
 		}
 		
@@ -8632,10 +8958,12 @@ module OneM2M_Templates {
 			groupName := *,//O
 			semanticSupportIndicator := *,//O
 			notifyAggregation := *,//O
+			somecastEnable := *,//O
+			somecastAlgorithm := *,//O
 			choice := *//O
 		};
 		
-		template (value) MgmtCmd_optional m_contentMgmtCmd_allOmit := {
+		template MgmtCmd_optional m_contentMgmtCmd_allOmit := {
 			resourceName := omit,//M
 			resourceType := omit,//M
 			resourceID := omit,//M
@@ -8646,6 +8974,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			description := omit,//O
 			cmdType := omit,//M
 			execReqArgs := omit,//O
@@ -8729,8 +9058,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			location := omit,//O
 			cseType := omit,//O
 			pointOfAccess := omit,//O
 			cSEBase := omit,//M
@@ -8748,6 +9080,7 @@ module OneM2M_Templates {
 			externalGroupID := omit,//O
 			triggerEnable := omit,//O
 			activityPatternElements := omit,//O
+			enableTimeCompensation := omit,//O
 			choice := omit//O
 		};
 		
@@ -8794,8 +9127,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
+			location := *,//O
 			cseType := *,//O
 			pointOfAccess := *,//O
 			cSEBase := ?,//M
@@ -8813,6 +9149,7 @@ module OneM2M_Templates {
 			externalGroupID := *,//O
 			triggerEnable := *,//O
 			activityPatternElements := *,//O
+			enableTimeCompensation := *,//O
 			choice := *//O
 		};
 		
@@ -8827,7 +9164,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
 			dynamicAuthorizationConsultationIDs := *,//O
-			stateTag := ?,//M
+			custodian := *,//O
 			operation := ?,//M
 			target := ?,//M
 			originator := ?,//M	
@@ -8850,8 +9187,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			scheduleElement := ?,//M
 			networkCoordinated := ?,//M
 			choice := *//O
@@ -8868,8 +9207,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//M
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//M
+			announceSyncType := *,//O
 			scheduleElement := *,//M
 			networkCoordinated := ?,//M
 			choice := *//O
@@ -8886,8 +9227,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//M
+			announceSyncType := omit,//O
 			scheduleElement := omit,//M
 			networkCoordinated := omit,//M
 			choice := omit//O
@@ -8935,6 +9278,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			creator := omit,//O
 			statsCollectID := omit,//M
 			collectingEntityID := omit,//M
@@ -8967,15 +9311,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //O
 			expirationTime := p_expirationTime, //M
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit, //O
 			announcedAttribute := omit, //O
+			announceSyncType := omit,//O
+			stateTag := omit,//O
 			creator := omit, //O
 			smjpID := p_smjpID, //M
 			smjpInputParameter := omit,//O
 			memberStoreType := p_memberStoreType, //M
 			mashupMember := omit, //O
 			resultGenType := p_resultGenType, //M
-			periodForResultGen :=  omit//O
+			periodForResultGen :=  omit,//O
+			choice := omit//M
 		};
 		
 		template (value) StatsConfig_optional m_contentStatsConfig_allOmit := {
@@ -8989,6 +9337,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			creator := omit,//O
 			choice := omit//M
 		}
@@ -9004,6 +9353,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
     		dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			creator := *,//O
 			eventNotificationCriteria := *,//O
 			expirationCounter := *,//O
@@ -9020,6 +9370,9 @@ module OneM2M_Templates {
 			notificationEventCat := *,//O
 			subscriberURI := *,//O
 			associatedCrossResourceSub := *,//O
+			notificationStatsEnable := *,//O
+			notificationStatsInfo := *,//O
+			primitiveProfileID := *,//O
 			choice := *//O
 		};
 		template Subscription_optional mw_contentSubscription_any := {
@@ -9033,6 +9386,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//M
 		    dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			creator := *,//O
 			eventNotificationCriteria := *,//O
 			expirationCounter := *,//O
@@ -9049,6 +9403,9 @@ module OneM2M_Templates {
 			notificationEventCat := *,//O
 			subscriberURI := *,//O
 			associatedCrossResourceSub := *,//O
+			notificationStatsEnable := *,//O
+			notificationStatsInfo := *,//O
+			primitiveProfileID := *,//O
 			choice := *//O
 		}
 		
@@ -9063,6 +9420,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator := omit,//O
 			eventNotificationCriteria := omit,//O
 			expirationCounter := omit,//O
@@ -9079,6 +9437,9 @@ module OneM2M_Templates {
 			notificationEventCat := omit,//O
 			subscriberURI := omit,//O
 			associatedCrossResourceSub := omit,//O
+			notificationStatsEnable := omit,//O
+			notificationStatsInfo := omit,//O
+			primitiveProfileID := omit,//O
 			choice := omit//O
 		}
 		
@@ -9128,6 +9489,7 @@ module OneM2M_Templates {
 			expirationTime := ?,//M
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := ?,//M
 			creator := *,//O
 			contentInfo := *,//O
@@ -9135,6 +9497,7 @@ module OneM2M_Templates {
 			contentRef := *, //O
 			ontologyRef := *,//O
 			content := ?,//M
+			deletionCnt := *,//O
 			choice := * //O
 			
 		};
@@ -9154,6 +9517,7 @@ module OneM2M_Templates {
 			expirationTime := omit,//M
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//M
 			creator := omit,//O
 			contentInfo := omit,//O
@@ -9161,6 +9525,7 @@ module OneM2M_Templates {
 			contentRef := omit,
 			ontologyRef := omit,//O
 			content := omit, //M
+			deletionCnt := omit,//O
 			choice := omit
 		};
 		
@@ -9194,8 +9559,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
     		dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := ?,//M
 			creator := *,//O
 			location := *,//O 
@@ -9225,8 +9592,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//M
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//M
+			announceSyncType := *,//O
 			stateTag := *,//M
 			creator := *,//M
 			location := *, //O
@@ -9252,8 +9621,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//M
+			announceSyncType := omit,//O
 			stateTag := omit,//M
 			creator := omit,//M
 			location := omit, //O
@@ -9280,6 +9651,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			source := omit,//M
 			target := omit,//M
 			lifespan := omit,//M
@@ -9334,6 +9706,7 @@ module OneM2M_Templates {
 			link := ?,//M
 			dynamicAuthorizationConsultationIDs := *, //O
 			stateTag := *,//O
+			location := *,//O
 			maxNrOfInstances := *,//O
 			maxByteSize := *,//O
 			maxInstanceAge := *,//O
@@ -9431,9 +9804,12 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,
 			expirationTime := omit,
 			dynamicAuthorizationConsultationIDs := omit,
+			custodian := omit,//O
 			announceTo := omit,
 			announcedAttribute := omit,
+			announceSyncType := omit,//O
 			nodeID := omit,
+			nodeType := omit,//O
 			hostedCSELink := omit,
 			hostedAELinks := omit,//O
 			hostedServiceLinks := omit,//O
@@ -9459,9 +9835,11 @@ module OneM2M_Templates {
 			pointOfAccess := ?,//M
 			nodeLink := *,//O
 			dynamicAuthorizationConsultationIDs := *,
+			location := *,//O
 			contentSerialization := *,
 			e2eSecInfo := *,//O			
 			supportedReleaseVersions := ?,//M
+			currentTime := *,//O
 			choice := *//O
 		};
 
@@ -9480,15 +9858,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			creator := omit,//M
+			location := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
 			currentNrOfInstances := omit,//M
 			currentByteSize := omit,//M
 			periodicInterval := omit,//O
+			periodicIntervalDelta := omit,//O
 			missingDataDetect := omit,//O
 			missingDataMaxNr := omit,//O
 			missingDataList := omit,//O
@@ -9510,15 +9892,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			creator := *,//O TODO XSD should be changed to optional for creator in TimeSeries
+			location := *,//O
 			maxNrOfInstances := *,//O
 			maxByteSize := *,//O
 			maxInstanceAge := *,//O
 			currentNrOfInstances := ?,//M
 			currentByteSize := ?,//M
 			periodicInterval := *,//O
+			periodicIntervalDelta := *,//O
 			missingDataDetect := *,//O
 			missingDataMaxNr := *,//O
 			missingDataList := *,//O
@@ -9578,12 +9964,14 @@ module OneM2M_Templates {
 			expirationTime := ?,//M
 			link := ?,//M
 			dynamicAuthorizationConsultationIDs := *,//O
+			location := *,//O
 			maxNrOfInstances := *,//O
 			maxByteSize := *,//O
 			maxInstanceAge := *,//O
 			currentNrOfInstances := *,//O
 			currentByteSize := *,//O
 			periodicInterval := *,//O
+			periodicIntervalDelta := *,//O
 			missingDataMaxNr := *,//O
 			missingDataList := *,//O
 			missingDataCurrentNr := *,//O
@@ -9604,6 +9992,7 @@ module OneM2M_Templates {
 			expirationTime := ?,//M
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			dataGenerationTime := ?,//M
 			content := ?,//M
 			sequenceNr := *,//O
@@ -9639,6 +10028,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			roleID := omit, //M
 			issuer := omit, //M
 			holder := omit, //M
@@ -9660,6 +10050,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit, //O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			tokenID := omit, //M
 			tokenObject := omit, //M
 			version := omit, //O
@@ -9686,12 +10077,20 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := omit, //O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
+			custodian := omit,//O
+			location := omit,//O
 			containerDefinition := omit, //M
 			ontologyRef := omit, //O
 			contentSize := omit, //NP
-			nodeLink := omit //O
+			nodeLink := omit, //O
+			maxNrOfInstances := omit, //O
+			maxInstanceAge := omit, //O
+			maxByteSize := omit, //O
+			currentNrOfInstances := omit, //O
+			currentByteSize := omit //O
 		}
 		
 		template (present) FlexContainerResource_optional mw_contentFlexContainer(
@@ -9709,12 +10108,20 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := *, //O
 			announceTo := *,//O
 			announcedAttribute := *,//O
+			announceSyncType := *,//O
 			stateTag := *,//NP
 			creator := *,//O
+			custodian := *,//O
+			location := *,//O
 			containerDefinition := *, //M
 			ontologyRef := *, //O
 			contentSize := *, //NP
-			nodeLink := * //O
+			nodeLink := *, //O
+			maxNrOfInstances := *, //O
+			maxInstanceAge := *, //O
+			maxByteSize := *, //O
+			currentNrOfInstances := *, //O
+			currentByteSize := * //O
 		}
 		
 		template DeviceAirConditioner_optional m_contentDeviceAirConditioner_allOmit := {
@@ -9728,8 +10135,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9750,8 +10159,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9772,8 +10183,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9794,8 +10207,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9816,8 +10231,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9838,8 +10255,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9860,8 +10279,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9882,8 +10303,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9904,8 +10327,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9926,8 +10351,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9948,8 +10375,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9970,8 +10399,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -9992,8 +10423,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
 			containerDefinition := omit, //M
@@ -10014,6 +10447,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := *,//O
 			dynamicAuthorizationConsultationIDs := *,//O
+			custodian := *,//O
 			creator := ?,//M
 			regularResourcesAsTarget := *,//O
 			subscriptionResourcesAsTarget := *,//O
@@ -10024,6 +10458,8 @@ module OneM2M_Templates {
 			expirationCounter := *,//O
 			notificationURI := ?,//M
 			subscriberURI := *,//O
+			notificationStatsEnable := *,//O
+			notificationStatsInfo := *,//O
 			choice := *//O
 		};	
 		
@@ -10038,6 +10474,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//NP
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			creator := omit,//M
 			regularResourcesAsTarget := omit,//O
 			subscriptionResourcesAsTarget := omit,//O
@@ -10048,6 +10485,8 @@ module OneM2M_Templates {
 			expirationCounter := omit,//O
 			notificationURI := omit,//M
 			subscriberURI := omit,//O
+			notificationStatsEnable := *,//O
+			notificationStatsInfo := *,//O
 			choice := omit//NP
 		}	
 
@@ -10063,6 +10502,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			m2M_Sub_ID                          := ?, //M
 			m2M_SS_ID                           := *, //O
 			status                              := ?,   //M
@@ -10072,8 +10512,10 @@ module OneM2M_Templates {
 			serviceSubscriptionDuration         := *,  //O
 			currentNumAEs                       := ?, //M
 			maxNumAEs                           := *,  //O
+			currentNumNodes                       := ?, //M
 			maxNumNodes                         := *,  //O
 			maxNumBytes                         := *,  //O
+			maxNumUsers							:= *, //O
 			maxRequestRate                      := *, //O
 			maxNumContainers                    := *, //O
 			maxNumInstancesPerContainer         := *, //O
@@ -10083,7 +10525,6 @@ module OneM2M_Templates {
 			maxNotificationRate                 := *, //O
 			maxNumFlexContainers                := *, //O
 			maxNumInstancesPerFlexContainer     := *, //O
-			maxNumUsers							:= *, //O
 			defaultAccessControlPrivileges      := *, //O
 			choice 					            := *  //O
 
@@ -10099,6 +10540,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			applicableCredIDs := *,//O
 			allowedApp_IDs := *,//O
 			allowedAEs := *,//O
@@ -10118,6 +10560,7 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
 			dynamicAuthorizationConsultationIDs := *, //O
+			custodian := *,//O
 			nodeID := ?,//M
 			cSE_ID := *,//O
 			deviceIdentifier := *,//O
@@ -10135,7 +10578,7 @@ module OneM2M_Templates {
 		 * @param p_accessControlPolicyIds ACP IDs for the PollingChannel
 		 * @param p_name Resource name
 		 */
-		template (value) GenericInterworkingService_invalid m_contentCreateGenericInterworkingService_invalid (in template (omit) XSD.String p_name := c_defaultGenericInterworkingServiceResourceName, 
+		template (value) GenericInterworkingService_invalid m_contentCreateGenericInterworkingService_invalid (in template (omit) ResourceName p_name := c_defaultGenericInterworkingServiceResourceName, 
 																	in template (omit) AcpType p_accessControlPolicyIds := omit) := {
 			
 			resourceName := p_name,//O
@@ -10175,8 +10618,11 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
+			announceSyncType := omit,//O
+			location := omit,//O
 			appName := omit,//O
 			app_ID := omit,//M
 			aE_ID := omit,//M
@@ -10185,7 +10631,15 @@ module OneM2M_Templates {
 			nodeLink := omit,//O
 			requestReachability := omit,//M
 			contentSerialization := omit,//O
-			e2eSecInfo:= omit, //O
+			e2eSecInfo := omit, //O
+			m2M_Ext_ID := omit,//O
+			supportedReleaseVersions := omit, //O
+			registrationStatus := omit, //O
+			trackRegistrationPoints := omit, //O
+			sessionCapabilities := omit, //O
+			triggerEnable := omit, //O
+			activityPatternElements := omit, //O
+			enableTimeCompensation := omit, //O
 			choice := omit//O
 		};
     	
@@ -10218,10 +10672,13 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//M
+			announceSyncType := omit,//O
 			creator := omit,//O
 			memberType := omit,//M
+			specializationType := omit,//O
 			currentNrOfMembers := omit,//M
 			maxNrOfMembers := omit,//M
 			memberIDs := omit,//M
@@ -10230,6 +10687,9 @@ module OneM2M_Templates {
 			consistencyStrategy := omit,//O
 			groupName := omit,//O
 			semanticSupportIndicator := omit,//O
+			notifyAggregation := omit,//O
+			somecastEnable := omit,//O
+			somecastAlgorithm := omit,//O
 			choice := omit//O
 		};
     	
@@ -10242,7 +10702,8 @@ module OneM2M_Templates {
 			lastModifiedTime := omit,//M
 			expirationCounter := omit,//Invalid attribute
 			labels := omit,//O
-			expirationTime := omit//M
+			expirationTime := omit,//M
+			choice := omit//O
 		};
     	
 		template (value) Schedule_invalid m_contentUpdateSchedule_invalid := {
@@ -10268,11 +10729,12 @@ module OneM2M_Templates {
 			parentID := omit,//M
 			creationTime := omit,//M
 			lastModifiedTime := omit,//M
-			maxNrOfInstances := omit,//Invalid attribute
 			labels := omit,//O
+			maxNrOfInstances := omit,//Invalid attribute
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			creator := omit,//O
 			eventNotificationCriteria := omit,//O
 			expirationCounter := omit,//O
@@ -10288,6 +10750,10 @@ module OneM2M_Templates {
 			notificationContentType := omit,//M
 			notificationEventCat := omit,//O
 			subscriberURI := omit,//O
+			associatedCrossResourceSub := omit,//O
+			notificationStatsEnable := omit,//O
+			notificationStatsInfo := omit,//O
+			primitiveProfileID := omit,//O
 			choice := omit//O
 		};
 		
@@ -10303,10 +10769,13 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//M
+			announceSyncType := omit,//O
 			stateTag := omit,//M
 			creator := omit,//M
+			location := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
@@ -10330,16 +10799,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit, //O
+			custodian := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			stateTag := omit,//NP
+			announceSyncType := omit,//O
 			creator := omit,//O
+			location := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
 			currentNrOfInstances := omit,//NP
 			currentByteSize := omit,//NP
 			periodicInterval := omit,//O
+			periodicIntervalDelta := omit,//O
 			missingDataDetect := omit,//O
 			missingDataMaxNr := omit,//O
 			missingDataList := omit,//NP
@@ -10374,7 +10846,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := omit,
 			authorSignReqInfo := omit,
 			releaseVersionIndicator := PX_RELEASE_VERSION,
-			vendorInformation := omit
+			vendorInformation := omit,
+			m2mServiceUser := omit
 		};
 		
 		/**
@@ -10405,14 +10878,15 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 			
     	};
     	
 		/**
 		 * @desc Base Reception template for request primitive
 		 */
-		template RequestPrimitive mw_requestPrimitive(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
+		template RequestPrimitive mw_requestPrimitive(template XSD.ID p_from := *, template (present) XSD.AnyURI p_to := ?) := {
 			operation := ?,
 			to_ := p_to,
 			from_ := p_from,
@@ -10437,10 +10911,12 @@ module OneM2M_Templates {
 			localTokenIDs := *,
 			tokenRequestIndicator := *,
 			groupRequestTargetMembers := *,
+			groupSomecastTargetNumber := *,
 			authorSignIndicator := *,
 			authorSigns := *,
 			authorRelIndicator := *,
 			semanticQueryIndicator := *,
+			ontologyMappingResources := *,
 			releaseVersionIndicator := ?,
 			vendorInformation := *,
 			primitiveProfileIdentifier := *,
@@ -10462,7 +10938,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 			
 		};
     	
@@ -10481,7 +10958,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
     	};
         		 
     	template ResponsePrimitive mw_responsePrimitiveKO := {
@@ -10499,7 +10977,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
     	};
     	
     	template ResponsePrimitive mw_responsePollingResponse (template RequestPrimitive p_requestPrimitive := ?) := {
@@ -10517,7 +10996,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 		};
     	
 		template ResponsePrimitive mw_responseDiscovery (template URIList p_uriList := ?) := {
@@ -10535,7 +11015,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 		};
     	
 		template (value) ResponsePrimitive m_responseNotification(ResponseStatusCode p_statusCode, in template(omit) PrimitiveContent p_notification := omit) := {
@@ -10553,7 +11034,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := omit,
 			authorSignReqInfo := omit,
 			releaseVersionIndicator := PX_RELEASE_VERSION,
-			vendorInformation := omit
+			vendorInformation := omit,
+			m2mServiceUser := omit
 		};
 		
 		template ResponsePrimitive mw_responseNotify(ResponseStatusCode p_statusCode) := {
@@ -10571,7 +11053,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 		};
 		
 		/**
@@ -10589,12 +11072,13 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,
 			expirationTime := ?,
 			dynamicAuthorizationConsultationIDs := *,
-			announceTo := *,
-			announcedAttribute := *,
+			custodian := *,//O
+			stateTag := *,
 			creator := *,
 			smjpInputParameter := *,
 			mashupResultFormat := ?,
-			mashupResult := ?
+			mashupResult := ?,
+			choice := *//NP
 		}
 			
 		/**
@@ -10612,15 +11096,19 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,
 			expirationTime := ?,
 			dynamicAuthorizationConsultationIDs := *,
+			custodian := *,//O
 			announceTo := *,
 			announcedAttribute := *,
+			announceSyncType := *,//O
+			stateTag := *,
 			creator := *,
 			smjpID := ?,
 			smjpInputParameter := *,
 			memberStoreType := ?,
 			mashupMember := *,
 			resultGenType := ?,
-			periodForResultGen := *
+			periodForResultGen := *,
+			choice := *//NP
 		}
 
 		
@@ -10639,8 +11127,10 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,
 			expirationTime := ?,
 			dynamicAuthorizationConsultationIDs := *,
+			custodian := *,//O
 			announceTo := *,
 			announcedAttribute := *,
+			announceSyncType := *,//O
 			creator := *,
 			descriptorRepresentation := ?,               
 			semanticOpExec := *,                         
@@ -10668,14 +11158,18 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,
 			expirationTime := ?,
 			dynamicAuthorizationConsultationIDs := *,
+			custodian := *,//O
 			announceTo := *,
 			announcedAttribute := *,
+			announceSyncType := *,//O
+			stateTag := *,
 			creator := *,
 			memberFilter := ?,
 			smiID := *,
 			inputDescriptor := *,
 			outputDescriptor := ?,
-			functionDescriptor := ?
+			functionDescriptor := ?,
+			choice := *//NP
 		}
     	
 		template ResponsePrimitive mw_responseNotifySecurityInfo(ResponseStatusCode p_statusCode, template SecurityInfo p_securityInfo) := {
@@ -10693,7 +11187,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 		};
     	
 		group InfoPortTemplates {
@@ -10734,10 +11229,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -10774,7 +11271,7 @@ module OneM2M_Templates {
 			requestPrimitive := {
 				requestIdentifier := testcasename() & "-m_utCreateSubscription",
 				resourceType := int23,
-				primitiveContent := {subscription := m_contentSubscription}
+				primitiveContent := {subscription := mw_contentSubscription_allOmit}
 			}
 		}
 		
@@ -10821,10 +11318,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -10876,10 +11375,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -10931,10 +11432,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -10966,7 +11469,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,//FIXME
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 
 		}
 		
@@ -10985,7 +11489,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,//FIXME
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 
 		}
 		
@@ -11004,7 +11509,8 @@ module OneM2M_Templates {
 			tokenRequestInformation := *,
 			authorSignReqInfo := *,
 			releaseVersionIndicator := ?,//FIXME
-			vendorInformation := *
+			vendorInformation := *,
+			m2mServiceUser := *
 
 		}
 		
@@ -11163,10 +11669,12 @@ module OneM2M_Templates {
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
 				groupRequestTargetMembers := omit,
+				groupSomecastTargetNumber := omit,
 				authorSignIndicator := omit,
 				authorSigns := omit,
 				authorRelIndicator := omit,
 				semanticQueryIndicator := omit,
+				ontologyMappingResources := omit,
 				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit,
 				primitiveProfileIdentifier := omit,
@@ -11665,7 +12173,7 @@ module OneM2M_Templates {
              * @desc Base primitiveContent for CREATE operation for softwareCampaign resource
              * @param p_name Resource name
              */
-            template (value) SoftwareCampaign_optional m_contentCreateSoftwareCampaign (in template (omit) XSD.String p_name := c_defaultRoleResourceName):= {
+            template (value) SoftwareCampaign_optional m_contentCreateSoftwareCampaign (in template (omit) ResourceName p_name := c_defaultRoleResourceName):= {
                 resourceName := omit,//O
                 resourceType := omit,//NP
                 resourceID := omit,//NP
@@ -11676,10 +12184,10 @@ module OneM2M_Templates {
                 accessControlPolicyIDs := omit, //O
                 expirationTime := omit,//O
                 dynamicAuthorizationConsultationIDs := omit, //O
-                holder := omit,//O           
-                announceTo := omit,//O
-                announceSyncType := omit,//O
+				custodian := omit,//O
+				announceTo := omit,//O
                 announcedAttribute := omit,//O
+                announceSyncType := omit,//O
                 campaignEnabled := omit,//O
                 campaignStatus := omit,//NP
                 version := omit,//M
@@ -11690,7 +12198,8 @@ module OneM2M_Templates {
                 softwareOperation := omit,//M
                 softwareLinks := omit,//NP
                 aggregatedSoftwareStatus := omit,//NP
-                individualSoftwareStatus := omit//NP
+				individualSoftwareStatuses := omit,//NP
+            	choice := omit//NP
             };     
                 
             /**
@@ -11707,10 +12216,10 @@ module OneM2M_Templates {
                 accessControlPolicyIDs := omit, //O
                 expirationTime := omit,//O
                 dynamicAuthorizationConsultationIDs := omit, //O
-                holder := omit,//O           
-                announceTo := omit,//O
-                announceSyncType := omit,//O
+				custodian := omit,//O
+				announceTo := omit,//O
                 announcedAttribute := omit,//O
+                announceSyncType := omit,//O
                 campaignEnabled := false,
                 campaignStatus := int2,             
                 version := "version1", //
@@ -11721,27 +12230,28 @@ module OneM2M_Templates {
                 softwareOperation := int1,
                 softwareLinks := omit,
                 aggregatedSoftwareStatus := int0,
-                individualSoftwareStatus := omit
+				individualSoftwareStatuses := omit,
+            	choice := omit//NP
             };
 
-            template SoftwareCampaign_optional m_contentCreateSoftwareCampaignNoSoftwareTargets(template Action_optional p_action := omit) modifies m_contentCreateSoftwareCampaignBase := {
+            template SoftwareCampaign_optional m_contentCreateSoftwareCampaignNoSoftwareTargets(template ListOfSoftwareTriggerCriteria p_softwareTriggerCriteria := omit) modifies m_contentCreateSoftwareCampaignBase := {
                 resourceName := c_defaultSoftwareCampaignResourceName, //O
                 softwareTargets := {"InvalidTarget"},
-                softwareTriggerCriteria := p_action,
+                softwareTriggerCriteria := p_softwareTriggerCriteria,
                 softwareOperation := int1,
                 softwareLinks := omit,
                 aggregatedSoftwareStatus := int0,//UNINITIALIZED 
-                individualSoftwareStatus := omit
+				individualSoftwareStatuses := omit
             };
             
-            template SoftwareCampaign_optional m_contentCreateSoftwareCampaignNoSoftwareTriggerCriteria(in template ListOfM2MID p_softwareTargets := omit, template Action_optional p_action) modifies m_contentCreateSoftwareCampaignBase := {
+            template SoftwareCampaign_optional m_contentCreateSoftwareCampaignNoSoftwareTriggerCriteria(in template ListOfM2MID p_softwareTargets := omit, template ListOfSoftwareTriggerCriteria p_softwareTriggerCriteria) modifies m_contentCreateSoftwareCampaignBase := {
                 resourceName := c_defaultSoftwareCampaignResourceName, //O
                 softwareTargets := p_softwareTargets,
-                softwareTriggerCriteria := p_action,
+                softwareTriggerCriteria := p_softwareTriggerCriteria,
                 softwareOperation := int1, 
                 softwareLinks := omit,
                 aggregatedSoftwareStatus := int0,//UNINITIALIZED 
-                individualSoftwareStatus := omit
+				individualSoftwareStatuses := omit
             };
 
             /**
@@ -11756,19 +12266,19 @@ module OneM2M_Templates {
             /**
              * @desc CREATE request primitive for Software campaign resource without attribute softwareTargets
              */
-            template (value) RequestPrimitive m_createSoftwareCampaignNoSoftwareTargets(in template (value) Action_optional p_action) modifies m_create := {
+            template (value) RequestPrimitive m_createSoftwareCampaignNoSoftwareTargets(in template (value) ListOfSoftwareTriggerCriteria p_softwareTriggerCriteria) modifies m_create := {
                 requestIdentifier := testcasename() & "-m_createSoftwareCampaign",
                 resourceType := int61,
-                primitiveContent := {softwareCampaign := m_contentCreateSoftwareCampaignNoSoftwareTargets(p_action)}
+                primitiveContent := {softwareCampaign := m_contentCreateSoftwareCampaignNoSoftwareTargets(p_softwareTriggerCriteria)}
             };
             
             /**
              * @desc CREATE request primitive for Software campaign resource without attribute SoftwareTriggerCriteria
              */
-            template (value) RequestPrimitive m_createSoftwareCampaignNoSoftwareTriggerCriteria(in template (omit) ListOfM2MID p_softwareTargets := omit, template (value) Action_optional p_action) modifies m_create := {
+            template (value) RequestPrimitive m_createSoftwareCampaignNoSoftwareTriggerCriteria(in template (omit) ListOfM2MID p_softwareTargets := omit, template (value) ListOfSoftwareTriggerCriteria p_softwareTriggerCriteria) modifies m_create := {
                 requestIdentifier := testcasename() & "-m_createSoftwareCampaign",
                 resourceType := int61,
-                primitiveContent := {softwareCampaign := m_contentCreateSoftwareCampaignNoSoftwareTriggerCriteria(p_softwareTargets, p_action)}
+                primitiveContent := {softwareCampaign := m_contentCreateSoftwareCampaignNoSoftwareTriggerCriteria(p_softwareTargets, p_softwareTriggerCriteria)}
             };
     }     
 	
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 2e9e908d02212654f164afc1ef1e7921769771f9..561dae55b2e64f089ac4fba7026a287f0d0cef83 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -263,7 +263,8 @@ group OptionalResourceTypes {
 		Labels labels optional,
 		Timestamp expirationTime optional,
 		ListOfURIs announceTo optional,
-		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,//TODO A list that can be empty
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		SetOfAcrs privileges optional,
 		SetOfAcrs selfPrivileges optional,
 		ListOfURIs authorizationDecisionResourceIDs optional,
@@ -298,29 +299,29 @@ group OptionalResourceTypes {
 		Timestamp creationTime optional,
 		Timestamp lastModifiedTime optional,
 		Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
+		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional, 
-        XSD.ID holder optional,              
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
-        XSD.ID announceSyncType optional,    
-        ListOfNCNames announcedAttribute optional,
-        XSD.ID creator optional,
-        XSD.Integer actionPriority optional,
-        XSD.AnyURI subjectResourceID optional,
-        EvalCriteria evalCriteria optional,
-        EvalMode evalMode optional,
-        XSD.Integer evalControlParam optional,
-        ListOfURIs dependencies optional,
-        XSD.AnyURI objectResourceID optional,
-        RequestPrimitive actionPrimitive optional,
-        ActionInput input optional,
-        ResponsePrimitive actionResult optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		XSD.PositiveInteger actionPriority optional,
+		XSD.AnyURI subjectResourceID optional,
+		EvalCriteria evalCriteria optional,
+		EvalMode evalMode optional,
+		XSD.PositiveInteger evalControlParam optional,
+		ListOfURIs dependencies optional,
+		XSD.AnyURI objectResourceID optional,
+		RequestPrimitive actionPrimitive optional,
+		ActionInput input optional,
+		ResponsePrimitive actionResult optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
+				Dependency dependency,
 				Subscription subscription,
-                Transaction transaction
+				Transaction transaction
 			} choice_list
 		} choice optional
 	}
@@ -334,7 +335,7 @@ group OptionalResourceTypes {
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
-	};    
+	};
     
 	type record AccessControlPolicyAnnc_optional
 	{
@@ -383,8 +384,11 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		GeoCoordinates location optional,
 		XSD.String appName optional,
 		XSD.String app_ID optional,
 		XSD.ID aE_ID optional,
@@ -401,6 +405,7 @@ group OptionalResourceTypes {
 		SessionCapabilities sessionCapabilities optional,
 		XSD.Boolean triggerEnable optional,
 		ActivityPatternElements activityPatternElements optional,
+		XSD.Boolean enableTimeCompensation optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -418,9 +423,10 @@ group OptionalResourceTypes {
 				TriggerRequest triggerRequest,
 				TransactionMgmt transactionMgmt,
 				Transaction transaction,
-				PrimitveProfile primitiveProfile,
-                State_optional state,
-                ProcessManagement_optional processManagement
+				E2eQosSession e2eQosSession,
+				TimeSyncBeacon timeSyncBeacon,
+				NwMonitoringReq nwMonitoringReq,
+				PrimitiveProfile primitiveProfile
 			} choice_list
 		} choice optional
 	}
@@ -432,6 +438,13 @@ group OptionalResourceTypes {
 	  variant (aE_ID) "name as 'AE-ID'";
 	  //variant (requestReachability) "text 'true' as '1'";
 	  //variant (requestReachability) "text 'false' as '0'";
+	  variant (m2M_Ext_ID) "name as 'M2M-Ext-ID'";
+	  //variant (trackRegistrationPoints) "text 'true' as '1'";
+	  //variant (trackRegistrationPoints) "text 'false' as '0'";
+	  //variant (triggerEnable) "text 'true' as '1'";
+	  //variant (triggerEnable) "text 'false' as '0'";
+	  //variant (enableTimeCompensation) "text 'true' as '1'";
+	  //variant (enableTimeCompensation) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -453,6 +466,7 @@ group OptionalResourceTypes {
 		Timestamp expirationTime optional,
 		XSD.AnyURI link optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		GeoCoordinates location optional,
 		XSD.String appName optional,
 		XSD.String app_ID optional,
 		XSD.ID aE_ID optional,
@@ -490,7 +504,10 @@ group OptionalResourceTypes {
 				CrossResourceSubscription crossResourceSubscription,
 				TriggerRequest triggerRequest,
 				TransactionMgmt transactionMgmt,
-				Transaction transaction
+				Transaction transaction,
+				E2eQosSession e2eQosSession,
+				NwMonitoringReq nwMonitoringReq,
+				PrimitiveProfile primitiveProfile
 			} choice_list
 		} choice optional
 	}
@@ -501,6 +518,10 @@ group OptionalResourceTypes {
 	  variant (aE_ID) "name as 'AE-ID'";
 	  //variant (requestReachability) "text 'true' as '1'";
 	  //variant (requestReachability) "text 'false' as '0'";
+	  //variant (trackRegistrationPoints) "text 'true' as '1'";
+	  //variant (trackRegistrationPoints) "text 'false' as '0'";
+	  //variant (triggerEnable) "text 'true' as '1'";
+	  //variant (triggerEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -508,7 +529,7 @@ group OptionalResourceTypes {
 	  variant (choice.choice_list[-]) "untagged";
 	  variant (choice.choice_list[-].group_) "name as 'group'";
 	};
-	
+
 	type record MgmtCmd_optional
 	{
 		ResourceName resourceName optional,
@@ -521,6 +542,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		XSD.String description optional,
 		CmdType cmdType optional,
 		ExecReqArgsListType execReqArgs optional,
@@ -551,7 +573,7 @@ group OptionalResourceTypes {
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-	
+
 
 	type record MgmtResource_optional
 	{
@@ -565,8 +587,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		MgmtDefinition mgmtDefinition optional,
 		ListOfURIs objectIDs optional,
 		ListOfURIs objectPaths optional,
@@ -617,12 +641,20 @@ group OptionalResourceTypes {
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
+		XSD.ID custodian optional,
+		GeoCoordinates location optional,
 		XSD.AnyURI containerDefinition optional,
 		XSD.AnyURI ontologyRef optional,
 		XSD.NonNegativeInteger contentSize optional,
-		XSD.AnyURI nodeLink optional
+		XSD.AnyURI nodeLink optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional
 	}
 	with {
 	  variant "name as uncapitalized";
@@ -642,11 +674,18 @@ group OptionalResourceTypes {
 		Timestamp expirationTime optional,
 		XSD.AnyURI link optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
+		GeoCoordinates location optional,
 		XSD.AnyURI containerDefinition optional,
 		XSD.AnyURI ontologyRef optional,
-		XSD.NonNegativeInteger contentSize,
-		XSD.AnyURI nodeLink optional
+		XSD.NonNegativeInteger contentSize optional,
+		XSD.AnyURI nodeLink optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional
 	}
 	with {
 	  variant "name as uncapitalized";
@@ -665,11 +704,13 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
-		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,//TODO A list that can be empty
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
-		GeoCoordinates location optional,  //TODO Manually added until XSD files are updated
+		GeoCoordinates location optional,
 		XSD.NonNegativeInteger maxNrOfInstances optional,
 		XSD.NonNegativeInteger maxByteSize optional,
 		XSD.NonNegativeInteger maxInstanceAge optional,
@@ -693,7 +734,7 @@ group OptionalResourceTypes {
 	}
 	with {
 	  variant "name as uncapitalized";
-	  //variant "element";
+	  variant "element";
 	  variant (resourceName) "attribute";
 	  variant (announcedAttribute) "list";
 	  //variant (disableRetrieval) "text 'true' as '1'";
@@ -719,6 +760,7 @@ group OptionalResourceTypes {
 		XSD.AnyURI link optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
 		XSD.NonNegativeInteger stateTag optional,
+		GeoCoordinates location optional,
 		XSD.NonNegativeInteger maxNrOfInstances optional,
 		XSD.NonNegativeInteger maxByteSize optional,
 		XSD.NonNegativeInteger maxInstanceAge optional,
@@ -770,13 +812,15 @@ group OptionalResourceTypes {
 		Timestamp expirationTime optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		ContentInfo contentInfo optional,
 		XSD.NonNegativeInteger contentSize optional,
 		ContentRef contentRef optional,
 		XSD.AnyURI ontologyRef optional,
-		XSD.AnySimpleType content optional, 
+		XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
+		XSD.PositiveInteger deletionCnt optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -812,7 +856,7 @@ group OptionalResourceTypes {
 		ContentInfo contentInfo optional,
 		XSD.NonNegativeInteger contentSize optional,
 		XSD.AnyURI ontologyRef optional,
-		XSD.AnySimpleType content optional,
+		XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -848,9 +892,11 @@ group OptionalResourceTypes {
 		PoaList pointOfAccess optional,
 		XSD.AnyURI nodeLink optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		GeoCoordinates location optional,
 		Serializations contentSerialization optional,
 		E2eSecInfo e2eSecInfo optional,
 		SupportedReleaseVersions supportedReleaseVersions optional,
+		Timestamp currentTime optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -872,7 +918,7 @@ group OptionalResourceTypes {
 				M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
 				ServiceSubscribedAppRule serviceSubscribedAppRule,
 				Role role,
-				XSD.Token token,
+				OneM2M_Types.Token token,
 				Sg_flexContainerResource_group sg_flexContainerResource,
 				AuthorizationDecision_1 authorizationDecision,
 				AuthorizationPolicy authorizationPolicy,
@@ -886,9 +932,11 @@ group OptionalResourceTypes {
 				BackgroundDataTransfer backgroundDataTransfer,
 				TransactionMgmt transactionMgmt,
 				Transaction transaction,
-				PrimitveProfile primitiveProfile,
-                State_optional state,
-                ProcessManagement_optional processManagement
+				SemanticRuleRepository semanticRuleRepository,
+				E2eQosSession e2eQosSession,
+				TimeSyncBeacon timeSyncBeacon,
+				NwMonitoringReq nwMonitoringReq,
+				PrimitiveProfile primitiveProfile
 			} choice_list
 		} choice optional
 	}
@@ -904,6 +952,7 @@ group OptionalResourceTypes {
 	  variant (choice.choice_list[-]) "untagged";
 	  variant (choice.choice_list[-].aE) "name as capitalized";
 	  variant (choice.choice_list[-].group_) "name as 'group'";
+	  variant (choice.choice_list[-].aEContactList) "name as capitalized";
 	};
 
 	type record CSEBaseAnnc_optional
@@ -915,68 +964,41 @@ group OptionalResourceTypes {
 		Timestamp creationTime optional,
 		Timestamp lastModifiedTime optional,
 		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		XSD.AnyURI link optional,
-		AcpType accessControlPolicyIDs optional,
-		CseTypeID cseType optional,
-		XSD.ID cSE_ID optional,
-		ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
-		PoaList pointOfAccess optional,
-		XSD.AnyURI nodeLink optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
-		Serializations contentSerialization optional,
 		E2eSecInfo e2eSecInfo optional,
 		SupportedReleaseVersions supportedReleaseVersions optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
-				RemoteCSE remoteCSE,
 				RemoteCSEAnnc remoteCSEAnnc,
-				Node node,
-				AE aE,
-				Container container,
-				Group group_,
-				AccessControlPolicy accessControlPolicy,
-				Subscription subscription,
-				MgmtCmd mgmtCmd,
-				LocationPolicy locationPolicy,
-				StatsConfig statsConfig,
-				StatsCollect statsCollect,
-				Request request,
-				Delivery delivery,
-				Schedule schedule,
-				M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
-				ServiceSubscribedAppRule serviceSubscribedAppRule,
-				Role role,
-				XSD.Token token,
-				Sg_flexContainerResource_group sg_flexContainerResource,
-				AuthorizationDecision_1 authorizationDecision,
-				AuthorizationPolicy authorizationPolicy,
-				AuthorizationInformation authorizationInformation,
-				OntologyRepository ontologyRepository,
-				SemanticMashupJobProfile semanticMashupJobProfile,
-				SemanticMashupInstance semanticMashupInstance,
-				AEContactList aEContactList,
-				LocalMulticastGroup localMulticastGroup,
-				CrossResourceSubscription crossResourceSubscription,
-				BackgroundDataTransfer backgroundDataTransfer,
-				TransactionMgmt transactionMgmt,
-				Transaction transaction
+				NodeAnnc nodeAnnc,
+				ContainerAnnc containerAnnc,
+				GroupAnnc groupAnnc,
+				AccessControlPolicyAnnc accessControlPolicyAnnc,
+				TimeSeriesAnnc timeSeriesAnnc,
+				LocationPolicyAnnc locationPolicyAnnc,
+				AEAnnc aEAnnc,
+				Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource,
+				OntologyRepositoryAnnc ontologyRepositoryAnnc,
+				SemanticMashupJobProfileAnnc semanticMashupJobProfileAnnc,
+				SemanticMashupInstanceAnnc semanticMashupInstanceAnnc,
+				TimeSyncBeaconAnnc timeSyncBeaconAnnc,
+				PrimitiveProfileAnnc primitiveProfileAnnc
 			} choice_list
 		} choice optional
 	}
 	with {
 	  variant "element";
 	  variant (resourceName) "attribute";
-	  variant (cSE_ID) "name as 'CSE-ID'";
-	  variant (supportedResourceType) "list";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
-	  variant (choice.choice_list[-].aE) "name as capitalized";
-	  variant (choice.choice_list[-].group_) "name as 'group'";
+	  variant (choice.choice_list[-].aEAnnc) "name as capitalized";
 	};
 
 	type record Delivery_optional
@@ -991,6 +1013,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		XSD.ID source optional,
 		XSD.ID target optional,
 		Timestamp lifespan optional,
@@ -1040,8 +1063,8 @@ group OptionalResourceTypes {
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record of union {
-				GenericInterworkingService genericInterworkingService,
-				GenericInterworkingOperationInstance genericInterworkingOperationInstance,
+				GenericInterworkingService_optional genericInterworkingService,
+				GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
 				SemanticDescriptor semanticDescriptor,
 				Subscription subscription
 			} choice_list
@@ -1058,6 +1081,7 @@ group OptionalResourceTypes {
 	  variant (choice.choice_list[-]) "untagged";
 	};
 
+	//TODO Update GenericInterworking resources
 	type record GenericInterworkingOperationInstance_optional
 	{
 		ResourceName resourceName optional,
@@ -1114,20 +1138,24 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
-		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,//TODO A list that can be empty
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.ID creator optional,
 		MemberType memberType optional,
 		SpecializationType specializationType optional,
 		XSD.NonNegativeInteger currentNrOfMembers optional,
 		XSD.PositiveInteger maxNrOfMembers optional,
-		record length(0 .. infinity) of XSD.AnyURI memberIDs optional,//TODO A list that can be empty
+		record of XSD.AnyURI memberIDs optional,
 		ListOfURIs membersAccessControlPolicyIDs optional,
 		XSD.Boolean memberTypeValidated optional,
 		ConsistencyStrategy consistencyStrategy optional,
 		XSD.String groupName optional,
 		XSD.Boolean semanticSupportIndicator optional,
 		BatchNotify notifyAggregation optional,
+		XSD.Boolean somecastEnable optional,
+		SomecastAlgorithm somecastAlgorithm optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -1147,6 +1175,8 @@ group OptionalResourceTypes {
 	  //variant (memberTypeValidated) "text 'false' as '0'";
 	  //variant (semanticSupportIndicator) "text 'true' as '1'";
 	  //variant (semanticSupportIndicator) "text 'false' as '0'";
+	  //variant (somecastEnable) "text 'true' as '1'";
+	  //variant (somecastEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1178,6 +1208,8 @@ group OptionalResourceTypes {
 		XSD.String groupName optional,
 		XSD.Boolean semanticSupportIndicator optional,
 		BatchNotify notifyAggregation optional,
+		XSD.Boolean somecastEnable optional,
+		SomecastAlgorithm somecastAlgorithm optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -1197,6 +1229,8 @@ group OptionalResourceTypes {
 	  //variant (memberTypeValidated) "text 'false' as '0'";
 	  //variant (semanticSupportIndicator) "text 'true' as '1'";
 	  //variant (semanticSupportIndicator) "text 'false' as '0'";
+	  //variant (somecastEnable) "text 'true' as '1'";
+	  //variant (somecastEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1216,8 +1250,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		LocationSource locationSource optional,
 		LocationInformationType locationInformationType optional,
 		ListOfDuration locationUpdatePeriod optional,
@@ -1244,6 +1280,8 @@ group OptionalResourceTypes {
 	  variant "element";
 	  variant (resourceName) "attribute";
 	  variant (announcedAttribute) "list";
+	  //variant (retrieveLastKnownLocation) "text 'true' as '1'";
+	  //variant (retrieveLastKnownLocation) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1288,6 +1326,13 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  //variant (retrieveLastKnownLocation) "text 'true' as '1'";
+	  //variant (retrieveLastKnownLocation) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 	type record M2mServiceSubscriptionProfile_optional
@@ -1302,18 +1347,20 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
-		//TODO To be removed/replaced by the type defined in XSDs
+		XSD.ID custodian optional,
 		XSD.ID m2M_Sub_ID optional,
-		XSD.ID m2M_SS_ID optional,	
-		ServiceSubscriptionStatus status optional ,
+		XSD.ID m2M_SS_ID optional,
+		ServiceSubscriptionStatus status optional,
 		XSD.Boolean activate_ optional,
 		Timestamp activationTime optional,
 		Timestamp deactivationTime optional,
 		XSD.Duration serviceSubscriptionDuration optional,
 		XSD.NonNegativeInteger currentNumAEs optional,
 		XSD.NonNegativeInteger maxNumAEs optional,
+		XSD.NonNegativeInteger currentNumNodes optional,
 		XSD.NonNegativeInteger maxNumNodes optional,
 		XSD.NonNegativeInteger maxNumBytes optional,
+		XSD.NonNegativeInteger maxNumUsers optional,
 		XSD.NonNegativeInteger maxRequestRate optional,
 		XSD.NonNegativeInteger maxNumContainers optional,
 		XSD.NonNegativeInteger maxNumInstancesPerContainer optional,
@@ -1323,7 +1370,6 @@ group OptionalResourceTypes {
 		XSD.NonNegativeInteger maxNotificationRate optional,
 		XSD.NonNegativeInteger maxNumFlexContainers optional,
 		XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
-		XSD.NonNegativeInteger maxNumUsers optional,
 		SetOfAcrs defaultAccessControlPrivileges optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -1331,8 +1377,7 @@ group OptionalResourceTypes {
 				ServiceSubscribedNode serviceSubscribedNode,
 				Subscription subscription,
 				Transaction transaction,
-				//TODO To be removed/replaced by the type defined in XSDs
-				ServiceSubscribedUserProfile_optional serviceSubscribedUserProfile
+				ServiceSubscribedUserProfile serviceSubscribedUserProfile
 			} choice_list
 		} choice optional
 	}
@@ -1340,6 +1385,11 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  variant (m2M_Sub_ID) "name as 'M2M-Sub-ID'";
+	  variant (m2M_SS_ID) "name as 'M2M-SS-ID'";
+	  variant (activate_) "name as 'activate'";
+	  //variant (activate_) "text 'true' as '1'";
+	  //variant (activate_) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1359,9 +1409,12 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		NodeID nodeID optional,
+		NodeType nodeType optional,
 		XSD.ID hostedCSELink optional,
 		ListOfM2MID hostedAELinks optional,
 		ListOfM2MID hostedServiceLinks optional,
@@ -1376,7 +1429,7 @@ group OptionalResourceTypes {
 				AreaNwkInfo areaNwkInfo,
 				AreaNwkDeviceInfo areaNwkDeviceInfo,
 				Firmware firmware,
-				//SoftwareCampaign_optional software,
+				Software software,
 				DeviceInfo deviceInfo,
 				DeviceCapability deviceCapability,
 				Reboot reboot,
@@ -1395,6 +1448,8 @@ group OptionalResourceTypes {
 	  variant "element";
 	  variant (resourceName) "attribute";
 	  variant (announcedAttribute) "list";
+	  //variant (roamingStatus) "text 'true' as '1'";
+	  //variant (roamingStatus) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1447,6 +1502,8 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  //variant (roamingStatus) "text 'true' as '1'";
+	  //variant (roamingStatus) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1466,8 +1523,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		union {
@@ -1475,7 +1534,9 @@ group OptionalResourceTypes {
 			record length(1 .. infinity) of union {
 				Subscription subscription,
 				Ontology ontology,
-				Transaction transaction
+				Transaction transaction,
+				OntologyMapping ontologyMapping,
+				OntologyMappingAlgorithmRepository ontologyMappingAlgorithmRepository
 			} choice_list
 		} choice optional
 	}
@@ -1490,7 +1551,7 @@ group OptionalResourceTypes {
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-	
+
 	type record Ontology_optional
 	{
 		ResourceName resourceName optional,
@@ -1503,12 +1564,15 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.String description optional,
 		SemanticFormat ontologyFormat optional,
-		XSD.AnySimpleType ontologyContent optional,//FIXME Use AnySimpleType instead
+		XSD.AnySimpleType ontologyContent optional,
 		Sparql semanticOpExec optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -1551,6 +1615,11 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 	type record PrimitveProfile_optional
@@ -1559,23 +1628,23 @@ group OptionalResourceTypes {
 		ResourceType resourceType optional,
 		XSD.ID resourceID optional,
 		NhURI parentID optional,
-		AcpType accessControlPolicyIDs optional,
 		Timestamp creationTime optional,
-		Timestamp expirationTime optional,
 		Timestamp lastModifiedTime optional,
 		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-		ListOfURIs dynamicAuthorizationConsultationIDs optional,
-		XSD.ID creator optional,
-		ListOfM2MID IDList optional,
+		AnnounceSyncType announceSyncType optional,
+		ListOfM2MID iDList optional,
 		ResourceTypeList resourceTypes optional,
 		ListOfOperations operations optional,
 		ListOfURIs resourceIDs optional,
 		SupportedReleaseVersions releaseVersions optional,
 		ListOfAttributes additions optional,
-		AttributeList deletions optional,
-		ListOfAttributes modifications optional,
+		AttributeList_1 deletions optional,
 		PrimitiveProfileApplicability applicability optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -1589,142 +1658,141 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (iDList) "name as capitalized";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
-    
-    type record length(1 .. infinity) of EvalCriteria ListOfEvalCriteria_optional
-    with {
-      variant "name as uncapitalized";
-      variant "list";
-    };
-        
-    type record StateTransitions_optional
-    {
-        EvalCriteria evalCriteria,
-        XSD.AnyURI nextState
-    }
-        
-    type record length(1 .. infinity) of StateTransitions_optional ListOfStateTransitions_optional
-    with {
-      variant "name as uncapitalized";
-      variant "list";
-    };
 
     type record Dependency_optional
     {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.ID holder optional,
-        ListOfURIs announceTo optional,
-        ListOfNCNames announcedAttribute optional,
-        XSD.ID announceSyncType optional,
-        XSD.ID creator optional,        
-        XSD.Boolean sufficient optional,
-        EvalCriteria evalCriteria optional,
-        XSD.AnyURI referencedResourceID optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription,
-                Transaction transaction
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };     
-    
+	  	ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		XSD.Boolean sufficient optional,
+		EvalCriteria evalCriteria optional,
+		XSD.AnyURI referencedResourceID optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				Transaction transaction
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  //variant (sufficient) "text 'true' as '1'";
+	  //variant (sufficient) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
     type record State_optional
     {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.ID holder optional,
-        ListOfURIs announceTo optional,
-        ListOfNCNames announcedAttribute optional,
-        XSD.ID announceSyncType optional,
-        XSD.ID creator optional,
-        XSD.Boolean stateActive optional,
-        XSD.AnyURI stateAction optional,
-        ListOfStateTransitions_optional stateTransitions optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription,
-                Transaction transaction,
-                Action_optional action_ //to make tools compile
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };     
+	 	ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		XSD.Boolean stateActive optional,
+		XSD.AnyURI stateAction optional,
+		ListOfStateTransitions stateTransitions optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				Transaction transaction,
+				Action action_
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  //variant (stateActive) "text 'true' as '1'";
+	  //variant (stateActive) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	  variant (choice.choice_list[-].action_) "name as 'action'";
+	};
 
     type record ProcessManagement_optional
     {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp creationTime optional,
-        Timestamp expirationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.ID creator optional,
-        XSD.ID holder optional,
-        XSD.ID announceSyncType optional,
-        ProcessStatus processStatus optional,
-        ProcessControl processControl optional,
-        XSD.AnyURI currentState optional,
-        ListOfEvalCriteria_optional activateConditions optional,
-        ListOfEvalCriteria_optional endConditions optional,
-        XSD.AnyURI initialState optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription,
-                Transaction transaction,
-                State_optional state
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-    };
+	  	ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		ProcessStatus processStatus optional,
+		ProcessControl processControl optional,
+		XSD.AnyURI currentState optional,
+		ListOfEvalCriteria activateConditions optional,
+		ListOfEvalCriteria endConditions optional,
+		XSD.AnyURI initialState optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				Transaction transaction,
+				State_optional state
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
 
 	type record RemoteCSE_optional
 	{
@@ -1738,8 +1806,11 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		GeoCoordinates location optional,
 		CseTypeID cseType optional,
 		PoaList pointOfAccess optional,
 		XSD.AnyURI cSEBase optional,
@@ -1757,6 +1828,7 @@ group OptionalResourceTypes {
 		ExternalID externalGroupID optional,
 		XSD.Boolean triggerEnable optional,
 		ActivityPatternElements activityPatternElements optional,
+		XSD.Boolean enableTimeCompensation optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -1783,9 +1855,12 @@ group OptionalResourceTypes {
 				CrossResourceSubscription crossResourceSubscription,
 				TransactionMgmt transactionMgmt,
 				Transaction transaction,
-				PrimitveProfile primitiveProfile,
-                State_optional state,
-                ProcessManagement_optional processManagement
+				E2eQosSession e2eQosSession,
+				TimeSyncBeacon timeSyncBeacon,
+				TimeSyncBeaconAnnc timeSyncBeaconAnnc,
+				NwMonitoringReq nwMonitoringReq,
+				PrimitiveProfile primitiveProfile,
+				PrimitiveProfileAnnc primitiveProfileAnnc
 			} choice_list
 		} choice optional
 	}
@@ -1800,6 +1875,10 @@ group OptionalResourceTypes {
 	  variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'";
 	  //variant (requestReachability) "text 'true' as '1'";
 	  //variant (requestReachability) "text 'false' as '0'";
+	  //variant (triggerEnable) "text 'true' as '1'";
+	  //variant (triggerEnable) "text 'false' as '0'";
+	  //variant (enableTimeCompensation) "text 'true' as '1'";
+	  //variant (enableTimeCompensation) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1822,6 +1901,7 @@ group OptionalResourceTypes {
 		Timestamp expirationTime optional,
 		XSD.AnyURI link optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		GeoCoordinates location optional,
 		CseTypeID cseType optional,
 		PoaList pointOfAccess optional,
 		XSD.AnyURI cSEBase optional,
@@ -1861,7 +1941,11 @@ group OptionalResourceTypes {
 				SemanticMashupInstanceAnnc semanticMashupInstanceAnnc,
 				CrossResourceSubscription crossResourceSubscription,
 				TransactionMgmt transactionMgmt,
-				Transaction transaction
+				Transaction transaction,
+				E2eQosSession e2eQosSession,
+				NwMonitoringReq nwMonitoringReq,
+				PrimitiveProfile primitiveProfile,
+				PrimitiveProfileAnnc primitiveProfileAnnc
 			} choice_list
 		} choice optional
 	}
@@ -1873,6 +1957,8 @@ group OptionalResourceTypes {
 	  variant (cSE_ID) "name as 'CSE-ID'";
 	  //variant (requestReachability) "text 'true' as '1'";
 	  //variant (requestReachability) "text 'false' as '0'";
+	  //variant (triggerEnable) "text 'true' as '1'";
+	  //variant (triggerEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1881,7 +1967,7 @@ group OptionalResourceTypes {
 	  variant (choice.choice_list[-].group_) "name as 'group'";
 	  variant (choice.choice_list[-].aEAnnc) "name as capitalized";
 	};
-	
+
 	type record Request_optional
 	{
 		ResourceName resourceName optional,
@@ -1894,7 +1980,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
-		XSD.NonNegativeInteger stateTag optional,
+		XSD.ID custodian optional,
 		Operation operation optional,
 		XSD.AnyURI target optional,
 		XSD.ID originator optional,
@@ -1933,8 +2019,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		ScheduleEntries scheduleElement optional,
 		XSD.Boolean networkCoordinated optional,
 		union {
@@ -1950,6 +2038,8 @@ group OptionalResourceTypes {
 	  variant "element";
 	  variant (resourceName) "attribute";
 	  variant (announcedAttribute) "list";
+	  //variant (networkCoordinated) "text 'true' as '1'";
+	  //variant (networkCoordinated) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -1968,8 +2058,8 @@ group OptionalResourceTypes {
 		Labels labels optional,
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
-		ListOfURIs dynamicAuthorizationConsultationIDs optional,
 		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
 		ScheduleEntries scheduleElement optional,
 		XSD.Boolean networkCoordinated optional,
 		union {
@@ -1983,6 +2073,13 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  //variant (networkCoordinated) "text 'true' as '1'";
+	  //variant (networkCoordinated) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 	type record SemanticDescriptor_optional
@@ -1997,8 +2094,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.ID creator optional,
 		SemanticFormat descriptorRepresentation optional,
 		Sparql semanticOpExec optional,
@@ -2020,13 +2119,17 @@ group OptionalResourceTypes {
 	  variant "element";
 	  variant (resourceName) "attribute";
 	  variant (announcedAttribute) "list";
+	  //variant (semanticValidated) "text 'true' as '1'";
+	  //variant (semanticValidated) "text 'false' as '0'";
+	  //variant (validationEnable) "text 'true' as '1'";
+	  //variant (validationEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-	
+
 	type record SemanticDescriptorAnnc_optional
 	{
 		ResourceName resourceName optional,
@@ -2059,6 +2162,10 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  //variant (semanticValidated) "text 'true' as '1'";
+	  //variant (semanticValidated) "text 'false' as '0'";
+	  //variant (validationEnable) "text 'true' as '1'";
+	  //variant (validationEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -2078,18 +2185,37 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		Sparql memberFilter optional,
 		ListOfURIs smiID optional,
 		XSD.Base64Binary inputDescriptor optional,
 		XSD.Base64Binary outputDescriptor optional,
-		XSD.Base64Binary functionDescriptor optional
+		XSD.Base64Binary functionDescriptor optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				SemanticMashupInstance semanticMashupInstance,
+				SemanticDescriptor semanticDescriptor,
+				Transaction transaction
+			} choice_list
+		} choice optional
 	}
 	with {
 	  variant "name as uncapitalized";
 	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 	type record SemanticMashupInstance_optional
@@ -2104,19 +2230,38 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI smjpID optional,
 		XSD.Base64Binary smjpInputParameter optional,
 		MashupMemberStoreType memberStoreType optional,
 		MashupMembers mashupMember optional,
 		MashupResultGenType resultGenType optional,
-		XSD.Duration periodForResultGen optional
+		XSD.Duration periodForResultGen optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				SemanticMashupResult semanticMashupResult,
+				SemanticDescriptor semanticDescriptor,
+				Transaction transaction
+			} choice_list
+		} choice optional
 	}
 	with {
 	  variant "name as uncapitalized";
 	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 
@@ -2133,16 +2278,30 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
-		ListOfURIs announceTo optional,
-		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,		
+		XSD.ID custodian optional,
+		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.Base64Binary smjpInputParameter optional,
 		Serializations mashupResultFormat optional,
-		XSD.Base64Binary mashupResult optional
+		XSD.Base64Binary mashupResult optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor,
+				Transaction transaction
+			} choice_list
+		} choice optional
 	}
 	with {
 	  variant "name as uncapitalized";
 	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 	type record ServiceSubscribedAppRule_optional
@@ -2157,12 +2316,12 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfM2MID applicableCredIDs optional,
 		ListOfM2MID allowedApp_IDs optional,
 		ListOfM2MID allowedAEs optional,
 		record length(1 .. infinity) of RoleID allowedRole_IDs optional,
-		// TODO: To update once oneM2MTypes is updated
-		ListOfM2MID allowedUsers optional,
+		ListOfURIs allowedUsers optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -2197,6 +2356,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		NodeID nodeID optional,
 		XSD.ID cSE_ID optional,
 		record of DeviceID deviceIdentifier optional,
@@ -2216,14 +2376,15 @@ group OptionalResourceTypes {
 	  variant (resourceName) "attribute";
 	  variant (cSE_ID) "name as 'CSE-ID'";
 	  variant (deviceIdentifier) "list";
+	  //variant (niddRequired) "text 'true' as '1'";
+	  //variant (niddRequired) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-	
-    //TODO To be removed/replaced by the type defined in XSDs
+
 	type record ServiceSubscribedUserProfile_optional {
 		ResourceName resourceName optional,
 		ResourceType resourceType optional,
@@ -2235,7 +2396,8 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
-		XSD.ID M2M_User_ID optional,
+		XSD.ID custodian optional,
+		XSD.ID m2M_User_ID optional,
 		XSD.NonNegativeInteger maxNumAEs optional,
 		XSD.NonNegativeInteger maxNumNodes optional,
 		XSD.NonNegativeInteger maxNumBytes optional,
@@ -2248,37 +2410,79 @@ group OptionalResourceTypes {
 		XSD.NonNegativeInteger maxNotificationRate optional,
 		XSD.NonNegativeInteger maxNumFlexContainers optional,
 		XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
-		SetOfAcrs defaultAccessControlPrivileges optional
+		SetOfAcrs defaultAccessControlPrivileges optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				Transaction transaction
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (m2M_User_ID) "name as 'M2M-User-ID'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
+
 	
-    type record SoftwareCampaign_optional //added on Release-4
+    type record SoftwareCampaign_optional
     {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional, 
-        XSD.ID holder optional,          
-        ListOfURIs announceTo optional,
-        XSD.ID announceSyncType optional,    
-        ListOfNCNames announcedAttribute optional,
-        XSD.Boolean campaignEnabled optional,
-        ExecStatusType campaignStatus optional,
-        XSD.String version optional,
-        XSD.String softwareName optional,
-        XSD.AnyURI uRL optional,
-        ListOfM2MID softwareTargets optional,
-        Action_optional softwareTriggerCriteria optional,
-        SoftwareOperation softwareOperation optional,
-        ListOfM2MID softwareLinks optional,
-        AggregatedSoftwareStatus aggregatedSoftwareStatus optional,
-        XSD.String individualSoftwareStatus optional //ToDo - complete with tuple if used
-    };
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		XSD.Boolean campaignEnabled optional,
+		ExecStatusType campaignStatus optional,
+		XSD.String version optional,
+		XSD.String softwareName optional,
+		XSD.AnyURI uRL optional,
+		ListOfURIs softwareTargets optional,
+		ListOfSoftwareTriggerCriteria softwareTriggerCriteria optional,
+		SoftwareOperation softwareOperation optional,
+		ListOfURIs softwareLinks optional,
+		Status aggregatedSoftwareStatus optional,
+		ListOfActionStatuses individualSoftwareStatuses optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				Transaction transaction,
+				Schedule schedule
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  //variant (campaignEnabled) "text 'true' as '1'";
+	  //variant (campaignEnabled) "text 'false' as '0'";
+	  variant (uRL) "name as capitalized";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
 
 	type record StatsCollect_optional
 	{
@@ -2292,6 +2496,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		XSD.ID creator optional,
 		XSD.String statsCollectID optional,
 		XSD.ID collectingEntityID optional,
@@ -2331,6 +2536,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		XSD.ID creator optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -2351,7 +2557,7 @@ group OptionalResourceTypes {
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-	
+
 	type record EventConfig_optional
 	{
 		ResourceName resourceName optional,
@@ -2364,6 +2570,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		XSD.ID creator optional,
 		XSD.String eventID optional,
 		EventType eventType optional,
@@ -2382,15 +2589,15 @@ group OptionalResourceTypes {
 		} choice optional
 	}
 	with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (operationType) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (operationType) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 	type record Subscription_optional
@@ -2405,6 +2612,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		XSD.ID creator optional,
 		EventNotificationCriteria eventNotificationCriteria optional,
 		XSD.PositiveInteger expirationCounter optional,
@@ -2421,6 +2629,9 @@ group OptionalResourceTypes {
 		EventCat notificationEventCat optional,
 		XSD.AnyURI subscriberURI optional,
 		ListOfURIs associatedCrossResourceSub optional,
+		XSD.Boolean notificationStatsEnable optional,
+		SetOfNotificationStatsInfo notificationStatsInfo optional,
+		XSD.AnyURI primitiveProfileID optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -2436,13 +2647,15 @@ group OptionalResourceTypes {
 	  variant (resourceName) "attribute";
 	  //variant (latestNotify) "text 'true' as '1'";
 	  //variant (latestNotify) "text 'false' as '0'";
+	  //variant (notificationStatsEnable) "text 'true' as '1'";
+	  //variant (notificationStatsEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-	
+
 	type record TimeSeries_optional
 	{
 		ResourceName resourceName optional,
@@ -2455,15 +2668,19 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
-		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,//TODO A list that can be empty
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.ID creator optional,
+		GeoCoordinates location optional,
 		XSD.NonNegativeInteger maxNrOfInstances optional,
 		XSD.NonNegativeInteger maxByteSize optional,
 		XSD.NonNegativeInteger maxInstanceAge optional,
 		XSD.NonNegativeInteger currentNrOfInstances optional,
 		XSD.NonNegativeInteger currentByteSize optional,
 		XSD.PositiveInteger periodicInterval optional,
+		XSD.NonNegativeInteger periodicIntervalDelta optional,
 		XSD.Boolean missingDataDetect optional,
 		XSD.PositiveInteger missingDataMaxNr optional,
 		MissingDataList missingDataList optional,
@@ -2509,12 +2726,14 @@ group OptionalResourceTypes {
 		Timestamp expirationTime optional,
 		XSD.AnyURI link optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		GeoCoordinates location optional,
 		XSD.NonNegativeInteger maxNrOfInstances optional,
 		XSD.NonNegativeInteger maxByteSize optional,
 		XSD.NonNegativeInteger maxInstanceAge optional,
 		XSD.NonNegativeInteger currentNrOfInstances optional,
 		XSD.NonNegativeInteger currentByteSize optional,
 		XSD.PositiveInteger periodicInterval optional,
+		XSD.NonNegativeInteger periodicIntervalDelta optional,
 		XSD.PositiveInteger missingDataMaxNr optional,
 		MissingDataList missingDataList optional,
 		XSD.NonNegativeInteger missingDataCurrentNr optional,
@@ -2537,15 +2756,13 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
-	  //variant (missingDataDetect) "text 'true' as '1'";
-	  //variant (missingDataDetect) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-	
+
 	type record TimeSeriesInstance_optional
 	{
 		ResourceName resourceName optional,
@@ -2558,10 +2775,11 @@ group OptionalResourceTypes {
 		Timestamp expirationTime optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		AbsRelTimestamp dataGenerationTime optional,
 		XSD.AnySimpleType content optional,
 		XSD.NonNegativeInteger sequenceNr optional,
-		XSD.NonNegativeInteger contentSize  optional,
+		XSD.NonNegativeInteger contentSize optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -2575,6 +2793,11 @@ group OptionalResourceTypes {
 	  variant "element";
 	  variant (resourceName) "attribute";
 	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 
@@ -2605,8 +2828,13 @@ group OptionalResourceTypes {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
-		
+
 	type record DynamicAuthorizationConsultation_optional
 	{
 		ResourceName resourceName optional,
@@ -2619,8 +2847,9 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
-		XSD.Boolean dynamicAuthorizationEnabled,
-		ListOfURIs dynamicAuthorizationPoA optional,
+		XSD.ID custodian optional,
+		XSD.Boolean dynamicAuthorizationEnabled optional,
+		PoaList dynamicAuthorizationPoA optional,
 		Timestamp dynamicAuthorizationLifetime optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -2655,6 +2884,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		RoleID roleID optional,
 		XSD.ID issuer optional,
 		XSD.ID holder optional,
@@ -2667,7 +2897,7 @@ group OptionalResourceTypes {
 			record length(1 .. infinity) of union {
 				Subscription subscription,
 				Transaction transaction
-			} choice_list 
+			} choice_list
 		} choice optional
 	}
 	with {
@@ -2693,8 +2923,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -2738,8 +2970,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -2777,8 +3011,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -2814,8 +3050,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -2852,8 +3090,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -2888,8 +3128,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -2924,8 +3166,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -2965,8 +3209,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3003,8 +3249,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3041,8 +3289,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3077,8 +3327,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3115,8 +3367,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3150,8 +3404,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3188,8 +3444,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3222,8 +3480,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3257,8 +3517,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3294,8 +3556,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3335,8 +3599,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3370,8 +3636,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3407,8 +3675,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3448,8 +3718,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3486,8 +3758,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3519,8 +3793,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3559,8 +3835,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3592,8 +3870,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3625,8 +3905,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3658,8 +3940,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3693,8 +3977,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3726,8 +4012,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3761,8 +4049,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3794,8 +4084,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3831,8 +4123,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3870,8 +4164,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3908,8 +4204,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3941,8 +4239,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -3976,8 +4276,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		ListOfNCNames announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
 		XSD.AnyURI containerDefinition optional,
@@ -4009,8 +4311,10 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		MgmtDefinition mgmtDefinition optional,
 		ListOfURIs objectIDs optional,
 		ListOfURIs objectPaths optional,
@@ -4063,6 +4367,7 @@ group OptionalResourceTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		TokenID tokenID optional,
 		DynAuthJWT tokenObject optional,
 		XSD.String version optional,
@@ -4096,130 +4401,137 @@ group OptionalResourceTypes {
 
 	type record CrossResourceSubscription_optional
 	{
-			ResourceName resourceName optional,
-			ResourceType resourceType optional,
-			XSD.ID resourceID optional,
-			NhURI parentID optional,
-			Timestamp creationTime optional,
-			Timestamp lastModifiedTime optional,
-			Labels labels optional,
-			AcpType accessControlPolicyIDs optional,
-			Timestamp expirationTime optional,
-			ListOfURIs dynamicAuthorizationConsultationIDs optional,
-			XSD.ID creator optional,
-			ListOfURIs regularResourcesAsTarget optional,
-			ListOfURIs subscriptionResourcesAsTarget optional,
-			TimeWindowType timeWindowType optional,
-			AbsRelTimestamp timeWindowSize optional,
-			EventNotificationCriteriaSet eventNotificationCriteriaSet optional,
-			EventCat notificationEventCat optional,
-			XSD.PositiveInteger expirationCounter optional,
-			record of XSD.AnyURI notificationURI optional,
-			XSD.ID subscriberURI optional,
-			union {
-				record length(1 .. infinity) of ChildResourceRef childResource_list,
-				record length(1 .. infinity) of union {
-					Schedule schedule,
-					NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
-					Transaction transaction
-				} choice_list
-			} choice optional
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
+		XSD.ID creator optional,
+		ListOfURIs regularResourcesAsTarget optional,
+		ListOfURIs subscriptionResourcesAsTarget optional,
+		TimeWindowType timeWindowType optional,
+		XSD.Duration timeWindowSize optional,
+		EventNotificationCriteriaSet eventNotificationCriteriaSet optional,
+		EventCat notificationEventCat optional,
+		XSD.PositiveInteger expirationCounter optional,
+		record of XSD.AnyURI notificationURI optional,
+		XSD.AnyURI subscriberURI optional,
+		XSD.Boolean notificationStatsEnable optional,
+		SetOfNotificationStatsInfo notificationStatsInfo optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Schedule schedule,
+				NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
+				Transaction transaction
+			} choice_list
+		} choice optional
 	}
 	with {
-		variant "name as uncapitalized";
-		variant "element";
-		variant (resourceName) "attribute";
-		variant (notificationURI) "list";
-		variant (choice) "untagged";
-		variant (choice.childResource_list) "untagged";
-		variant (choice.childResource_list[-]) "name as 'childResource'";
-		variant (choice.choice_list) "untagged";
-		variant (choice.choice_list[-]) "untagged";
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (notificationURI) "list";
+	  //variant (notificationStatsEnable) "text 'true' as '1'";
+	  //variant (notificationStatsEnable) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record TransactionMgmt_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
+		XSD.ID creator optional,
+		Timestamp transactionLockTime optional,
+		Timestamp transactionExecuteTime optional,
+		Timestamp transactionCommitTime optional,
+		Timestamp transactionExpirationTime optional,
+		TransactionMode transactionMode optional,
+		TransactionLockType transactionLockType optional,
+		TransactionControl transactionControl optional,
+		TransactionState transactionState optional,
+		XSD.NonNegativeInteger transactionMaxRetries optional,
+		TransactionMgmtHandling transactionMgmtHandling optional,
+		AggregatedRequest requestPrimitives optional,
+		AggregatedResponse responsePrimitives optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
-		type record TransactionMgmt_optional
-		{
-			ResourceName resourceName optional,
-			ResourceType resourceType optional,
-			XSD.ID resourceID optional,
-			NhURI parentID optional,
-			Timestamp creationTime optional,
-			Timestamp lastModifiedTime optional,
-			Labels labels optional,
-			AcpType accessControlPolicyIDs optional,
-			Timestamp expirationTime optional,
-			ListOfURIs dynamicAuthorizationConsultationIDs optional,
-			XSD.ID creator optional,
-			Timestamp transactionLockTime optional,
-			Timestamp transactionExecuteTime optional,
-			Timestamp transactionCommitTime optional,
-			Timestamp transactionExpirationTime optional,
-			TransactionMode transactionMode optional,
-			TransactionLockType transactionLockType optional,
-			TransactionControl transactionControl optional,
-			TransactionState transactionState optional,
-			XSD.NonNegativeInteger transactionMaxRetries optional,
-			TransactionMgmtHandling transactionMgmtHandling optional,
-			AggregatedRequest requestPrimitives optional,
-			AggregatedResponse responsePrimitives optional,
-			union {
-				record length(1 .. infinity) of ChildResourceRef childResource_list,
-				record length(1 .. infinity) of union {
-					Subscription subscription
-				} choice_list
-			} choice optional
-		}
-		with {
-			variant "name as uncapitalized";
-			variant "element";
-			variant (resourceName) "attribute";
-			variant (choice) "untagged";
-			variant (choice.childResource_list) "untagged";
-			variant (choice.childResource_list[-]) "name as 'childResource'";
-			variant (choice.choice_list) "untagged";
-			variant (choice.choice_list[-]) "untagged";
-		};
-		
 		
 	type record Transaction_optional
-{
-	ResourceName resourceName optional,
-	ResourceType resourceType optional,
-	XSD.ID resourceID optional,
-	NhURI parentID optional,
-	Timestamp creationTime optional,
-	Timestamp lastModifiedTime optional,
-	Labels labels optional,
-	AcpType accessControlPolicyIDs optional,
-	Timestamp expirationTime optional,
-	ListOfURIs dynamicAuthorizationConsultationIDs optional,
-	XSD.ID creator optional,
-	XSD.String transactionID optional,
-	TransactionControl transactionControl optional,
-	TransactionState transactionState optional,
-	Timestamp transactionLockTime optional,
-	Timestamp transactionExecuteTime optional,
-	Timestamp transactionCommitTime optional,
-	TransactionLockType transactionLockType optional,
-	RequestPrimitive requestPrimitive optional,
-	ResponsePrimitive responsePrimitive optional,
-	union {
-		record length(1 .. infinity) of ChildResourceRef childResource_list,
-		record length(1 .. infinity) of union {
-			Subscription subscription
-		} choice_list
-	} choice optional
-}
-with {
-  variant "name as uncapitalized";
-  variant "element";
-  variant (resourceName) "attribute";
-  variant (choice) "untagged";
-  variant (choice.childResource_list) "untagged";
-  variant (choice.childResource_list[-]) "name as 'childResource'";
-  variant (choice.choice_list) "untagged";
-  variant (choice.choice_list[-]) "untagged";
-};
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
+		XSD.ID creator optional,
+		XSD.String transactionID optional,
+		TransactionControl transactionControl optional,
+		TransactionState transactionState optional,
+		Timestamp transactionLockTime optional,
+		Timestamp transactionExecuteTime optional,
+		Timestamp transactionCommitTime optional,
+		TransactionLockType transactionLockType optional,
+		RequestPrimitive requestPrimitive optional,
+		ResponsePrimitive responsePrimitive optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
 
 }//end group OptionalResourceTypes
 	
@@ -4241,8 +4553,11 @@ group InvalidTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
+		GeoCoordinates location optional,
 		XSD.String appName optional,
 		XSD.String app_ID optional,
 		XSD.ID aE_ID optional,
@@ -4252,6 +4567,14 @@ group InvalidTypes {
 		XSD.Boolean requestReachability optional,
 		Serializations contentSerialization optional,
 		E2eSecInfo e2eSecInfo optional,
+		ExternalID m2M_Ext_ID optional,
+		SupportedReleaseVersions supportedReleaseVersions optional,
+		AERegistrationStatus registrationStatus optional,
+		XSD.Boolean trackRegistrationPoints optional,
+		SessionCapabilities sessionCapabilities optional,
+		XSD.Boolean triggerEnable optional,
+		ActivityPatternElements activityPatternElements optional,
+		XSD.Boolean enableTimeCompensation optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
@@ -4260,10 +4583,19 @@ group InvalidTypes {
 				AccessControlPolicy accessControlPolicy,
 				Subscription subscription,
 				PollingChannel pollingChannel,
-				Schedule schedule,
 				SemanticDescriptor semanticDescriptor,
 				TimeSeries timeSeries,
-				Sg_flexContainerResource_group sg_flexContainerResource
+				Sg_flexContainerResource_group sg_flexContainerResource,
+				SemanticMashupInstance semanticMashupInstance,
+				MultimediaSession multimediaSession,
+				CrossResourceSubscription crossResourceSubscription,
+				TriggerRequest triggerRequest,
+				TransactionMgmt transactionMgmt,
+				Transaction transaction,
+				E2eQosSession e2eQosSession,
+				TimeSyncBeacon timeSyncBeacon,
+				NwMonitoringReq nwMonitoringReq,
+				PrimitiveProfile primitiveProfile
 			} choice_list
 		} choice optional
 	}
@@ -4275,6 +4607,13 @@ group InvalidTypes {
 	  variant (aE_ID) "name as 'AE-ID'";
 	  //variant (requestReachability) "text 'true' as '1'";
 	  //variant (requestReachability) "text 'false' as '0'";
+	  variant (m2M_Ext_ID) "name as 'M2M-Ext-ID'";
+	  //variant (trackRegistrationPoints) "text 'true' as '1'";
+	  //variant (trackRegistrationPoints) "text 'false' as '0'";
+	  //variant (triggerEnable) "text 'true' as '1'";
+	  //variant (triggerEnable) "text 'false' as '0'";
+	  //variant (enableTimeCompensation) "text 'true' as '1'";
+	  //variant (enableTimeCompensation) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -4329,15 +4668,18 @@ group InvalidTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-		XSD.Integer stateTag optional,
+		AnnounceSyncType announceSyncType optional,
+		XSD.NonNegativeInteger stateTag optional,
 		XSD.ID creator optional,
-		XSD.Integer maxNrOfInstances optional,
-		XSD.Integer maxByteSize optional,
-		XSD.Integer maxInstanceAge optional,
-		XSD.Integer currentNrOfInstances optional,
-		XSD.Integer currentByteSize optional,
+		GeoCoordinates location optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional,
 		XSD.AnyURI locationID optional,
 		XSD.AnyURI ontologyRef optional,
 		XSD.Boolean disableRetrieval optional,
@@ -4348,13 +4690,15 @@ group InvalidTypes {
 				Container container,
 				Subscription subscription,
 				SemanticDescriptor semanticDescriptor,
-				Sg_flexContainerResource_group sg_flexContainerResource
+				Sg_flexContainerResource_group sg_flexContainerResource,
+				TimeSeries timeSeries,
+				Transaction transaction
 			} choice_list
 		} choice optional
 	}
 	with {
 	  variant "name as uncapitalized";
-	  //variant "element";
+	  variant "element";
 	  variant (resourceName) "attribute";
 	  variant (announcedAttribute) "list";
 	  //variant (disableRetrieval) "text 'true' as '1'";
@@ -4392,8 +4736,8 @@ group InvalidTypes {
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record of union {
-				GenericInterworkingService genericInterworkingService,
-				GenericInterworkingOperationInstance genericInterworkingOperationInstance,
+				GenericInterworkingService_optional genericInterworkingService,
+				GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
 				SemanticDescriptor semanticDescriptor,
 				Subscription subscription
 			} choice_list
@@ -4422,23 +4766,30 @@ group InvalidTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.ID creator optional,
 		MemberType memberType optional,
+		SpecializationType specializationType optional,
 		XSD.NonNegativeInteger currentNrOfMembers optional,
 		XSD.PositiveInteger maxNrOfMembers optional,
-		ListOfURIs memberIDs optional,
+		record of XSD.AnyURI memberIDs optional,
 		ListOfURIs membersAccessControlPolicyIDs optional,
 		XSD.Boolean memberTypeValidated optional,
 		ConsistencyStrategy consistencyStrategy optional,
 		XSD.String groupName optional,
 		XSD.Boolean semanticSupportIndicator optional,
+		BatchNotify notifyAggregation optional,
+		XSD.Boolean somecastEnable optional,
+		SomecastAlgorithm somecastAlgorithm optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
 				Subscription subscription,
-				SemanticDescriptor semanticDescriptor
+				SemanticDescriptor semanticDescriptor,
+				Transaction transaction
 			} choice_list
 		} choice optional
 	}
@@ -4447,17 +4798,19 @@ group InvalidTypes {
 	  variant "element";
 	  variant (resourceName) "attribute";
 	  variant (announcedAttribute) "list";
+	  variant (memberIDs) "list";
 	  //variant (memberTypeValidated) "text 'true' as '1'";
 	  //variant (memberTypeValidated) "text 'false' as '0'";
 	  //variant (semanticSupportIndicator) "text 'true' as '1'";
 	  //variant (semanticSupportIndicator) "text 'false' as '0'";
+	  //variant (somecastEnable) "text 'true' as '1'";
+	  //variant (somecastEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-
        
 	type record PollingChannel_invalid {
 		ResourceName resourceName optional,
@@ -4468,12 +4821,23 @@ group InvalidTypes {
 		Timestamp lastModifiedTime optional,
 		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel
 		Labels labels optional,
-		Timestamp expirationTime optional
+		Timestamp expirationTime optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Transaction transaction
+			} choice_list
+		} choice optional
 	}
 	with {
 	  variant "name as uncapitalized";
 	  variant "element";
 	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
        
 	type record Schedule_invalid {
@@ -4515,11 +4879,12 @@ group InvalidTypes {
 		NhURI parentID optional,
 		Timestamp creationTime optional,
 		Timestamp lastModifiedTime optional,
-		XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription
 		Labels labels optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		XSD.ID creator optional,
 		EventNotificationCriteria eventNotificationCriteria optional,
 		XSD.PositiveInteger expirationCounter optional,
@@ -4535,11 +4900,16 @@ group InvalidTypes {
 		NotificationContentType notificationContentType optional,
 		EventCat notificationEventCat optional,
 		XSD.AnyURI subscriberURI optional,
+		ListOfURIs associatedCrossResourceSub optional,
+		XSD.Boolean notificationStatsEnable optional,
+		SetOfNotificationStatsInfo notificationStatsInfo optional,
+		XSD.AnyURI primitiveProfileID optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
 				Schedule schedule,
-				NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
+				NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
+				Transaction transaction
 			} choice_list
 		} choice optional
 	}
@@ -4549,6 +4919,8 @@ group InvalidTypes {
 	  variant (resourceName) "attribute";
 	  //variant (latestNotify) "text 'true' as '1'";
 	  //variant (latestNotify) "text 'false' as '0'";
+	  //variant (notificationStatsEnable) "text 'true' as '1'";
+	  //variant (notificationStatsEnable) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -4569,29 +4941,33 @@ group InvalidTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID custodian optional,
 		ListOfURIs announceTo optional,
 		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-		XSD.NonNegativeInteger stateTag optional,
+		AnnounceSyncType announceSyncType optional,
 		XSD.ID creator optional,
+		GeoCoordinates location optional,
 		XSD.NonNegativeInteger maxNrOfInstances optional,
 		XSD.NonNegativeInteger maxByteSize optional,
 		XSD.NonNegativeInteger maxInstanceAge optional,
 		XSD.NonNegativeInteger currentNrOfInstances optional,
 		XSD.NonNegativeInteger currentByteSize optional,
-		XSD.NonNegativeInteger periodicInterval optional,
+		XSD.PositiveInteger periodicInterval optional,
+		XSD.NonNegativeInteger periodicIntervalDelta optional,
 		XSD.Boolean missingDataDetect optional,
-		XSD.NonNegativeInteger missingDataMaxNr optional,
+		XSD.PositiveInteger missingDataMaxNr optional,
 		MissingDataList missingDataList optional,
 		XSD.NonNegativeInteger missingDataCurrentNr optional,
-		XSD.NonNegativeInteger missingDataDetectTimer optional,
+		XSD.PositiveInteger missingDataDetectTimer optional,
 		XSD.AnyURI ontologyRef optional,
 		ContentInfo contentInfo optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
 			record length(1 .. infinity) of union {
-				TimeSeriesInstance_optional timeSeriesInstance,
-				Subscription_optional subscription,
-				SemanticDescriptor_optional semanticDescriptor
+				TimeSeriesInstance timeSeriesInstance,
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor,
+				Transaction transaction
 			} choice_list
 		} choice optional
 	}
@@ -4608,8 +4984,6 @@ group InvalidTypes {
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	};
-
-
        
 	 type record LocationPolicy_invalid {
 		ResourceName resourceName optional,
@@ -4663,13 +5037,6 @@ group OtherTypes {
 	
 	type record length(1 .. infinity) of DynAuthJWT RecordOfDynAuthJWT;
 
-	type enumerated PrimitiveProfileApplicability {
-		REQUESTS_TO_CSE (1),
-		RESPONSES_FROM_CSE (2),
-		REQUESTS_FROM_CSE (4),
-		RESPONSES_TO_CSE (8)
-	}
-
 	type enumerated SyncPoints {
 	   e_done  (0),
 	   e_error	(1)  
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index 7f2b3a92d6f12731cc6c3ba32ecaa8a2a3ca37a4..d7ecc31c5febf98eaaf297bd4d1000a67e6834d7 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit 7f2b3a92d6f12731cc6c3ba32ecaa8a2a3ca37a4
+Subproject commit d7ecc31c5febf98eaaf297bd4d1000a67e6834d7
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 009c818e7ed0b9636938ee4f8b9a1071fa0db1de..aad4253661fae6e81dfab7afdc0070a867efa00c 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -9567,8 +9567,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_childResourceIndex_1 := -1;
 					var integer v_childResourceIndex_2 := -1;
 					var Labels v_labels := {"VALUE_1"};
-					var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};					
-					var ListOfCoordinates v_location_2 := {-4.4216366, 36.7213028};					
+					var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";					
+					var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";					
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					const ResourceType c_containerResourceType := int3;					 
 			
@@ -9646,8 +9646,8 @@ module OneM2M_PermutationFunctions {
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
 					var integer v_childResourceIndex_1 := -1;					
-					var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};					
-					var ListOfCoordinates v_location_2 := {-4.4216366, 36.7213028};
+					var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";					
+					var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					const ResourceType c_containerResourceType := int3;
 					 
@@ -9716,7 +9716,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
 					var integer v_childResourceIndex := -1;
-					var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
+					var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					const ResourceType c_containerResourceType := int3;
 					var AttributeAux v_invalidAttribute;
@@ -9783,7 +9783,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aeIndex := -1;
 					var integer v_resourceIndex := -1;
 					var integer v_childResourceIndex_1 := -1;					
-					var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};										
+					var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";										
 					const ResourceType c_containerResourceType := int3;
 					 
 			
@@ -9999,8 +9999,8 @@ module OneM2M_PermutationFunctions {
                         var integer v_childResourceIndex_1 := -1;
                         var integer v_childResourceIndex_2 := -1;
                         var Labels v_labels := {"VALUE_0"};
-                        var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
-                        var ListOfCoordinates v_location_2 := {-4.4216366, 36.7213028};
+                        var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
+                        var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
                         var integer i;
 
                         // Test control
@@ -10083,7 +10083,7 @@ module OneM2M_PermutationFunctions {
                         var template RequestPrimitive v_createRequest := m_createContainerBase;
                         var integer v_childResourceIndex := -1;
                         var Labels v_labels := {"VALUE_0"};
-                        var ListOfCoordinates v_location := {2.3514616, 48.8566969};
+                        var ListOfCoordinates v_location := "[2.3514616,48.8566969]";
 
                         // Test control
                         if(not(PICS_ACP_SUPPORT)) {
@@ -10160,7 +10160,7 @@ module OneM2M_PermutationFunctions {
                         var template RequestPrimitive v_createRequest := m_createContainerBase;
                         var integer v_childResourceIndex := -1;
                         var Labels v_labels := {"VALUE_0"};
-                        var ListOfCoordinates v_location := {2.3514616, 48.8566969};
+                        var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
 
                         // Test control
                         if(not(PICS_ACP_SUPPORT)) {
@@ -10726,9 +10726,9 @@ module OneM2M_PermutationFunctions {
 					var Labels v_labels_1:= {"VALUE_1"};
 					var Labels v_labels_2:= {"VALUE_2"};					
 					var RequestPrimitive v_notificationRequest;
-					var AbsRelTimestamp myAbsRelTimestamp;
-					myAbsRelTimestamp.alt_1 := float2int(PX_TAC/2.0);													
-			
+					var XSD.Duration v_myAbsRelTimestamp;
+					v_myAbsRelTimestamp := "PT2S";	
+					
 					// Test control
 
 					// Test component configuration
@@ -10741,7 +10741,7 @@ module OneM2M_PermutationFunctions {
 					v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1					
 					v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2										
 					
-					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NotInitialized");
+					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp, "NotInitialized");
 					v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1, e_nonHierarchical, e_cseRelative), f_getResourceAddress(v_resourceIndex_2, e_nonHierarchical, e_cseRelative)};
 					v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
 					f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration			
@@ -10795,8 +10795,8 @@ module OneM2M_PermutationFunctions {
 					var Labels v_labels_1:= {"VALUE_1"};
 					var Labels v_labels_2:= {"VALUE_2"};					
 					var RequestPrimitive v_notificationRequest;
-					var AbsRelTimestamp myAbsRelTimestamp;
-					myAbsRelTimestamp.alt_1 := float2int(PX_TAC / 2.0);
+					var XSD.Duration v_myAbsRelTimestamp;
+					v_myAbsRelTimestamp := "PT2S";	
 					timer t_notificationTimer := PX_TAC;
 					var float v_elapsedTime;						
 			
@@ -10812,7 +10812,7 @@ module OneM2M_PermutationFunctions {
 					v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1					
 					v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2										
 					
-					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NullValue");
+					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp, "NullValue");
 					v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
 					v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
 					f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration			
@@ -10833,7 +10833,7 @@ module OneM2M_PermutationFunctions {
 					f_cse_updateResource(int3, v_resourceIndex_1, v_updateRequest_1); // Update request 1 
 					
 					v_elapsedTime := t_notificationTimer.read;
-					while (v_elapsedTime < int2float(myAbsRelTimestamp.alt_1)){ // Wait until window size expires 
+					while (v_elapsedTime < str2float(v_myAbsRelTimestamp)){ // Wait until window size expires 
 						v_elapsedTime := t_notificationTimer.read;
 					}
 					t_notificationTimer.stop;
@@ -10866,8 +10866,8 @@ module OneM2M_PermutationFunctions {
 					var Labels v_labels_1:= {"VALUE_1"};
 					var Labels v_labels_2:= {"VALUE_2"};					
 					var RequestPrimitive v_notificationRequest;
-					var AbsRelTimestamp myAbsRelTimestamp;
-					myAbsRelTimestamp.alt_1 := float2int(PX_TAC / 2.0);	
+					var XSD.Duration v_myAbsRelTimestamp;
+					v_myAbsRelTimestamp := "PT2S";	
 					
 					// Test control
 
@@ -10881,7 +10881,7 @@ module OneM2M_PermutationFunctions {
 					v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1					
 					v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2										
 					
-					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NullValue");
+					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp, "NullValue");
 					v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
 					v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int2})}; // Delete_of_Resource
 					f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration			
@@ -10930,9 +10930,9 @@ module OneM2M_PermutationFunctions {
 					var Labels v_labels_1:= {"VALUE_1"};
 					var Labels v_labels_2:= {"VALUE_2"};					
 					var RequestPrimitive v_notificationRequest;
-					var AbsRelTimestamp myAbsRelTimestamp;
-					myAbsRelTimestamp.alt_1 := float2int(PX_TAC/2.0);													
-			
+					var XSD.Duration v_myAbsRelTimestamp;
+					v_myAbsRelTimestamp := "PT2S";	
+					
 					// Test control
 
 					// Test component configuration
@@ -10949,7 +10949,7 @@ module OneM2M_PermutationFunctions {
 					v_childResourceIndex_1 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_1);//Subscription_1
 					v_childResourceIndex_1 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_2);//Subscription_2																		
 					
-					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NullValue");
+					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp, "NullValue");
 					v_createRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
 					v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
 					f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration			
@@ -11005,8 +11005,8 @@ module OneM2M_PermutationFunctions {
 					var Labels v_labels_1:= {"VALUE_1"};
 					var Labels v_labels_2:= {"VALUE_2"};					
 					var RequestPrimitive v_notificationRequest;
-					var AbsRelTimestamp myAbsRelTimestamp;
-					myAbsRelTimestamp.alt_1 := float2int(PX_TAC / 2.0);
+					var XSD.Duration v_myAbsRelTimestamp;
+					v_myAbsRelTimestamp := "PT2S";	
 					timer t_notificationTimer := PX_TAC;
 					var float v_elapsedTime;						
 			
@@ -11026,7 +11026,7 @@ module OneM2M_PermutationFunctions {
 					v_childResourceIndex_1 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_1);//Subscription_1
 					v_childResourceIndex_1 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_2);//Subscription_2										
 					
-					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NullValue");
+					v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp, "NullValue");
 					v_createRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
 					v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
 					f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration			
@@ -11047,7 +11047,7 @@ module OneM2M_PermutationFunctions {
 					f_cse_updateResource(int3, v_resourceIndex_1, v_updateRequest_1); // Update request 1 
 					
 					v_elapsedTime := t_notificationTimer.read;
-					while (v_elapsedTime < int2float(myAbsRelTimestamp.alt_1)){ // Wait until window size expires 
+					while (v_elapsedTime < str2float(v_myAbsRelTimestamp)){ // Wait until window size expires 
 						v_elapsedTime := t_notificationTimer.read;
 					}
 					t_notificationTimer.stop;
diff --git a/OneM2M_Testcases_CSE_Release_4.ttcn b/OneM2M_Testcases_CSE_Release_4.ttcn
index d2107ecae71cdea8cae2c7b9496df3ab301c0088..6d2f1e6de87aedbf863c73cfe86ce4dfdd2e4652 100644
--- a/OneM2M_Testcases_CSE_Release_4.ttcn
+++ b/OneM2M_Testcases_CSE_Release_4.ttcn
@@ -925,7 +925,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					// Test Body
                     v_evalcriteria.subject := "tempContainer.content"; //string example
                     v_evalcriteria.operator := int1; // equal
-                    v_evalcriteria.threshold := 3;                    
+                    v_evalcriteria.threshold := "3";                    
 					v_request := f_getCreateRequestPrimitive(int65, m_createState(-, m_contentCreateStateWithStateTransitions(-, m_stateTransitions(v_evalcriteria,"non_existing_state"))), v_aeIndex);
 
 					f_send(e_mcaPort, m_request(valueof(v_request)));
@@ -983,7 +983,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					// Test Body
                     v_evalcriteria.subject := "tempContainer.content"; //string example
                     v_evalcriteria.operator := int1; // equal
-                    v_evalcriteria.threshold := 3;
+                    v_evalcriteria.threshold := "3";
                     v_requeststate := m_createState(-, m_contentCreateStateWithStateTransitions(-, m_stateTransitions(v_evalcriteria,"")));
                     v_resourceState := f_cse_createResource(int65, v_requeststate, v_aeIndex);
                     
@@ -1048,7 +1048,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					// Test Body
                     v_evalcriteria.subject := "tempResource.content"; //string example
                     v_evalcriteria.operator := int1; // equals
-                    v_evalcriteria.threshold := 3;
+                    v_evalcriteria.threshold := "3";
                     v_requeststate := m_createState(-, m_contentCreateStateWithStateTransitions(-, m_stateTransitions(v_evalcriteria,"")));
                     
 					v_request := f_getCreateRequestPrimitive(int65, v_requeststate, -1);
@@ -1345,7 +1345,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                     
                     v_evalcriteria.subject := v_invalidAttribute; // not matching subjectResourceID attributes
                     v_evalcriteria.operator := int1; // equal
-                    v_evalcriteria.threshold := 3;
+                    v_evalcriteria.threshold := "3";
                     v_request.primitiveContent.action_.evalCriteria := v_evalcriteria;
                     
 					f_send(e_mcaPort, m_request(valueof(v_request)));
@@ -1402,7 +1402,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                     
                     v_evalcriteria.subject := v_invalidAttribute; // not matching subjectResourceID attributes
                     v_evalcriteria.operator := int1; // equal
-                    v_evalcriteria.threshold := 3;
+                    v_evalcriteria.threshold := "3";
                     v_request.primitiveContent.action_.evalCriteria := v_evalcriteria;
                     
 					f_send(e_mcaPort, m_request(valueof(v_request)));
@@ -1459,7 +1459,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                     
                     v_evalcriteria.subject := v_attributeSet;
                     v_evalcriteria.operator := int1; // equal
-                    v_evalcriteria.threshold := -1;
+                    v_evalcriteria.threshold := "-1";
                     v_request.primitiveContent.action_.evalCriteria := v_evalcriteria;
                     
 					f_send(e_mcaPort, m_request(valueof(v_request)));
@@ -1516,7 +1516,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                     
                     v_evalcriteria.subject := v_attributeSet;
                     v_evalcriteria.operator := int3; // operator set to invalid value as greater does not apply to NCName
-                    v_evalcriteria.threshold := 2;
+                    v_evalcriteria.threshold := "2";
                     v_request.primitiveContent.action_.evalCriteria := v_evalcriteria;
                     
 					f_send(e_mcaPort, m_request(valueof(v_request)));
@@ -1682,7 +1682,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                     v_request.primitiveContent.dependency.referencedResourceID := f_getResourceId(vc_resourcesList[v_resourceIndex].resource);
                     v_evalcriteria.subject := v_invalidAttribute;
                     v_evalcriteria.operator := int1;
-                    v_evalcriteria.threshold := 2;
+                    v_evalcriteria.threshold := "2";
 
 					f_send(e_mcaPort, m_request(valueof(v_request)));
                     tc_ac.start;
@@ -1738,7 +1738,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					v_request := f_getCreateRequestPrimitive(int64, m_createDependencyBase, v_aeIndex);
                     v_evalcriteria.subject := v_attributeSet;
                     v_evalcriteria.operator := int1;
-                    v_evalcriteria.threshold := -1;
+                    v_evalcriteria.threshold := "-1";
 
 					f_send(e_mcaPort, m_request(valueof(v_request)));
                     tc_ac.start;
@@ -1794,7 +1794,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					v_request := f_getCreateRequestPrimitive(int64, m_createDependencyBase, v_aeIndex);
                     v_evalcriteria.subject := v_attributeSet;
                     v_evalcriteria.operator := int3; // operator set to invalid value as greater does not apply to NCName
-                    v_evalcriteria.threshold := 1;
+                    v_evalcriteria.threshold := "1";
 
 					f_send(e_mcaPort, m_request(valueof(v_request)));
                     tc_ac.start;
@@ -3413,7 +3413,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 										var template RequestPrimitive v_createRequest := valueof(m_createAcpBase);
 										var integer v_state := 0; // Sequencing of received message
                                         var SignatureList v_authorSigns;
-                                        var template RequestPrimitive v_notifyRequest := m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentCreateNotification({ uRI := "" }, omit, omit, omit));
+                                        var template RequestPrimitive v_notifyRequest := m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotificationEmpty);
 										// Test control
 										if(not(PICS_ACP_SUPPORT)) {
 											setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
@@ -4473,7 +4473,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                         var integer v_resourceIndex := -1;
                         var integer v_childResourceIndex := -1;  
                         var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption  
-                        var ListOfCoordinates v_location := {2.3514616, 48.8566969};
+                        var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
                         var template RequestPrimitive v_createRequest := m_createContainerBase;
 
                         // Test control
@@ -4543,8 +4543,8 @@ module OneM2M_Testcases_CSE_Release_4 {
                         var integer v_resourceIndex := -1;
                         var integer v_childResourceIndex := -1;  
                         var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption  
-                        var ListOfCoordinates v_location := {-4.4216366, 36.7213028};
-                        var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
+                        var ListOfCoordinates v_location := "[-4.4216366, 36.7213028]";
+                        var ListOfCoordinates v_location_1 := "[2.3514616, 48.8566969]";
                         var template RequestPrimitive v_createRequest := m_createContainerBase;
                         var template (omit) ListOfURIs uRIList := {"NotInitialized"};
                         var MsgIn v_response;
@@ -4622,7 +4622,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                         var integer v_resourceIndex := -1;
                         var integer v_childResourceIndex := -1;  
                         var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption   
-                        var ListOfCoordinates v_location := {2.3514616, 48.8566969};
+                        var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
                         var template RequestPrimitive v_createRequest := m_createContainerBase;
                         var Labels v_labels := {"VALUE_1"};                    
                         var template (omit) ListOfURIs uRIList := {"NotInitialized"};
@@ -12055,7 +12055,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					
 					} 
 					
-					if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, active ))){	 
+					if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, int1 ))){	 
 					
 						setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile does not has Status as ACTIVE in updated content.");
 					} 
@@ -12137,7 +12137,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					
 					} 
 					
-					if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, inactive ))){	 
+					if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, int2 ))){	 
 					
 						setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile does not has Status as INACTIVE in updated content.");
 					} 
@@ -14338,7 +14338,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var template RequestPrimitive v_createSoftwareCampaignRequest;
                 var integer v_aeIndex := -1;
                 var RequestPrimitive v_request;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
                 
                 // Test component configuration
                 f_cf02Up();
@@ -14349,8 +14349,8 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);// subject set as the parent resource
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
-                v_createSoftwareCampaignRequest := m_createSoftwareCampaignNoSoftwareTargets(valueof(v_actionGeneric));
+                v_actionGeneric.evalCriteria.threshold := "3";
+                v_createSoftwareCampaignRequest := m_createSoftwareCampaignNoSoftwareTargets({{valueof(v_actionGeneric)}});
 
                 v_request := f_getCreateRequestPrimitive(int61, v_createSoftwareCampaignRequest, v_aeIndex);
                 f_send(e_mcaPort, m_request(v_request));
@@ -14394,7 +14394,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_resourceIndex := -1;
                 var RequestPrimitive v_request;
                 var template RequestPrimitive v_createRequest := m_createContainerBase;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
                 
                 // Test component configuration
                 f_cf02Up();
@@ -14408,14 +14408,14 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);// subject set as the parent resource
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createRequest.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
                 v_resourceIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;			
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_resourceIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
                 
                 // Software Campaign resource created with no accessible softwareTriggerCriteria            
                 v_request := f_getCreateRequestPrimitive(int61, v_createSoftwareCampaignRequest, v_aeIndex);
@@ -14460,7 +14460,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var template RequestPrimitive v_createSoftwareCampaignRequest;
                 var integer v_aeIndex := -1; 
                 var RequestPrimitive v_request;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
                                 
                 // Test component configuration
                 f_cf02Up();
@@ -14468,11 +14468,11 @@ module OneM2M_Testcases_CSE_Release_4 {
                 // Preamble
                 v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi
 
-                v_actionGeneric.subjectResourceID := omit;// resource referenced in attribute softwareTriggerCriteria
+                v_actionGeneric.subjectResourceID := "resource_not_existing";// resource referenced in attribute softwareTriggerCriteria
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;                
-                v_createSoftwareCampaignRequest := m_createSoftwareCampaignNoSoftwareTriggerCriteria(-, valueof(v_actionGeneric));
+                v_actionGeneric.evalCriteria.threshold := "3";                
+                v_createSoftwareCampaignRequest := m_createSoftwareCampaignNoSoftwareTriggerCriteria(-, {{valueof(v_actionGeneric)}});
                 
                 // Software Campaign resource created with no resource referenced in softwareTriggerCriteria attribute
                 v_request := f_getCreateRequestPrimitive(int61, v_createSoftwareCampaignRequest, v_aeIndex);
@@ -14522,7 +14522,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var template RequestPrimitive v_createRequest := m_createContainerBase;
                 var ResourceType v_resourceType := int61;
 
-                var template Action_optional p_actionGeneric;
+                var template SoftwareTriggerCriterion p_actionGeneric;
 
                 // Test component configuration
                 f_cf02Up();
@@ -14537,11 +14537,11 @@ module OneM2M_Testcases_CSE_Release_4 {
                 p_actionGeneric.subjectResourceID := f_getOriginator(v_resourceIndexContainer);
                 p_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 p_actionGeneric.evalCriteria.operator := int1;
-                p_actionGeneric.evalCriteria.threshold := 3;
+                p_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := p_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{p_actionGeneric}};
                 
                 // Software Campaign resource created with no values on attribute softwareTriggerCriteria
                 v_createRequestPrimitive := f_getCreateRequestPrimitive(v_resourceType, v_createSoftwareCampaignRequest, v_aeIndex);
@@ -14588,7 +14588,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_aeIndex := -1;
                 var integer v_softwareCampaignResourceIndex := -1;
                 var ResourceType v_resourceTypeSoftwareCampaign := int61;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
 
                 // Test component configuration
                 f_cf02Up();
@@ -14600,12 +14600,12 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;			
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignEnabled := true;
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
                 
                 //IUT having valid <softwareCampaign> resource
                 v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
@@ -14652,7 +14652,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_aeIndex := -1;
                 var integer v_softwareCampaignResourceIndex := -1;
                 var ResourceType v_resourceTypeSoftwareCampaign := int61;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
 
                 // Test component configuration
                 f_cf02Up();
@@ -14663,11 +14663,11 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignStatus := int4; //CANCELLING acc. to TS-0004, Table 6.3.4.2.15 1: Interpretation of execStatusType
                 
                 //IUT having valid <softwareCampaign> resource - containing campaignStatus attribute set to CANCELLING
@@ -14717,7 +14717,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_aeIndex := -1;
                 var integer v_softwareCampaignResourceIndex := -1;
                 var ResourceType v_resourceTypeSoftwareCampaign := int61;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
 
                 // Test component configuration
                 f_cf02Up();
@@ -14728,11 +14728,11 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{valueof(v_actionGeneric)}};
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignEnabled := true;
                 
                 //IUT having valid <softwareCampaign> resource - containing campaignEnabled attribute set to TRUE
@@ -14784,7 +14784,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_aeIndex := -1;
                 var integer v_softwareCampaignResourceIndex := -1;
                 var ResourceType v_resourceTypeSoftwareCampaign := int61;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
                 var XSD.ID v_notaccessibleresource := "Invalid_ID";
 
                 // Test component configuration
@@ -14796,12 +14796,12 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 //IUT having valid <softwareCampaign> resource - containing campaignEnabled attribute set to TRUE
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;                
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{valueof(v_actionGeneric)}};                
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignEnabled := true;
                 
                 v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
@@ -14852,7 +14852,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_aeIndex, v_resourceIndexNode := -1;
                 var integer v_softwareCampaignResourceIndex := -1;
                 var ResourceType v_resourceTypeSoftwareCampaign := int61;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
 
                 // Test component configuration
                 f_cf02Up();
@@ -14866,11 +14866,11 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
                 
                 //IUT having valid <softwareCampaign> resource
                 v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
@@ -14922,7 +14922,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_aeIndex := -1;
                 var integer v_softwareCampaignResourceIndex := -1;
                 var ResourceType v_resourceTypeSoftwareCampaign := int61;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
 
                 // Test component configuration
                 f_cf02Up();
@@ -14933,12 +14933,12 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignEnabled  := true;
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
                 
                 //IUT having valid <softwareCampaign> resource
                 v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
@@ -14990,7 +14990,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_aeIndex := -1;
                 var integer v_softwareCampaignResourceIndex := -1;
                 var ResourceType v_resourceTypeSoftwareCampaign := int61;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
 
                 // Test component configuration
                 f_cf02Up();
@@ -15001,18 +15001,18 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;//campaignEnabled attribute set to FALSE
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
                 
                 //IUT having valid <softwareCampaign> resource
                 v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
 
                 v_actionGeneric.subjectResourceID := "Invalid_URI";
                 v_updateSoftwareCampaign := m_updateSoftwareCampaign;
-                v_updateSoftwareCampaign.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_updateSoftwareCampaign.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
                 v_updateRequest := valueof(v_updateSoftwareCampaign);
                 v_updateRequest := f_getUpdateRequestPrimitive(v_resourceTypeSoftwareCampaign, v_softwareCampaignResourceIndex, v_updateRequest);
                 
@@ -15058,7 +15058,7 @@ module OneM2M_Testcases_CSE_Release_4 {
                 var integer v_aeIndex, v_containerResourceIndex := -1;
                 var integer v_softwareCampaignResourceIndex := -1;
                 var ResourceType v_resourceTypeSoftwareCampaign := int61;
-                var template Action_optional v_actionGeneric;
+                var template SoftwareTriggerCriterion v_actionGeneric;
 
                 // Test component configuration
                 f_cf02Up();
@@ -15070,11 +15070,11 @@ module OneM2M_Testcases_CSE_Release_4 {
                 v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
                 v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
                 v_actionGeneric.evalCriteria.operator := int1;
-                v_actionGeneric.evalCriteria.threshold := 3;
+                v_actionGeneric.evalCriteria.threshold := "3";
                 
                 v_createSoftwareCampaignRequest := m_createSoftwareCampaign;//campaignEnabled attribute set to FALSE
                 v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
-                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
 
                 //subject? resource at SUBJECT_RESOURCE_ADDRESS - TBD used container resource
                 v_containerResourceIndex := f_cse_createResource(int3, m_createContainerBase);
@@ -15084,7 +15084,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 
                 v_actionGeneric.subjectResourceID := f_getResourceAddress(v_containerResourceIndex); //SUBJECT_RESOURCE_ADDRESS
                 v_updateSoftwareCampaign := m_updateSoftwareCampaign;
-                v_updateSoftwareCampaign.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
+                v_updateSoftwareCampaign.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
                 v_updateRequest := valueof(v_updateSoftwareCampaign);
                 v_updateRequest := f_getUpdateRequestPrimitive(v_resourceTypeSoftwareCampaign, v_softwareCampaignResourceIndex, v_updateRequest);
                 
@@ -15307,20 +15307,20 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
-							f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
-							v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
-							if(not match(c_transactionControl , vc_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
+							f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
+							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
+							if(not match(c_transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
 								setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
 							}
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
 						}
@@ -15344,7 +15344,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					// Tear down
 					f_cf01Down();
 					
-					return vc_response.primitive.responsePrimitive;
+					return v_response.primitive.responsePrimitive;
 					    				
 				}//end f_CSE_TMG_CRE_001
 					
@@ -15485,20 +15485,20 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
-							f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
-							v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
-							if(not match(c_transactionControl , vc_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
+							f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
+							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
+							if(not match(c_transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
 								setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
 							}
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
 						}
@@ -15522,7 +15522,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					// Tear down
 					f_cf01Down();
 					
-					return vc_response.primitive.responsePrimitive;
+					return v_response.primitive.responsePrimitive;
 					
 					
 				}//end f_CSE_TMG_CRE_003
@@ -15653,20 +15653,20 @@ module OneM2M_Testcases_CSE_Release_4 {
 					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
-							f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
-							v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
-							if(not match(c_transactionControl , vc_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
+							f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
+							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
+							if(not match(c_transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
 								setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
 							}
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Wrong response status code");
 						}
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
 						}
@@ -15690,7 +15690,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					// Tear down
 					f_cf01Down();
 					
-					return vc_response.primitive.responsePrimitive;
+					return v_response.primitive.responsePrimitive;
 					    				
 				}//end f_CSE_TMG_CRE_005
 				
@@ -18014,7 +18014,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					
 					vc_ae1.start(f_cse_updateResource(int20, v_serviceSubscribedNodeIndex, v_updateServiceSubscribedNode));
 					
-					v_requestPrimitive := m_t8_request_delete(v_requestResourceURI,v_requestHeader , v_niddConfig); // NIDD configuration delete request
+					v_requestPrimitive := m_t8_request_delete(v_requestResourceURI,v_requestHeader , valueof(v_niddConfig)); // NIDD configuration delete request
 					tc_ac.start;
 					alt{
 						[] mcnPortIn.receive(mw_t8Request(v_requestPrimitive)) {
@@ -18083,7 +18083,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					
 					vc_ae1.start(f_cse_deleteResource(v_serviceSubscribedNodeIndex));
 					
-					v_requestPrimitive := m_t8_request_delete(v_requestResourceURI, v_requestHeader, v_niddConfig); // NIDD configuration delete request 
+					v_requestPrimitive := m_t8_request_delete(v_requestResourceURI, v_requestHeader, valueof(v_niddConfig)); // NIDD configuration delete request 
 					tc_ac.start;
 					alt{
 						[] mcnPortIn.receive(mw_t8Request(v_requestPrimitive)) {
@@ -18495,7 +18495,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 					
 			// Test Body
 			//Scef send niddDownlink data delivery notification
-			v_requestPrimitiveNiddDownlinkDataDeliveryStatusNotification := m_t8_request_post(v_requestResourceURI, v_requestHeader, v_niddDLDataStatusNotificationBody); // NIDD Uplink data transfer request
+			v_requestPrimitiveNiddDownlinkDataDeliveryStatusNotification := m_t8_request_post(v_requestResourceURI, v_requestHeader, valueof(v_niddDLDataStatusNotificationBody)); // NIDD Uplink data transfer request
 			mcnPort.send(mw_t8Request(v_requestPrimitiveNiddDownlinkDataDeliveryStatusNotification));
 					
 			tc_ac.start;