diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index a8610a1af32bd9b74bb0f174d85fbf961320ae7b..f1d58cdb58ec1c6b1f5d3e5301dbce5e62996760 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3250,11 +3250,11 @@ module OneM2M_Templates {
 			aE_ID := omit,//NP
 			pointOfAccess := omit,//O
 			ontologyRef := omit,//O
-			nodeLink := omit,//NP
+			nodeLink := omit,//O
 			requestReachability := omit,//O
 			contentSerialization := omit,//O
 			e2eSecInfo := omit, //O
-			supportedReleaseVersions := {"2a"},//M
+			supportedReleaseVersions := omit,//O
 			choice := omit//NP
 		};	
     	
@@ -3387,7 +3387,7 @@ module OneM2M_Templates {
 			nodeLink := omit,
 			dynamicAuthorizationConsultationIDs := omit,
 			e2eSecInfo := omit, 
-			supportedReleaseVersions := {"2a"},//M
+			supportedReleaseVersions := omit,
 			choice := omit
 
 		};
@@ -3489,24 +3489,24 @@ module OneM2M_Templates {
 		 * @desc Base primitiveContent for UPDATE operation for ContentInstance resource
 		 */
 		template (value) ContentInstance_optional m_contentUpdateContentInstance := {
-			resourceName := omit,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			expirationTime := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			contentInfo := omit,//O
-			contentSize := omit,//NP
-			contentRef := omit, //O
-			ontologyRef := omit,//O
-			content := omit, //M
-			choice := omit //O
+			resourceName := omit,
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			expirationTime := omit,
+			announceTo := omit,
+			announcedAttribute := omit,
+			stateTag := omit,
+			creator := omit,
+			contentInfo := omit,
+			contentSize := omit,
+			contentRef := omit,
+			ontologyRef := omit,
+			content := omit,
+			choice := omit
 		};
 		
 		template (value) LocationPolicy_optional m_contentUpdateLocationPolicy (in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) := {
@@ -3536,49 +3536,49 @@ module OneM2M_Templates {
     	};
     	
     	template (value) Node_optional m_contentUpdateNode := {
-			resourceName := omit,
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			expirationTime := omit,
-			dynamicAuthorizationConsultationIDs := omit,
-			announceTo := omit,
-			announcedAttribute := omit,
-			nodeID := omit,
-			hostedCSELink := omit,
-			mgmtClientAddress := omit,
-			choice := omit
+			resourceName := omit,//NP
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			nodeID := omit,//O
+			hostedCSELink := omit,//NP
+			mgmtClientAddress := omit,//O
+			choice := omit//O
     	}
     	
     	template (value) RemoteCSE_optional m_contentUpdateRemoteCSE := {
-			resourceName := omit,
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			expirationTime := omit,
-			dynamicAuthorizationConsultationIDs := omit,
-			announceTo := omit,
-			announcedAttribute := omit,
-			cseType := omit,
-			pointOfAccess := omit,
-			cSEBase := omit,
-			cSE_ID := omit,
-			m2M_Ext_ID := omit,
-			trigger_Recipient_ID := omit,
-			requestReachability := omit,
-			nodeLink := omit,
-			triggerReferenceNumber := omit,
-			e2eSecInfo := omit,
+			resourceName := omit,//NP
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			cseType := omit,//NP
+			pointOfAccess := omit,//O
+			cSEBase := omit,//NP
+			cSE_ID := omit,//NP
+			m2M_Ext_ID := omit,//O
+			trigger_Recipient_ID := omit,//O
+			requestReachability := omit,//O
+			nodeLink := omit,//O
+			triggerReferenceNumber := omit,//O
+			e2eSecInfo := omit,//O
 			supportedReleaseVersions := omit,//O
-			choice := omit
+			choice := omit//O
     	}
     	
 		template (value) AEAnnc_optional m_contentUpdateAEAnnc := {