diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index deae807c36c487dbee30561544b27a699bc2e380..0ec0526bff28fccf6acef11251b33d75f450f114 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7201,43 +7201,40 @@ module OneM2M_Templates {
 			niddRequired 							:= true, //O
 			choice 									:= omit //O
 
-		
-
 		};
-		
 
-/**
+		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxValue1  := {
-
-			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
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfile := {
+
+			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
 			m2M_Sub_ID                          := omit, //NP
 			m2M_SS_ID                           := omit, //O
-			status                              := omit,   //NP
-			activate_                            := omit,  //O
+			status                              := omit, //NP
+			activate_                           := omit, //O
 			activationTime                      := omit, //NP
-			deactivationTime                    := omit,  //NP
-			serviceSubscriptionDuration         := omit,  //O
+			deactivationTime                    := omit, //NP
+			serviceSubscriptionDuration         := omit, //O
 			currentNumAEs                       := omit, //NP
-			maxNumAEs                           := 1,  //O
-			maxNumNodes                         := 1,  //O
-			maxNumBytes                         := 1,  //O
-			maxRequestRate                      := 1, //O
-			maxNumContainers                    := 1, //O
-			maxNumInstancesPerContainer         := 1, //O
-			maxNumTimeSeries                    := 1, //O
-			maxNumInstancesPerTimeSeries        := 1, //O
-			maxMembersPerGroup                  := 1, //O
+			maxNumAEs                           := omit, //O
+			maxNumNodes                         := omit, //O
+			maxNumBytes                         := omit, //O
+			maxRequestRate                      := omit, //O
+			maxNumContainers                    := omit, //O
+			maxNumInstancesPerContainer         := omit, //O
+			maxNumTimeSeries                    := omit, //O
+			maxNumInstancesPerTimeSeries        := omit, //O
+			maxMembersPerGroup                  := omit, //O
 			maxNotificationRate                 := omit, //O
 			maxNumFlexContainers                := omit, //O
 			maxNumInstancesPerFlexContainer     := omit, //O
@@ -7245,8 +7242,23 @@ module OneM2M_Templates {
 			defaultAccessControlPrivileges      := omit, //O
 			choice 					            := omit  //NP
 
-		
+		};		
+
+		/**
+		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
+		 */
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxValue1 modifies m_contentUpdateServiceSubscriptionProfile := {
 
+			maxNumAEs                           := 1,  //O
+			maxNumNodes                         := 1,  //O
+			maxNumBytes                         := 1,  //O
+			maxRequestRate                      := 1, //O
+			maxNumContainers                    := 1, //O
+			maxNumInstancesPerContainer         := 1, //O
+			maxNumTimeSeries                    := 1, //O
+			maxNumInstancesPerTimeSeries        := 1, //O
+			maxMembersPerGroup                  := 1  //O
+			
 		};
 
 
@@ -7254,48 +7266,16 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileActivated := {
-
-			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
-			m2M_Sub_ID                          := omit, //NP
-			m2M_SS_ID                           := omit, //O
-			status                              := omit,   //NP
-			activate_                            := true,  //O
-			activationTime                      := omit, //NP
-			deactivationTime                    := omit,  //NP
-			serviceSubscriptionDuration         := omit,  //O
-			currentNumAEs                       := omit, //NP
-			maxNumAEs                           := omit,  //O
-			maxNumNodes                         := omit,  //O
-			maxNumBytes                         := omit,  //O
-			maxRequestRate                      := omit, //O
-			maxNumContainers                    := omit, //O
-			maxNumInstancesPerContainer         := omit, //O
-			maxNumTimeSeries                    := omit, //O
-			maxNumInstancesPerTimeSeries        := omit, //O
-			maxMembersPerGroup                  := omit, //O
-			maxNotificationRate                 := omit, //O
-			maxNumFlexContainers                := omit, //O
-			maxNumInstancesPerFlexContainer     := omit, //O
-			maxNumUsers							:= omit, //O
-			defaultAccessControlPrivileges      := omit, //O
-			choice 					            := omit  //NP
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileActivated modifies m_contentUpdateServiceSubscriptionProfile := {
 
+			activate_                            := true  //O
+			
 		};
 		
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileDeactivated modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileDeactivated modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			activate_                            := false  //O
 
@@ -7304,7 +7284,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumAEsZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumAEsZero modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumAEs                            := 0  //O
 
@@ -7313,7 +7293,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumAEs2 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumAEs2 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumAEs                            := 2  //O
 
@@ -7322,7 +7302,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumContainersZero  modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumContainersZero  modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumContainers                    := 0 //O
 
@@ -7331,7 +7311,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumContainers2 modifies m_contentUpdateServiceSubscriptionProfileActivated:= {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumContainers2 modifies m_contentUpdateServiceSubscriptionProfile:= {
 
 			maxNumContainers                    := 2 //O
 
@@ -7340,7 +7320,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumTimeSeriesZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumTimeSeriesZero modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumTimeSeries                    := 0 //O
 
@@ -7349,7 +7329,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumTimeSeries3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumTimeSeries3 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumTimeSeries                    := 3 //O
 
@@ -7358,7 +7338,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfilemaxNumInstancesPerContainerOne modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfilemaxNumInstancesPerContainerOne modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumInstancesPerContainer                   := 1 //O
 
@@ -7367,7 +7347,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfilemaxNumInstancesPerContainer3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfilemaxNumInstancesPerContainer3 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumInstancesPerContainer                   := 3 //O
 
@@ -7376,7 +7356,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumInstancesPerTimeSeriesZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumInstancesPerTimeSeriesZero modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumInstancesPerTimeSeries                   := 0 //O
 
@@ -7385,7 +7365,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumInstancesPerTimeSeries3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumInstancesPerTimeSeries3 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumInstancesPerTimeSeries                   := 3 //O
 
@@ -7394,7 +7374,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxMembersPerGroupZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxMembersPerGroupZero modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxMembersPerGroup                			   := 0 //O
 
@@ -7403,7 +7383,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxMembersPerGroup3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxMembersPerGroup3 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxMembersPerGroup                			   := 3 //O
 
@@ -7412,7 +7392,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumBytes100 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumBytes100 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumBytes		                			   := 100 //O
 
@@ -7421,7 +7401,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumBytes300 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumBytes300 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumBytes		                			   := 300 //O
 
@@ -7430,7 +7410,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumNodesZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumNodesZero modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumNodes		                			   := 0 //O
 
@@ -7439,7 +7419,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumNodes3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumNodes3 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumNodes		                			   := 3 //O
 
@@ -7448,7 +7428,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumUsersZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumUsersZero modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumUsers		                			   := 0 //O
 
@@ -7456,7 +7436,7 @@ module OneM2M_Templates {
 		/**
 		 * @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
 		 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumUsers2 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
+		template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumUsers2 modifies m_contentUpdateServiceSubscriptionProfile := {
 
 			maxNumUsers		                			   := 2 //O