diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 9ac24596bf5cd1a6a7c420fecf2401f872fbda26..00de2b54823fe97c91ce6154c829c720b6f5dac3 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1,9283 +1,9337 @@
-/**
- *  Copyright Notification
- *  No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
- *  The copyright and the foregoing restriction extend to reproduction in all media.
- *  © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
- *  All rights reserved.
- *  
- *  @author     oneM2M
- *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- *              $Id: OneM2M_Templates.ttcn 356 2017-08-21 12:25:14Z reinaortega $
- *  @desc       Module containing templates for oneM2M
- *
- */
-module OneM2M_Templates {
-
-	import from XSD all;
-	import from OneM2M_Types all;
-	import from OneM2M_TypesAndValues all;
-	import from OneM2M_Pixits all;
-	//import from OneM2M_Functions all;
-	
-	import from OneM2M_Types_3GPP_T8 all;
-
-	/* Templates */
-	
-	group Primitives {
-    	/** 
-    	 * @desc Base template for request sending operations
-    	 * @param p_requestPrimitive
-    	 */
-    	template (value) MsgOut m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeAux_list p_forcedFields := omit) := {
-    		primitive := { requestPrimitive := p_requestPrimitive},
-    		host := "",
-    		xmlNamespace := PX_XML_NAMESPACE,
-    		protocolBinding := "",
-    		serialization := "", 
-    		forcedFields := p_forcedFields
-    	};
-    	
-		/** 
-		 * @desc Base template for response sending operations
-		 * @param p_responsePrimitive
-		 */
-		template (value) MsgOut m_response(in template (value) ResponsePrimitive p_responsePrimitive, in template (omit) AttributeAux_list p_forcedFields := omit) := {
-			primitive := { responsePrimitive := p_responsePrimitive},
-			host := "",
-			xmlNamespace := PX_XML_NAMESPACE,
-			protocolBinding := "",
-			serialization := "", 
-			forcedFields := p_forcedFields
-		};
-		
-		/** 
-		 * @desc Base template for response sending operations
-		 * @param p_responsePrimitive
-		 */
-		template (value) MsgOut m_httpResponse(in template (value) ResponsePrimitive p_responsePrimitive, in template (omit) AttributeAux_list p_forcedFields := omit) := {
-			primitive := { responsePrimitive := p_responsePrimitive},
-			host := "",
-			xmlNamespace := PX_XML_NAMESPACE,
-			protocolBinding := "",
-			serialization := "", 
-			forcedFields := p_forcedFields
-		};
-		
-		template MsgIn mw_request(in template RequestPrimitive p_requestPrimitive, template AttributeList_1 p_nullFields := *) := {
-			primitive := { requestPrimitive := p_requestPrimitive}, 
-			nullFields := p_nullFields
-		};
-    	
-		/** 
-		 * @desc Base template for response receiving operations
-		 * @param p_responsePrimitive
-		 */
-		template MsgIn mw_response(in template  ResponsePrimitive p_responsePrimitive := ?, template AttributeList_1 p_nullFields := *) := {
-			primitive := { responsePrimitive := p_responsePrimitive}, 
-			nullFields := p_nullFields
-		};
-    	
-	}//end of group primitives
-	
-	group RequestPrimitives { 
-		
-		group Retrieve {
-
-			/**
-			 * @desc Base RETRIEVE request primitive
-			 * @param p_targetResourceAddress Target resource address
-			 * @param p_originator Originator (from)
-			 */
-			template (value) RequestPrimitive m_retrieve(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
-				operation := int2,
-				to_ := p_targetResourceAddress,
-				from_ := p_originator,
-				requestIdentifier := "m_retrieve",
-				resourceType := omit,
-				primitiveContent := omit,
-				roleIDs := omit, 
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit,
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			};
-        	
-			/**
-			 * @desc RETRIEVE request primitive for child references
-			 * @param p_targetResourceAddress Target resource address
-			 * @param p_originator Originator (from)
-			 */
-			template (value) RequestPrimitive m_retrieveChildResourceRefs(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, template (omit) ResourceTypeList p_resourceTypeList := omit) modifies m_retrieve := {
-				filterCriteria := {
-					createdBefore := omit,
-					createdAfter := omit,
-					modifiedSince := omit,
-					unmodifiedSince := omit,
-					stateTagSmaller := omit,
-					stateTagBigger := omit,
-					expireBefore := omit,
-					expireAfter := omit,
-					labels := omit,
-					childLabels := omit,
-					parentLabels := omit,
-					labelsQuery := omit,
-					resourceType := p_resourceTypeList,
-					childResourceType := omit,
-					parentResourceType := omit,
-					sizeAbove := omit,
-					sizeBelow := omit,
-					contentType_list := {},
-					attribute_list := {},
-					childAttribute_list := {},
-					parentAttribute_list := {},
-					filterUsage := int1,
-					limit := omit,
-					semanticsFilter_list := {},
-					filterOperation := omit,
-					contentFilterSyntax := omit,
-					contentFilterQuery := omit,
-					level := omit,
-					offset := omit,
-					applyRelativePath := omit
-				}
-			};
-			
-			/**
-			 * @desc Base Receive RETRIEVE request primitive
-			 * @param p_targetResourceAddress Target resource address
-			 */
-			template RequestPrimitive mw_retrieve(template XSD.ID p_targetResourceAddress, template XSD.ID p_from := ?) := {
-				operation := int2,
-				to_ := p_targetResourceAddress,
-				from_ := p_from,
-				requestIdentifier := ?,
-				resourceType := omit,
-				primitiveContent := *,
-				roleIDs := *, 
-				originatingTimestamp := *,
-				requestExpirationTimestamp := *,
-				resultExpirationTimestamp := *,
-				operationExecutionTime := *,
-				responseType := *,
-				resultPersistence := *,
-				resultContent := *,
-				eventCategory := *,
-				deliveryAggregation := *,
-				groupRequestIdentifier := *,
-				filterCriteria := *,
-				desiredIdentifierResultType := *,
-				tokens := *,
-				tokenIDs := *,
-				localTokenIDs := *,
-				tokenRequestIndicator := *,
-				groupRequestTargetMembers := *,
-				authorSignIndicator := *,
-				authorSigns := *,
-				authorRelIndicator := *,
-				semanticQueryIndicator := *,
-				releaseVersionIndicator := ?,
-				vendorInformation := *
-			};
-        	
-			template RequestPrimitive mw_retrieveFormalOntology(template XSD.ID p_targetResourceAddress := ?, template XSD.ID p_from := ?, template XSD.AnyURI p_ontologyServerUri := ?) modifies mw_retrieve := {
-    		from_ := p_from,
-				requestIdentifier := ?,
-				primitiveContent := { flexContainer := mw_contentFlexContainer(p_ontologyServerUri) },
-				releaseVersionIndicator := "3"
-			};
-        	
-			/**
-			 * @desc RETRIEVE request primitive for a single attribute in To field ("targetResourceAddress#AttributeName")
-			 * @param p_targetResourceAddress Target resource address (including "#AttributeName")
-			 * @param p_originator Originator (from)
-			 */
-			template (value) RequestPrimitive m_retrieveAttributeToOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
-        		operation := int2,
-        		to_ := p_targetResourceAddress,
-        		from_ := p_originator,
-        		requestIdentifier := "m_retrieveResourceAttributeOptionTo",
-        		resourceType := omit,
-				primitiveContent := omit, 
-				roleIDs := omit,
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit,
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-        	};
-        	
-			/**
-			 * @desc RETRIEVE request primtive containing the target attributes in the primitiveContent field
-			 * @param p_targetResourceAddress Target resource address 
-			 * @param p_attributeList Target attribute list
-			 * @param p_originator Originator (from)
-			 */
-			template (value) RequestPrimitive m_retrieveAttributeContentOption(XSD.ID p_targetResourceAddress, in template (value) AttributeList_1 p_attributeList, in XSD.ID p_originator) := {
-				operation := int2,
-				to_ := p_targetResourceAddress,
-				from_ := p_originator,
-				requestIdentifier := "m_retrieveResourceAttributeContentOption",
-				resourceType := omit,
-				primitiveContent := {attributeList := p_attributeList},
-				roleIDs := omit,
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit,
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			};
-			
-			/**
-			  * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
-			  * @param p_targetResourceAddress Target resource address 
-			  * @param p_filterCriteria FilterCriteria
-			  * @param p_originator Originator (from)
-		     */
-			template (value) RequestPrimitive m_retrieveFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
-				requestIdentifier := "m_retrieveResourceFilterUsageOption",
-				filterCriteria := {
-					createdBefore := omit,
-					createdAfter := omit,
-					modifiedSince := omit,
-					unmodifiedSince := omit,
-					stateTagSmaller := omit,
-					stateTagBigger := omit,
-					expireBefore := omit,
-					expireAfter := omit,
-					labels := omit,
-					childLabels := omit,
-					parentLabels := omit,
-					labelsQuery := omit,
-					resourceType := omit,
-					childResourceType := omit,
-					parentResourceType := omit,
-					sizeAbove := omit,
-					sizeBelow := omit,
-					contentType_list := {},
-					attribute_list := {},
-					childAttribute_list := {},
-					parentAttribute_list := {},
-					filterUsage := int1,
-					limit := omit,
-					semanticsFilter_list := {},
-					filterOperation := omit,
-					contentFilterSyntax := omit,
-					contentFilterQuery := omit,
-					level := omit,
-					offset := omit,
-					applyRelativePath := omit
-				}
-			};
-			
-			/**
-			  * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
-			  * @param p_targetResourceAddress Target resource address 
-			  * @param p_filterCriteria FilterCriteria
-			  * @param p_originator Originator (from)
-			 */
-			template (value) RequestPrimitive m_retrieveFilterCriteria(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterCriteria p_filterCriteria) modifies m_retrieve := {
-				requestIdentifier := "m_retrieveResourceFilterUsageOption",
-				filterCriteria := p_filterCriteria
-			};
-			
-			/**
-			  * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
-			  * @param p_targetResourceAddress Target resource address 
-			  * @param p_originator Originator (from)
-			  * @param p_filterUsage FilterUsage
-			  * @param p_labels Labels
-			 */
-			template (value) RequestPrimitive m_retrieveFilterUsageOptionLabel(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage, in Labels p_labels) modifies m_retrieve := {
-				requestIdentifier := "m_retrieveResourceFilterUsageOptionLabel",
-				filterCriteria := {
-					createdBefore := omit,
-					createdAfter := omit,
-					modifiedSince := omit,
-					unmodifiedSince := omit,
-					stateTagSmaller := omit,
-					stateTagBigger := omit,
-					expireBefore := omit,
-					expireAfter := omit,
-					labels := p_labels,
-					childLabels := omit,
-					parentLabels := omit,
-					labelsQuery := omit,
-					resourceType := omit,
-					childResourceType := omit,
-					parentResourceType := omit,
-					sizeAbove := omit,
-					sizeBelow := omit,
-					contentType_list := {},
-					attribute_list := {},
-					childAttribute_list := {},
-					parentAttribute_list := {},
-					filterUsage := p_filterUsage, 
-					limit := omit,
-					semanticsFilter_list := {},
-					filterOperation := omit,
-					contentFilterSyntax := omit,
-					contentFilterQuery := omit,
-					level := omit,
-					offset := omit,
-					applyRelativePath := omit
-				}
-			};
-			/**
-			  * @desc RETRIEVE request primtive containing the Desired Identifier Result Type in the desiredIdentifierResultType field and Filter Criteria in the filterCriteria field
-			  * @param p_targetResourceAddress Target resource address 
-			  * @param p_filterCriteria FilterCriteria
-			  * @param p_originator Originator (from)
-			 */
-			template (value) RequestPrimitive m_retrieveDiscResTypeFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) DesIdResType p_desIdResType, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
-				requestIdentifier := "m_retrieveResourceFilterUsageOption",
-				filterCriteria := {
-					createdBefore := omit,
-					createdAfter := omit,
-					modifiedSince := omit,
-					unmodifiedSince := omit,
-					stateTagSmaller := omit,
-					stateTagBigger := omit,
-					expireBefore := omit,
-					expireAfter := omit,
-					labels := omit,
-					childLabels := omit,
-					parentLabels := omit,
-					labelsQuery := omit,
-					resourceType := omit,
-					childResourceType := omit,
-					parentResourceType := omit,
-					sizeAbove := omit,
-					sizeBelow := omit,
-					contentType_list := {},
-					attribute_list := {},
-					childAttribute_list := {},
-					parentAttribute_list := {},
-					filterUsage := p_filterUsage, 
-					limit := omit,
-					semanticsFilter_list := {},
-					filterOperation := omit,
-					contentFilterSyntax := omit,
-					contentFilterQuery := omit,
-					level := omit,
-					offset := omit,
-					applyRelativePath := omit
-				},
-				desiredIdentifierResultType := p_desIdResType
-			};
-			
-			/**
-			  * @desc RETRIEVE request primtive containing the Discovery Type in the desiredIdentifierResultType field and Filter Criteria in the filterCriteria field
-			  * @param p_targetResourceAddress Target resource address 
-			  * @param p_filterCriteria FilterCriteria
-			  * @param p_originator Originator (from)
-			 */
-			template (value) RequestPrimitive m_retrieveInvalidFormatOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
-				requestIdentifier := "m_retrieveResourceFilterUsageOption",
-				filterCriteria := {
-					createdBefore := omit,
-					createdAfter := omit,
-					modifiedSince := omit,
-					unmodifiedSince := omit,
-					stateTagSmaller := omit,
-					stateTagBigger := omit,
-					expireBefore := omit,
-					expireAfter := omit,
-					labels := omit,
-					childLabels := omit,
-					parentLabels := omit,
-					labelsQuery := omit,
-					resourceType := omit,
-					childResourceType := omit,
-					parentResourceType := omit,
-					sizeAbove := omit,
-					sizeBelow := omit,
-					contentType_list := {},
-					attribute_list := {},
-					childAttribute_list := {},
-					parentAttribute_list := {},
-					filterUsage := omit, 
-					limit := omit,
-					semanticsFilter_list := {},
-					filterOperation := omit,
-					contentFilterSyntax := omit,
-					contentFilterQuery := omit,
-					level := omit,
-					offset := omit,
-					applyRelativePath := omit
-				}
-			};
-			
-			/**
-			  * @desc RETRIEVE request primtive for polling request
-			  * @param p_targetResourceAddress Target resource address 
-			  * @param p_filterCriteria FilterCriteria
-			  * @param p_originator Originator (from)
-			 */
-			template (value) RequestPrimitive m_retrievePollingRequest(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
-				to_ := p_targetResourceAddress & "/pcu"
-			};
-			
-			/**
-			  * @desc FilterCriteria empty template
-			 */
-			template (value) FilterCriteria m_filterCriteria := {
-				createdBefore := omit,
-				createdAfter := omit,
-				modifiedSince := omit,
-				unmodifiedSince := omit,
-				stateTagSmaller := omit,
-				stateTagBigger := omit,
-				expireBefore := omit,
-				expireAfter := omit,
-				labels := omit,
-				childLabels := omit,
-				parentLabels := omit,
-				labelsQuery := omit,
-				resourceType := omit,
-				childResourceType := omit,
-				parentResourceType := omit,
-				sizeAbove := omit,
-				sizeBelow := omit,
-				contentType_list := {},
-				attribute_list := {},
-				childAttribute_list := {},
-				parentAttribute_list := {},
-				filterUsage := omit, 
-				limit := omit,
-				semanticsFilter_list := {},
-				filterOperation := omit,
-				contentFilterSyntax := omit,
-				contentFilterQuery := omit,
-				level := omit,
-				offset := omit,
-				applyRelativePath := omit
-			}
-			
-			
-			
-			
-			
-    	}//end group Retrieve
-
-    	group Update {
-    		
-    		template (value) RequestPrimitive m_update := {
-				operation := int3,
-				to_ := "NotInitialized",
-				from_ := "NotInitialized",
-				requestIdentifier := "m_update",
-				resourceType := omit,
-				primitiveContent:= omit,
-				roleIDs := omit, 
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit,
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			};
-        	
-						
-			template RequestPrimitive mw_update(template XSD.ID p_from := ?, template XSD.ID p_to := ?) := {
-				operation := int3,
-				to_ := p_to,
-				from_ := p_from,
-				requestIdentifier := ?,
-				resourceType := omit,
-				primitiveContent:= ?,
-				roleIDs := *, 
-				originatingTimestamp := *,
-				requestExpirationTimestamp := *,
-				resultExpirationTimestamp := *,
-				operationExecutionTime := *,
-				responseType := *,
-				resultPersistence := *,
-				resultContent := *,
-				eventCategory := *,
-				deliveryAggregation := *,
-				groupRequestIdentifier := *,
-				filterCriteria := *,
-				desiredIdentifierResultType := *, 
-				tokens := *,
-				tokenIDs := *,
-				localTokenIDs := *,
-				tokenRequestIndicator := *,
-				groupRequestTargetMembers := *,
-				authorSignIndicator := *,
-				authorSigns := *,
-				authorRelIndicator := *,
-				semanticQueryIndicator := *,
-				releaseVersionIndicator := ?,
-				vendorInformation := *
-			};
-        	
-			/**
-			 * @desc Base UPDATE request primitive for Ae resource
-			 */
-			template (value) RequestPrimitive m_updateAeBase modifies m_update:= {
-				requestIdentifier := "m_updateAe",
-				primitiveContent:= {aE := m_contentUpdateAe}
-			};
-        	
-			/**
-			 * @desc Reception template for update Ae resource
-			 */
-			template RequestPrimitive mw_updateAe(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
-				primitiveContent:= {aE := ?}
-			};
-			 
-        	
-			/**
-			 * @desc Base UPDATE request primitive for Container resource
-			 */
-			template (value) RequestPrimitive m_updateContainerBase modifies m_update:= {
-				requestIdentifier := "m_updateContainer",
-				primitiveContent:= {container := m_contentUpdateContainer}
-			};
-			
-			/**
-			 * @desc Base Reception template for update Container
-			 */
-			template RequestPrimitive mw_updateContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
-				primitiveContent := {container := ?}
-			}; 
-			
-			/**
-			 * @desc Base UPDATE request primitive for ContentInstance resource
-			 */
-			template (value) RequestPrimitive m_updateContentInstanceBase modifies m_update:= {
-				requestIdentifier := "m_updateContentInstance",
-				primitiveContent:= {contentInstance := m_contentUpdateContentInstance}
-			};
-			
-			/**
-			 * @desc Base UPDATE request primitive for AccessControlPolicy resource
-			 */        				
-			template (value) RequestPrimitive m_updateAcpBase modifies m_update := {
-				requestIdentifier := "m_updateAcp",
-				primitiveContent:= {accessControlPolicy := m_contentUpdateAcp}
-			};
-			
-			template (value) RequestPrimitive m_updateAcpPrivileges(in template(omit) SetOfAcrs p_privileges := omit, in template(omit) SetOfAcrs p_selfPrivileges := omit) modifies m_update := {
-				requestIdentifier := "m_updateAcp",
-				primitiveContent:= {accessControlPolicy := m_contentUpdateAcpPrivileges(p_privileges, p_selfPrivileges)}
-			};
-			
-			/**
-			 * @desc Base UPDATE request primitive for GenericInterworkingService resource
-			 */
-			template (value) RequestPrimitive m_updateGenericInterworkingServiceBase modifies m_update:= {
-				requestIdentifier := "m_updateGenericInterworkingService",
-				primitiveContent:= {genericInterworkingService := m_contentUpdateGenericInterworkingService}
-			};
-
-            /**
-			 * @desc Base UPDATE request primitive for GenericInterworkingService_invalid resource
-			 */
-			template (value) RequestPrimitive m_updateGenericInterworkingServiceBase_invalid modifies m_update:= {
-				requestIdentifier := "m_updateGenericInterworkingServiceInvalid",
-				primitiveContent:= {genericInterworkingService_invalid := m_contentUpdateGenericInterworkingService_invalid}
-			};
-
-            /**
-			 * @desc Base UPDATE request primitive for Group resource
-			 */
-			template (value) RequestPrimitive m_updateGroupBase modifies m_update := {
-				requestIdentifier := "m_updateGroup",
-				primitiveContent:= {group_ := m_contentUpdateGroup}
-			};
-			
-			/**
-			 * @desc Base UPDATE request primitive for CSEBase resource
-			 */
-			template (value) RequestPrimitive m_updateCSEBaseBase modifies m_update := {
-				requestIdentifier := "m_updateGroup",
-				primitiveContent:= {cSEBase := m_contentUpdateCSEBase}
-			};
-			
-			/**
-			 * @desc Base UPDATE request primitive for Schedule resource
-			 */
-			template (value) RequestPrimitive m_updateScheduleBase modifies m_update := {
-				requestIdentifier := "m_updateSchedule",
-				primitiveContent:= {schedule := m_contentUpdateSchedule}
-			};
-			
-			/**
-			 * @desc Base UPDATE request primitive for PollingChannel resource
-			 */
-			template (value) RequestPrimitive m_updatePollingChannelBase modifies m_update := {
-				requestIdentifier := "m_updatePollingChannel",
-				primitiveContent:= {pollingChannel := m_contentUpdatePollingChannel}
-			};
-			
-			/**
-			 * @desc Base UPDATE request primitive for Subscription resource
-			 */
-			template (value) RequestPrimitive m_updateSubscriptionBase modifies m_update := {
-				requestIdentifier := "m_updateSubscription",
-				primitiveContent:= {subscription := m_contentUpdateSubscription}
-			};
-			
-			template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) modifies m_update := {
-        	  	to_ 				:= p_locResourceAddress,
-        	  	requestIdentifier	:= "m_updateLocationPolicy",
-        	  	primitiveContent	:= {locationPolicy := m_contentUpdateLocationPolicy(p_accessControlPolicyIds, p_locationUpdatePeriod)}
-			  };
-        	
-        	template (value) RequestPrimitive m_updateNodeBase modifies m_update := {
-				requestIdentifier := "m_updateNode",
-				primitiveContent:= {node := m_contentUpdateNode}
-        	}
-        	
-        	template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
-			   requestIdentifier := "m_updateRemoteCSEBase",
-        	   primitiveContent := {remoteCSE := m_contentUpdateRemoteCSE}
-        	}
-
-			/**
-			 * @desc Reception template for update remoteCSE resource
-			 */
-			template RequestPrimitive mw_updateRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
-				primitiveContent:= {remoteCSE := ?}
-			};
-			       	
-			template (value) RequestPrimitive m_updateAEAnncBase modifies m_update:= {
-				requestIdentifier := testcasename() & "-m_updateAEAnnc",
-				primitiveContent := {aEAnnc := m_contentUpdateAEAnnc}
-			};
-			
-			template RequestPrimitive mw_updateAEAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update:= {
-				primitiveContent := {aEAnnc := ?}
-			};
-
-            /**
-			 * @desc Base Reception template for update ContainerAnnc
-			 */
-			template RequestPrimitive mw_updateContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
-				primitiveContent := {containerAnnc := ?}
-			}; 
-			
-			/**
-			 * @desc Base Reception template for update GroupAnnc
-			 */
-			template RequestPrimitive mw_updateGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
-				primitiveContent := {groupAnnc := ?}
-			}; 
-			
-			/**
-			 * @desc Base Reception template for update AccessControlPolicyAnnc
-			 */
-			template RequestPrimitive mw_updateAccessControlPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
-				primitiveContent := {accessControlPolicyAnnc := ?}
-			};
-			
-			
-			/**
-			 * @desc Base UPDATE request primitive for Semantic Descriptor resource
-			 */
-			template (value) RequestPrimitive m_updateSemanticDescriptorBase modifies m_update := {
-				requestIdentifier := "m_updateSemanticDescriptor",
-				primitiveContent:= {semanticDescriptor := m_contentUpdateSemanticDescriptor}
-			};	
-			
-		   /**
-			 * @desc Base UPDATE request primitive for Semantic Descriptor resource. Reusing m_contentCreateSemanticMashupJobProfile.
-			 */
-			template (value) RequestPrimitive m_updateSemanticMashupJobProfileBase modifies m_update := {
-				requestIdentifier := "m_updateSemanticMashupJobProfileBase",
-				primitiveContent:= {semanticMashupJobProfile := m_contentUpdateSemanticMashupJobProfile}
-			};			
-			
-			/**
-			 * @desc Base UPDATE request primitive for SemanticMashupInstance resource
-			 */
-			template (value) RequestPrimitive m_updateSemanticMashupInstanceBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createSemanticMashupInstance",
-				resourceType := int41,
-				primitiveContent := {semanticMashupInstance := m_contentUpdateSemanticMashupInstance }
-			};
-			 	
-			
-			/**
-			 * @desc Base UPDATE request primitive for TimeSeries resource
-			 */
-			template (value) RequestPrimitive m_updateTimeSeriesBase modifies m_update := {
-				requestIdentifier := "m_updateTimeSeries",
-				primitiveContent:= {timeSeries := m_contentUpdateTimeSeries}
-			};
-			
-			/**
-			 * @desc Base UPDATE request primitive for TimeSeriesInstance resource
-			 */
-			template (value) RequestPrimitive m_updateTimeSeriesInstanceBase modifies m_update:= {
-				requestIdentifier := "m_updateTimeSeriesInstance",
-				primitiveContent:= {timeSeriesInstance := m_contentUpdateTimeSeriesInstance}
-			};		
-			
-			/**
-			 * @desc Base Reception template for update TimeSeriesAnnc
-			 */
-			template RequestPrimitive mw_updateTimeSeriesAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
-				primitiveContent := {timeSeriesAnnc := ?}
-			}; 
-			
-			/**
-			 * @desc Base UPDATE request primitive for Role resource
-			 */
-			template (value) RequestPrimitive m_updateRoleBase modifies m_update:= {
-				requestIdentifier := "m_updateRole",
-				primitiveContent:= {role := m_contentUpdateRole}
-			};
-			
-			
-    	}//end group Update
-    	
-    	group Create {
-
-			template (value) RequestPrimitive m_create := {
-				operation := int1,
-				to_ := "NotInitialized",
-				from_ := "NotInitialized",
-				requestIdentifier := testcasename() & "-m_create",
-				resourceType := omit,
-				primitiveContent := omit,
-				roleIDs := omit,
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit,
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-
-			};
-        	
-			/**
-			 * @desc Base Reception template for create operation
-			 */
-			template RequestPrimitive mw_create(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
-				operation := int1,
-				to_ := p_to,
-				from_ := p_from,
-				requestIdentifier := ?,
-				resourceType := ?,
-				primitiveContent := ?,
-				roleIDs := *,
-				originatingTimestamp := *,
-				requestExpirationTimestamp := *,
-				resultExpirationTimestamp := *,
-				operationExecutionTime := *,
-				responseType := *,
-				resultPersistence := *,
-				resultContent := *,
-				eventCategory := *,
-				deliveryAggregation := *,
-				groupRequestIdentifier := *,
-				filterCriteria := *,
-				desiredIdentifierResultType := *,
-				tokens := *,
-				tokenIDs := *,
-				localTokenIDs := *,
-				tokenRequestIndicator := *,
-				groupRequestTargetMembers := *,
-				authorSignIndicator := *,
-				authorSigns := *,
-				authorRelIndicator := *,
-				semanticQueryIndicator := *,
-				releaseVersionIndicator := ?,
-				vendorInformation := *
-			}
-			
-			/**
-			 * @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)
-			}
-			
-			/**
-			 * @desc CREATE request primitive for AEAnnc resource
-			 * @param p_accessControlPolicyIds
-			 * @param p_to
-			 * @param p_from
-			 * @param p_appId
-			 * @param p_stemId
-			 */
-			template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_appId, XSD.AnyURI p_link := "NotInitialized") modifies m_create:= {
-				from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
-				requestIdentifier := testcasename() & "-m_createAEAnnc",
-				resourceType := int10002,
-				primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, p_link)}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for AEAnnc resource
-			 * @param p_accessControlPolicyIds
-			 * @param p_to
-			 * @param p_from
-			 * @param p_appId
-			 * @param p_stemId
-			 */
-			template (value) RequestPrimitive m_createAEAnncBase modifies m_create:= {
-				requestIdentifier := testcasename() & "-m_createAEAnnc",
-				resourceType := int10002,
-				primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, omit, -, -)}
-			};
-			
-			/**
-			 * @desc Reception template for CREATE AEAnnc for registration when AE-ID-Stem starts with S
-			 */
-			template RequestPrimitive mw_createAEAnnc_s_ae_id(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_createAnnc := {				
-				primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
-			};
-
-			/**
-			 * @desc Reception template for CREATE AEAnnc as announced resource
-			 */
-			template RequestPrimitive mw_createAEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := *, template XSD.AnyURI p_link := ?) modifies mw_create := {				
-				resourceType := int10002,
-				primitiveContent := {aEAnnc := mw_contentCreateAEAnnc(-, p_accessControlPolicyIds)}
-			};
-			
-			template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := PX_TS_AE1.aeIdStem, template (omit) ResourceName p_resourceName :=  c_defaultAe1ResourceName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
-				from_ := p_from,//It should be used either omit, or "s", or "c"
-				requestIdentifier := testcasename() & "-m_createAe",
-				resourceType := int2,
-				primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds,p_resourceName, p_appId, p_poaList)}
-			};
-        	
-			/**
-			 * @desc Reception template for AE registration
-			 */
-			template  RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?, template AE_optional p_ae := mw_contentCreateAeBase) modifies mw_create := {
-				resourceType := int2,
-				primitiveContent := {aE := p_ae}
-			};  
-			        	
-			/**
-			 * @desc Base CREATE request primitive for AccessControlPolicy resource
-			 */
-			template (value) RequestPrimitive m_createAcpBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createAcp",
-				resourceType := int1,
-				primitiveContent := {accessControlPolicy := m_contentCreateAcp ()}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for AccessControlPolicyAnnc resource
-			 */
-			template (value) RequestPrimitive m_createAcpAnncBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createAcpAnnc",
-				resourceType := int10001,
-				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 := {
-				requestIdentifier := testcasename() & "-m_createAcp",
-        		resourceType := int1,
-        		primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
-        	};
-        	
-			/**
-			 * @desc Reception template for CREATE AcpAnnc
-			 */
-			template RequestPrimitive mw_createAccessControlPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				to_ := p_to,
-				from_ := p_from,
-				resourceType := int10001,
-				primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnncBase(-)}
-			};
-        	
-			/**
-			  * @desc Reception template for CREATE AcpAnnc
-			  */
-			template RequestPrimitive mw_createRemoteCSEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?) modifies mw_createAnnc := {
-				resourceType := int10016,
-				primitiveContent := {remoteCSEAnnc := mw_contentCreateRemoteCSEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
-			};
-       	
-			/**
-			 * @desc Base CREATE request primitive for CSEBase resource
-			 */
-			template (value) RequestPrimitive m_createCSEBaseBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createCSEBase",
-				resourceType := int5,
-				primitiveContent := {cSEBase := m_contentCreateCSEBase}
-			};
-			
-			/**
-			  * @desc Base CREATE request primitive for CSEBaseAnnc resource
-			  */
-			template RequestPrimitive m_createCSEBaseAnncBase(template (value) XSD.ID p_from := PX_TS_CSE1.cseId, template (omit) AcpType p_accessControlPolicyIds := omit, XSD.AnyURI p_link := "NotInitialized") modifies m_create := {
-				from_ := p_from,
-				resourceType := int10005,
-				primitiveContent := {cSEBaseAnnc := m_contentCreateCSEBaseAnnc(-, p_accessControlPolicyIds, p_link)}
-			}
-        	
-        	/**
-			  * @desc Reception template for CREATE CSEBaseAnnc
-			  */
-			template RequestPrimitive mw_createCSEBaseAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?) modifies mw_createAnnc := {
-				resourceType := int10005,
-				primitiveContent := {cSEBaseAnnc := mw_contentCreateCSEBaseAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
-			};
-        	
-       	
-			/**
-			 * @desc Base CREATE request primitive for Container resource
-			 */
-			template (value) RequestPrimitive m_createContainerBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createContainer",
-				resourceType := int3,
-				primitiveContent := {container := m_contentCreateContainer}
-			};
-			
-			/**
-			 * @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 := {
-				requestIdentifier := testcasename() & "-m_createDynamicAuthorizationConsultation",
-				resourceType := int34,
-				primitiveContent := {dynamicAuthorizationConsultation := m_contentDynamicAuthorizationConsultation(p_dyn_auth_enabled, p_name)}
-			};
-			
-			
-			/**
-			 * @desc Base CREATE request primitive for ContainerAnnc resource
-			 */
-			template (value) RequestPrimitive m_createContainerAnncBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createContainerAnnc",
-				resourceType := int10003,
-				primitiveContent := {containerAnnc := m_contentCreateContainerAnnc}
-			};
-			       	
-			/**
-			 * @desc Base CREATE request primitive for Container resource using Container_update_invalid
-			 */
-			template (value) RequestPrimitive m_createContainerBaseInvalid modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createContainer",
-				resourceType := int3,
-				primitiveContent := {container_invalid := m_contentCreateContainerInvalid}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for remoteCSE resource
-			 */
-			template (value) RequestPrimitive m_createRemoteCSEBase(template (value) XSD.ID p_from := PX_TS_CSE1.cseId, template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName :=  c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId) modifies m_create := {
-				from_ := p_from,//Originator CSE-ID
-				requestIdentifier := testcasename() & "-m_createRemoteCSE",
-				resourceType := int16,
-				primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase)}
-			};
-			
-			/**
-			 * @desc CREATE request primitive for remoteCSE resource with poa
-			 */
-			template (value) RequestPrimitive m_createRemoteCSE_poa(template (value) XSD.ID p_from := PX_TS_CSE1.cseId, template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName :=  c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName, in template (omit) XSD.ID p_cSE_ID := PX_TS_CSE1.cseId, in PoaList p_poaList) modifies m_createRemoteCSEBase := {
-				primitiveContent := {remoteCSE := m_contentCreateRemoteCSE_poa(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_poaList)}
-			};
-			
-			/**
-			 * @desc Base reception template for CREATE RemoteCSE
-			 */
-			template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int16,
-				primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for remoteCSEAnnc resource
-			 */
-			template (value) RequestPrimitive m_createRemoteCSEAnncBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createRemoteCSEAnnc",
-				resourceType := int10016,
-				primitiveContent := {remoteCSEAnnc := m_contentCreateRemoteCSEAnnc}
-			};			
-			
-			/**
-			 * @desc CREATE request primitive for Container resource wiht no resourceName provided
-			 */
-			template (value) RequestPrimitive m_createContainer_noResourceName modifies m_createContainerBase := {
-				primitiveContent := {container := m_contentCreateContainer(omit)}
-			};
-	
-    		template (value) RequestPrimitive m_createContainer(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_resourceName := c_defaultContainerResourceName) modifies m_create := {
-    			to_ := p_parentResourceAddress,
-				requestIdentifier := testcasename() & "-m_createContainer",
-    			resourceType := int3,
-    			primitiveContent := {container := m_contentCreateContainer(p_resourceName)}
-    		};
-        	
-			/**
-			 * @desc Reception template for CREATE Container
-			 */
-			template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int3,
-				primitiveContent := {container := mw_contentCreateContainerBase}
-			};  
-			
-			/**
-			 * @desc Base Reception template for CREATE ContainerAnnc
-			 */
-			template RequestPrimitive mw_createContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				resourceType := int10003,
-				primitiveContent := {containerAnnc := mw_contentCreateContainerAnncBase}
-			};
-			
-			/**
-			 * @desc Reception template for CREATE FlexContainer
-			 */
-			template RequestPrimitive mw_createFlexContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {flexContainer := ?}
-			};  
-			
-			/**
-			 * @desc Base CREATE request primitive for GenericInterworkingService resource
-			 */
-			template (value) RequestPrimitive m_createGenericInterworkingServiceBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createGenericInterworkingService",
-				resourceType := int28,
-				primitiveContent := {genericInterworkingService := m_contentCreateGenericInterworkingService()}
-			};
-
-            /**
-			 * @desc Reception template for CREATE GenericInterworkingOperationInstance
-			 */
-			template RequestPrimitive mw_createGenericIwkOpInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28,  // FIXME: not found in TS004
-				primitiveContent := {genericInterworkingOperationInstance := ?}
-			}; 
-        	
-			/**
-			 * @desc Base CREATE request primitive for Content Instance resource
-			 */
-			template (value) RequestPrimitive m_createContentInstanceBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createContentInstance",
-				resourceType := int4,
-				primitiveContent := {contentInstance := m_contentCreateContentInstance}
-			};
-				
-			/**
-			 * @desc Base CREATE request primitive for ContentInstanceAnnc resource
-			 */
-			template (value) RequestPrimitive m_createContentInstanceAnncBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createContentInstanceAnnc",
-				resourceType := int10004,
-				primitiveContent := {contentInstanceAnnc := m_contentCreateContentInstanceAnnc}
-			};
-				
-			/**
-			 * @desc CREATE request primitive for Content Instance resource with no resourceName provided
-			 */
-			template (value) RequestPrimitive m_createContentInstance_noResourceName modifies m_createContentInstanceBase := {
-				primitiveContent := {contentInstance := m_contentCreateContentInstance(omit)}
-			};
-    		
-    		template (value) RequestPrimitive m_createContentInstance(XSD.ID p_parentResourceAddress, XSD.String p_primitiveContent) modifies m_create := {
-    			to_ := p_parentResourceAddress,
-    			from_ := "admin:admin",
-				requestIdentifier := testcasename() & "-m_createContentInstance",
-    			resourceType := int4,
-    			primitiveContent := {contentInstance := m_contentCreateContentInstance(-, p_primitiveContent)}
-    		};
-    		
-			/**
-			 * @desc Reception template for CREATE ContentInstanceAnnc
-			 */
-			template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				resourceType := int10004,
-				primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
-			};  
-			
-			/**
-			 * @desc Reception template for CREATE ContentInstance
-			 */
-			template RequestPrimitive mw_createContentInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int4,
-				primitiveContent := {contentInstance := mw_contentCreateContentInstanceBase}
-			}; 
-			
-			/**
-			 * @desc Base CREATE request primitive for Delivery resource
-			 */
-			/*template (value) RequestPrimitive m_createDeliveryBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createDelivery" & f_rnd(1, 1000000),
-				resourceType := int6,
-				primitiveContent := {delivery := m_contentCreateDelivery()}
-			};*/
-        	    		
-       	
-			/**
-			 * @desc Base CREATE request primitive for Group resource
-			 */
-			template (value) RequestPrimitive m_createGroupBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createGroup",
-				resourceType := int9,
-				primitiveContent := {group_ := m_contentCreateGroup (1, {"NotInitialized"}, omit, omit)}	//TODO: p_resourceId
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for GroupAnnc resource
-			 */
-			template (value) RequestPrimitive m_createGroupAnncBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createGroupAnnc",
-				resourceType := int10009,
-				primitiveContent := {groupAnnc := m_contentCreateGroupAnnc (1, {"NotInitialized"}, omit, omit)}	//TODO: p_resourceId
-			};
-        	
-        	template (value) RequestPrimitive m_createGroup(in template (value) XSD.NonNegativeInteger p_maxNrOfMembers,
-															in template (value) ListOfURIs p_memberIds := {"NotInitialized"},
-															in template (omit) AcpType p_accessControlPolicyIds,
-															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 := {
-				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
-        	};
-        	
-			/**
-			 * @desc Reception template for CREATE Group
-			 */
-			template  RequestPrimitive mw_createGroup(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int9,
-				primitiveContent := {group_ := mw_contentCreateGroupBase}
-			};  
-			  	
-			/**
-			 * @desc Reception template for CREATE GroupAnnc
-			 */
-			template RequestPrimitive mw_createGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				resourceType := int10009,
-				primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
-			};  
-			
-			/**
-			 * @desc Base CREATE request primitive for MgmtCmd resource
-			 */
-			template (value) RequestPrimitive m_createMgmtCmdBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createMgmtCmd",
-				resourceType := int12,
-				primitiveContent := {mgmtResource := m_contentCreateMgmtCmd (-,-)}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for MgmtObj resource
-			 */
-			template (value) RequestPrimitive m_createMgmtObjBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createMgmtObj",
-				resourceType := int13,
-				primitiveContent := {mgmtResource := m_contentCreateMgmtObj (-,-)}
-			};
-        	
-			/**
-			 * @desc CREATE request primitive for MgmtObj resource
-			 */
-			template (value) RequestPrimitive m_createMgmtObj modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createMgmtObj",
-				resourceType := int13,
-				primitiveContent := {mgmtResource := m_contentCreateMgmtObj (-, -)}
-			};
-        	
-			/**
-			 * @desc Reception template for CREATE MgmtObjAnnc
-			 */
-			template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				resourceType := int10013,
-				primitiveContent := {announcedMgmtResource := mw_contentCreateMgmtObjAnncBase}
-			};  
-			
-			/**
-			 * @desc Base CREATE request primitive for Node resource
-			 */
-			template (value) RequestPrimitive m_createNodeBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createNode",
-				resourceType := int14,
-				primitiveContent := {node := m_contentCreateNode(-, -, -) }
-			};
-        	
-			/**
-			 * @desc CREATE request primitive for Node resource
-			 */
-			template (value) RequestPrimitive m_createNode modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createNode",
-				resourceType := int14,
-				primitiveContent := {node := m_contentCreateNode(-,-,-) }
-			};
-        	
-			/**
-			 * @desc Reception template for CREATE NodeAnnc
-			 */
-			template RequestPrimitive mw_createNodeAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				resourceType := int10014,
-				primitiveContent := {nodeAnnc := mw_contentCreateNodeAnncBase}
-			};  
-       	
-			/**
-			 * @desc Base CREATE request primitive for PollingChannel resource
-			 */
-			template (value) RequestPrimitive m_createPollingChannelBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createPollingChannel",
-				resourceType := int15,
-				primitiveContent := {pollingChannel := m_contentCreatePollingChannel (-)}
-			};
-        	
-        	template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_parentResourceAddress, in template (value)XSD.ID p_originatorId) modifies m_create := {
-        		to_ := p_parentResourceAddress,
-        		from_ := p_originatorId,
-				requestIdentifier := testcasename() & "-m_createPollingChannel",
-        		resourceType := int15,
-        		primitiveContent := {pollingChannel := m_contentCreatePollingChannel ()}
-        	};
-        	
-			template RequestPrimitive mw_createPollingChannel(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				to_ := p_to,
-				from_ := p_from,
-				primitiveContent := {pollingChannel := mw_contentCreatePollingChannel}
-			};
-        	
-			/**
-			 * @desc Base CREATE request primitive for Schedule resource
-			 */
-        	template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createSchedule",
-        		resourceType := int18,
-				primitiveContent := {schedule := m_contentCreateSchedule ({{"* * * * * * *"}})}
-        	};
-        	
-			/**
-			 * @desc Base CREATE request primitive for ScheduleAnnc resource
-			 */
-        	template (value) RequestPrimitive m_createScheduleAnncBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createScheduleAnnc",
-        		resourceType := int10018,
-				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 := {
-        		to_ := p_parentResourceAddress,
-				requestIdentifier := testcasename() & "-m_createSchedule",
-        		resourceType := int18,
-        		primitiveContent := {schedule := m_contentCreateSchedule (p_scheduleElement, p_name)}
-        	};
-        	
-			/**
-			 * @desc Reception template for CREATE ScheduleAnnc
-			 */
-			template RequestPrimitive mw_createScheduleAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				resourceType := int10018,
-				primitiveContent := {scheduleAnnc := mw_contentCreateScheduleAnncBase}
-			};  
-			
-			template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
-				resourceType := int19,//FIXME Is this the correct value?
-				primitiveContent := {serviceSubscribedAppRule := m_contentCreateServiceSubscribedAppRule (p_applicableCredIDs, p_allowedAppIDs, p_allowedAEs)}
-			};
-        	
-			/**
-			 * @desc Base CREATE request primitive for ServiceSubscribedAppRule Resource
-			 */
-			template (value) RequestPrimitive m_createServiceSubscribedAppRuleBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRuleBase",
-				resourceType := int19,
-				primitiveContent := {serviceSubscribedAppRule := m_contentCreateServiceSubscribedAppRuleBase}
-			};
-       	
-			/**
-			 * @desc Base CREATE request primitive for ServiceSubscribedNode Resource
-			 */
-			template (value) RequestPrimitive m_createServiceSubscribedNode modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createServiceSubscribedNode",
-				resourceType := int20,
-				primitiveContent := {serviceSubscribedNode := m_contentServiceSubscribedNode}
-			};
-			       	
-			/**
-			 * @desc Base CREATE request primitive for Subscription resource
-			 */
-			template (value) RequestPrimitive m_createSubscriptionBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createSubscription",
-				resourceType := int23,
-				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 := {
-        		to_ := p_to,
-				requestIdentifier := testcasename() & "-m_createSubscription",
-        		resourceType := int23,
-        		primitiveContent := {subscription := m_contentCreateSubscription (p_notificationURI, p_name)}
-        	};
-        	
-        	/**
-			 * @desc Reception template for CREATE Subscription
-			 */
-			template RequestPrimitive mw_createSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int23,
-				primitiveContent := {subscription := mw_contentCreateSubscriptionBase}
-			};
-        	
-
-			/**
-			 * @desc Base CREATE request primitive for OntologyRepository resource
-			 */        	
-			template (value) RequestPrimitive m_createOntologyRepositoryBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createOntologyRepository",
-				resourceType := int38,
-				primitiveContent := {ontologyRepository := m_contentCreateOntologyRepository }
-			};
-			
-		    /**
-			 * @desc Base CREATE request primitive for Ontology resource
-			 */        	
-			template (value) RequestPrimitive m_createOntologyBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createOntologyRepository",
-				resourceType := int39,
-				primitiveContent := {ontology := m_contentCreateOntology }
-			};
-
-			/**
-			 * @desc Base CREATE request primitive for SemanticDescriptor resource
-			 */        	
-			template (value) RequestPrimitive m_createSemanticDescriptorBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createSemanticDescriptor",
-				resourceType := int24,
-				primitiveContent := {semanticDescriptor := m_contentCreateSemanticDescriptor }
-			};
-        	
-			/**
-			 * @desc Base CREATE request primitive for SemanticMashupJobProfile resource
-			 */        	
-			template (value) RequestPrimitive m_createSemanticMashupJobProfileBase (in template (value) Sparql p_memberFilter := c_defaultMmemberFilter,
-			                                                                        in template (value) XSD.Base64Binary p_outputDescriptor := int2oct(0,65537),
-			                                                                        in template (value) XSD.Base64Binary p_functionDescriptor := int2oct(0,65537) ) modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createSemanticMashupJobProfile",
-				resourceType := int40,
-				primitiveContent := {semanticMashupJobProfile := m_contentCreateSemanticMashupJobProfile (p_memberFilter, p_outputDescriptor, p_functionDescriptor) }
-			};
-
-        	/**
-			 * @desc Base CREATE request primitive for SemanticMashupInstance resource
-			 */
-			template (value) RequestPrimitive m_createSemanticMashupInstanceBase (in XSD.AnyURI p_smjpID := "/AEID",
-			                                                                      in XSD.Base64Binary p_smjpInputParameter := '1234'O,
-			                                                                      in MashupMemberStoreType p_memberStoreType := int1,
-			                                                                      in MashupResultGenType p_mashupMember := int2) modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createSemanticMashupInstance",
-				resourceType := int41,
-				primitiveContent := {semanticMashupInstance := m_contentCreateSemanticMashupInstance (p_smjpID, p_smjpInputParameter, p_memberStoreType, p_mashupMember) }
-			};
-			
-			
-			/**
-			 * @desc Base CREATE request primitive for SemanticMashupResult resource
-			 */
-			template (value) RequestPrimitive m_createSemanticMashupResultBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createsemanticMashupResult",
-				resourceType := int42,
-				primitiveContent := {semanticMashupResult := m_contentCreateSemanticMashupResult}
-			};
-        	
-			template (value) RequestPrimitive m_createSubscriptionAdvanced(	template (omit) XSD.ID p_to := "NotInitialized", 
-																		   in template (omit)  XSD.String 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,
-																		   in template (omit) BatchNotify p_batchNotify := omit,
-																		   in template (omit) XSD.Boolean p_latestNotify := omit,
-																		   in template (omit) XSD.AnyURI p_subscriberURI := omit,
-																		   in template (omit) NotificationContentType p_notificationContentType := int1,
-			                                                               in template (omit) PendingNotification p_pendingNotification) modifies m_createSubscription := {
-				primitiveContent := {subscription := m_contentCreateSubscriptionAdvanced (p_notificationURI, p_name, p_eventNotificationCriteria, p_expirationCounter, p_batchNotify, p_latestNotify, p_subscriberURI, p_notificationContentType, p_pendingNotification)}
-			};
-        	
-        	/**
-			 * @desc Base CREATE request primitive for Location Policy resource
-			 */
-			template (value) RequestPrimitive m_createLocationPolicyBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createLocationPolicy",
-				resourceType := int10,
-				primitiveContent := {locationPolicy := m_contentCreateLocationPolicyBase}
-			};
-        	
-			template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) ListOfDuration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
-        		
-				requestIdentifier	:= testcasename() & "-m_createLocationPolicy", //the requestIdentifier is supposed to be set similar as "C190XX7T/001"  by prepending the AE-ID-Stem and slash(‘/’) in front of it
-        	  	resourceType		:= int10,
-        	  	primitiveContent	:= {locationPolicy := m_contentCreateLocationPolicy(p_locationSource, p_accessControlPolicyIds, p_locationUpdatePeriod, p_locationTargetID, p_locationServerAddress) },
-			  	resultContent := int1//default
-        	};
-        	
-			/**
-			 * @desc Reception template for CREATE LocationPolicyAnnc
-			 */
-			template RequestPrimitive mw_createLocationPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				resourceType := int10010,
-				primitiveContent := {locationPolicyAnnc := mw_contentCreateLocationPolicyAnncBase}
-			}; 
-			
-        	template (value) RequestPrimitive m_createNotification(in template (value) Representation p_resourcePresentation, in template (omit)NotificationEventType p_notifEventType, in template (omit) XSD.AnyURI p_subscriptionReference, in template (omit) XSD.AnyURI p_notifForwardingURI) modifies m_create := {
-			  requestIdentifier	:= testcasename() & "-m_createNotification",
-        	  primitiveContent	:= {notification := m_contentCreateNotification(p_resourcePresentation, p_notifEventType, p_subscriptionReference, p_notifForwardingURI)},
-        	  resultContent		:= int1 //default
-        	  
-        	};
-        	
-			/**
-			 * @desc Reception template for SemanticDescriptor creation
-			 */
-			template RequestPrimitive mw_createSemanticDescriptor(template XSD.ID p_from := *, template XSD.ID p_to := ?, template SemanticDescriptor_optional p_semanticDescriptor := mw_contentCreateSemanticDescriptor) modifies mw_create := {
-				resourceType := int24,
-				primitiveContent := {semanticDescriptor := p_semanticDescriptor}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for Stats Config resource
-			 */
-			template (value) RequestPrimitive m_createStatsConfigBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createStatsConfig",
-				resourceType := int22,
-				primitiveContent := {statsConfig := m_contentCreateStatsConfigBase}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for Stats Config resource
-			 */
-			template (value) RequestPrimitive m_createStatsCollectBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createStatsCollect",
-				resourceType := int21,
-				primitiveContent := {statsCollect := m_contentCreateStatCollectBase}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for M2mServiceSubscriptionProfile resource
-			 */
-			template (value) RequestPrimitive m_createM2mServiceSubscriptionProfileBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createM2mServiceSubscriptionProfile",
-				resourceType := int11,
-				primitiveContent := {m2mServiceSubscriptionProfile := m_contentCreatem2mServiceSubscriptionProfileBase}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for timeSeries resource
-			 */
-			template (value) RequestPrimitive m_createTimeSeriesBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createTimeSeries",
-				resourceType := int29,
-				primitiveContent := {timeSeries := m_contentCreateTimeSeries ()}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for timeSeriesAnnc resource
-			 */
-			template (value) RequestPrimitive m_createTimeSeriesAnncBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createTimeSeriesAnnc",
-				resourceType := int10029,
-				primitiveContent := {timeSeriesAnnc := m_contentCreateTimeSeriesAnnc}
-			};
-        	
-			template (value) RequestPrimitive m_createTimeSeries(in template (omit)  XSD.String p_name := c_defaultTimeSeriesResourceName,
-																 in XSD.Boolean p_missingDataDetect := true,
-																 in XSD.NonNegativeInteger p_periodicInterval := 5000,
-																 in XSD.NonNegativeInteger p_missingDataMaxNr := 5, 
-																 in XSD.NonNegativeInteger p_missingDataDetectTimer := 2000) modifies m_createTimeSeriesBase := {
-				primitiveContent := {timeSeries := m_contentCreateTimeSeriesAttributes (p_name, p_missingDataDetect, p_periodicInterval, p_missingDataMaxNr, p_missingDataDetectTimer)}
-			};
-        	
-			/**
-			 * @desc Reception template for CREATE timeSeries
-			 */
-			template RequestPrimitive mw_createTimeSeries(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int29,
-				primitiveContent := {timeSeries := ?}
-			};
-			
-			/**
-			 * @desc Base CREATE request primitive for timeSeriesInstance resource
-			 */
-			template (value) RequestPrimitive m_createTimeSeriesInstanceBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createTimeSeriesInstance",
-				resourceType := int30,
-				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 := {
-				to_ := p_parentResourceAddress,
-				requestIdentifier := testcasename() & "-m_createTimeSeriesInstance",
-				resourceType := int30,
-				primitiveContent := {timeSeriesInstance := m_contentCreateTimeSeriesInstance (p_name)}
-			};
-        	
-			/**
-			 * @desc Base Reception template for CREATE SemanticMashupJobProfile resource
-			 */        	
-			template RequestPrimitive mw_createSemanticMashupJobProfile(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int40,
-				primitiveContent := {semanticMashupJobProfile := mw_contentCreateSemanticMashupJobProfileBase }
-			};
-
-        	/**
-			 * @desc Base Reception template for CREATE SemanticMashupInstance resource
-			 */
-			template RequestPrimitive mw_createSemanticMashupInstance (template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int41,
-				primitiveContent := {semanticMashupInstance := mw_contentCreateSemanticMashupInstanceBase }
-			};
-			
-			
-			/**
-			 * @desc Base Reception template for CREATE SemanticMashupResult resource
-			 */
-			template RequestPrimitive mw_createSemanticMashupResult (template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int42,
-				primitiveContent := {semanticMashupResult := mw_contentCreateSemanticMashupResultBase}
-			};
-			
-			
-			/**
-			 * @desc Reception template for CREATE timeSeriesInstance
-			 */
-			template RequestPrimitive mw_createTimeSeriesInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int30,
-				primitiveContent := {timeSeriesInstance := mw_contentCreateTimeSeriesInstanceBase}
-			};
-			
-			/**
-			 * @desc Base Reception template for CREATE TimeSeriesAnnc
-			 */
-			template RequestPrimitive mw_createTimeSeriesAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int10029,
-				primitiveContent := {timeSeriesAnnc := mw_contentCreateTimeSeriesAnncBase}
-			};  
-			
-			/**
-			 * @desc Base CREATE request primitive for TimeSeriesInstanceAnnc
-			 */
-			template (value) RequestPrimitive m_createTimeSeriesInstanceAnnc modifies m_create := {
-				resourceType := int10030,
-				primitiveContent := {timeSeriesInstanceAnnc := m_contentCreateTimeSeriesInstanceAnnc}
-			};  
-						/**
-			 * @desc Base Reception template for CREATE TimeSeriesInstanceAnnc
-			 */
-			template RequestPrimitive mw_createTimeSeriesInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
-				resourceType := int10030,
-				primitiveContent := {timeSeriesInstanceAnnc := mw_contentCreateTimeSeriesInstanceAnncBase}
-			};  
-			
-			/**
-			 * @desc Base CREATE request primitive for role resource
-			 */
-			template (value) RequestPrimitive m_createRoleBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createRole",
-				resourceType := int31,
-				primitiveContent := {role := m_contentCreateRole()}
-			};
-			
-			/**
-			 * @desc Reception template for CREATE role resource
-			 */
-			template RequestPrimitive mw_createRole(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int31,
-				primitiveContent := {role := mw_contentCreateRoleBase()}
-			};  
-			
-			/**
-			 * @desc Base CREATE request primitive for token resource
-			 */
-			template (value) RequestPrimitive m_createTokenBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createToken",
-				resourceType := int32,
-				primitiveContent := {token := m_contentCreateToken()}
-			};
-			
-			/**
-			 * @desc Reception template for CREATE token resource
-			 */
-			template RequestPrimitive mw_createToken(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int31,
-				primitiveContent := {token := mw_contentCreateTokenBase}
-			};  
-			
-			/**
-			 * @desc Reception template for CREATE DeviceAirConditioner
-			 */
-			template RequestPrimitive mw_createDeviceAirConditioner(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceAirConditioner := ?}
-			}; 
-			
-			/**
-			 * @desc Reception template for CREATE DeviceClothesWasherDryer
-			 */
-			template RequestPrimitive mw_createDeviceClothesWasherDryer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceClothesWasherDryer := ?}
-			};			
-
-			/**
-			 * @desc Reception template for CREATE DeviceElectricVehicleCharger
-			 */
-			template RequestPrimitive mw_createDeviceElectricVehicleCharger(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceElectricVehicleCharger := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceLight
-			 */
-			template RequestPrimitive mw_createDeviceLight(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceLight := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceMicrogeneration
-			 */
-			template RequestPrimitive mw_createDeviceMicrogeneration(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceMicrogeneration := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceOven
-			 */
-			template RequestPrimitive mw_createDeviceOven(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceOven := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceRefrigerator
-			 */
-			template RequestPrimitive mw_createDeviceRefrigerator(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceRefrigerator := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceRobotCleaner
-			 */
-			template RequestPrimitive mw_createDeviceRobotCleaner(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceRobotCleaner := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceSmartElectricMeter
-			 */
-			template RequestPrimitive mw_createDeviceSmartElectricMeter(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceSmartElectricMeter := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceStorageBattery
-			 */
-			template RequestPrimitive mw_createDeviceStorageBattery(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceStorageBattery := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceTelevision
-			 */
-			template RequestPrimitive mw_createDeviceTelevision(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceTelevision := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceThermostat
-			 */
-			template RequestPrimitive mw_createDeviceThermostat(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceThermostat := ?}
-			};
-			
-			/**
-			 * @desc Reception template for CREATE DeviceWaterHeater
-			 */
-			template RequestPrimitive mw_createDeviceWaterHeater(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {deviceWaterHeater := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE BinarySwitch
-			 */
-			template RequestPrimitive mw_createBinarySwitch(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {binarySwitch := ?}
-			};		
-
-			/**
-			 * @desc Reception template for CREATE BinarySwitchRequired
-			 */
-			template RequestPrimitive mw_createBinarySwitchRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {binarySwitch := mw_contentBinarySwitchBase}
-			};		
-
-			/**
-			 * @desc Reception template for CREATE FaultDetection
-			 */
-			template RequestPrimitive mw_createFaultDetection(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {faultDetection := ?}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE FaultDetectionRequired
-			 */
-			template RequestPrimitive mw_createFaultDetectionRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {faultDetection := mw_contentFaultDetectionBase}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE RunState
-			 */
-			template RequestPrimitive mw_createRunState(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {runState := ?}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE RunStateRequired
-			 */
-			template RequestPrimitive mw_createRunStateRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {runState := mw_contentRunStateBase}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE Battery
-			 */
-			template RequestPrimitive mw_createBattery(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {battery := ?}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE BatteryRequired
-			 */
-			template RequestPrimitive mw_createBatteryRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {battery := mw_contentBatteryBase}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE ElectricVehicleConnector
-			 */
-			template RequestPrimitive mw_createElectricVehicleConnector(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {electricVehicleConnector := ?}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE ElectricVehicleConnectorRequired
-			 */
-			template RequestPrimitive mw_createElectricVehicleConnectorRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {electricVehicleConnector := mw_contentElectricVehicleConnectorBase}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE EnergyGeneration
-			 */
-			template RequestPrimitive mw_createEnergyGeneration(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {energyGeneration := ?}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE EnergyConsumption
-			 */
-			template RequestPrimitive mw_createEnergyConsumption(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {energyConsumption := ?}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE EnergyConsumptionRequired
-			 */
-			template RequestPrimitive mw_createEnergyConsumptionRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {energyConsumption := mw_contentEnergyConsumptionBase}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE Temperature
-			 */
-			template RequestPrimitive mw_createTemperature(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {temperature := ?}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE TemperatureRequired
-			 */
-			template RequestPrimitive mw_createTemperatureRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {temperature := mw_contentTemperatureBase}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE TurboRequired
-			 */
-			template RequestPrimitive mw_createTurboRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {turbo := mw_contentTurboBase}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE AirFlowRequired
-			 */
-			template RequestPrimitive mw_createAirFlowRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {airFlow := mw_contentAirFlowBase}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE SpinLevelRequired
-			 */
-			template RequestPrimitive mw_createSpinLevelRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {spinLevel := mw_contentSpinLevelBase}
-			};	
-			
-			/**
-			 * @desc Reception template for CREATE WaterFlowRequired
-			 */
-			template RequestPrimitive mw_createWaterFlowRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {waterFlow := mw_contentWaterFlowBase}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE BrightnessRequired
-			 */
-			template RequestPrimitive mw_createBrightnessRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {brightness := mw_contentBrightnessBase}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE ColourRequired
-			 */
-			template RequestPrimitive mw_createColourRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {colour := mw_contentColourBase}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE ColourSaturationRequired
-			 */
-			template RequestPrimitive mw_createColourSaturationRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {colourSaturation := mw_contentColourSaturationBase}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE DoorStatusRequired
-			 */
-			template RequestPrimitive mw_createDoorStatusRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {doorStatus := mw_contentDoorStatusBase}
-			};	
-
-			/**
-			 * @desc Reception template for CREATE PowerSaveRequired
-			 */
-			template RequestPrimitive mw_createPowerSaveRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {powerSave := mw_contentPowerSaveBase}
-			};
-
-			/**
-			 * @desc Reception template for CREATE MediaInputRequired
-			 */
-			template RequestPrimitive mw_createMediaInputRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {mediaInput := mw_contentMediaInputBase}
-			};
-
-			/**
-			 * @desc Reception template for CREATE AudioVolumeRequired
-			 */
-			template RequestPrimitive mw_createAudioVolumeRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {audioVolume := mw_contentAudioVolumeBase}
-			};
-
-			/**
-			 * @desc Reception template for CREATE TelevisionChannelRequired
-			 */
-			template RequestPrimitive mw_createTelevisionChannelRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {televisionChannel := mw_contentTelevisionChannelBase}
-			};
-
-			/**
-			 * @desc Reception template for CREATE BoilerRequired
-			 */
-			template RequestPrimitive mw_createBoilerRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {boiler := mw_contentBoilerBase}
-			};
-
-			/**
-			 * @desc Reception template for CREATE ClockRequired
-			 */
-			template RequestPrimitive mw_createClockRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {clock := mw_contentClockBase}
-			};
-
-			/**
-			 * @desc Reception template for CREATE HotWaterSupplyRequired
-			 */
-			template RequestPrimitive mw_createHotWaterSupplyRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int28, 
-				primitiveContent := {hotWaterSupply := mw_contentHotWaterSupplyBase}
-			};
-
-			/**
-			 * @desc Reception template for CREATE Node
-			 */
-			template RequestPrimitive mw_createNode(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int14, 
-				primitiveContent := {node := ?}
-			};
-
-			/**
-			 * @desc Reception template for CREATE DeviceInfo
-			 */
-			template RequestPrimitive mw_createDeviceInfo(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
-				resourceType := int13, 
-				primitiveContent := {deviceInfo := ?}
-			};
-						
-			/**
-			 * @desc Base Reception template for CREATE DynamicAuthorizationC
-			 */
-			/*template (value) RequestPrimitive m_createDynamicAuthorizationConsultationBase modifies m_create := {
-				requestIdentifier := testcasename() & "-m_createDynamicAuthorizationConsultation",
-				resourceType := int10003,
-				primitiveContent := {dynamicAuthorizationConsultation := m_contentCreateContainerAnnc}
-			};*/
-			
-    	}//end group Create
-    	
-    	group Delete {
-    	
-			template (value) RequestPrimitive m_delete(XSD.ID p_resourceAddress, in XSD.ID p_originator := PX_SUPER_AE_ID) := {
-        		operation := int4,
-        		to_ := p_resourceAddress,
-        		from_ := p_originator,
-				requestIdentifier := testcasename() & "-m_delete",
-        		resourceType := omit,
-        		primitiveContent := omit, 
-				roleIDs := omit, 
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit, 
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			};
-
-			template RequestPrimitive mw_delete(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := ?) := {
-				operation := int4,
-				to_ := p_resourceAddress,
-				from_ := p_from,
-				requestIdentifier := ?,
-				resourceType := omit,
-				primitiveContent := omit, 
-				roleIDs := *, 
-				originatingTimestamp := *,
-				requestExpirationTimestamp := *,
-				resultExpirationTimestamp := *,
-				operationExecutionTime := *,
-				responseType := *,
-				resultPersistence := *,
-				resultContent := *,
-				eventCategory := *,
-				deliveryAggregation := *,
-				groupRequestIdentifier := *,
-				filterCriteria := *,
-				desiredIdentifierResultType := *, 
-				tokens := *,
-				tokenIDs := *,
-				localTokenIDs := *,
-				tokenRequestIndicator := *,
-				groupRequestTargetMembers := *,
-				authorSignIndicator := *,
-				authorSigns := *,
-				authorRelIndicator := *,
-				semanticQueryIndicator := *,
-				releaseVersionIndicator := ?,
-				vendorInformation := *
-        	};
-        	
-			/**
-			  * @desc Base UPDATE request primitive for PollingChannel resource
-			 */
-			 template (value) RequestPrimitive m_deletePollingChannelBase(XSD.ID p_resourceAddress, in XSD.ID p_originator := PX_SUPER_AE_ID) modifies m_delete := {
-				requestIdentifier := "m_deletePollingChannel",
-				primitiveContent:= {pollingChannel := m_contentDeletePollingChannel}
-			 };
-        	
-    	}//end group Delete
-    	
-    	group Notify {
-    		
-			/**
-			 * @desc Base NOTIFY request primitive
-			 */
-			template (value) RequestPrimitive m_notify(XSD.ID p_resourceAddress) := {
-				operation := int5,
-				to_ := p_resourceAddress,
-				from_ := "NotInitialized",
-				requestIdentifier := testcasename() & "-m_notify",
-				resourceType := omit,
-				primitiveContent := {notification := m_contentNotification_allOmit},
-				roleIDs := omit,
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit,
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			};
-			
-
-			/**
-			 * @desc Base NOTIFY request primitive
-			 */
-			template (value) RequestPrimitive m_notifyNotification(XSD.ID p_resourceAddress, template (value) Notification p_notification, template (omit) AbsRelTimestamp p_requestExpirationTimestamp := omit) modifies m_notify := {
-				primitiveContent := {notification := p_notification},
-				requestExpirationTimestamp := p_requestExpirationTimestamp//Needed for polling
-			};
-			
-			/**
-			 * @desc Base NOTIFY request primitive carrying a responsePrimitive
-			 */
-			template (value) RequestPrimitive m_notifyResponsePrimitive(XSD.ID p_resourceAddress, ResponsePrimitive p_responsePrimitive) modifies m_notify := {
-				primitiveContent := {responsePrimitive := p_responsePrimitive}
-			};
-			
-			/**
-			 * @desc Base NOTIFY Aggregated request primitive
-			 */
-			template (value) RequestPrimitive m_notifyAggregatedNotification := {
-				operation := int5,
-				to_ := "NotInitialized",
-				from_ := omit,
-				requestIdentifier := testcasename() & "-m_notifyAggregatedNotification",
-				resourceType := omit,
-				primitiveContent := {aggregatedNotification := {notification_list := {m_contentNotification_allOmit,m_contentNotification_allOmit}}},
-				roleIDs := omit,
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit,
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			};
-    		
-    		/**
-			* @desc Base NOTIFY request primitive
-			*/
-			template RequestPrimitive mw_notify := {
-				operation := int5,
-				to_ := ?,
-				from_ := *,
-				requestIdentifier := ?,
-				resourceType := omit,
-				primitiveContent := {notification := mw_contentNotificationBase},
-				roleIDs := *,
-				originatingTimestamp := *,
-				requestExpirationTimestamp := *,
-				resultExpirationTimestamp := *,
-				operationExecutionTime := *,
-				responseType := *,
-				resultPersistence := omit,
-				resultContent := int0 ifpresent,
-				eventCategory := *,
-				deliveryAggregation := *,
-				groupRequestIdentifier := *,
-				filterCriteria := *,
-				desiredIdentifierResultType := *,
-				tokens := *,
-				tokenIDs := *,
-				localTokenIDs := *,
-				tokenRequestIndicator := *,
-				groupRequestTargetMembers := *,
-				authorSignIndicator := *,
-				authorSigns := *,
-				authorRelIndicator := *,
-				semanticQueryIndicator := *,
-				releaseVersionIndicator := ?,
-				vendorInformation := *
-			};
-			
-			/**
-			 * @desc Base NOTIFY request primitive
-			 */
-			template RequestPrimitive mw_notifyAggregatedNotification (in template AggregatedNotification p_aggregatedNotification := ?) modifies mw_notify := {
-				primitiveContent := { aggregatedNotification := p_aggregatedNotification}
-			};
-			
-			/**
-			 * @desc Base NOTIFY request primitive
-			 */
-			
-			template RequestPrimitive mw_notifyNotification(in template Notification p_notification) modifies mw_notify := {
-				primitiveContent := {notification := p_notification}
-			};
-			
-			/**
-			 * @desc Base NOTIFY request primitive for ResponsePrimitive
-			 */
-
-			template RequestPrimitive mw_notifyResponsePrimitive(in template ResponsePrimitive p_responsePrimitive) modifies mw_notify := {
-				primitiveContent := {responsePrimitive := p_responsePrimitive}
-			};		
-
-			
-    		
-    	}//end of group Notify
-	}//end group RequestPrimitives
-	
-	group ContentCreate {
-		
-		template (value) PrimitiveContent m_primitiveContentAccessControlPolicy(template (value) AccessControlPolicy_optional p_acp) := {
-			accessControlPolicy := p_acp
-		}
-		
-		template (value) PrimitiveContent m_primitiveContentAe(template (value) AE_optional p_ae) := {
-			aE := p_ae
-		}
-
-		
-		template (value) PrimitiveContent m_primitiveContentOntologyRepository(template (value) OntologyRepository_optional p_ontologyRepository) := {
-			ontologyRepository := p_ontologyRepository
-		}
-		
-	    template (value) PrimitiveContent m_primitiveContentOntology(template (value) Ontology_optional p_ontology) := {
-			ontology := p_ontology
-		}
-				
-		template (value) PrimitiveContent m_primitiveContentContainer(template (value) Container_optional p_container) := {
-			container := p_container
-		}
-		
-		template (value) PrimitiveContent m_primitiveContentContentInstance(template (value) ContentInstance_optional p_contentInstance) := {
-			contentInstance := p_contentInstance
-		}
-		            
-        template (value) PrimitiveContent m_primitiveContentCSEBase(template (value) CSEBase_optional p_cSEBase) := {
-	        cSEBase := p_cSEBase
-		}
-
-		template (value) PrimitiveContent m_primitiveContentPollingChannel(template (value) PollingChannel_optional p_pollingChannel) := {
-			pollingChannel := p_pollingChannel
-		}
-
-		template (value) PrimitiveContent m_primitiveContentRemoteCSE(template (value) RemoteCSE_optional p_remoteCSE) := {
-			remoteCSE := p_remoteCSE
-		}
-		
-		template (value) PrimitiveContent m_primitiveContentRemoteCSEAnnc(template (value) RemoteCSEAnnc_optional p_remoteCSEAnnc) := {
-			remoteCSEAnnc := p_remoteCSEAnnc
-		}
-
-		template (value) PrimitiveContent m_primitiveContentResponsePrimitive(template (value) ResponsePrimitive p_responsePrimitive) := {
-			responsePrimitive := p_responsePrimitive
-		}		
-		
-		template (value) PrimitiveContent m_primitiveContentSchedule(template (value) Schedule_optional p_schedule) := {
-			schedule := p_schedule
-		}
-
-		template (value) PrimitiveContent m_primitiveContentSubscription(template (value) Subscription_optional p_subscription) := {
-			subscription := p_subscription
-		}
-
-		template (value) PrimitiveContent m_primitiveContentTimeSeries(template (value) TimeSeries_optional p_timeSeries) := {
-			timeSeries := p_timeSeries
-		}
-		
-		template (value) PrimitiveContent m_primitiveContentTimeSeriesInstance(template (value) TimeSeriesInstance_optional p_timeSeriesInstance) := {
-			timeSeriesInstance := p_timeSeriesInstance
-		}
-
-		template (value) PrimitiveContent m_primitiveContentSemanticDescriptor(template (value) SemanticDescriptor_optional p_SemanticDescriptor) := {
-			semanticDescriptor := p_SemanticDescriptor
-		}
-		
-		template (value) PrimitiveContent m_primitiveContentSemanticMashupInstance(template (value) SemanticMashupInstance_optional p_semanticMashupInstance) := {
-			semanticMashupInstance := p_semanticMashupInstance
-		}
-				
-		template (value) PrimitiveContent m_primitiveContentGroup(template (value) Group_optional p_group) := {
-			group_ := p_group
-		}
-				
-		template PrimitiveContent mw_primitiveContent := ?;
-		
-		template PrimitiveContent mw_primitiveContentNotification (template Notification p_notification) := {
-			notification := p_notification
-		};
-		 
-		template (present) PrimitiveContent mw_primitiveContentFlexContainer(template (present) FlexContainerResource_optional p_flexContainer := ?) := {
-			flexContainer := p_flexContainer
-		};
-		 
-		 
-		/**
-		 * @desc Base primitiveContent for CREATE operation for AEAnnc resource
-		 * @param p_labels Labels
-		 * @param p_accessControlPolicyIds AcpIDs
-		 * @param p_appId App ID
-		 * @param p_nodeLink Node link
-		 */
-		template (value) AEAnnc_optional m_contentCreateAEAnnc (in template (omit)  Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, template (omit) XSD.ID p_appId := omit, in template (omit) XSD.AnyURI p_link := "NotInitialized") := {
-			resourceName := omit,//NA 
-			resourceType := omit,//NA
-			resourceID := omit,//NA
-			parentID := omit,//NA
-			creationTime := omit,//NA
-			lastModifiedTime := omit,//NA
-			labels := p_labels,//MA
-			accessControlPolicyIDs := p_accessControlPolicyIds,//MA Special case, mandatory for announced resources
-			expirationTime := "20301231T012345",//MA
-			link := p_link,//M
-			dynamicAuthorizationConsultationIDs := omit, //OA			
-			appName := omit,//OA
-			app_ID := p_appId,//OA
-			aE_ID := omit,//OA
-			pointOfAccess := omit, //OA
-			ontologyRef := omit,//OA
-			nodeLink := omit,//OA
-			requestReachability := omit,//OA
-			contentSerialization := omit,//OA
-			e2eSecInfo := omit, //MA TODO Check whether it is optional or mandatory for create operation
-			supportedReleaseVersions := omit, //MA
-			registrationStatus := omit,//OA
-			trackRegistrationPoints := omit,//OA
-			sessionCapabilities := omit,//OA
-			triggerEnable := omit,//OA
-			activityPatternElements := omit,//OA
-			choice := omit//NP
-		};	
-
-		/**
-		 * @desc Base reception template of primitiveContent for CREATE operation for AEAnnc resource
-		 * @param p_labels Labels
-		 * @param p_accessControlPolicyIds AcpIDs
-		 * @param p_appId App ID
-		 * @param p_nodeLink Node link
-		 */
-		template AEAnnc_optional mw_contentCreateAEAnnc (in template  Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
-    		resourceName := omit,//NA M
-    		resourceType := omit,//NA M
-    		resourceID := omit,//NA M
-    		parentID := omit,//NA M
-    		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
-    		dynamicAuthorizationConsultationIDs := *, //OA O			
-			appName := *,//OA O
-			app_ID := *,//OA M
-			aE_ID := *,//OA M
-			pointOfAccess := *, //OA O
-			ontologyRef := *,//OA O
-			nodeLink := *,//OA O
-			requestReachability := *,//OA M
-			contentSerialization := *,//OA O
-			e2eSecInfo := *, //MA O
-			supportedReleaseVersions := ?,//MA M Mandatory for AEAnnc from Release 2
-			registrationStatus := *,//OA O
-			trackRegistrationPoints := *,//OA O
-			sessionCapabilities := *,//OA O
-			triggerEnable := *,//OA O
-			activityPatternElements := *,//OA O
-			choice := omit//NA
-		};	
-		
-		/**
-		 * @desc Base reception template of primitiveContent for CREATE operation for RemoteCSEAnnc resource
-		 * @param p_labels Labels
-		 * @param p_accessControlPolicyIds AcpIDs
-		 * @param p_appId App ID
-		 * @param p_nodeLink Node link
-		 */
-		template RemoteCSEAnnc_optional mw_contentCreateRemoteCSEAnnc (in template  Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			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
-			dynamicAuthorizationConsultationIDs := omit, //OA O
-			cseType := *,//OA O
-			pointOfAccess := *,//OA O
-			cSEBase := *,//OA M
-			cSE_ID := *,//OA M
-			requestReachability := *,//OA M
-			nodeLink := *,//OA O
-			contentSerialization := *,//OA O
-			e2eSecInfo := ?,//OA O
-			descendantCSEs := *,//OA O
-			supportedReleaseVersions := ?, //MA M Mandatory for RemoteCSE from Release 2
-			multicastCapability := *,//OA O
-			externalGroupID := *,//OA O
-			triggerEnable := *,//OA O
-			activityPatternElements := *,//OA O
-			choice := omit//NA
-		};
-		
-    	/**
-    	 * @desc Base primitiveContent for CREATE operation for AE resource
-    	 * @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) := {
-
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-    		dynamicAuthorizationConsultationIDs := omit, //O
-    		announceTo := omit,//O
-    		announcedAttribute := 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"},
-    		ontologyRef := omit,//O
-    		nodeLink := omit,//NP
-    		requestReachability := false,//M
-    		contentSerialization := omit,//O
-			e2eSecInfo := omit, //O
-			m2M_Ext_ID := omit, //O
-			supportedReleaseVersions := {"1", "2", "2a", "3"}, //M
-			registrationStatus := omit, //O
-			trackRegistrationPoints := omit, //O
-			sessionCapabilities := omit, //O
-			triggerEnable := omit, //O
-			activityPatternElements := omit, //O
-    		choice := omit//NP
-    	};	
-    	
-    	/**
-    	 * @desc Base reception template of primitiveContent for CREATE operation for AE resource
-    	 */
-    	template AE_optional mw_contentCreateAeBase := {
-
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-    		dynamicAuthorizationConsultationIDs := *, //O
-    		announceTo := *,//O
-    		announcedAttribute := *,//O
-    		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"},
-    		ontologyRef := *,//O
-    		nodeLink := *,//NP
-    		requestReachability := ?,//M
-    		contentSerialization := *,//O
-			e2eSecInfo := *, //O
-			m2M_Ext_ID := *, //O
-			supportedReleaseVersions := ?, //M
-			registrationStatus := *, //O
-			trackRegistrationPoints := *, //O
-			sessionCapabilities := *, //O
-			triggerEnable := *, //O
-			activityPatternElements := *, //O
-			choice := *//NP
-    	};	
-    	
-    	/**
-    	 * @desc Base primitiveContent for CREATE operation for AccessControlPolicy resource
-    	 * @param p_name Resource name
-    	 * @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 ) := {
-			resourceName := p_name,//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
-			privileges := {
-				accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
-			},//M
-			selfPrivileges := {
-				accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}
-			},//M
-			authorizationDecisionResourceIDs := omit,//O
-			authorizationPolicyResourceIDs := omit,//O
-			authorizationInformationResourceIDs := omit,//O		
-			choice := omit //NP
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
-		 * @param p_name Resource name
-		 * @param p_acor Allowed originators
-		 * @param p_allowedOperations Allowed operations
-		 */
-		template (value) AccessControlPolicyAnnc_optional m_contentCreateAcpAnnc (in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
-			resourceName := omit,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			expirationTime := omit,//O
-			link := omit,//M TODO Put the right value
-			privileges := {
-				accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
-			},//M
-			selfPrivileges := {
-				accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}
-			},//M
-			authorizationDecisionResourceIDs := omit,//O
-			authorizationPolicyResourceIDs := omit,//O
-			authorizationInformationResourceIDs := omit,//O	
-			choice := omit //NP
-		};
-		
-		/**
-		 * @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
-		 * @param p_labels Labels
-		 */
-		template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnncBase (in template Labels p_labels := *) := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := p_labels,//MA O
-			expirationTime := ?,//MA M
-			link := ?,//M
-			privileges := ?,//MA M
-			selfPrivileges := ?,//MA M
-			authorizationDecisionResourceIDs := *,//MA O
-			authorizationPolicyResourceIDs := *,//MA O
-			authorizationInformationResourceIDs := *,//MA O	
-			choice := omit//NA
-		};	
-		
-		template (value) AccessControlRule m_createAcr (in template (value) ListOfURIs p_acor, in template (value) AccessControlOperations p_allowedOperations) := {
-			accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
-			accessControlOperations := p_allowedOperations,
-			accessControlContexts_list := omit,
-			accessControlAuthenticationFlag := omit, 
-			accessControlObjectDetails_list := omit
-		}
-    	
-		/*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
-			resourceName := omit,
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			cseType := omit,
-			cSE_ID := omit,
-			supportedResourceType := omit,
-			pointOfAccess := omit,
-			nodeLink := omit,
-			e2eSecInfo := omit, 
-			choice := {
-				choice_list := {{
-				  serviceSubscribedAppRule := p_serviceSubscribedAppRule
-				}}
-			}
-		}*/
-		
-		/**
-		 * @desc Base primitiveContent for CSEBase resource
-		 * @param p_name Resource name
-		 */
-		template (value) CSEBase_optional m_contentCSEBase(in CseSimuComponentDesc p_componentDesc):= {
-			resourceName := p_componentDesc.cseName,//O
-			resourceType := int5,
-			resourceID := p_componentDesc.cseResourceId,
-			parentID := "",//Following TS-0001, it must be NULL. Set to a value for Codec to set it to null
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			cseType := omit,
-			cSE_ID := p_componentDesc.cseId,
-			supportedResourceType := p_componentDesc.supportedResourceType,
-			pointOfAccess := {"NotInitialized"},
-			nodeLink := omit,
-			dynamicAuthorizationConsultationIDs := omit,
-			contentSerialization := omit,
-			e2eSecInfo := omit, 
-			supportedReleaseVersions := {"1", "2", "2a", "3"},
-			choice := omit
-		};
-
-		/**
-		 * @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):= {
-			resourceName := p_name,//O
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			cseType := omit,
-			cSE_ID := omit,
-			supportedResourceType := omit,
-			pointOfAccess := omit,
-			nodeLink := omit,
-			dynamicAuthorizationConsultationIDs := omit,
-			contentSerialization := omit,
-			e2eSecInfo := omit, 
-			supportedReleaseVersions := {"1", "2", "2a", "3"},
-			choice := omit
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for CSEBaseAnnc resource
-		 * @param p_name Resource name
-		 */
-		template (value) CSEBaseAnnc_optional m_contentCreateCSEBaseAnnc (template (omit)  Labels p_labels := (omit), template (omit)AcpType p_accessControlPolicyIds := omit, template (value) XSD.AnyURI p_link) := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := p_labels,//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
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for CSEBaseAnnc resource
-		 * @param p_name Resource name
-		 */
-		template CSEBaseAnnc_optional mw_contentCreateCSEBaseAnnc (in template  Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := p_labels,//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
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for PollingChannel resource
-		 * @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, 
-																	in template (omit) AcpType p_accessControlPolicyIds,
-																	in template (value) XSD.ID p_source,
-																	in template (value) XSD.ID p_target,
-																	in template (value) Timestamp p_lifespan,
-																	in template (value) EventCat p_eventCat,
-																	in template (value) DeliveryMetaData p_deliveryMetaData) := {
-			
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit,//O
-			source := p_source,//M
-			target := p_target,//M
-			lifespan := p_lifespan,//M
-			eventCat := p_eventCat,//M
-			deliveryMetaData := p_deliveryMetaData,//M
-			aggregatedRequest := omit,//O
-			choice := omit//NP
-			
-		};    
-    	
-        /**
-		 * @desc Base primitiveContent for CREATE operation for GenericInterworkingService resource
-		 * @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, 
-																	in template (omit) AcpType p_accessControlPolicyIds := omit) := {
-			
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := PX_CND_GENERIC_INTERWORKING_SERVICE,//M
-			ontologyRef := omit,//O
-			contentSize := omit,//NP
-			serviceName := "MyService",//M??
-			inputDataPointLinks := omit,//O
-			outputDataPointLinks := omit,//O		
-			choice := omit//NP
-			
-		};
-
-        /**
-    	 * @desc Base primitiveContent for CREATE operation for Group resource
-    	 * @param p_maxNrOfMembers Max number of members
-    	 * @param p_memberIds Member IDs
-    	 * @param p_accessControlPolicyIds ACP IDs for the Group
-    	 * @param p_name Resource name
-    	 */
-    	template (value) Group_optional m_contentCreateGroup (	in template (value) XSD.PositiveInteger p_maxNrOfMembers,
-    															in template (value) ListOfURIs p_memberIds,
-    															in template (omit) AcpType p_accessControlPolicyIds,
-    															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) XSD.Boolean p_semanticSupportIndicator := true) := {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-    		dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			creator := omit,//O
-			memberType := p_memberType,//O
-			specializationType := omit,//O
-			currentNrOfMembers := omit,//NP
-			maxNrOfMembers := p_maxNrOfMembers,//M
-			memberIDs := p_memberIds,//M
-			membersAccessControlPolicyIDs := p_membersAccessControlPolicyIDs,//O
-			memberTypeValidated := omit,//NP
-			consistencyStrategy := p_consistencyStrategy,//O
-			groupName := omit,//O
-			semanticSupportIndicator := omit,//O
-			notifyAggregation := omit,//O
-			choice := omit//NP
-    	};  
-    	
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Group resource
-		 * @param p_maxNrOfMembers Max number of members
-		 * @param p_memberIds Member IDs
-		 * @param p_accessControlPolicyIds ACP IDs for the Group
-		 * @param p_name Resource name
-		 */
-		template Group_optional mw_contentCreateGroupBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			creator := *,//O
-			memberType := *,//O
-			specializationType := *,//O
-			currentNrOfMembers := omit,//NP
-			maxNrOfMembers := ?,//M
-			memberIDs := ?,//M
-			membersAccessControlPolicyIDs := *,//O
-			memberTypeValidated := omit,//NP
-			consistencyStrategy := *,//O
-			groupName := *,//O
-			semanticSupportIndicator := *,//O
-			notifyAggregation := *,//O
-			choice := omit//NP
-		};  
-    	
-    	
-		/**
-		 * @desc Base primitiveContent for CREATE operation for GroupAnnc resource
-		 * @param p_maxNrOfMembers Max number of members
-		 * @param p_memberIds Member IDs
-		 * @param p_accessControlPolicyIds ACP IDs for the GroupAnnc
-		 * @param p_name Resource name
-		 */
-		template (value) GroupAnnc_optional m_contentCreateGroupAnnc (	in template (value) XSD.PositiveInteger p_maxNrOfMembers,
-																in template (value) ListOfURIs p_memberIds,
-																in template (omit) AcpType p_accessControlPolicyIds,
-																in template (omit) MemberType p_memberType := omit,
-																in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
-																in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit) := {	
-			resourceName := omit,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			link := omit,//M TODO Put the right value
-			dynamicAuthorizationConsultationIDs := omit, //O
-			memberType := p_memberType,//O
-			specializationType := omit,//O
-			currentNrOfMembers := omit,//NP
-			maxNrOfMembers := p_maxNrOfMembers,//M
-			memberIDs := p_memberIds,//M
-			membersAccessControlPolicyIDs := p_membersAccessControlPolicyIDs,//O
-			memberTypeValidated := omit,//NP
-			consistencyStrategy := p_consistencyStrategy,//O
-			groupName := omit,//O
-			semanticSupportIndicator := omit,//O
-			notifyAggregation := omit,//O
-			choice := omit//NP
-		};  
-    	
-		  /**
-		  * @desc Base reception template of primitiveContent for CREATE operation for GroupAnnc resource
-		  */
-		  template GroupAnnc_optional mw_contentCreateGroupAnncBase := {
-			  resourceName := omit,//NA M
-			  resourceType := omit,//NA M
-			  resourceID := omit,//NA M
-			  parentID := omit,//NA M
-			  creationTime := omit,//NA M
-			  lastModifiedTime := omit,//NA M
-			  labels := *,//MA O
-			  accessControlPolicyIDs := *,//MA O //TODO Fix if acpi is mandatory for announced resources (SDS discussion)
-			  expirationTime := ?,//MA M
-			  link := ?,//M
-			  dynamicAuthorizationConsultationIDs := *, //OA O
-			  memberType := *, //OA M
-			  specializationType := *,//O O
-			  currentNrOfMembers := *,//OA M
-			  maxNrOfMembers := *, //OA M
-			  memberIDs := *,//OA M
-			  membersAccessControlPolicyIDs := *,//OA O
-			  memberTypeValidated := *,//OA O
-			  consistencyStrategy := *,//OA M
-			  groupName := *,//OA O
-			  semanticSupportIndicator := *,//OA O
-			  notifyAggregation := *,//OA O
-			  choice := omit //NA
-		  };
-    	
-		/**
-		 * @desc Base primitiveContent for CREATE operation for MgmtObj resource
-		 * @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) := {
-			
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			mgmtDefinition := omit,//O
-			objectIDs := omit,//O
-			objectPaths := omit,//O
-			description := omit,//O
-			mgmtSchema := omit//O
-		};	  	
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for MgmtCmd resource
-		 * @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) := {
-			
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			mgmtDefinition := omit,//O
-			objectIDs := omit,//O
-			objectPaths := omit,//O
-			description := omit,//O
-			mgmtSchema := omit//O
-		};
-		
-		/**
-		 * @desc Base reception template of primitiveContent for CREATE operation for MgmtObjAnnc resource
-		 */
-		template AnnouncedMgmtResource_optional mw_contentCreateMgmtObjAnncBase := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := *,//MA
-			accessControlPolicyIDs := ?,//MA
-			expirationTime := ?,//MA M
-			link := ?,
-			dynamicAuthorizationConsultationIDs := *, //OA
-			mgmtDefinition := ?, //MA
-			objectIDs := *, //OA
-			objectPaths := *, //OA
-			description := * ,//OA
-			mgmtSchema := omit//OA
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Node resource
-		 * @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
-			
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			nodeID := p_nodeId,//M
-			hostedCSELink := omit,//O
-			hostedAELinks := omit,//O
-			hostedServiceLinks := omit,//O
-			mgmtClientAddress := omit,//O
-			roamingStatus := omit,//O
-			networkID := omit,//O
-			choice := omit//O
-		};	  	
-
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for Node resource
-		 * @param p_name Resource name
-		 */
-		template Node_optional mw_contentCreateNodeBase (template XSD.String p_name := *) := {
-			
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			nodeID := ?,//M
-			hostedCSELink := *,//O
-			hostedAELinks := *,//O
-			hostedServiceLinks := *,//O
-			mgmtClientAddress := *,//O
-			roamingStatus := *,//O
-			networkID := *,//O
-			
-			choice := *//O
-		};	
-		
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for NodeAnnc resource
-		 * @param p_name Resource name
-		 */
-		template NodeAnnc_optional mw_contentCreateNodeAnncBase := {
-			
-			resourceName := omit,//NP
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := ?,//M
-			accessControlPolicyIDs := ?,//M
-			expirationTime := ?,//M
-			link := ?,//M
-			dynamicAuthorizationConsultationIDs := *, //O
-			nodeID := ?,//M
-			hostedCSELink := *,//O
-			hostedAELinks := *,//O
-			hostedServiceLinks := *,//O
-			mgmtClientAddress := *,//O
-			roamingStatus := *,//O
-			networkID := *,//O
-			choice := omit//NP
-		};	
-    	
-    	/**
-    	 * @desc Base primitiveContent for CREATE operation for PollingChannel resource
-    	 * @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) := {
-			resourceName := p_name,//O
-            resourceType := omit,//NP
-            resourceID := omit,//NP
-            parentID := omit,//NP
-            creationTime := omit,//NP
-            lastModifiedTime := omit,//NP
-            labels := omit,//O
-            expirationTime := omit,//O
-            choice := omit//NP
-    	};   	   	
-    	
-		/**
-		 * @desc Base reception template of primitiveContent for CREATE operation for PollingChannel resource
-		 * @param p_accessControlPolicyIds ACP IDs for the PollingChannel
-		 * @param p_name Resource name
-		 */
-		template PollingChannel_optional mw_contentCreatePollingChannel := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			expirationTime := *,//O
-			choice := omit//NP
-		};   	   	
-    	
-    	/**
-    	 * @desc Base primitiveContent for CREATE operation for Schedule resource
-    	 * @param p_scheduleElement Schedule
-    	 * @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) := {
-			resourceName := p_name,//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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			scheduleElement := p_scheduleElement,//M
-			networkCoordinated := omit,//O
-			choice := omit//NP
-    	};  
-    	
-		/**
-		 * @desc Base primitiveContent for CREATE operation for ScheduleAnnc resource
-		 */
-		template (value) ScheduleAnnc_optional m_contentCreateScheduleAnnc (in template (omit) AcpType p_accessControlPolicyIds,in template (omit) ScheduleEntries p_scheduleEntries) := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := omit,//MA O
-			accessControlPolicyIDs := omit,//NA O
-			expirationTime := "29991231T235959",//MA M
-			dynamicAuthorizationConsultationIDs := omit,//NA O
-			link := "NotInitialized",//M
-			scheduleElement := p_scheduleEntries,//OA M
-			networkCoordinated := omit,//OA O
-			choice := omit//NP
-		};  	
-
-		/**
-		 * @desc Base reception template of primitiveContent for CREATE operation for ScheduleAnnc resource
-		 */
-		template ScheduleAnnc_optional mw_contentCreateScheduleAnncBase := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := *,//MA O
-			accessControlPolicyIDs := omit,//NA O
-			expirationTime := ?,//MA M
-			dynamicAuthorizationConsultationIDs := omit,//NA O
-			link := ?,//M
-			scheduleElement := * ,//OA M
-			networkCoordinated := *,//OA O
-			choice := omit//NP
-		};  	
-    	
-		template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) := {
-		  	resourceName := omit,//TODO TS-0004 7.4.29.1 2 Missing attribute
-			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
-			applicableCredIDs := p_applicableCredIDs,//O
-			allowedApp_IDs := p_allowedAppIDs,//O
-			allowedAEs := p_allowedAEs,//O
-			allowedRole_IDs := omit,//O
-			choice := omit //O
-		}
-		
-		/**
-		 * @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) := {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			creator := omit,//O
-			choice := omit//O
-		};  
-    	
-
-    	/**
-    	 * @desc Base primitiveContent for CREATE operation for Subscription resource
-    	 * @param p_notificationURI Notification URI
-    	 * @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) := {
-			resourceName := p_name,//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
-			creator := omit,//O
-			eventNotificationCriteria := omit,//O
-			expirationCounter := omit,//O
-			notificationURI := p_notificationURI,//M
-			groupID := omit,//O
-			notificationForwardingURI := omit,//O
-			batchNotify := omit,//O
-			rateLimit := omit,//O
-			preSubscriptionNotify := omit,//O
-			pendingNotification := omit,//O
-			notificationStoragePriority := omit,//O
-			latestNotify := omit,//O
-			notificationContentType := omit, //O
-			notificationEventCat := omit,//O
-			subscriberURI := omit,//O
-			associatedCrossResourceSub := omit,//O
-			choice := omit//NP
-    	};   	
-    	
-    			
-		template (value) OntologyRepository_optional m_contentCreateOntologyRepository := {
-			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
-			announceTo := omit,	//O
-			announcedAttribute := omit,	//O
-			stateTag := omit,	//NP
-			creator := omit,	//O
-			choice := omit	//NP
-		};
-		
-		template (value) Ontology_optional m_contentCreateOntology(SemanticFormat p_ontologyFormat := int1, 
-                                                           // TO DO: May have to URI encode it
-		                                                   XSD.AnySimpleType p_ontologyContent := "https://git.onem2m.org/MAS/BaseOntology/raw/3_6_0/base_ontology.owl") := {
-			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
-			announceTo := omit,	//O
-			announcedAttribute := omit,	//O
-			creator := omit,	//O
-            description := omit, //O
-            ontologyFormat := p_ontologyFormat, //M
-            ontologyContent := p_ontologyContent, //M
-            semanticOpExec := omit, //O
-            choice := omit//O
-		};
-
-    			
-    	/**
-		 * @desc 	Base primitiveContent for CREATE operation for SemanticDescriptor resource
-		 */
-		template (value) SemanticDescriptor_optional m_contentCreateSemanticDescriptor(in SemanticFormat p_descriptorRepresentation := int4,
-																						in XSD.Base64Binary p_descriptor := c_validDescriptor) := {			
-			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
-			announceTo := omit,                             //O
-			announcedAttribute := omit,                     //O
-			creator := omit,                                //O
-			descriptorRepresentation := p_descriptorRepresentation,               //M
-			semanticOpExec := omit,                         //NP
-			descriptor := p_descriptor,       //M
-			ontologyRef := omit,                            //O
-			relatedSemantics := omit,                       //O
-			semanticValidated := omit,                      //NP
-			validationEnable := omit,                       //O
-			choice := omit//O
-		} 
-		
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for SemanticDescriptor resource
-		 * @param NULL
-		 */	
-		template SemanticDescriptor_optional mw_contentCreateSemanticDescriptor := {			
-			resourceName := *,                              //O
-			resourceType := omit,                           //NP
-			resourceID := omit,                             //NP
-			parentID := omit,                               //NP
-			creationTime := omit,                           //NP
-			lastModifiedTime := omit,                       //NP
-			labels := *,                                 //O
-			accessControlPolicyIDs := *,                 //O
-			expirationTime := *,                         //O
-			dynamicAuthorizationConsultationIDs := *,    //O
-			announceTo := *,                             //O
-			announcedAttribute := *,                     //O
-			creator := *,                                //O
-			descriptorRepresentation := ?,               //M
-			semanticOpExec := omit,                         //NP
-			descriptor := ?,                             //M
-			ontologyRef := *,                            //O
-			relatedSemantics := *,                       //O
-			semanticValidated := omit,                      //NP
-			validationEnable := *,                       //O
-			choice := *//O
-		} 		
-    	
-    	/**
-    	 * @desc Base primitiveContent for CREATE operation for SemanticMashupJobProfile resource
-    	 * @param TODO 
-    	 * @param TODO
-    	 */   	
-		template SemanticMashupJobProfile_optional m_contentCreateSemanticMashupJobProfile (in template (value) Sparql p_memberFilter,
-		                                                                                    in template (value) XSD.Base64Binary p_outputDescriptor, 
-		                                                                                    in template (value) XSD.Base64Binary p_functionDescriptor)  := {		
-			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
-			announceTo := omit,	//O
-			announcedAttribute := omit,	//O
-			creator := omit,	//O
-			memberFilter := p_memberFilter,	//M
-			smiID := omit,	//O
-			inputDescriptor := omit,	//O
-			outputDescriptor := p_outputDescriptor,	//M
-			functionDescriptor := p_functionDescriptor	//M
-		}
-		
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for SemanticMashupJobProfile resource
-		 * @param NULL
-		 */			
-		template SemanticMashupJobProfile_optional mw_contentCreateSemanticMashupJobProfileBase  := {		
-			resourceName := *,	//O
-			resourceType := omit,	//NP
-			resourceID := omit,	//NP
-			parentID := omit,	//NP
-			creationTime := omit,	//NP
-			lastModifiedTime := omit,	//NP
-			labels := *,	//O
-			accessControlPolicyIDs := *,	//O
-			expirationTime := *,	//O
-			dynamicAuthorizationConsultationIDs := *,	//O
-			announceTo := *,	//O
-			announcedAttribute := *,	//O
-			creator := *,	//O
-			memberFilter := ?,	//M
-			smiID := *,	//O
-			inputDescriptor := *,	//O
-			outputDescriptor := ?,	//M
-			functionDescriptor := ?	//M
-		}
-    	
-    	
-    	
-    	/**
-    	 * @desc Base primitiveContent for CREATE operation for SemanticMashupInstance resource
-    	 */    	
-  		template SemanticMashupInstance_optional m_contentCreateSemanticMashupInstance (in XSD.AnyURI p_smjpID,
-		                                                                                in XSD.Base64Binary p_smjpInputParameter,
-		                                                                                in MashupMemberStoreType p_memberStoreType,
-		                                                                                in MashupResultGenType p_mashupMember)  := {
-  			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
-			announceTo := omit,	//O
-			announcedAttribute := 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
-		}   	
-    	
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for SemanticMashupInstance resource
-		 * @param NULL
-		 */    	
-  		template SemanticMashupInstance_optional mw_contentCreateSemanticMashupInstanceBase  := {
-  			resourceName := *,	//O
-			resourceType := omit,	//NP
-			resourceID := omit,	//NP
-			parentID := omit,	//NP
-			creationTime := omit,	//NP
-			lastModifiedTime := omit,	//NP
-			labels := *,	//O
-			accessControlPolicyIDs := *,	//O
-			expirationTime := *,	//O
-			dynamicAuthorizationConsultationIDs := *,	//O
-			announceTo := *,	//O
-			announcedAttribute := *,	//O
-			creator := *,	//O
-			smjpID := ?,	//M
-			smjpInputParameter := ?,	//M
-			memberStoreType := ?,	//M
-			mashupMember := *,	//O
-			resultGenType := ?,	//M
-			periodForResultGen := *	//O
-		}   	
-
-
-    	
-		/**
-		 * @desc Base primitiveContent for CREATE operation for SemanticMashupResult resource
-		 */    	
-		template (value) SemanticMashupResult_optional m_contentCreateSemanticMashupResult  := {    	
-			resourceName := omit,	//NP
-			resourceType := omit,	//NP
-			resourceID := omit,	//NP
-			parentID := omit,	//NP
-			creationTime := omit,	//NP
-			lastModifiedTime := omit,	//NP
-			labels := omit,	//NP
-			accessControlPolicyIDs := omit,	//NP
-			expirationTime := omit,	//NP
-			dynamicAuthorizationConsultationIDs := omit,	//NP
-			announceTo := omit,	//NP
-			announcedAttribute := omit,	//NP
-			creator := omit,	//NP
-			smjpInputParameter := omit,	//NP
-			mashupResultFormat := omit,	//NP
-			mashupResult := omit	//NP
-		}
-		
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for SemanticMashupResult resource
-		 * @param NULL
-		 */		
-		template SemanticMashupResult_optional mw_contentCreateSemanticMashupResultBase  := {    	
-			resourceName := omit,	//NP
-			resourceType := omit,	//NP
-			resourceID := omit,	//NP
-			parentID := omit,	//NP
-			creationTime := omit,	//NP
-			lastModifiedTime := omit,	//NP
-			labels := omit,	//NP
-			accessControlPolicyIDs := omit,	//NP
-			expirationTime := omit,	//NP
-			dynamicAuthorizationConsultationIDs := omit,	//NP
-			announceTo := omit,	//NP
-			announcedAttribute := omit,	//NP
-			creator := omit,	//NP
-			smjpInputParameter := omit,	//NP
-			mashupResultFormat := omit,	//NP
-			mashupResult := omit	//NP
-		}
-		
-		
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for Subscription resource
-		 * @param p_notificationURI Notification URI
-		 * @param p_name Resource name
-		 */
-		template Subscription_optional mw_contentCreateSubscriptionBase (template XSD.String p_name := *) := {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-    		dynamicAuthorizationConsultationIDs := *, //O
-			creator := *,//O
-			eventNotificationCriteria := *,//O
-			expirationCounter := *,//O
-			notificationURI := ?,//M
-			groupID := *,//O
-			notificationForwardingURI := *,//O
-			batchNotify := *,//O
-			rateLimit := *,//O
-			preSubscriptionNotify := *,//O
-			pendingNotification := *,//O
-			notificationStoragePriority := *,//O
-			latestNotify := *,//O
-			notificationContentType := *, //O
-			notificationEventCat := *,//O
-			subscriberURI := *,//O
-			associatedCrossResourceSub := *,//O
-			choice := *//O
-		};   	
-
-		template (value) Subscription_optional m_contentCreateSubscriptionAdvanced (in template (value) ListOfURIs p_notificationURI,
-																					in template (omit)  XSD.String p_name := c_defaultSubscriptionResourceName,
-																					in template (omit) EventNotificationCriteria p_eventNotificationCriteria,
-																					in template (omit) XSD.PositiveInteger p_expirationCounter,
-																					in template (omit) BatchNotify p_batchNotify,
-																					in template (omit) XSD.Boolean p_latestNotify,
-																					in template (omit) XSD.AnyURI p_subscriberURI,
-																					in template (omit) NotificationContentType p_notificationContentType,
-		                                                                            in template (omit) PendingNotification p_pendingNotification) modifies m_contentCreateSubscription := {
-			eventNotificationCriteria := p_eventNotificationCriteria,//O
-			expirationCounter := p_expirationCounter,//O
-			batchNotify := p_batchNotify,//O
-			pendingNotification := p_pendingNotification,//O
-			latestNotify := p_latestNotify,//O
-			notificationContentType := p_notificationContentType, //TODO Set to omit once xsd is fixed,//O
-			subscriberURI := p_subscriberURI//O
-		}; 
-		
-		template (value) EventNotificationCriteria m_eventNotificationCriteria ( template (omit) EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := omit, template (omit) EventNotificationCriteria.attribute p_attribute_list := omit) := { //the parameter should be a list of NotificationEventTypeEventType
-			createdBefore := omit,
-			createdAfter := omit,
-			modifiedSince := omit,
-			unmodifiedSince := omit,
-			stateTagSmaller := omit,
-			stateTagBigger := omit,
-			expireBefore := omit,
-			expireAfter := omit,
-			sizeAbove := omit,
-			sizeBelow := omit,
-			operationMonitor_list := omit,
-			attribute := p_attribute_list, 
-			notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
-			childResourceType := omit,
-			missingData := omit,
-			filterOperation := omit
-		};
-        
-		template (value) BatchNotify m_batchNotify (in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration := "PT20S") := {
-			number := p_number,
-			duration := p_duration //TODO duration has to be set to 1s and match to the Duration regex 
-		};
-		//normaly duration can be omited
-		
-		
-         	
-    	
-    	/**
-    	 * @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") := {
-			resourceName := p_name,//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 := "text/strings:0",//O
-			contentSize := omit,//NP
-			contentRef := omit, //O
-			ontologyRef := omit,//O
-			content := p_primitiveContent,//M
-			choice := omit //O
-		};
-
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for ContentInstance resource
-		 * @param p_primitiveContent Content for the ContentInstance
-		 */
-		template ContentInstance_optional mw_contentCreateContentInstanceBase(template XSD.String p_name := *) := {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			expirationTime := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			contentInfo := *,//O
-			contentSize := omit,//NP
-			contentRef := *, //O
-			ontologyRef := *,//O
-			content := ?,//M
-			choice := * //O
-		};
-					
-		/**
-		 * @desc Base primitiveContent for CREATE operation for ContentInstanceAnnc resource
-		 */
-		template (value) ContentInstanceAnnc_optional m_contentCreateContentInstanceAnnc := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := omit,//MA O
-			expirationTime := "29991231T235959",//NA M
-			link := "NotInitialized", //M
-			stateTag := omit,//OA M
-			contentInfo := omit,//OA O
-			contentSize := omit,//OA M
-			ontologyRef := omit,//OA O
-			content := omit, //OA M
-			choice := omit //O
-		};
-
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for ContentInstanceAnnc resource
-		 */
-		template ContentInstanceAnnc_optional mw_contentCreateContentInstanceAnncBase := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := *,//MA O
-			expirationTime := ?,//NA M
-			link := ?, //M
-			stateTag := *,//OA M
-			contentInfo := *,//OA O
-			contentSize := *,//OA M
-			ontologyRef := *,//OA O
-			content := *, //OA M
-			choice := omit //O
-		};
-		
-    	/**
-    	 * @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):= {
-			resourceName := p_name,//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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			locationID := omit,//O
-			ontologyRef := omit,//O
-			disableRetrieval := omit, //O
-			choice := omit//NP
-    	};
-    	
-		/**
-		 * @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):= {
-			resourceName := p_name,//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
-			dynamicAuthorizationEnabled := p_dyn_auth_enabled,//M
-			dynamicAuthorizationPoA := omit,//O
-			dynamicAuthorizationLifetime := omit,//O	
-			choice := omit
-		};
-    	
-    	
-    	
-		/**
-		 * @desc Base primitiveContent for CREATE operation for ContainerAnnc resource
-		 * @param p_name Resource name
-		 */
-		template (value) ContainerAnnc_optional m_contentCreateContainerAnnc := {
-			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
-			link := "NotInitialized",//M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			stateTag := omit,//NP
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			locationID := omit,//O
-			ontologyRef := omit,//O
-			disableRetrieval := omit, //O
-			choice := omit//NP
-		};
-		
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for Container resource
-		 * @param p_name Resource name
-		 */
-		template Container_optional mw_contentCreateContainerBase (template XSD.String p_name := *):= {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			maxNrOfInstances := *,//O
-			maxByteSize := *,//O
-			maxInstanceAge := *,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			locationID := *,//O
-			ontologyRef := *,//O
-			disableRetrieval := *, //O
-			choice := *//NP
-		};
-    	
-		/**
-		 * @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
-		 * @param p_name Resource name
-		 */
-		template (value) Container_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			expirationCounter := omit,//Field not existing in container resource
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			locationID := omit,//O
-			ontologyRef := omit,//O
-			disableRetrieval := omit,//O
-			choice := omit//NP
-		};
-    	
-		/**
-		 * @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):= {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit,
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			cseType := omit,//O
-			pointOfAccess := omit,//O
-			cSEBase := valueof(p_cSEBase),//M
-			cSE_ID := omit,//M
-			m2M_Ext_ID := omit,//O
-			trigger_Recipient_ID := omit,//O
-			requestReachability := false,//M
-			nodeLink := omit,//O
-			triggerReferenceNumber := omit,//O
-			contentSerialization := omit,//O
-			e2eSecInfo := omit,//O
-			descendantCSEs := omit,//O
-			supportedReleaseVersions := {"1", "2", "2a", "3"}, //M
-			multicastCapability := omit,//O
-			externalGroupID := omit,//O
-			triggerEnable := omit,//O
-			activityPatternElements := omit,//O
-			choice := omit//O
-		};
-    	
-		/**
-		 * @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):= {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit,
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			cseType := omit,//O
-			pointOfAccess := p_poaList,//O
-			cSEBase := valueof(p_cSEBase),//M
-			cSE_ID := omit,//M
-			m2M_Ext_ID := omit,//O
-			trigger_Recipient_ID := omit,//O
-			requestReachability := true,//M
-			nodeLink := omit,//O
-			triggerReferenceNumber := omit,//O
-			contentSerialization := omit,//O
-			e2eSecInfo := omit,//O
-			descendantCSEs := omit,//O
-			supportedReleaseVersions := {"1", "2", "2a", "3"}, //M
-			multicastCapability := omit,//O
-			externalGroupID := omit,//O
-			triggerEnable := omit,//O
-			activityPatternElements := omit,//O
-			choice := omit//O
-		};
-		
-		/**
-		* @desc Base reception template of primitiveContent for CREATE operation for remoteCSE resource
-		*/
-		template RemoteCSE_optional mw_contentCreateRemoteCSEBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			cseType := *,//O
-			pointOfAccess := *,//O
-			cSEBase := ?,//M
-			cSE_ID := *,//M
-			m2M_Ext_ID := *,//O
-			trigger_Recipient_ID := *,//O
-			requestReachability := ?,//M
-			nodeLink := *,//O
-			triggerReferenceNumber := *,//O
-			contentSerialization := *,//O
-			e2eSecInfo := *,//O
-			descendantCSEs := *,//O
-			supportedReleaseVersions := {"1", "2", "2a", "3"}, //M
-			multicastCapability := *,//O
-			externalGroupID := *,//O
-			triggerEnable := *,//O
-			activityPatternElements := *,//O
-			choice := *//O
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for RemoteCSEAnnc resource
-		 * @param p_name Resource name
-		 */
-		template (value) RemoteCSEAnnc_optional m_contentCreateRemoteCSEAnnc := {
-			resourceName := omit,//NA NP
-			resourceType := omit,//NA NP
-			resourceID := omit,//NA NP
-			parentID := omit,//NA NP
-			creationTime := omit,//NA NP
-			lastModifiedTime := omit,//NA NP
-			labels := omit,//MA O
-			accessControlPolicyIDs := omit,//MA O
-			expirationTime := "29991231T235959",//MA M
-			link := "NotInitialized",//M
-			dynamicAuthorizationConsultationIDs := omit,//OA O 
-			cseType := omit,//OA O
-			pointOfAccess := omit,//OA O
-			cSEBase := omit,//OA O
-			cSE_ID := omit,//OA O
-			requestReachability := false,//OA O
-			nodeLink := omit,//OA O
-			contentSerialization := omit,//OA O
-			e2eSecInfo := omit,//MA M
-			descendantCSEs := omit,//OA O
-			supportedReleaseVersions := {"1", "2", "2a", "3"}, //MA M
-			multicastCapability := omit,//OA O
-			externalGroupID := omit,//OA O
-			triggerEnable := omit,//OA O
-			activityPatternElements := omit,//OA O
-			choice := omit//OA O
-		};
-		
-		/**
-		* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
-		*/
-		template ContainerAnnc_optional mw_contentCreateContainerAnncBase := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := *,//MA O
-			accessControlPolicyIDs := *,//MA O
-			expirationTime := ?,//MA M
-			link := ?, //M
-			dynamicAuthorizationConsultationIDs := *,//OA O
-			stateTag := *,//OA M
-			maxNrOfInstances := *,//OA O
-			maxByteSize := *, //OA O
-			maxInstanceAge := *, //OA O
-			currentNrOfInstances := *, //OA M
-			currentByteSize := *, //OA M
-			locationID := *, //OA O
-			ontologyRef := *, //OA O
-			disableRetrieval := *, //OA O
-			choice := omit //NA
-		};
-    	
-		template (value) LocationPolicy_optional m_contentCreateLocationPolicy (in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) ListOfDuration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) := {
-    	  	resourceName 				:= c_defaultLocationPolicyResourceName, //O
-    	  	resourceType				:= omit, //NP
-    	    resourceID					:= omit, //NP
-    	    parentID					:= omit, //NP
-    	  	creationTime				:= omit, //NP
-    	  	lastModifiedTime			:= omit, //NP
-    	  	labels 						:= PX_LABELS,//O
-    	  	accessControlPolicyIDs 	:= p_accessControlPolicyIds, //O
- 	  	  	expirationTime 			:= omit, //O
-      		dynamicAuthorizationConsultationIDs := omit, //O
-    	  	announceTo 				:= omit, 				   //O
-    	  	announcedAttribute		:= omit, 			      //O
-    		locationSource 			:= p_locationSource, //M
-    		locationInformationType := omit,//O
-    		locationUpdatePeriod 		:= p_locationUpdatePeriod, //O
-    		locationTargetID 			:= p_locationTargetID, 	//O
-    		locationServer 			:= p_locationServerAddress,//O
-    		locationContainerID		:= omit,    		   //NP
-    		locationContainerName 	:= PX_LOCATION_CONTAINER_NAME,//O    		
-    	  	locationStatus				:= omit,              //NP
-			geographicalTargetArea := omit, //O
-			geofenceEventCriteria := omit, //O
-			authID := omit, //O
-			retrieveLastKnownLocation := omit, //O
-			locationUpdateEventCriteria := omit, //O
-			choice 					:= omit  	         //NP
-    	   	  	
-    	};
-    	
-		template (value) LocationPolicy_optional m_contentCreateLocationPolicyBase := {
-				resourceName 				:= c_defaultLocationPolicyResourceName, //O
-				resourceType				:= omit, //NP
-				resourceID					:= omit, //NP
-				parentID					:= omit, //NP
-				creationTime				:= omit, //NP
-				lastModifiedTime			:= omit, //NP
-				labels 						:= PX_LABELS,//O
-				accessControlPolicyIDs 	:= omit, //O
-				expirationTime 			:= omit, //O
-				dynamicAuthorizationConsultationIDs := omit, //O
-				announceTo 				:= omit, 				   //O
-				announcedAttribute		:= omit, 			      //O
-				locationSource 			:= int1, //M
-				locationInformationType := omit,//O
-				locationUpdatePeriod 		:= omit, //O
-				locationTargetID 			:= omit, 	//O
-				locationServer 			:= omit,//O
-				locationContainerID		:= omit,    		   //NP
-				locationContainerName 	:= PX_LOCATION_CONTAINER_NAME,//O    		
-				locationStatus				:= omit,              //NP
-				geographicalTargetArea := omit, //O
-				geofenceEventCriteria := omit, //O
-				authID := omit, //O
-				retrieveLastKnownLocation := omit, //O
-				locationUpdateEventCriteria := omit, //O
-				choice 					:= omit  	         //NP
-			};
-    	
-	  /**
-	  * @desc Base reception template of primitiveContent for CREATE operation for LocationPolicyAnnc resource
-	  */
-	  template LocationPolicyAnnc_optional mw_contentCreateLocationPolicyAnncBase := {
-		  resourceName := omit,//NA M
-		  resourceType := omit,//NA M
-		  resourceID := omit,//NA M
-		  parentID := omit,//NA M
-		  creationTime := omit,//NA M
-		  lastModifiedTime := omit,//NA M
-		  labels := *,//MA
-		  accessControlPolicyIDs := ?,//MA
-		  expirationTime := ?,//MA M
-		  link := ?,
-		  dynamicAuthorizationConsultationIDs := *, //OA
-		  locationSource := *, //OA
-		  locationInformationType := *,//OA
-		  locationUpdatePeriod := *, //OA
-		  locationTargetID := *, //OA
-		  locationServer := *, //OA
-		  locationContainerID := *, //OA
-		  locationContainerName := *, //OA
-		  locationStatus := *,//OA
-		  geographicalTargetArea := omit, //O
-		  geofenceEventCriteria := omit, //O
-		  authID := omit, //O
-		  retrieveLastKnownLocation := omit, //O
-		  locationUpdateEventCriteria := omit, //O
-		  choice := omit//NP
-	    };
-    	
-    	template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation, 
-    																in template (omit) NotificationEventType p_notifEventType, 
-    																in template (omit) XSD.AnyURI p_subReference, 
-    																in template (omit) XSD.AnyURI p_notifForwardingURI) := {
-    	  notificationEvent := {
-    	    representation := p_resourcePresentation,
-        	operationMonitor := {
-        		operation := omit,
-        	    originator := omit
-        	},
-        	notificationEventType := p_notifEventType    	    
-    	  },
-    	  verificationRequest := omit,
-    	  subscriptionDeletion := omit,
-    	  subscriptionReference := p_subReference,
-    	  creator := omit,
-    	  notificationForwardingURI := p_notifForwardingURI,
-		  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
-		 * @param p_ontologyRef  Expected OntologyRef value
-		 */
-		//template SemanticDescriptor_optional mw_contentCreateSemanticDescriptor_ontologyRef(template XSD.AnyURI p_ontologyRef) modifies mw_contentCreateSemanticDescriptor := {
-		//	ontologyRef := p_ontologyRef
-		//}  
-		
-		/**
-			 * @desc Base primitiveContent for CREATE operation for StatConfig resource
-			 * @param p_primitiveConten t Content for the StatConfig
-			 */
-		template (value) StatsConfig_optional m_contentCreateStatsConfigBase := {
-			resourceName 				:= c_defaultStatsConfigResourceName, //O
-			resourceType				:= omit, //NP
-			resourceID					:= omit, //NP
-			parentID					:= omit, //NP
-			creationTime				:= omit, //NP
-			lastModifiedTime			:= omit, //NP
-			labels 						:= PX_LABELS,//O
-			accessControlPolicyIDs 	:= omit, //O
-			expirationTime 			:= omit, //O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			creator                 := omit,
-			choice 					:= omit  	         //NP
-		};
-		
-		/**
-			 * @desc Base primitiveContent for CREATE operation for StatCollect resource
-			 * @param p_primitiveContent Content for the StatCollect
-			 */
-		template (value) StatsCollect_optional m_contentCreateStatCollectBase := {
-			resourceName 				:= c_defaultStatsCollectResourceName, //O
-			resourceType				:= omit, //NP
-			resourceID					:= omit, //NP
-			parentID					:= omit, //NP
-			creationTime				:= omit, //NP
-			lastModifiedTime			:= omit, //NP
-			labels 						:= PX_LABELS,//O
-			accessControlPolicyIDs 	:= omit, //O
-			expirationTime 			:= omit, //O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			creator                 := omit,
-			statsCollectID          := omit,
-			collectingEntityID      := omit,
-			collectedEntityID       := omit,
-			statsRuleStatus         := omit,
-			statModel               := omit,
-			collectPeriod           := omit,
-			eventID                 := omit,
-			choice 					:= omit  	         //NP
-		};
-		
-		/**
-			 * @desc Base primitiveContent for CREATE operation for M2mServiceSubscriptionProfile resource
-			 * @param p_primitiveContent Content for the M2mServiceSubscriptionProfile
-			 */
-		template (value) M2mServiceSubscriptionProfile_optional m_contentCreatem2mServiceSubscriptionProfileBase := {
-			resourceName 				:= c_defaultm2mServiceSubscriptionProfileResourceName, //O
-			resourceType				:= omit, //NP
-			resourceID					:= omit, //NP
-			parentID					:= omit, //NP
-			creationTime				:= omit, //NP
-			lastModifiedTime			:= omit, //NP
-			labels 						:= PX_LABELS,//O
-			accessControlPolicyIDs 	:= omit, //O
-			expirationTime 			:= omit, //O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			choice 					:= omit  	         //NP
-		};
-		
-		/**
-		  * @desc Base primitiveContent for CREATE operation for ServiceSubscribedAppRule_optional resource
-		  * @param p_primitiveContent Content for the ServiceSubscribedAppRule_optional
-		 */
-		template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRuleBase := {
-			resourceName 				:= c_defaultServiceSubscribedAppRuleResourceName, //O
-			resourceType				:= omit, //NP
-			resourceID					:= omit, //NP
-			parentID					:= omit, //NP
-			creationTime				:= omit, //NP
-			lastModifiedTime			:= omit, //NP
-			labels 						:= PX_LABELS,//O
-			accessControlPolicyIDs 	:= omit, //O
-			expirationTime 			:= omit, //O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			applicableCredIDs       := omit,
-			allowedApp_IDs          := omit,
-			allowedAEs              := omit,
-			allowedRole_IDs			:= omit,
-			choice 					:= omit  	         //NP   
-		};
-		
-		template (value) ServiceSubscribedNode_optional m_contentServiceSubscribedNode := {
-			resourceName 			:= "MyServiceServiceSubscribedNodeResource", //O
-			resourceType 			:= omit, //M
-			resourceID 				:= omit, //M
-			parentID 				:= omit, //M
-			creationTime 			:= omit, //M
-			lastModifiedTime 		:= omit, //M
-			labels 					:= omit, //O
-			accessControlPolicyIDs 	:= omit, //O
-			expirationTime 			:= omit, //M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			nodeID 					:= omit, //M
-			cSE_ID 					:= omit, //O
-			deviceIdentifier 		:= omit, //M
-			ruleLinks 				:= omit, //O
-			niddRequired 			:= omit, //O
-			choice 					:= omit //O
-		};
-		
-		
-		
-		
-		/**
-		 * @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):= {
-			resourceName := p_name,//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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			creator := omit,//O
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			periodicInterval := omit,//O
-			missingDataDetect := omit,//O
-			missingDataMaxNr := omit,//O
-			missingDataList := omit,//NP
-			missingDataCurrentNr := omit,//NP
-			missingDataDetectTimer := omit,//O
-			ontologyRef := omit,//O
-			contentInfo := omit,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base reception template primitiveContent for CREATE operation for timeSeries resource 
-		 * @param p_name Resource name
-		 */
-		template TimeSeries_optional mw_contentCreateTimeSeriesBase (template XSD.String p_name := *):= {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			creator := *,//O
-			maxNrOfInstances := *,//O
-			maxByteSize := *,//O
-			maxInstanceAge := *,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			periodicInterval := *,//O
-			missingDataDetect := *,//O
-			missingDataMaxNr := *,//O
-			missingDataList := omit,//NP
-			missingDataCurrentNr := omit,//NP
-			missingDataDetectTimer := *,//O
-			ontologyRef := *,//O
-			contentInfo := omit,//O
-			choice := *//NP
-		};
-				
-		/**
-		 * @desc Base primitiveContent for CREATE operation for timeSeriesAnnc resource 
-		 * @param p_name Resource name
-		 */
-		template (value) TimeSeriesAnnc_optional m_contentCreateTimeSeriesAnnc := {			
-			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
-			link := "NotInitialized",//M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			periodicInterval := omit,//O
-			missingDataMaxNr := omit,//O
-			missingDataList := omit,//NP
-			missingDataCurrentNr := omit,//NP
-			missingDataDetectTimer := omit,//O
-			ontologyRef := omit,//O
-			contentInfo := omit,//O
-			choice := omit//NP
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for TimeSeriesAnnc resource
-		 * @param p_primitiveContent Content for the TimeSeriesAnnc
-		 */
-		template TimeSeriesAnnc_optional mw_contentCreateTimeSeriesAnncBase := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := *,//MA
-			accessControlPolicyIDs := *,//MA
-			expirationTime := ?,//MA M
-			link := ?, //M NA
-			dynamicAuthorizationConsultationIDs := *, //OA			
-			maxNrOfInstances := *,//O OA		
-			maxByteSize := *,//O OA	
-			maxInstanceAge := *,//O OA	
-			currentNrOfInstances := *,//M OA
-			currentByteSize := *,//M OA
-			periodicInterval := *,//O OA
-			missingDataMaxNr := *,//O OA
-			missingDataList := *,//O OA
-			missingDataCurrentNr := *,//O OA
-			missingDataDetectTimer := *,//O OA
-			ontologyRef := *,//O OA
-			contentInfo := omit,//O
-			choice := omit //O
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for TimeSeriesInstanceAnnc resource
-		 * @param p_primitiveContent Content for the TimeSeriesInstanceAnnc
-		 */
-		template TimeSeriesInstanceAnnc_optional mw_contentCreateTimeSeriesInstanceAnncBase := {			
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := *,//MA
-			expirationTime := ?,//MA M To be double checked SDS-2019-0668R01
-			link := ?, //M NA
-			dataGenerationTime := *,//M OA
-			content := *,//M OA
-			sequenceNr := *,//O OA
-			contentSize := *,//M OA
-			choice := omit//NP			
-		}		
-		
-		/**
-		 * @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,
-																		in template (omit) XSD.Boolean p_missingDataDetect := omit,
-																		in template (omit) XSD.NonNegativeInteger p_periodicInterval := omit,
-																		in template (omit) XSD.NonNegativeInteger p_missingDataMaxNr := omit, 
-																		in template (omit) XSD.NonNegativeInteger p_missingDataDetectTimer := omit) modifies m_contentCreateTimeSeries := {
-		
-			periodicInterval := p_periodicInterval,//O
-			missingDataDetect := p_missingDataDetect,//O
-			missingDataMaxNr := p_missingDataMaxNr,//O
-			missingDataDetectTimer := p_missingDataDetectTimer//O
-		}
-		
-		/**
-		 * @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):= {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			expirationCounter := omit,//Field not existing in container resource
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			periodicInterval := omit,//O
-			missingDataDetect := omit,//O
-			missingDataMaxNr := omit,//O
-			missingDataList := omit,//NP
-			missingDataCurrentNr := omit,//NP
-			missingDataDetectTimer := omit,//O
-			ontologyRef := omit,//O
-			contentInfo := omit,//O
-			choice := omit//NP
-		};
-		
-		/**
-		 * @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):= {
-			resourceName := p_name,//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
-			dataGenerationTime := {alt_ := "00000101T000000"},//M
-			content := "AnyValue",//M
-			sequenceNr := omit,//O
-			contentSize  := omit,//NP
-			choice := omit//O
-		};
-		
-		/**
-		 * @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 := *):= {
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			expirationTime := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			dataGenerationTime := ?,//M
-			content := ?,//M
-			sequenceNr := *,//O
-			contentSize  := omit,//NP
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for TimeSeriesInstanceAnnc resource
-		 * @param p_name Resource name
-		 */
-		template (value) TimeSeriesInstanceAnnc_optional m_contentCreateTimeSeriesInstanceAnnc := {
-			resourceName := omit,//NA M
-			resourceType := omit,//NA M
-			resourceID := omit,//NA M
-			parentID := omit,//NA M
-			creationTime := omit,//NA M
-			lastModifiedTime := omit,//NA M
-			labels := omit,//MA O
-			expirationTime := omit,//NA M
-			link := "NotInitialized", //M
-			dataGenerationTime := omit,//OA M
-			content := omit,//OA M
-			sequenceNr := omit,//OA O
-			contentSize  := omit,//OA M
-			choice := omit//NA O
-		};
-		
-		template (value) MissingData m_missingData( in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration) := {
-			number := p_number,
-			duration := p_duration
-		};
-	
-		/**
-		 * @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):= {
-			resourceName := p_name,//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
-			roleID := "roleID@a.b", //M
-			issuer := "issuer", //M
-			holder := "holder", //M
-			notBefore := "00000101T000000",//M
-			notAfter := "00000101T000000",//M
-			roleName := omit, //O
-			tokenLink := omit, //O
-			choice := omit//O
-		};
-		
-		/**
-		 * @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 := *):= {
-			resourceName := p_name,//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
-			roleID := ?, //M
-			issuer := ?, //M
-			holder := ?, //M
-			notBefore := ?,//M
-			notAfter := ?,//M
-			roleName := omit, //O
-			tokenLink := omit, //O
-			choice := omit//O
-		};
-		
-		/**
-		 * @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):= {
-			resourceName := p_name,//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
-			tokenID := "roleID@a.b", //M
-			tokenObject := {alt_ := "oneM2M.oneM2M.oneM2M"}, //M
-			version := omit, //O
-			issuer := omit, //O
-			holder := omit, //O
-			notBefore := omit,//O
-			notAfter := omit,//O
-			tokenName := omit,//O
-			audience := omit,//O
-			permissions := omit,//O
-			extension_ := omit,//O
-			choice := omit//O
-		};
-		
-		/**
-		 * @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 := *):= {
-			resourceName := p_name,//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
-			tokenID := ?, //M
-			tokenObject := ?, //M
-			version := omit, //O
-			issuer := omit, //O
-			holder := omit, //O
-			notBefore := omit,//O
-			notAfter := omit,//O
-			tokenName := omit,//O
-			audience := omit,//O
-			permissions := omit,//O
-			extension_ := omit,//O
-			choice := omit//O
-		};
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for BinarySwitch resource
-		 * @param 
-		 */
-		template BinarySwitch_optional mw_contentBinarySwitchBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			powerState := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for FaultDetection resource
-		 * @param 
-		 */
-		template FaultDetection_optional mw_contentFaultDetectionBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			status := ?,//M
-			code := *,//O
-			description := *,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for RunState resource
-		 * @param 
-		 */
-		template RunState_optional mw_contentRunStateBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
- 			currentMachineState := ?,//M 
-			machineStates := ?,//M
-		    currentJobState := *,//O
-			jobStates := *,//O
-			progressPercentage := *,//O
-			choice := omit//NP
-		};
-
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Battery resource
-		 * @param 
-		 */
-		template Battery_optional mw_contentBatteryBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			level := ?,//M
-			capacity := *,//O
-			charging := *,//O
-			discharging := *,//O
-			lowBattery := *,//O
-			batteryThreshold := *,//O
-			electricEnergy := *,//O
-			voltage := *,//O
-			material := *,//O
-			choice := omit//NP
-		};
-
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for ElectricVehicleConnector resource
-		 * @param 
-		 */
-		template ElectricVehicleConnector_optional mw_contentElectricVehicleConnectorBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			status := ?,//M
-			chargingCapacity := *,//O
-			dischargingCapacity := *,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for EnergyConsumption resource
-		 * @param 
-		 */
-		template EnergyConsumption_optional mw_contentEnergyConsumptionBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			power := ?,//M
-			absoluteEnergyConsumption := *,//O
-			roundingEnergyConsumption := *,//O
-			significantDigits := *,//O
-			multiplyingFactors := *,//O
-			voltage := *,//O
-			current := *,//O
-			frequency := *,//O
-			measuringScope := *,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Temperature resource
-		 * @param 
-		 */
-		template Temperature_optional mw_contentTemperatureBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			currentTemperature := ?,//M
-			targetTemperature := *,//O
-			unit := *,//O
-			minValue := *,//O
-			maxValue := *,//O
-			stepValue := *,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Turbo resource
-		 * @param 
-		 */
-		template Turbo_optional mw_contentTurboBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			turboEnabled := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for AirFlow resource
-		 * @param 
-		 */
-		template AirFlow_optional mw_contentAirFlowBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			speed := ?,//M
-			minSpeed := *,//O
-			maxSpeed := *,//O
-			verticalDirection := *,//O
-			supportedVerticalDirection := *,//O
-			horizontalDirection := *,//O
-			supportedHorizontalDirection := *,//O
-			automode := *,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for SpinLevel resource
-		 * @param 
-		 */
-		template SpinLevel_optional mw_contentSpinLevelBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			spinLevelStrength := ?,//M
-			choice := omit//NP
-		};
-	
-		/**
-		 * @desc Base primitiveContent for CREATE operation for WaterFlow resource
-		 * @param 
-		 */
-		template WaterFlow_optional mw_contentWaterFlowBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-		 	waterFlowStrength := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for TelevisionChannel resource
-		 * @param 
-		 */
-		template TelevisionChannel_optional mw_contentTelevisionChannelBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			channelId := ?,//M
-			availableChannels := *,//O
-			previousChannel := *,//O
-			channelName := *,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Brightness resource
-		 * @param 
-		 */
-		template Brightness_optional mw_contentBrightnessBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			brightness := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Colour resource
-		 * @param 
-		 */
-		template Colour_optional mw_contentColourBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			red := ?,//M
-			green := ?,//M
-			blue := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for ColourSaturation resource
-		 * @param 
-		 */
-		template ColourSaturation_optional mw_contentColourSaturationBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			colourSaturation := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for DoorStatus resource
-		 * @param 
-		 */
-		template DoorStatus_optional mw_contentDoorStatusBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			doorState := ?,//M
-			openDuration := *,//O
-			openAlarm := *,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for PowerSave resource
-		 * @param 
-		 */
-		template PowerSave_optional mw_contentPowerSaveBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			powerSaveEnabled := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for MediaInput resource
-		 * @param 
-		 */
-		template MediaInput_optional mw_contentMediaInputBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			mediaID := ?,//M
-			supportedMediaSources := ?,//M
-			mediaName := *,//O
-			status := *,//O
-			mediaType := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for AudioVolume resource
-		 * @param 
-		 */
-		template AudioVolume_optional mw_contentAudioVolumeBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			volumePercentage := ?,//M
-			stepValue := *,//O
-			maxValue := *,//O
-			muteEnabled := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Boiler resource
-		 * @param 
-		 */
-		template Boiler_optional mw_contentBoilerBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			status := ?,//M
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for Clock resource
-		 * @param 
-		 */
-		template Clock_optional mw_contentClockBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			currentTime := ?,//M
-			currentDate := ?,//M
-			currentTimeZone := *,//O
-			choice := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for HotWaterSupply resource
-		 * @param 
-		 */
-		template HotWaterSupply_optional mw_contentHotWaterSupplyBase := {
-			resourceName := *,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := omit,//NP
-			creator := *,//O
-			containerDefinition := ?,//M
-			ontologyRef := *,//O
-			contentSize := omit,//NP
-			nodeLink := *,//O
-			bath := *,//O
-			choice := omit//NP
-		};
-	
-	}//end group ContentCreate
-	
-	group ContentUpdate {
-		
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for AE resource
-		 */
-		template (value) AE_optional m_contentUpdateAe := {
-			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
-			appName := omit,//O
-			app_ID := omit,//NP
-			aE_ID := omit,//NP
-			pointOfAccess := omit,//O
-			ontologyRef := omit,//O
-			nodeLink := omit,//O
-			requestReachability := omit,//O
-			contentSerialization := 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
-			choice := omit //NP
-		};	
-    	
-		/**
-		 * @desc Base reception primitiveContent for UPDATE operation for AE resource
-		 */
-		template AE_optional mw_contentUpdateAe modifies mw_contentAe_any := {
-			resourceName := omit,//NP
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			app_ID := omit,//NP
-			aE_ID := omit//NP
-		};
-
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for AccessControlPolicy resource
-		 */
-		template (value) AccessControlPolicy_optional m_contentUpdateAcp := {
-			resourceName := omit,//NP
-			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
-			privileges := omit,//O
-			selfPrivileges := omit,//O
-			authorizationDecisionResourceIDs := omit,//O
-			authorizationPolicyResourceIDs := omit,//O
-			authorizationInformationResourceIDs := omit,//O	
-			choice := omit //NP
-		};
-		
-		template (value) AccessControlPolicy_optional m_contentUpdateAcpPrivileges(in template(omit) SetOfAcrs p_privileges, in template(omit) SetOfAcrs p_selfPrivileges) modifies m_contentUpdateAcp := {
-			privileges := p_privileges,//O
-			selfPrivileges := p_selfPrivileges//O
-		};
-    	
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for GenericInterworkingService resource
-		 */
-		template (value) GenericInterworkingService_optional m_contentUpdateGenericInterworkingService := {
-			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
-			stateTag := omit,//NP
-			creator := omit,//NP
-			containerDefinition := omit,//NP
-			ontologyRef := omit,//O
-			contentSize := omit,//NP
-			serviceName := omit,//NP
-			inputDataPointLinks := omit,//O
-			outputDataPointLinks := omit,//O
-			choice := omit//NP
-		};
-		  	
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for GenericInterworkingService_invalid resource
-		 */
-		template (value) GenericInterworkingService_invalid m_contentUpdateGenericInterworkingService_invalid := {
-			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
-			stateTag := omit,//NP
-			creator := omit,//NP
-			containerDefinition := omit,//NP
-			ontologyRef := omit,//O
-			contentSize := omit,//NP
-			serviceName := omit,//NP
-			expirationCounter:= omit,//Invalid attribute
-			inputDataPointLinks := omit,//O
-			outputDataPointLinks := omit,//O
-			choice := omit//NP
-		};
-
-        /**
-		 * @desc Base primitiveContent for UPDATE operation for Group resource
-		 */
-		template (value) Group_optional m_contentUpdateGroup := {
-			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
-			creator := omit,//NP
-			memberType := omit,//NP
-			specializationType := omit,//NP
-			currentNrOfMembers := omit,//NP
-			maxNrOfMembers := omit,//O
-			memberIDs := omit,//O
-			membersAccessControlPolicyIDs := omit,//O
-			memberTypeValidated := omit,//NP
-			consistencyStrategy := omit,//NP
-			groupName := omit,//O
-			semanticSupportIndicator := omit,//O
-			notifyAggregation := omit,//O
-			choice := omit//NP
-
-		};
-		
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for CSEBase resource
-		 */
-		template (value) CSEBase_optional m_contentUpdateCSEBase := {
-			resourceName := omit,
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			cseType := omit,
-			cSE_ID := omit,
-			supportedResourceType := omit,
-			pointOfAccess := omit,
-			nodeLink := omit,
-			dynamicAuthorizationConsultationIDs := omit,
-			contentSerialization := omit,
-			e2eSecInfo := omit, 
-			supportedReleaseVersions := omit,
-			choice := omit
-
-		};
-    	
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for PollingChannel resource
-		 */
-		template (value) PollingChannel_optional m_contentUpdatePollingChannel := {
-			resourceName := omit,//NP
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			expirationTime := omit,//O
-			choice := omit
-		};
-    	
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for Schedule resource
-		 */
-		template (value) Schedule_optional m_contentUpdateSchedule := {
-			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
-			scheduleElement := omit,//O
-			networkCoordinated := omit,//O
-			choice := omit//NP
-		};
-    	
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for Subscription resource
-		 */
-		template (value) Subscription_optional m_contentUpdateSubscription := {
-			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
-			creator := omit,//NP
-			eventNotificationCriteria := omit,//O
-			expirationCounter := omit,//O
-			notificationURI := omit,//O
-			groupID := omit,//O
-			notificationForwardingURI := omit,//O
-			batchNotify := omit,//O
-			rateLimit := omit,//O
-			preSubscriptionNotify := omit,//NP
-			pendingNotification := omit,//O
-			notificationStoragePriority := omit,//O
-			latestNotify := omit,//O
-			notificationContentType := omit,//O
-			notificationEventCat := omit,//O
-			subscriberURI := omit,//NP
-			associatedCrossResourceSub := omit,//O
-			choice := omit//NP
-		};
-				
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for Container resource
-		 */
-		template (value) Container_optional m_contentUpdateContainer := {
-			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
-			stateTag := omit,//NP
-			creator := omit,//NP
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			locationID := omit,//O
-			ontologyRef := omit,//O
-    		disableRetrieval := omit, //NP
-			choice := omit//NP
-		};
-		
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for ContentInstance resource
-		 */
-		template (value) ContentInstance_optional m_contentUpdateContentInstance := {
-			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) := {
-    	  	resourceName 			:= omit,//NP
-    	  	resourceType			:= omit,//NP
-    	    resourceID				:= omit,//NP
-    	    parentID				:= omit,//NP
-    	  	creationTime			:= omit,//NP
-    	  	lastModifiedTime		:= omit,//NP
-    	  	labels 					:= PX_LABELS,//O
-    	  	accessControlPolicyIDs 	:= p_accessControlPolicyIds,//O
-    	  	expirationTime 			:= omit,//O    	  	
-    		dynamicAuthorizationConsultationIDs := omit, //O
-    	  	announceTo 				:= omit,//O
-    	  	announcedAttribute		:= omit,//O
-    		locationSource 			:= omit,//NP
-			locationInformationType := omit,//O
-			locationUpdatePeriod 	:= {p_locationUpdatePeriod}, //O
-    		locationTargetID 		:= omit, //NP
-    		locationServer 			:= omit, //NP
-    		locationContainerID		:= omit, //NP  
-    		locationContainerName 	:= PX_LOCATION_CONTAINER_NAME, //O    		 		
-    	  	locationStatus			:= omit, //NP
-			geographicalTargetArea := omit, //O
-			geofenceEventCriteria := omit, //O
-			authID := omit, //O
-			retrieveLastKnownLocation := omit, //O
-			locationUpdateEventCriteria := omit, //O
-			choice 					:= omit  //NP	   	  	
-    	};
-    	
-    	template (value) Node_optional m_contentUpdateNode := {
-			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
-			hostedAELinks := omit,//O
-			hostedServiceLinks := omit,//O
-			mgmtClientAddress := omit,//O
-			roamingStatus := omit,//O
-			networkID := omit,//O
-			choice := omit
-    	}
-    	
-    	template (value) RemoteCSE_optional m_contentUpdateRemoteCSE := {
-			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
-			contentSerialization := omit,//O
-			e2eSecInfo := omit,//O
-			descendantCSEs := omit,//O
-			supportedReleaseVersions := omit, //O
-			multicastCapability := omit,//O
-			externalGroupID := omit,//O
-			triggerEnable := omit,//O
-			activityPatternElements := omit,//O
-			choice := omit
-    	}
-    	
-		template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
-			resourceName := omit,
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			expirationTime := omit,
-			link := omit,
-			dynamicAuthorizationConsultationIDs := omit,
-			appName := omit,
-			app_ID := omit,
-			aE_ID := omit,
-			pointOfAccess := omit,
-			ontologyRef := omit,
-			nodeLink := omit,
-			requestReachability := omit,
-			contentSerialization := omit,
-			e2eSecInfo := omit,
-			supportedReleaseVersions := omit,
-			registrationStatus := omit,//O
-			trackRegistrationPoints := omit,//O
-			sessionCapabilities := omit,//O
-			triggerEnable := omit,//O
-			activityPatternElements := omit,//O
-			choice := omit
-    	}
-    	
-		template (value) ContainerAnnc_optional m_contentUpdateContainerAnnc := {
-			resourceName := omit,
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			expirationTime := omit,
-			link := omit,
-			dynamicAuthorizationConsultationIDs := omit,
-			stateTag := omit,
-			maxNrOfInstances := omit,
-			maxByteSize := omit,
-			maxInstanceAge := omit,
-			currentNrOfInstances := omit,
-			currentByteSize := omit,
-			locationID := omit,
-			ontologyRef := omit,
-			disableRetrieval := omit,
-			choice := omit
-		};
-		
-		template (value) GroupAnnc_optional m_contentUpdateGroupAnnc := {
-			resourceName := omit,
-		  	resourceType := omit,
-		  	resourceID := omit,
-		  	parentID := omit,
-		  	creationTime := omit,
-		  	lastModifiedTime := omit,
-		  	labels := omit,
-		  	accessControlPolicyIDs := omit,
-		  	expirationTime := omit,
-		  	link := omit,
-		  	dynamicAuthorizationConsultationIDs := omit,
-		  	memberType := omit,
-			specializationType := omit,
-			currentNrOfMembers := omit, 
-		  	maxNrOfMembers := omit,
-		  	memberIDs := omit, 
-		  	membersAccessControlPolicyIDs := omit,
-		  	memberTypeValidated := omit,
-		  	consistencyStrategy := omit, 
-		  	groupName := omit, 
-		  	semanticSupportIndicator := omit,
-		  	notifyAggregation := omit,
-		  	choice := omit
-		};	
-		
-    			
-		/**
-		 * @desc 	Base primitiveContent for UPDATE operation for SemanticDescriptor resource
-		 */
-		template (value) SemanticDescriptor_optional m_contentUpdateSemanticDescriptor := {			
-			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
-			announceTo := omit,                             //O
-			announcedAttribute := omit,                     //O
-			creator := omit,                                //O
-			descriptorRepresentation := omit,               //M
-			semanticOpExec := omit,                         //NP
-			descriptor := omit,                             //M
-			ontologyRef := omit,                            //O
-			relatedSemantics := omit,                       //O
-			semanticValidated := omit,                      //NP
-			validationEnable := omit,                       //O
-			choice := omit//O
-		} 
-		
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for TimeSeries resource
-		 */
-		template (value) TimeSeries_optional m_contentUpdateTimeSeries := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			creator := omit,//O
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			periodicInterval := omit,//O
-			missingDataDetect := omit,//O
-			missingDataMaxNr := omit,//O
-			missingDataList := omit,//NP
-			missingDataCurrentNr := omit,//NP
-			missingDataDetectTimer := omit,//O
-			ontologyRef := omit,//O
-			contentInfo := omit,//O
-			choice := omit//NP
-		};
-		
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for TimeSeriesInstance resource
-		 */
-		template (value) TimeSeriesInstance_optional m_contentUpdateTimeSeriesInstance := {
-			resourceName := omit,
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			expirationTime := omit,
-			announceTo := omit,
-			announcedAttribute := omit,
-			dataGenerationTime := omit,
-			content := omit,
-			sequenceNr := omit,
-			contentSize := omit,
-			choice := omit
-		};
-		
-		/**
-		 * @desc Base primitiveContent for UPDATE operation for TimeSeriesInstance resource
-		 */
-		template (value) Role_optional m_contentUpdateRole := {
-			resourceName := omit,
-			resourceType := omit,
-			resourceID := omit,
-			parentID := omit,
-			creationTime := omit,
-			lastModifiedTime := omit,
-			labels := omit,
-			accessControlPolicyIDs := omit,
-			expirationTime := omit,
-			dynamicAuthorizationConsultationIDs := omit,
-			roleID := omit,
-			issuer := omit,
-			holder := omit,
-			notBefore := omit,
-			notAfter := omit,
-			roleName := omit,
-			tokenLink := omit,
-			choice := omit
-		};
-		/**
-		 * @desc Base primitiveContent for CREATE operation for SemanticMashupJobProfile resource
-		 */   	
-		template (value) SemanticMashupJobProfile_optional m_contentUpdateSemanticMashupJobProfile := {		
-			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
-			announceTo := omit,	//O
-			announcedAttribute := omit,	//O
-			creator := omit,	//O
-			memberFilter := omit,	//M
-			smiID := omit,	//O
-			inputDescriptor := omit,	//O
-			outputDescriptor := omit,	//O
-			functionDescriptor := omit	//O
-		}
-		
-		/**
-		 * @desc Base primitiveContent for CREATE operation for SemanticMashupInstance resource
-		 */    	
-		template (value) SemanticMashupInstance_optional m_contentUpdateSemanticMashupInstance := {
-			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
-			announceTo := omit,	//O
-			announcedAttribute := omit,	//O
-			creator := omit,	//O
-			smjpID := omit,	//O
-			smjpInputParameter := omit,	//O
-			memberStoreType := omit,	//O
-			mashupMember := omit,	//O
-			resultGenType := omit,   //O
-			periodForResultGen := omit	//O
-		} 
-	}//end group ContentUpdate
-	
-	group ContentRetrieve {
-		/**
-		  * @desc Base primitiveContent for DELETE operation for PollingChannel resource
-		 */
-		template (value) PollingChannel_optional m_contentRetrievePollingChannel := {
-			resourceName := omit,//NP
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			expirationTime := omit,//O
-			choice := omit//NP
-		};
-	}
-	
-	group ContentDelete {
-		
-		/**
-		  * @desc Base primitiveContent for DELETE operation for PollingChannel resource
-		 */
-		template (value) PollingChannel_optional m_contentDeletePollingChannel := {
-			resourceName := omit,//NP
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			expirationTime := omit,//O
-			choice := omit//NP
-		};
-				
-	} //end group ContentDelete
-
-	group ResponseContent {
-		
-		template AE_optional mw_contentAeBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-    		dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			appName := *,//O
-			app_ID := ?,//M
-			aE_ID := ?,//M
-			pointOfAccess := *,//O
-			ontologyRef := *,//O
-			nodeLink := *,//O
-			requestReachability := ?,//M
-			contentSerialization := *,//O
-			e2eSecInfo := *, //O
-			m2M_Ext_ID := *, //O
-			supportedReleaseVersions := ?,//M
-			registrationStatus := *, //O
-			trackRegistrationPoints := *, //O
-			sessionCapabilities := *, //O
-			triggerEnable := *, //O
-			activityPatternElements := *, //O			
-			choice := *//O
-		};
-    	
-		template (value) AE_optional m_contentAe_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			appName := omit,//O
-			app_ID := omit,//M
-			aE_ID := omit,//M
-			pointOfAccess := omit,//O
-			ontologyRef := omit,//O
-			nodeLink := omit,//O
-			requestReachability := omit,//M
-			contentSerialization := omit,//O
-			e2eSecInfo:= omit, //O
-			m2M_Ext_ID := omit,//O
-			supportedReleaseVersions := omit,//M
-			registrationStatus := omit,//O
-			trackRegistrationPoints := omit,//O
-			sessionCapabilities := omit,//O
-			triggerEnable := omit,//O
-			activityPatternElements := omit,//O
-			choice := omit//O
-		};
-		
-		template AE_optional mw_contentAe_any := {
-			resourceName := *,//M
-			resourceType := *,//M
-			resourceID := *,//M
-			parentID := *,//M
-			creationTime := *,//M
-			lastModifiedTime := *,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//M
-			dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			appName := *,//O
-			app_ID := *,//M
-			aE_ID := *,//M
-			pointOfAccess := *,//O
-			ontologyRef := *,//O
-			nodeLink := *,//O
-			requestReachability := *,//M
-			contentSerialization := *,//O
-			e2eSecInfo:= *, //O
-			m2M_Ext_ID := *, //O
-			supportedReleaseVersions := ?, //M
-			registrationStatus := *, //O
-			trackRegistrationPoints := *, //O
-			sessionCapabilities := *, //O
-			triggerEnable := *, //O
-			activityPatternElements := *, //O
-			choice := *//O
-		};
-    	
-		template AEAnnc_optional mw_contentAeAnnc_base := {
-			resourceName := ?,//M NA
-			resourceType := ?,//M NA
-			resourceID := ?,//M NA
-			parentID := ?,//M NA
-			creationTime := ?,//M NA
-			lastModifiedTime := ?,//M NA
-			labels := *,//O MA
-			accessControlPolicyIDs := *,//O MA Special case: acpi mandatory for announced resources
-			expirationTime := ?,//M MA
-			link := ?,//M,
-			dynamicAuthorizationConsultationIDs := *, //O OA
-			appName := *,//O OA
-			app_ID := *,//M OA
-			aE_ID := *,//M OA
-			pointOfAccess := *,//O OA
-			ontologyRef := *,//O OA
-			nodeLink := *,//O OA
-			requestReachability := *,//M OA
-			contentSerialization := *,//O OA
-			e2eSecInfo:= *, //O MA
-			supportedReleaseVersions := *,//O MA
-			registrationStatus := *,//O,
-			trackRegistrationPoints := *,//O,
-			sessionCapabilities := *,//O,
-			triggerEnable := *,//O,
-			activityPatternElements := *,//O,
-			choice := *//O
-		};
-		
-
-        template AEAnnc_optional mw_contentAeAnnc_any := {
-			resourceName := *,//M
-			resourceType := *,//M
-			resourceID := *,//M
-			parentID := *,//M
-			creationTime := *,//M
-			lastModifiedTime := *,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//M
-			link := *,//M,
-			dynamicAuthorizationConsultationIDs := *, //O
-			appName := *,//O
-			app_ID := *,//M
-			aE_ID := *,//M
-			pointOfAccess := *,//O
-			ontologyRef := *,//O
-			nodeLink := *,//O
-			requestReachability := *,//M
-			contentSerialization := *,//O
-			e2eSecInfo:= *, //O
-			supportedReleaseVersions := ?,//M
-			registrationStatus := *,//O,
-			trackRegistrationPoints := *,//O,
-			sessionCapabilities := *,//O,
-			triggerEnable := *,//O,
-			activityPatternElements := *,//O,
-			choice := *//O
-		};
-
-        template AccessControlPolicy_optional mw_contentAcpBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			expirationTime := ?,//M
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			privileges := ?,//M
-			selfPrivileges := ?,//M
-			authorizationDecisionResourceIDs := *,//O
-			authorizationPolicyResourceIDs := *,//O
-			authorizationInformationResourceIDs := *,//O
-			choice := *//O
-		};
-		
-		template AccessControlPolicy_optional mw_contentAcp_any := {
-			resourceName := *,//M
-			resourceType := *,//M
-			resourceID := *,//M
-			parentID := *,//M
-			creationTime := *,//M
-			lastModifiedTime := *,//M
-			labels := *,//O
-			expirationTime := *,//M
-			announceTo := *,//O
-			announcedAttribute := *,//M
-			privileges := *,//M
-			selfPrivileges := *,//M
-			authorizationDecisionResourceIDs := *,//O
-			authorizationPolicyResourceIDs := *,//O
-			authorizationInformationResourceIDs := *,//O
-			choice := *//O
-		}
-		
-		template AccessControlPolicy_optional mw_contentAcp_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			expirationTime := omit,//M
-			announceTo := omit,//O
-			announcedAttribute := omit,//M
-			privileges := omit,//M
-			selfPrivileges := omit,//M
-			authorizationDecisionResourceIDs := omit,//O
-			authorizationPolicyResourceIDs := omit,//O
-			authorizationInformationResourceIDs := omit,//O
-			choice := omit//O
-		}
-		
-		template (value) LocationPolicy_optional m_contentLocationPolicy_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			locationSource := omit,//M
-			locationInformationType := omit,//O
-			locationUpdatePeriod := omit,//O
-			locationTargetID := omit,//O
-			locationServer := omit,//O
-			locationContainerID := omit,//O
-			locationContainerName := omit,//O
-			locationStatus := omit,//M
-			geographicalTargetArea := omit, //O
-			geofenceEventCriteria := omit, //O
-			authID := omit, //O
-			retrieveLastKnownLocation := omit, //O
-			locationUpdateEventCriteria := omit, //O
-			choice := omit//O
-		}
-		
-		template AccessControlPolicy_optional mw_contentAcp_rc1 modifies mw_contentAcpBase := {
-			choice := omit	//O
-		}
-		
-		template XSD.AnyURI mw_contentAcp_rc2 := ?;
-		
-		template Resource mw_contentAcp_rc3 := {
-			choice := {accessControlPolicy := ?},
-			uRI := ? 	
-		}
-		
-		template AccessControlPolicy_optional mw_contentAcp_rc4 modifies mw_contentAcpBase := {
-			choice := {choice_list := ?}	//O
-		}
-		
-		template AccessControlPolicy_optional mw_contentAcp_rc5 modifies mw_contentAcpBase := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template AccessControlPolicy_optional mw_contentAcp_rc6 modifies mw_contentAcp_allOmit := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template AccessControlPolicy_optional mw_contentAcp_rc7 modifies mw_contentAcpBase := {
-			
-		}
-		
-		template AccessControlPolicy_optional mw_contentAcp_rc8 modifies mw_contentAcp_allOmit := {
-			choice := {choice_list := ?}	//O
-		}
-		
-	   template AccessControlPolicyAnnc_optional mw_contentAcpAnncBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			expirationTime := ?,//M
-			link := ?,//M
-			privileges := ?,//M
-			selfPrivileges := ?,//M
-			authorizationDecisionResourceIDs := *,//O
-			authorizationPolicyResourceIDs := *,//O
-			authorizationInformationResourceIDs := *,//O
-			choice := *//O
-		};
-    	
-		template Group_optional mw_contentGroupBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-    		dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			creator := *,//O
-			memberType := ?,//M
-			specializationType := *,//O
-			currentNrOfMembers := ?,//M
-			maxNrOfMembers := ?,//M
-			memberIDs := ?,//M
-			membersAccessControlPolicyIDs := *,//O
-			memberTypeValidated := *,//O
-			consistencyStrategy := *,//O
-			groupName := *,//O
-			semanticSupportIndicator := *,//O
-			notifyAggregation := *,//O
-			choice := *//O
-		};
-		
-		template Group_optional mw_contentGroup_any := {
-			resourceName := *,//M
-			resourceType := *,//M
-			resourceID := *,//M
-			parentID := *,//M
-			creationTime := *,//M
-			lastModifiedTime := *,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//M
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//M
-			creator := *,//O
-			memberType := *,//M
-			specializationType := *,//O
-			currentNrOfMembers := *,//M
-			maxNrOfMembers := *,//M
-			memberIDs := *,//M
-			membersAccessControlPolicyIDs := *,//O
-			memberTypeValidated := *,//M
-			consistencyStrategy := *,//O
-			groupName := *,//O
-			semanticSupportIndicator := *,//O
-			notifyAggregation := *,//O
-			choice := *//O
-		}
-		
-		template Group_optional mw_contentGroup_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//M
-			creator := omit,//O
-			memberType := omit,//M
-			specializationType := omit,//O
-			currentNrOfMembers := omit,//M
-			maxNrOfMembers := omit,//M
-			memberIDs := omit,//M
-			membersAccessControlPolicyIDs := omit,//O
-			memberTypeValidated := omit,//M
-			consistencyStrategy := omit,//O
-			groupName := omit,//O
-			semanticSupportIndicator := omit,//O
-			notifyAggregation := omit,//O
-			choice := omit//O
-		}
-		
-		template Group_optional mw_contentGroup_rc1 modifies mw_contentGroupBase := {
-			choice := omit	//O
-		}
-		
-		template XSD.AnyURI mw_contentGroup_rc2 := ?; 
-		
-		template Resource  mw_contentGroup_rc3 := {
-			choice := {group_ := ?},
-			uRI := ?
-		}
-		
-		template Group_optional mw_contentGroup_rc4 modifies mw_contentGroupBase := {
-			choice := {choice_list := {{subscription := ?}}}	//O
-		}
-		
-		template Group_optional mw_contentGroup_rc5 modifies mw_contentGroupBase := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template Group_optional mw_contentGroup_rc6 modifies mw_contentGroup_allOmit := { 
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template Group_optional mw_contentGroup_rc7 modifies mw_contentGroupBase := {
-			
-		}
-		
-		template Group_optional mw_contentGroup_rc8 modifies mw_contentGroup_allOmit := {
-			choice := {choice_list := ?}	//O
-		}
-		
-		template GroupAnnc_optional mw_contentGroupAnncBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-			link := ?,//M
-			dynamicAuthorizationConsultationIDs := *, //O
-			memberType := *,//O
-			specializationType := *,//O
-			currentNrOfMembers := *,//O
-			maxNrOfMembers := *,//O
-			memberIDs := *,//O
-			membersAccessControlPolicyIDs := *,//O
-			memberTypeValidated := *,//O
-			consistencyStrategy := *,//O
-			groupName := *,//O
-			semanticSupportIndicator := *,//O
-			notifyAggregation := *,//O
-			choice := *//O
-		};
-		
-		template (value) MgmtCmd_optional m_contentMgmtCmd_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			description := omit,//O
-			cmdType := omit,//M
-			execReqArgs := omit,//O
-			execEnable := omit,//M
-			execTarget := omit,//M
-			execMode := omit,//O
-			execFrequency := omit,//O
-			execDelay := omit,//O
-			execNumber := omit,//O
-			choice := omit//M
-		}
-    	
-		template PollingChannel_optional mw_contentPollingChannelBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			expirationTime := ?,//M
-			choice := omit//NP
-		};
-		
-		template PollingChannel_optional mw_contentPollingChannel_any := {
-			resourceName := *,//M
-			resourceType := *,//M
-			resourceID := *,//M
-			parentID := *,//M
-			creationTime := *,//M
-			lastModifiedTime := *,//M
-			labels := *,//O
-			expirationTime := *,//M
-			choice := omit//NP
-		};
-		
-		template PollingChannel_optional mw_contentPollingChannel_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			expirationTime := omit,//M
-			choice := omit//NP
-		};
-		
-		template PollingChannel_optional mw_contentPollingChannel_rc1 modifies mw_contentPollingChannelBase := {
-		}
-		
-		template XSD.AnyURI mw_contentPollingChannel_rc2 := ?; 
-		
-		template Resource  mw_contentPollingChannel_rc3 := {
-			choice := {pollingChannel := ?},
-			uRI := ?
-		}
-		
-		template PollingChannel_optional mw_contentPollingChannel_rc4 modifies mw_contentPollingChannelBase := {
-		}
-		
-		template PollingChannel_optional mw_contentPollingChannel_rc5 modifies mw_contentPollingChannelBase := {
-		}
-		
-		template PollingChannel_optional mw_contentPollingChannel_rc6 modifies mw_contentPollingChannel_allOmit := { 
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template PollingChannel_optional mw_contentPollingChannel_rc8 modifies mw_contentPollingChannel_allOmit := {
-			choice := {choice_list := ?}	//O
-		}
-
-		template (value) RemoteCSE_optional m_contentRemoteCSE_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			cseType := omit,//O
-			pointOfAccess := omit,//O
-			cSEBase := omit,//M
-			cSE_ID := omit,//M
-			m2M_Ext_ID := omit,//O
-			trigger_Recipient_ID := omit,//O
-			requestReachability := omit,//M
-			nodeLink := omit,//O
-			triggerReferenceNumber := omit,//O
-			contentSerialization := omit,//O
-			e2eSecInfo := omit,//O
-			descendantCSEs := omit,//O
-			supportedReleaseVersions := omit,//M
-			multicastCapability := omit,//O
-			externalGroupID := omit,//O
-			triggerEnable := omit,//O
-			activityPatternElements := omit,//O
-			choice := omit//O
-		};
-		
-		template (value) RemoteCSE_optional m_contentRemoteCSE_e2eSecInfo (in E2eSecInfo p_e2eSecInfo, in charstring p_pointOfAccess, in CseSimuComponentDesc p_componentDesc)  modifies m_contentRemoteCSE_allOmit := {
-			resourceName := p_componentDesc.cseName,//M
-			resourceType := int16,//M
-			resourceID := p_componentDesc.cseResourceId,//M
-			pointOfAccess := {p_pointOfAccess},//O
-			cSEBase := p_componentDesc.cseId & "/" & p_componentDesc.cseName,//M
-			cSE_ID := p_componentDesc.cseId,//M
-			requestReachability := true,//M
-			e2eSecInfo := p_e2eSecInfo//O
-		};
-		
-		
-		template (value) RemoteCSE_optional m_contentMyRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
-			resourceName := PX_TS_CSE1.cseName,//M
-			resourceType := int16,//M
-			resourceID := PX_TS_CSE1.cseResourceId,//M
-			pointOfAccess := {p_pointOfAccess},//O
-			cSEBase := PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName,//M
-			cSE_ID := PX_TS_CSE1.cseId,//M
-			requestReachability := true//M
-		};
-		
-		template (value) RemoteCSE_optional m_contentLocalRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
-			resourceName := PX_CSE_NAME,//M
-			resourceType := int16,//M
-			resourceID := PX_CSE_RESOURCE_ID,//M
-			pointOfAccess := {p_pointOfAccess},//O
-			cSEBase := PX_CSE_ID & "/" & PX_CSE_NAME,//M
-			cSE_ID := PX_CSE_ID,//M
-			requestReachability := true//M
-		};
-		
-		template RemoteCSE_optional mw_contentRemoteCSEBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			cseType := *,//O
-			pointOfAccess := *,//O
-			cSEBase := ?,//M
-			cSE_ID := ?,//M
-			m2M_Ext_ID := *,//O
-			trigger_Recipient_ID := *,//O
-			requestReachability := ?,//M
-			nodeLink := *,//O
-			triggerReferenceNumber := *,//O
-			contentSerialization := *,//O
-			e2eSecInfo := *,//O
-			descendantCSEs := *,//O
-			supportedReleaseVersions := ?,//M
-			multicastCapability := *,//O
-			externalGroupID := *,//O
-			triggerEnable := *,//O
-			activityPatternElements := *,//O
-			choice := *//O
-		};
-		
-		template Request_optional mw_contentRequestBase := {			
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-			dynamicAuthorizationConsultationIDs := *,//O
-			stateTag := ?,//M
-			operation := ?,//M
-			target := ?,//M
-			originator := ?,//M	
-			requestID := ?,//M
-			metaInformation := ?,//M
-			primitiveContent := *,//O
-			requestStatus := ?,//M
-			operationResult := *,//M
-			choice := *//O
-		};
-		
-		template Schedule_optional mw_contentScheduleBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			scheduleElement := ?,//M
-			networkCoordinated := ?,//M
-			choice := *//O
-		};
-		
-		template Schedule_optional mw_contentSchedule_any := {
-			resourceName := *,//M
-			resourceType := *,//M
-			resourceID := *,//M
-			parentID := *,//M
-			creationTime := *,//M
-			lastModifiedTime := *,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//M
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//M
-			scheduleElement := *,//M
-			networkCoordinated := ?,//M
-			choice := *//O
-		}
-		
-		template Schedule_optional mw_contentSchedule_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//M
-			scheduleElement := omit,//M
-			networkCoordinated := omit,//M
-			choice := omit//O
-		}
-		
-		template Schedule_optional mw_contentSchedule_rc1 modifies mw_contentScheduleBase := {
-			choice := omit	//O
-		}
-		
-		template XSD.AnyURI mw_contentSchedule_rc2 := ?; 
-		
-		template Resource mw_contentSchedule_rc3 := {
-			choice := {schedule := ?},
-			uRI := ?
-		}
-		
-		template Schedule_optional mw_contentSchedule_rc4 modifies mw_contentScheduleBase := {
-			choice := {choice_list := ?}	//O
-		}
-		
-		template Schedule_optional mw_contentSchedule_rc5 modifies mw_contentScheduleBase := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template Schedule_optional mw_contentSchedule_rc6 modifies mw_contentSchedule_allOmit := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template Schedule_optional mw_contentSchedule_rc7 modifies mw_contentScheduleBase := {
-			
-		}
-		
-		template Schedule_optional mw_contentSchedule_rc8 modifies mw_contentSchedule_allOmit := {
-			choice := {choice_list := ?}	//O
-		}
-		
-		template (value) StatsCollect_optional m_contentStatsCollect_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			creator := omit,//O
-			statsCollectID := omit,//M
-			collectingEntityID := omit,//M
-			collectedEntityID := omit,//M
-			statsRuleStatus := omit,//M
-			statModel := omit,//M
-			collectPeriod := omit,//O
-			eventID := omit,//O
-			choice := omit//M
-		}
-		
-		//Ontology Repository Internal resource at CSE as per TS-001
-		template SemanticMashupInstance_optional m_contentSemanticMashupInstance (XSD.ID resourceID := "NotInitialized",
-																				  ResourceName p_resourceName := "NotInitialized",
-																				  NhURI p_parentID := "NotInitialized",
-																				  Timestamp p_expirationTime := "20301231T012345",
-																				  Timestamp p_creationTime := "21001231T012345",
-																				  Timestamp p_lastModifiedTime := "21001231T012345",
-																				  XSD.AnyURI p_smjpID := "NotInitialized",
-		                                                                          MashupMemberStoreType p_memberStoreType := int1,
-																				  MashupResultGenType p_resultGenType := int1 ) := {  //when SMI is created
-
-			resourceName := p_resourceName, //M
-			resourceType := int41, //M
-			resourceID := omit, //M
-			parentID := p_parentID, //M
-			creationTime := p_creationTime, //M
-			lastModifiedTime := p_lastModifiedTime, //M
-			labels := omit, //O
-			accessControlPolicyIDs := omit, //O
-			expirationTime := p_expirationTime, //M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit, //O
-			announcedAttribute := 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
-		};
-		
-		template (value) StatsConfig_optional m_contentStatsConfig_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			creator := omit,//O
-			choice := omit//M
-		}
-    	
-		template Subscription_optional mw_contentSubscriptionBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-    		dynamicAuthorizationConsultationIDs := *, //O
-			creator := *,//O
-			eventNotificationCriteria := *,//O
-			expirationCounter := *,//O
-			notificationURI := ?,//M
-			groupID := *,//O
-			notificationForwardingURI := *,//O
-			batchNotify := *,//O
-			rateLimit := *,//O
-			preSubscriptionNotify := *,//O
-			pendingNotification := *,//O
-			notificationStoragePriority := *,//O
-			latestNotify := *,//O
-			notificationContentType := *,//O
-			notificationEventCat := *,//O
-			subscriberURI := *,//O
-			associatedCrossResourceSub := *,//O
-			choice := *//O
-		};
-		template Subscription_optional mw_contentSubscription_any := {
-			resourceName := *,//M
-			resourceType := *,//M
-			resourceID := *,//M
-			parentID := *,//M
-			creationTime := *,//M
-			lastModifiedTime := *,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//M
-		    dynamicAuthorizationConsultationIDs := *, //O
-			creator := *,//O
-			eventNotificationCriteria := *,//O
-			expirationCounter := *,//O
-			notificationURI := *,//M
-			groupID := *,//O
-			notificationForwardingURI := *,//O
-			batchNotify := *,//O
-			rateLimit := *,//O
-			preSubscriptionNotify := *,//O
-			pendingNotification := *,//O
-			notificationStoragePriority := *,//O
-			latestNotify := *,//O
-			notificationContentType := *,//M
-			notificationEventCat := *,//O
-			subscriberURI := *,//O
-			associatedCrossResourceSub := *,//O
-			choice := *//O
-		}
-		
-		template Subscription_optional mw_contentSubscription_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			creator := omit,//O
-			eventNotificationCriteria := omit,//O
-			expirationCounter := omit,//O
-			notificationURI := omit,//M
-			groupID := omit,//O
-			notificationForwardingURI := omit,//O
-			batchNotify := omit,//O
-			rateLimit := omit,//O
-			preSubscriptionNotify := omit,//O
-			pendingNotification := omit,//O
-			notificationStoragePriority := omit,//O
-			latestNotify := omit,//O
-			notificationContentType := omit,//M
-			notificationEventCat := omit,//O
-			subscriberURI := omit,//O
-			associatedCrossResourceSub := omit,//O
-			choice := omit//O
-		}
-		
-		template (value) Subscription_optional m_contentSubscription modifies mw_contentSubscription_allOmit := {
-			resourceType := int23	//M
-		}
-		
-		template Subscription_optional mw_contentSubscription_rc1 modifies mw_contentSubscriptionBase := {
-			choice := omit	//O
-		}
-		
-		template XSD.AnyURI mw_contentSubscription_rc2 := ?;  
-		
-		template Resource mw_contentSubscription_rc3 := {
-			choice := {subscription := ?},
-			uRI := ?
-		}
-		
-		template Subscription_optional mw_contentSubscription_rc4 modifies mw_contentSubscriptionBase := {
-			choice := { choice_list := {{schedule := ?}}}	//O
-		}
-		
-		template Subscription_optional mw_contentSubscription_rc5 modifies mw_contentSubscriptionBase := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template Subscription_optional mw_contentSubscription_rc6 modifies mw_contentSubscription_allOmit := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template Subscription_optional mw_contentSubscription_rc7 modifies mw_contentSubscriptionBase := {
-			
-		}
-		
-		template Subscription_optional mw_contentSubscription_rc8 modifies mw_contentSubscription_allOmit := {
-			choice := {choice_list := ?}	//O
-		}
-    	
-		template ContentInstance_optional mw_contentContentInstanceBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			expirationTime := ?,//M
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := ?,//M
-			creator := *,//O
-			contentInfo := *,//O
-			contentSize := ?,//M
-			contentRef := *, //O
-			ontologyRef := *,//O
-			content := ?,//M
-			choice := * //O
-			
-		};
-		
-		template ContentInstance_optional mw_contentContentInstance_rc1 modifies mw_contentContentInstanceBase := {
-			choice := omit	//O
-		}
-		
-		template (value) ContentInstance_optional m_contentContentInstance_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit ,//O
-			expirationTime := omit,//M
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//M
-			creator := omit,//O
-			contentInfo := omit,//O
-			contentSize := omit,//M
-			contentRef := omit,
-			ontologyRef := omit,//O
-			content := omit, //M
-			choice := omit
-		};
-		
-		template ContentInstanceAnnc_optional mw_contentContentInstanceAnncBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			expirationTime := ?,//M
-			link := ?,//M
-			stateTag := *,//O
-			contentInfo := *,//O
-			contentSize := *,//O
-			ontologyRef := *,//O
-			content := *,//O
-			choice := * //O
-			
-		};
-		
-		template Container_optional mw_contentContainerBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-    		dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := ?,//M
-			creator := *,//O
-			maxNrOfInstances := *,//O
-			maxByteSize := *,//O
-			maxInstanceAge := *,//O
-			currentNrOfInstances := ?,//M
-			currentByteSize := ?,//M
-			locationID := *,//O
-			ontologyRef := *,//O
-			disableRetrieval := *, //O
-			choice := *//O
-		};
-		
-		template Container_optional mw_contentContainer_any := {
-			resourceName := *,//M
-			resourceType := *,//M
-			resourceID := *,//M
-			parentID := *,//M
-			creationTime := *,//M
-			lastModifiedTime := *,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//M
-			dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//M
-			stateTag := *,//M
-			creator := *,//M
-			maxNrOfInstances := *,//O
-			maxByteSize := *,//O
-			maxInstanceAge := *,//O
-			currentNrOfInstances := *,//M
-			currentByteSize := *,//M
-			locationID := *,//O
-			ontologyRef := *,//O
-			disableRetrieval := *, //O
-			choice := *//O
-		}
-		
-		template Container_optional mw_contentContainer_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//M
-			stateTag := omit,//M
-			creator := omit,//M
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//M
-			currentByteSize := omit,//M
-			locationID := omit,//O
-			ontologyRef := omit,//O
-			disableRetrieval := omit, //O
-			choice := omit//O
-		}
-		
-		template (value) Delivery_optional m_contentDelivery_allOmit := {
-	
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			source := omit,//M
-			target := omit,//M
-			lifespan := omit,//M
-			eventCat := omit,//M
-			deliveryMetaData := omit,//M
-			aggregatedRequest := omit,//M
-			choice := omit//O
-	
-		};    
-		
-		template Container_optional mw_contentContainer_rc1 modifies mw_contentContainerBase := {
-			choice := omit	//O
-		}
-		
-		template XSD.AnyURI mw_contentContainer_rc2 := ?;
-		
-		template Resource mw_contentContainer_rc3 := {
-			choice := {container := ?},
-			uRI := ?
-		}
-		
-		template Container_optional mw_contentContainer_rc4 modifies mw_contentContainerBase := {
-			choice := {choice_list := ?}	//O
-		}
-		
-		template Container_optional mw_contentContainer_rc5 modifies mw_contentContainerBase := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template Container_optional mw_contentContainer_rc6 modifies mw_contentContainer_allOmit := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template Container_optional mw_contentContainer_rc7 modifies mw_contentContainerBase := {
-		
-		}
-		
-		template Container_optional mw_contentContainer_rc8 modifies mw_contentContainer_allOmit := {
-			choice := {choice_list := ?}	//O
-		}
-		
-		template ContainerAnnc_optional mw_contentContainerAnncBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-			link := ?,//M
-			dynamicAuthorizationConsultationIDs := *, //O
-			stateTag := *,//O
-			maxNrOfInstances := *,//O
-			maxByteSize := *,//O
-			maxInstanceAge := *,//O
-			currentNrOfInstances := *,//O
-			currentByteSize := *,//O
-			locationID := *,//O
-			ontologyRef := *,//O
-			disableRetrieval := *, //O
-			choice := *//O
-		};
-		
-		template (value) Notification m_contentNotification_allOmit := {
-			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
-		};
-		
-		template (value) Notification m_contentNotification_subscriptionVerification(XSD.ID p_creator) modifies m_contentNotification_allOmit:= {
-			verificationRequest := true,
-			creator := p_creator
-		};
-		
-		template Notification mw_contentNotification_any := {
-			notificationEvent := *,
-			verificationRequest := *,
-			subscriptionDeletion := *,
-			subscriptionReference := *,
-			creator := *,
-			notificationForwardingURI := *,
-			notificationTarget := *,
-			targetRemovalRequest := *,
-			targetRemovalAllowance := *,
-			iPEDiscoveryRequest := *,
-			aERegistrationPointChange := *,
-			aEReferenceIDChange := *,
-			trackingID1 := *,
-			trackingID2 := *
-		};
-
-		template Notification mw_contentNotificationBase := {
-			notificationEvent := *,//O
-			verificationRequest := *,//O
-			subscriptionDeletion := *,//O
-			subscriptionReference := *,//M //TODO Put it back to ? subscriptionReference is mandatory
-			creator := *,//O
-			notificationForwardingURI := *,//O
-			notificationTarget := *,
-			targetRemovalRequest := *,
-			targetRemovalAllowance := *,
-			iPEDiscoveryRequest := *,//O
-			aERegistrationPointChange := *,//O
-			aEReferenceIDChange := *,//O
-			trackingID1 := *,//O
-			trackingID2 := *//O
-		};
-		
-		template Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := {
-			verificationRequest := true,
-			creator := ?
-		}
-
-
-		template Notification mw_contentNotification (in template  Representation p_representation) modifies mw_contentNotificationBase := {
-			notificationEvent := {
-				representation := p_representation,
-				operationMonitor := *,
-				notificationEventType := ?
-			}
-		};
-		
-		template Representation mw_timeSeriesNotification (TimeSeriesNotification p_timeSeriesNotification) := {
-			timeSeriesNotification := p_timeSeriesNotification
-		}
-		
-		template (value) Node_optional m_contentNode_allOmit := {
-			
-			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,
-			hostedAELinks := omit,//O
-			hostedServiceLinks := omit,//O
-			mgmtClientAddress := omit,//O
-			roamingStatus := omit,//O
-			networkID := omit,//O
-			choice := omit			
-			
-		};
-		
-		template CSEBase_optional mw_contentCSEBaseBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := "",//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			cseType := *,//O
-			cSE_ID := ?,//M
-			supportedResourceType := ?,//M
-			pointOfAccess := ?,//M
-			nodeLink := *,//O
-			dynamicAuthorizationConsultationIDs := *,
-			contentSerialization := *,
-			e2eSecInfo := *,//O			
-			supportedReleaseVersions := ?,//M
-			choice := *//O
-		};
-
-		template CSEBase_optional mw_contentCSEBase_rc1 modifies mw_contentCSEBaseBase := {
-			choice := omit	//O
-		}
-		
-		template TimeSeries_optional mw_contentTimeSeries_allOmit := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			creator := omit,//M
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//M
-			currentByteSize := omit,//M
-			periodicInterval := omit,//O
-			missingDataDetect := omit,//O
-			missingDataMaxNr := omit,//O
-			missingDataList := omit,//O
-			missingDataCurrentNr := omit,//O
-			missingDataDetectTimer := omit,//O
-			ontologyRef := omit,//O
-			contentInfo := omit,//O
-			choice := omit//O
-		}
-		
-		template TimeSeries_optional mw_contentTimeSeriesBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-			dynamicAuthorizationConsultationIDs := *,//O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			creator := *,//O TODO XSD should be changed to optional for creator in TimeSeries
-			maxNrOfInstances := *,//O
-			maxByteSize := *,//O
-			maxInstanceAge := *,//O
-			currentNrOfInstances := ?,//M
-			currentByteSize := ?,//M
-			periodicInterval := *,//O
-			missingDataDetect := *,//O
-			missingDataMaxNr := *,//O
-			missingDataList := *,//O
-			missingDataCurrentNr := *,//O
-			missingDataDetectTimer := *,//O
-			ontologyRef := *,//O
-			contentInfo := *,//O
-			choice := *//O
-		};
-		
-		template TimeSeries_optional mw_contentTimeSeries(in template MissingDataList p_missingDataList := *, in template XSD.NonNegativeInteger p_missingDataCurrentNr := *) modifies mw_contentTimeSeriesBase := {
-			missingDataList := p_missingDataList,
-			missingDataCurrentNr := p_missingDataCurrentNr
-		}
-
-		template TimeSeriesNotification mw_contentTimeSeriesNotification(in template MissingDataList p_missingDataList := *, in template XSD.NonNegativeInteger p_missingDataCurrentNr := *) := {
-			missingDataList := p_missingDataList,
-			missingDataCurrentNr := p_missingDataCurrentNr
-		}
-		
-		template TimeSeries_optional mw_contentTimeSeries_rc1 modifies mw_contentTimeSeriesBase := {
-			choice := omit	//O
-		}
-		
-		template XSD.AnyURI mw_contentTimeSeries_rc2 := ?;
-		
-		template Resource mw_contentTimeSeries_rc3 := {
-			choice := {timeSeries := ?},
-			uRI := ?
-		}
-		
-		template TimeSeries_optional mw_contentTimeSeries_rc4 modifies mw_contentTimeSeriesBase := {
-			choice := { choice_list := {{subscription := ?}}}	//O
-		}
-		
-		template TimeSeries_optional mw_contentTimeSeries_rc5 modifies mw_contentTimeSeriesBase := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template TimeSeries_optional mw_contentTimeSeries_rc6 modifies mw_contentTimeSeries_allOmit := {
-			choice := {childResource_list := ?}	//O
-		}
-		
-		template TimeSeries_optional mw_contentTimeSeries_rc8 modifies mw_contentTimeSeries_allOmit := {
-			choice := {choice_list := ?}	//O
-		}
-
-		template TimeSeriesAnnc_optional mw_contentTimeSeriesAnncBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := ?,//M
-			link := ?,//M
-			dynamicAuthorizationConsultationIDs := *,//O
-			maxNrOfInstances := *,//O
-			maxByteSize := *,//O
-			maxInstanceAge := *,//O
-			currentNrOfInstances := *,//O
-			currentByteSize := *,//O
-			periodicInterval := *,//O
-			missingDataMaxNr := *,//O
-			missingDataList := *,//O
-			missingDataCurrentNr := *,//O
-			missingDataDetectTimer := *,//O
-			ontologyRef := *,//O
-			contentInfo := *,//O
-			choice := *//O
-		};
-		
-		template TimeSeriesInstance_optional mw_contentTimeSeriesInstanceBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			expirationTime := ?,//M
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			dataGenerationTime := ?,//M
-			content := ?,//M
-			sequenceNr := *,//O
-			contentSize  := ?,//M
-			choice := *//O
-		};
-		
-		template TimeSeriesInstanceAnnc_optional mw_contentTimeSeriesInstanceAnncBase := {
-			resourceName := ?,//M
-			resourceType := ?,//M
-			resourceID := ?,//M
-			parentID := ?,//M
-			creationTime := ?,//M
-			lastModifiedTime := ?,//M
-			labels := *,//O
-			expirationTime := ?,//M
-			link := ?,//M
-			dataGenerationTime := *,//O
-			content := *,//O
-			sequenceNr := *,//O
-			contentSize  := *,//O
-			choice := *//O
-		};
-
-		template (value) Role_optional mw_contentRole_allOmit := {
-			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
-			roleID := omit, //M
-			issuer := omit, //M
-			holder := omit, //M
-			notBefore := omit,//M
-			notAfter := omit,//M
-			roleName := omit, //O
-			tokenLink := omit, //O
-			choice := omit//O
-		}
-		
-		template (value) Token_optional mw_contentToken_allOmit := {
-			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
-			tokenID := omit, //M
-			tokenObject := omit, //M
-			version := omit, //O
-			issuer := omit, //O
-			holder := omit, //O
-			notBefore := omit,//O
-			notAfter := omit,//O
-			tokenName := omit,//O
-			audience := omit,//O
-			permissions := omit,//O
-			extension_ := omit,//O
-			choice := omit//O
-		}
-		template (value) FlexContainerResource_optional m_contentFlexContainer_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit //O
-		}
-		
-		template (present) FlexContainerResource_optional mw_contentFlexContainer(
-																																							template (present) XSD.AnyURI p_ontologyRef := ?
-		) := {
-			resourceName := *,//O
-			resourceType := *,//NP
-			resourceID := *,//NP
-			parentID := *,//NP
-			creationTime := *,//NP
-			lastModifiedTime := *,//NP
-			labels := *,//O
-			accessControlPolicyIDs := *,//O
-			expirationTime := *,//O
-			dynamicAuthorizationConsultationIDs := *, //O
-			announceTo := *,//O
-			announcedAttribute := *,//O
-			stateTag := *,//NP
-			creator := *,//O
-			containerDefinition := *, //M
-			ontologyRef := *, //O
-			contentSize := *, //NP
-			nodeLink := * //O
-		}
-		
-		template DeviceAirConditioner_optional m_contentDeviceAirConditioner_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceClothesWasherDryer_optional m_contentDeviceClothesWasherDryer_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceElectricVehicleCharger_optional m_contentDeviceElectricVehicleCharger_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceLight_optional m_contentDeviceLight_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceMicrogeneration_optional m_contentDeviceMicrogeneration_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceOven_optional m_contentDeviceOven_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceRefrigerator_optional m_contentDeviceRefrigerator_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceRobotCleaner_optional m_contentDeviceRobotCleaner_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceSmartElectricMeter_optional m_contentDeviceSmartElectricMeter_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceStorageBattery_optional m_contentDeviceStorageBattery_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceTelevision_optional m_contentDeviceTelevision_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceThermostat_optional m_contentDeviceThermostat_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-		
-		template (value) DeviceWaterHeater_optional m_contentDeviceWaterHeater_allOmit := {
-			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
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := omit, //M
-			ontologyRef := omit, //O
-			contentSize := omit, //NP
-			nodeLink := omit, //O
-			choice := omit //NP
-		}
-
-
-	}//end group responseContent
-	
-	group SpecialContents {
-
-		/**
-		 * @desc Base primitiveContent for CREATE operation for GenericInterworkingService resource
-		 * @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, 
-																	in template (omit) AcpType p_accessControlPolicyIds := omit) := {
-			
-			resourceName := p_name,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			labels := omit,//O
-			accessControlPolicyIDs := p_accessControlPolicyIds,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			containerDefinition := PX_CND_GENERIC_INTERWORKING_SERVICE,//M
-			ontologyRef := omit,//O
-			contentSize := omit, //NP
-			serviceName := "MyService",//M??
-			expirationCounter := 1,//Invalid attribute
-			inputDataPointLinks := omit,//O
-			outputDataPointLinks := omit,//O		
-			choice := omit//NP
-			
-		};
-
-		template (value) AE_invalid m_contentUpdateAe_invalid := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			expirationCounter := omit,//Invalid attribute
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			appName := omit,//O
-			app_ID := omit,//M
-			aE_ID := omit,//M
-			pointOfAccess := omit,//O
-			ontologyRef := omit,//O
-			nodeLink := omit,//O
-			requestReachability := omit,//M
-			contentSerialization := omit,//O
-			e2eSecInfo:= omit, //O
-			choice := omit//O
-		};
-    	
-		template (value) AccessControlPolicy_invalid m_contentUpdateAcp_invalid := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			expirationCounter := omit,//Invalid attribute
-			labels := omit,//O
-			expirationTime := omit,//M
-			announceTo := omit,//O
-			announcedAttribute := omit,//M
-			privileges := omit,//M
-			selfPrivileges := omit,//M
-			choice := omit//O
-		};
-    	
-		template (value) Group_invalid m_contentUpdateGroup_invalid := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			expirationCounter := omit,//Invalid attribute
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit,//O
-			announceTo := omit,//O
-			announcedAttribute := omit,//M
-			creator := omit,//O
-			memberType := omit,//M
-			currentNrOfMembers := omit,//M
-			maxNrOfMembers := omit,//M
-			memberIDs := omit,//M
-			membersAccessControlPolicyIDs := omit,//O
-			memberTypeValidated := omit,//M
-			consistencyStrategy := omit,//O
-			groupName := omit,//O
-			semanticSupportIndicator := omit,//O
-			choice := omit//O
-		};
-    	
-		template (value) PollingChannel_invalid m_contentUpdatePollingChannel_invalid := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			expirationCounter := omit,//Invalid attribute
-			labels := omit,//O
-			expirationTime := omit//M
-		};
-    	
-		template (value) Schedule_invalid m_contentUpdateSchedule_invalid := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			expirationCounter := omit,//Invalid attribute
-			labels := omit,//O
-			expirationTime := omit,//M
-			announceTo := omit,//O
-			announcedAttribute := omit,//M
-			scheduleElement := omit,//M
-			choice := omit//O
-		};
-    	
-		template (value) Subscription_invalid m_contentUpdateSubscription_invalid := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			maxNrOfInstances := omit,//Invalid attribute
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			creator := omit,//O
-			eventNotificationCriteria := omit,//O
-			expirationCounter := omit,//O
-			notificationURI := omit,//M
-			groupID := omit,//O
-			notificationForwardingURI := omit,//O
-			batchNotify := omit,//O
-			rateLimit := omit,//O
-			preSubscriptionNotify := omit,//O
-			pendingNotification := omit,//O
-			notificationStoragePriority := omit,//O
-			latestNotify := omit,//O
-			notificationContentType := omit,//M
-			notificationEventCat := omit,//O
-			subscriberURI := omit,//O
-			choice := omit//O
-		};
-		
-		template (value) Container_invalid m_contentUpdateContainer_invalid := {
-			resourceName := omit,//M
-			resourceType := omit,//M
-			resourceID := omit,//M
-			parentID := omit,//M
-			creationTime := omit,//M
-			lastModifiedTime := omit,//M
-			expirationCounter := omit,//Invalid attribute
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//M
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//M
-			stateTag := omit,//M
-			creator := omit,//M
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//M
-			currentByteSize := omit,//M
-			locationID := omit,//O
-			ontologyRef := omit,//O
-			disableRetrieval := omit, //O
-			choice := omit//O
-		};	
-		
-		template (value) TimeSeries_invalid m_contentUpdateTimeSeries_invalid := {
-			resourceName := omit,//O
-			resourceType := omit,//NP
-			resourceID := omit,//NP
-			parentID := omit,//NP
-			creationTime := omit,//NP
-			lastModifiedTime := omit,//NP
-			expirationCounter := omit,//Field not existing in container resource
-			labels := omit,//O
-			accessControlPolicyIDs := omit,//O
-			expirationTime := omit,//O
-			dynamicAuthorizationConsultationIDs := omit, //O
-			announceTo := omit,//O
-			announcedAttribute := omit,//O
-			stateTag := omit,//NP
-			creator := omit,//O
-			maxNrOfInstances := omit,//O
-			maxByteSize := omit,//O
-			maxInstanceAge := omit,//O
-			currentNrOfInstances := omit,//NP
-			currentByteSize := omit,//NP
-			periodicInterval := omit,//O
-			missingDataDetect := omit,//O
-			missingDataMaxNr := omit,//O
-			missingDataList := omit,//NP
-			missingDataCurrentNr := omit,//NP
-			missingDataDetectTimer := omit,//O
-			ontologyRef := omit,//O
-			contentInfo := omit,//O
-			choice := omit//NP
-		};	
-				
-	}//end group SpecialContents
-	
-	group ResponsePrimitives {
-		
-		/**
-		 * @desc  Base template for sending ResponsePrimitive
-		 * @param p_statusCode	Status code
-		 * @param p_requestId	Request ID of the corresponding request
-		 */
-		template (value) ResponsePrimitive m_responsePrimitive(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (omit) PrimitiveContent p_content := omit) := {
-			responseStatusCode := p_statusCode,
-			requestIdentifier := p_requestId,
-			primitiveContent := p_content,
-			to_ := omit,
-			from_ := omit,
-			originatingTimestamp := omit,
-			resultExpirationTimestamp := omit,
-			eventCategory := omit,
-			contentStatus := omit,
-			contentOffset := omit,
-			assignedTokenIdentifiers := omit,
-			tokenRequestInformation := omit,
-			authorSignReqInfo := omit,
-			releaseVersionIndicator := PX_RELEASE_VERSION,
-			vendorInformation := omit
-		};
-		
-		/**
-		 * @desc  Base template for sending ResponsePrimitive
-		 * @param p_statusCode	Status code
-		 * @param p_requestId	Request ID of the corresponding request
-		 */
-		template (value) ResponsePrimitive m_responsePrimitive_content(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
-			primitiveContent := p_content			
-		}
-		
-		template ResponsePrimitive mw_responsePrimitiveforInfoPort := ?;
-		
-		template RequestPrimitive mw_requestPrimitiveforInfoPort := ?;
-		
-		template ResponsePrimitive mw_responsePrimitive(in template  ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
-			responseStatusCode := p_statusCode,
-			requestIdentifier := ?,
-			primitiveContent := p_content,
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-			
-    	};
-    	
-		/**
-		 * @desc Base Reception template for request primitive
-		 */
-		template RequestPrimitive mw_requestPrimitive(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
-			operation := ?,
-			to_ := p_to,
-			from_ := p_from,
-			requestIdentifier := ?,
-			resourceType := *,
-			primitiveContent := *,
-			roleIDs := *,
-			originatingTimestamp := *,
-			requestExpirationTimestamp := *,
-			resultExpirationTimestamp := *,
-			operationExecutionTime := *,
-			responseType := *,
-			resultPersistence := *,
-			resultContent := *,
-			eventCategory := *,
-			deliveryAggregation := *,
-			groupRequestIdentifier := *,
-			filterCriteria := *,
-			desiredIdentifierResultType := *,
-			tokens := *,
-			tokenIDs := *,
-			localTokenIDs := *,
-			tokenRequestIndicator := *,
-			groupRequestTargetMembers := *,
-			authorSignIndicator := *,
-			authorSigns := *,
-			authorRelIndicator := *,
-			semanticQueryIndicator := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-		}
-    	
-		template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := {
-			responseStatusCode := complement(p_statusCode),
-			requestIdentifier := ?,
-			primitiveContent := *,
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-			
-		};
-    	
-    	template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
-			responseStatusCode := (int2000, int2001, int2002, int2004),
-			requestIdentifier := ?,
-			primitiveContent := p_content,
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-    	};
-        		 
-    	template ResponsePrimitive mw_responsePrimitiveKO := {
- 			responseStatusCode := complement(int2000, int2001, int2002, int2004),
-			requestIdentifier := ?,
-			primitiveContent := *,
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-    	};
-    	
-    	template ResponsePrimitive mw_responsePollingResponse (template RequestPrimitive p_requestPrimitive := ?) := {
-			responseStatusCode := int2000,
-			requestIdentifier := ?,
-			primitiveContent := {requestPrimitive := p_requestPrimitive},
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-		};
-    	
-		template ResponsePrimitive mw_responseDiscovery (template URIList p_uriList := ?) := {
-			responseStatusCode := int2000,
-			requestIdentifier := ?,
-			primitiveContent := {uRIList := p_uriList},
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-		};
-    	
-		template (value) ResponsePrimitive m_responseNotification(ResponseStatusCode p_statusCode, in template(omit) PrimitiveContent p_notification := omit) := {
-			responseStatusCode := p_statusCode,
-			requestIdentifier := testcasename() & "-m_responseNotification",
-			primitiveContent := p_notification,
-			to_ := omit,
-			from_ := omit,
-			originatingTimestamp := omit,
-			resultExpirationTimestamp := omit,
-			eventCategory := omit,
-			contentStatus := omit,
-			contentOffset := omit,
-			assignedTokenIdentifiers := omit,
-			tokenRequestInformation := omit,
-			authorSignReqInfo := omit,
-			releaseVersionIndicator := PX_RELEASE_VERSION,
-			vendorInformation := omit
-		};
-		
-		template ResponsePrimitive mw_responseNotify(ResponseStatusCode p_statusCode) := {
-			responseStatusCode := p_statusCode,
-			requestIdentifier := ?,
-			primitiveContent := omit,
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-		};
-		
-		/**
-		 * @desc Base primitiveContent for RETRIEVE operation for SemanticMashupResult resource
-		 */
-		template SemanticMashupResult_optional mw_retrievSemanticMashupResult :=
-		{
-			resourceName := ?,
-			resourceType := int42,
-			resourceID := ?,
-			parentID := ?,
-			creationTime := ?,
-			lastModifiedTime := ?,
-			labels := *,
-			accessControlPolicyIDs := *,
-			expirationTime := ?,
-			dynamicAuthorizationConsultationIDs := *,
-			announceTo := *,
-			announcedAttribute := *,
-			creator := *,
-			smjpInputParameter := *,
-			mashupResultFormat := ?,
-			mashupResult := ?
-		}
-			
-		/**
-		 * @desc Base primitiveContent for RETRIEVE operation for SemanticMashupInstance resource
-		 */
-		template SemanticMashupInstance_optional mw_retrievSemanticMashupInstance :=
-		{
-			resourceName := ?,
-			resourceType := int41,
-			resourceID := ?,
-			parentID := ?,
-			creationTime := ?,
-			lastModifiedTime := ?,
-			labels := *,
-			accessControlPolicyIDs := *,
-			expirationTime := ?,
-			dynamicAuthorizationConsultationIDs := *,
-			announceTo := *,
-			announcedAttribute := *,
-			creator := *,
-			smjpID := ?,
-			smjpInputParameter := *,
-			memberStoreType := ?,
-			mashupMember := *,
-			resultGenType := ?,
-			periodForResultGen := *
-		}
-
-		
-			/**
-		 * @desc Base primitiveContent for RETRIEVE operation for SemanticDescriptor resource
-		 */
-		template SemanticDescriptor_optional mw_retrieveSemanticDescriptor :=
-		{
-			resourceName := ?,
-			resourceType := int42,
-			resourceID := ?,
-			parentID := ?,
-			creationTime := ?,
-			lastModifiedTime := ?,
-			labels := *,
-			accessControlPolicyIDs := *,
-			expirationTime := ?,
-			dynamicAuthorizationConsultationIDs := *,
-			announceTo := *,
-			announcedAttribute := *,
-			creator := *,
-			descriptorRepresentation := ?,               
-			semanticOpExec := *,                         
-			descriptor := ?,       
-			ontologyRef := *,                            
-			relatedSemantics := *,                       
-			semanticValidated := *,                      
-			validationEnable := *,
-			choice := *                   
-		}
-
-			
-		/**
-		 * @desc Base primitiveContent for RETRIEVE operation for SemanticMashupJobProfile resource
-		 */
-		template SemanticMashupJobProfile_optional mw_retrievSemanticMashupJobProfile :=
-		{
-			resourceName := ?,
-			resourceType := int40,
-			resourceID := ?,
-			parentID := ?,
-			creationTime := ?,
-			lastModifiedTime := ?,
-			labels := *,
-			accessControlPolicyIDs := *,
-			expirationTime := ?,
-			dynamicAuthorizationConsultationIDs := *,
-			announceTo := *,
-			announcedAttribute := *,
-			creator := *,
-			memberFilter := ?,
-			smiID := *,
-			inputDescriptor := *,
-			outputDescriptor := ?,
-			functionDescriptor := ?
-		}
-    	
-		template ResponsePrimitive mw_responseNotifySecurityInfo(ResponseStatusCode p_statusCode, template SecurityInfo p_securityInfo) := {
-			responseStatusCode := p_statusCode,
-			requestIdentifier := ?,
-			primitiveContent := {securityInfo := p_securityInfo},
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,
-			vendorInformation := *
-		};
-    	
-		group InfoPortTemplates {
-		
-			template MyResource mw_resource := ?;	
-			template integer mw_resourceIndex := ?;	
-			template XSD.ID mw_resourceAddress := ?;
-		
-		}//end group InfoPortTemplates
-    	
-	}//end group ResponsePrimitives	
-	
-	group UpperTester {
-		template (value) UtTriggerPrimitive m_utCreate := {
-			utCommand := omit,
-			requestPrimitive := {
-				operation := int1,
-				to_ := "NotInitialized",
-				from_ := "UNINITIALIZED",
-				requestIdentifier := testcasename() & "-m_utCreate",
-				resourceType := omit,
-				primitiveContent := omit,
-				roleIDs := omit, 
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit, 
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			}, 
-			forcedFields := omit
-		};
-		
-		template (value) UtTriggerPrimitive m_utCreateAe modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateAe",
-				resourceType := int2,
-				primitiveContent := {aE := m_contentAe_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateContainer modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateContainer",
-				resourceType := int3,
-				primitiveContent := {container := valueof(mw_contentContainer_allOmit)}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateContentInstance modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateContentInstance",
-				resourceType := int4,
-				primitiveContent := {contentInstance := m_contentContentInstance_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateSubscription modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateSubscription",
-				resourceType := int23,
-				primitiveContent := {subscription := m_contentSubscription}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateRemoteCSE modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateRemoteCSE",
-				resourceType := int16,
-				primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
-			}
-		}
- 		
-		template (value) UtTriggerPrimitive m_utCreatePollingChannel modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreatePollingChannel",
-				resourceType := int15,
-				primitiveContent := {pollingChannel := mw_contentPollingChannel_allOmit}
-			}
-		}
- 		
-		template (value) UtTriggerPrimitive m_utRetrieve(XSD.ID p_targetResourceAddress) := {
-			utCommand := omit,
-			requestPrimitive := {
-				operation := int2,
-				to_ := p_targetResourceAddress,
-				from_ := "UNINITIALIZED",
-				requestIdentifier := "m_utRetrieveResource",
-				resourceType := omit,
-				primitiveContent := omit,
-				roleIDs := omit, 
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit, 
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			}, 
-			forcedFields := omit
-		};
-		
-		template (value) UtTriggerPrimitive m_utRetrievePollingChannelUri(XSD.ID p_targetResourceAddress) modifies m_utRetrieve := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utRetrievePollingChannelUri",
-				resourceType := int15,
-				primitiveContent := {pollingChannel := m_contentRetrievePollingChannel}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utRetrieveRemoteCSE(XSD.ID p_targetResourceAddress) modifies m_utRetrieve := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utRetrieveRemoteCSE",
-				resourceType := int16,
-				primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
-			}
-		}
-
-		template (value) UtTriggerPrimitive m_utUpdate := {
-			utCommand := omit,
-			requestPrimitive := {
-				operation := int3,
-				to_ := "NotInitialized",
-				from_ := "UNINITIALIZED",
-				requestIdentifier := testcasename() & "-m_utUpdate",
-				resourceType := omit,
-				primitiveContent := omit,
-				roleIDs := omit, 
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit, 
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			}, 
-			forcedFields := omit
-		};
-		
-		template (value) UtTriggerPrimitive m_utUpdateAe modifies m_utUpdate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utUpdateContainer",
-				resourceType := int2,
-				primitiveContent := {aE := m_contentUpdateAe}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utUpdateContainer modifies m_utUpdate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utUpdateContainer",
-				resourceType := int3,
-				primitiveContent := {container := m_contentUpdateContainer}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utDelete := {
-			utCommand := omit,
-			requestPrimitive := {
-				operation := int4,
-				to_ := "NotInitialized",
-				from_ := "UNINITIALIZED",
-				requestIdentifier := testcasename() & "-m_utDeleteRequest",
-				resourceType := omit,
-				primitiveContent := omit, 
-				roleIDs := omit, 
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit, 
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			}, 
-			forcedFields := omit
-		};
-		
-		template (value) UtTriggerPrimitive m_utDeleteResource(XSD.ID p_targetResourceAddress) modifies m_utDelete := {
-			requestPrimitive := {
-				to_ := p_targetResourceAddress
-			}
-		};
-		
-		
-		
-		template UtTriggerAckPrimitive mw_utResponseOK := {
-			responseStatusCode := int2000,
-			requestIdentifier := ?,
-			primitiveContent := *,
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *, 
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,//FIXME
-			vendorInformation := *
-
-		}
-		
-		template UtTriggerAckPrimitive mw_utResponseKO := {
-			responseStatusCode := int4000,
-			requestIdentifier := ?,
-			primitiveContent := *,
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,//FIXME
-			vendorInformation := *
-
-		}
-		
-		template UtTriggerAckPrimitive mw_utResponse(ResponseStatusCode p_statusCode) := {
-			responseStatusCode := p_statusCode,
-			requestIdentifier := ?,
-			primitiveContent := *,
-			to_ := *,
-			from_ := *,
-			originatingTimestamp := *,
-			resultExpirationTimestamp := *,
-			eventCategory := *,
-			contentStatus := *,
-			contentOffset := *,
-			assignedTokenIdentifiers := *,
-			tokenRequestInformation := *,
-			authorSignReqInfo := *,
-			releaseVersionIndicator := ?,//FIXME
-			vendorInformation := *
-
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateRole modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateRole",
-				resourceType := int31,
-				primitiveContent := {role := valueof(mw_contentRole_allOmit)}
-	 }	
-		}
-	
-		template (value) UtTriggerPrimitive m_utCreateToken modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateToken",
-				resourceType := int32,
-				primitiveContent := {token := valueof(mw_contentToken_allOmit)}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateFlexContainer modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateFlexContainer",
-				resourceType := int28,
-				primitiveContent := {flexContainer := m_contentFlexContainer_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceAirConditioner modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceAirConditioner",
-				resourceType := int28,
-				primitiveContent := {deviceAirConditioner := m_contentDeviceAirConditioner_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceClothesWasherDryer modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceClothesWasherDryer",
-				resourceType := int28,
-				primitiveContent := {deviceClothesWasherDryer := m_contentDeviceClothesWasherDryer_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceElectricVehicleCharger modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceElectricVehicleCharger",
-				resourceType := int28,
-				primitiveContent := {deviceElectricVehicleCharger := m_contentDeviceElectricVehicleCharger_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceLight modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceLightr",
-				resourceType := int28,
-				primitiveContent := {deviceLight := m_contentDeviceLight_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceMicrogeneration modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceMicrogeneration",
-				resourceType := int28,
-				primitiveContent := {deviceMicrogeneration := m_contentDeviceMicrogeneration_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceOven modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceOven",
-				resourceType := int28,
-				primitiveContent := {deviceOven := m_contentDeviceOven_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceRefrigerator modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceRefrigerator",
-				resourceType := int28,
-				primitiveContent := {deviceRefrigerator := m_contentDeviceRefrigerator_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceRobotCleaner modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceRobotCleaner",
-				resourceType := int28,
-				primitiveContent := {deviceRobotCleaner := m_contentDeviceRobotCleaner_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceSmartElectricMeter modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceSmartElectricMeter",
-				resourceType := int28,
-				primitiveContent := {deviceSmartElectricMeter := m_contentDeviceSmartElectricMeter_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceStorageBattery modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceStorageBattery",
-				resourceType := int28,
-				primitiveContent := {deviceStorageBattery := m_contentDeviceStorageBattery_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceTelevision modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceTelevision",
-				resourceType := int28,
-				primitiveContent := {deviceTelevision := m_contentDeviceTelevision_allOmit}
-			}
-		}
-		
-	 	template (value) UtTriggerPrimitive m_utCreateDeviceThermostat modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceThermostat",
-				resourceType := int28,
-				primitiveContent := {deviceThermostat := m_contentDeviceThermostat_allOmit}
-			}
-		}
-		
-		template (value) UtTriggerPrimitive m_utCreateDeviceWaterHeater modifies m_utCreate := {
-			requestPrimitive := {
-				requestIdentifier := testcasename() & "-m_utCreateDeviceWaterHeater",
-				resourceType := int28,
-				primitiveContent := {deviceWaterHeater := m_contentDeviceWaterHeater_allOmit}
-			}
-		}
-
-		template (value) UtTriggerPrimitive m_utNotify := {
-			utCommand := omit,
-			requestPrimitive := {
-				operation := int5,
-				to_ := "NotInitialized",
-				from_ := "UNINITIALIZED",
-				requestIdentifier := testcasename() & "-m_utNotify",
-				resourceType := omit,
-				primitiveContent := omit,
-				roleIDs := omit, 
-				originatingTimestamp := omit,
-				requestExpirationTimestamp := omit,
-				resultExpirationTimestamp := omit,
-				operationExecutionTime := omit,
-				responseType := omit,
-				resultPersistence := omit,
-				resultContent := omit,
-				eventCategory := omit,
-				deliveryAggregation := omit,
-				groupRequestIdentifier := omit,
-				filterCriteria := omit,
-				desiredIdentifierResultType := omit,
-				tokens := omit,
-				tokenIDs := omit,
-				localTokenIDs := omit, 
-				tokenRequestIndicator := omit,
-				groupRequestTargetMembers := omit,
-				authorSignIndicator := omit,
-				authorSigns := omit,
-				authorRelIndicator := omit,
-				semanticQueryIndicator := omit,
-				releaseVersionIndicator := PX_RELEASE_VERSION,
-				vendorInformation := omit
-			}, 
-			forcedFields := omit
-		};
-		
-		template (value) UtTriggerPrimitive m_utCommand_reset := {
-			utCommand := "Reset",
-			requestPrimitive := omit, 
-			forcedFields := omit
-		}
-	 }
-	 
-		group t8_primitives {
-			
-			template (value) T8Primitive m_t8Request(
-																							in template (value) T8Request p_t8Request
-																							) := {
-				t8Request := p_t8Request
-			} // End of template m_t8Request
-			
-			template (present) T8Primitive mw_t8Request(
-																									in template (present) T8Request p_t8Request := ?
-																									) := {
-				t8Request := p_t8Request
-			} // End of template mw_t8Request
-			
-			template (value) T8Primitive m_t8Response(
-																								in template (value) T8Response p_t8Response
-																								) := {
-				t8Response := p_t8Response
-			} // End of template m_t8Response
-			
-			template (present) T8Primitive mw_t8Response(
-																									in template (present) T8Response p_t8Response := ?
-																									) := {
-				t8Response := p_t8Response
-			} // End of template mw_t8Response
-			
-			template (omit) OneM2M_Types_3GPP_T8.URI m_uri_3gpp_nidd(
-																																in charstring p_apiRoot := "/",
-																																in template (omit) charstring p_apiSpecificSuffixes := omit,
-																																in template (omit) OneM2M_Types_3GPP_T8.URI.queryParameters p_queryParameters := omit
-			) := {
-				apiRoot             := p_apiRoot,
-				apiName             := "3gpp-nidd",
-				apiVersion          := "v1",
-				apiSpecificSuffixes := p_apiSpecificSuffixes,
-				queryParameters     := p_queryParameters
-			} // End of template m_uri_3gpp_nidd
-			
-			template (present) OneM2M_Types_3GPP_T8.URI mw_uri_3gpp_nidd(
-																																		template (present) charstring p_apiRoot := ?,
-																																		template charstring p_apiSpecificSuffixes := *,
-																																		template OneM2M_Types_3GPP_T8.URI.queryParameters p_queryParameters := *
-			) := {
-				apiRoot             := p_apiRoot,
-				apiName             := "3gpp-nidd",
-				apiVersion          := "v1",
-				apiSpecificSuffixes := p_apiSpecificSuffixes,
-				queryParameters     := p_queryParameters
-			} // End of template mw_uri_3gpp_nidd
-			
-			template (omit) OneM2M_Types_3GPP_T8.URI m_uri_3gpp_device_triggering(
-																																						in charstring p_apiRoot := "/",
-																																						in template (omit) charstring p_apiSpecificSuffixes := omit,
-																																						in template (omit) OneM2M_Types_3GPP_T8.URI.queryParameters p_queryParameters := omit
-			) modifies m_uri_3gpp_nidd := {
-				apiName             := "3gpp-device-triggering"
-			} // End of template m_uri_3gpp_device_triggering
-			
-			template (present) OneM2M_Types_3GPP_T8.URI mw_uri_3gpp_device_triggering(
-																																								template (present) charstring p_apiRoot := ?,
-																																								template charstring p_apiSpecificSuffixes := *,
-																																								template OneM2M_Types_3GPP_T8.URI.queryParameters p_queryParameters := *
-			) modifies mw_uri_3gpp_nidd := {
-				apiName             := "3gpp-device-triggering"
-			} // End of template mw_uri_3gpp_device_triggering
-			
-		} // End of group t8_primitives
-		
-		group t8_request {
-			
-			template (omit) T8Request m_t8_request_get(
-																								in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
-																								in template (value) RequestHeaders p_requestHeaders,
-																								in template (omit) RequestBodyT8 p_requestBody := omit
-																								) := {
-				resourceMethod := GET,
-				resourceUri    := p_resourceUri,
-				requestHeaders := p_requestHeaders,
-				requestBody    := p_requestBody
-			} // End of template m_t8_request_get
-			
-			template (omit) T8Request m_t8_request_post(
-																									in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
-																									in template (value) RequestHeaders p_requestHeaders,
-																									in template (omit) RequestBodyT8 p_requestBody := omit
-																									) modifies m_t8_request_get := {
-				resourceMethod := POST
-			} // End of template m_t8_request_post
-			
-			template (present) T8Request mw_t8_request_post(
-																											template (present) OneM2M_Types_3GPP_T8.URI p_resourceUri := ?,
-																											template (present) RequestHeaders p_requestHeaders := ?,
-																											template (present) RequestBodyT8 p_requestBody := ?
-																											) := {
-				resourceMethod := POST,
-				resourceUri    := p_resourceUri,
-				requestHeaders := p_requestHeaders,
-				requestBody    := p_requestBody
-			} // End of template mw_t8_request_post
-			
-			template (omit) T8Request m_t8_request_delete(
-																										in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
-																										in template (value) RequestHeaders p_requestHeaders,
-																										in template (omit) RequestBodyT8 p_requestBody := omit
-																										) modifies m_t8_request_get := {
-				resourceMethod := DELETE
-			} // End of template m_t8_request_delete
-			
-			template (present) T8Request mw_t8_request_delete(
-																												template (present) OneM2M_Types_3GPP_T8.URI p_resourceUri := ?,
-																												template (present) RequestHeaders p_requestHeaders := ?
-																												) := {
-				resourceMethod := DELETE,
-				resourceUri    := p_resourceUri,
-				requestHeaders := p_requestHeaders,
-				requestBody    := omit
-			} // End of template mw_t8_request_delete
-			
-			template (omit) T8Request m_t8_request_patch(
-																									in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
-																									in template (value) RequestHeaders p_requestHeaders,
-																									in template (omit) RequestBodyT8 p_requestBody := omit
-																									) modifies m_t8_request_get := {
-				resourceMethod := PATCH
-			} // End of template m_t8_request_patch
-			
-			template (present) T8Request mw_t8_request_patch(
-																												template (present) OneM2M_Types_3GPP_T8.URI p_resourceUri := ?,
-																												template (present) RequestHeaders p_requestHeaders := ?,
-																												template (present) RequestBodyT8 p_requestBody := ?
-																												) := {
-				resourceMethod := PATCH,
-				resourceUri    := p_resourceUri,
-				requestHeaders := p_requestHeaders,
-				requestBody    := p_requestBody
-			} // End of template mw_t8_request_patch
-			
-			template (omit) T8Request m_t8_request_put(
-																									in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
-																									in template (value) RequestHeaders p_requestHeaders,
-																									in template (omit) RequestBodyT8 p_requestBody := omit
-																									) modifies m_t8_request_get := {
-				resourceMethod := PUT
-			} // End of template m_t8_request_put
-			
-			template (present) T8Request mw_t8_request_put(
-																									template (present) OneM2M_Types_3GPP_T8.URI p_resourceUri := ?,
-																									template (present) RequestHeaders p_requestHeaders := ?,
-																									template (present) RequestBodyT8 p_requestBody := ?
-																									) := {
-				resourceMethod := PUT,
-				resourceUri    := p_resourceUri,
-				requestHeaders := p_requestHeaders,
-				requestBody    := p_requestBody
-			} // End of template mw_t8_request_put
-			
-		} // End of group t8_request
-		
-		group t8_response {
-			
-			template (omit) T8Response m_t8_response_200_ok(
-																											in template (value) ResponseHeaders p_responseHeaders,
-																											in template (omit) ResponseBody p_responseBody := omit
-																											) := {
-				responseCode    := 200,
-				responseHeaders := p_responseHeaders,
-				responseBody    := p_responseBody
-			} // End of template m_t8_response_200_ok
-			
-			template T8Response mw_t8_response_200_ok(
-																								template (present) ResponseHeaders p_responseHeaders := ?,
-																								template ResponseBody p_responseBody := *
-																								) := {
-				responseCode    := 200,
-				responseHeaders := p_responseHeaders,
-				responseBody    := p_responseBody
-			} // End of template mw_t8_response_200_ok
-			
-			template (omit) T8Response m_t8_response_201_created(
-																													in template (value) ResponseHeaders p_responseHeaders,
-																													in template (omit) ResponseBody p_responseBody := omit
-																													) modifies m_t8_response_200_ok := {
-				responseCode    := 201
-			} // End of template m_t8_response_201_ok
-			
-			template T8Response mw_t8_response_201_created(
-																											template (present) ResponseHeaders p_responseHeaders := ?,
-																											template ResponseBody p_responseBody := *
-																											) modifies mw_t8_response_200_ok := {
-				responseCode    := 201
-			} // End of template mw_t8_response_201_ok
-			
-			template T8Response mw_t8_response_204_no_content(
-																												template (present) ResponseHeaders p_responseHeaders := ?,
-																												template ResponseBody p_responseBody := *
-																												) modifies mw_t8_response_200_ok := {
-				responseCode    := 204,
-				responseBody    := omit
-			} // End of template mw_t8_response_204_no_content
-			
-			template (value) T8Response m_t8_response_ko(
-																										in template (value) ResponseHeaders p_responseHeaders,
-																										in template (value) ProblemDetails p_problemDetails
-																										) := {
-				responseCode    := 400,
-				responseHeaders := p_responseHeaders,
-				responseBody    := { problemDetails := p_problemDetails }
-			} // End of template m_t8_response_ko
-			
-			template (present) T8Response mw_t8_response_ko(
-																											template (present) ResponseHeaders p_responseHeaders := ?,
-																											template (present) ProblemDetails p_problemDetails := ?
-																											) := {
-				responseCode    := ?,
-				responseHeaders := p_responseHeaders,
-				responseBody    := { problemDetails := p_problemDetails }
-			} // End of template mw_t8_response_ko
-			
-			template (value) T8Response m_t8_response_400_bad_request(
-																																in template (value) ResponseHeaders p_responseHeaders,
-																																in template (value) ProblemDetails p_problemDetails
-																																) modifies m_t8_response_ko := {
-			} // End of template m_t8_response_400_bad_request
-			
-			template (present) T8Response mw_t8_response_400_bad_request(
-																																		template (present) ResponseHeaders p_responseHeaders := ?,
-																																		template (present) ProblemDetails p_problemDetails := ?
-																																		) modifies mw_t8_response_ko := {
-				responseCode    := 400
-			} // End of template mw_t8_response_400_bad_request
-			
-			template (value) T8Response m_t8_response_404_not_found(
-																															in template (value) ResponseHeaders p_responseHeaders,
-																															in template (value) ProblemDetails p_problemDetails
-																															) modifies m_t8_response_ko := {
-				responseCode    := 404
-			} // End of template m_t8_response_404_not_found
-			
-			template (present) T8Response mw_t8_response_404_not_found(
-																																template (present) ResponseHeaders p_responseHeaders := ?,
-																																template (present) ProblemDetails p_problemDetails := ?
-																																) modifies mw_t8_response_ko := {
-				responseCode    := 404
-			} // End of template mw_t8_response_404_not_found
-			
-		} // End of group t8_response
-		
-		group nidd {
-		
-			template (value) RequestBodyT8 m_request_body_niddConfiguration(in template (value) NiddConfiguration p_niddConfiguration) := {
-				individualNiddConfiguration := p_niddConfiguration
-			} // End of template m_request_body_niddConfiguration
-			
-			template (value) NiddConfiguration m_niddConfiguration := {
-				self_ := "self_value",
-				supportedFeatures := Notification_test_event,
-				mtcProviderId := "mtcProviderId_value",
-				externalId := "externalId_value",
-				msisdn := "msisdn_value",
-				externalGroupId := "externalGroupId_value",
-				duration_ := omit,
-				reliableDataService := omit,
-				rdsPorts := omit, 
-				pdnEstablishmentOptions := omit,
-				notificationDestination := "/", 
-				requestTestNotification := omit,
-				websockNotifConfig := omit,
-				maximumPacketSize := omit,
-				niddDownlinkDataTransfers := omit,
-				status := ACTIVE
-			} // End of template m_niddConfiguration
-			
-			template (present) NiddConfiguration mw_niddConfiguration(
-																																template (present) Link p_notificationDestination := ?
-																																) := {
-				self_ := *,
-				supportedFeatures := *,
-				mtcProviderId := *,
-				externalId := *,
-				msisdn := *,
-				externalGroupId := *,
-				duration_ := *,
-				reliableDataService := *,
-				rdsPorts := *, 
-				pdnEstablishmentOptions := *,
-				notificationDestination := p_notificationDestination, 
-				requestTestNotification := *,
-				websockNotifConfig := *,
-				maximumPacketSize := *,
-				niddDownlinkDataTransfers := *,
-				status := *
-			} // End of template mw_niddConfiguration
-			
-			template (present) ResponseBody mw_response_body_niddConfigurations(
-																																					template (present) NiddConfigurations p_niddConfigurations := ?
-																																					) := {
-				niddConfigurations := p_niddConfigurations
-			} // End of template mw_response_body_niddConfigurations
-			
-			template (present) ResponseBody mw_response_body_individualNiddConfiguration(
-																																									template (present) NiddConfiguration p_individualNiddConfiguration := ?
-																																									) := {
-				individualNiddConfiguration := p_individualNiddConfiguration
-			} // End of template mw_response_body_individualNiddConfiguration
-			
-		} // End of group nidd
-		
-		group deviceTriggering {
-		
-			template (value) RequestBodyT8 m_request_body_deviceTriggering(in template (value) DeviceTriggering p_deviceTriggeringTransaction) := {
-				individualDeviceTriggeringTransaction := p_deviceTriggeringTransaction
-			} // End of template m_request_body_deviceTriggering
-			
-			template (present) RequestBodyT8 mw_request_body_deviceTriggering(template (present) DeviceTriggering p_deviceTriggeringTransaction := ?) := {
-				individualDeviceTriggeringTransaction := p_deviceTriggeringTransaction
-			} // End of template mw_request_body_deviceTriggering
-			
-			template (present) RequestBodyT8 mw_request_body_deviceTriggeringDeliveryReportNotification(template (present) DeviceTriggeringDeliveryReportNotification p_deviceTriggeringDeliveryReportNotification := ?) := {
-				deviceTriggeringDeliveryReportNotification := p_deviceTriggeringDeliveryReportNotification
-			} // End of template mw_request_body_deviceTriggeringDeliveryReportNotification
-			
-			template (value) ResponseBody m_response_body_deviceTriggerings(
-																																			in template (value) DeviceTriggerings p_deviceTriggeringTransactions
-																																			) := {
-				deviceTriggeringTransactions := p_deviceTriggeringTransactions
-			} // End of template m_response_body_deviceTriggerings
-			
-			template (present) ResponseBody mw_response_body_deviceTriggerings(
-																																				template (present) DeviceTriggerings p_deviceTriggeringTransactions := ?
-																																				) := {
-				deviceTriggeringTransactions := p_deviceTriggeringTransactions
-			} // End of template mw_response_body_deviceTriggerings
-			
-			template (value) ResponseBody m_response_body_individualDeviceTriggering(
-																																								in template (value) DeviceTriggering p_deviceTriggeringTransaction
-																																								) := {
-				individualDeviceTriggeringTransaction := p_deviceTriggeringTransaction
-			} // End of template m_response_body_individualDeviceTriggering
-			
-			template (present) ResponseBody mw_response_body_individualDeviceTriggering(
-																																									template (present) DeviceTriggering p_deviceTriggeringTransaction := ?
-																																									) := {
-				individualDeviceTriggeringTransaction := p_deviceTriggeringTransaction
-			} // End of template mw_response_body_individualDeviceTriggering
-			
-			template (value) DeviceTriggering m_deviceTriggering_externalId(
-																																			in template (value) ExternalId p_externalId,
-																																			in template (value) DurationSec p_validityPeriod := 0,
-																																			in template (value) Priority p_priority := NO_PRIORITY,
-																																			in template (value) Port p_applicationPortId,
-																																			in template (value) Bytes p_triggerPayload,
-																																			in template (value) Link p_notificationDestination
-																																			) := {
-				self_                   := omit,
-				externalId              := p_externalId,
-				msisdn                  := omit,
-				supportedFeatures       := omit,
-				validityPeriod          := p_validityPeriod,
-				priority                := p_priority,
-				applicationPortId       := p_applicationPortId,
-				appSrcPortId            := omit,
-				triggerPayload          := p_triggerPayload,
-				notificationDestination := p_notificationDestination, 
-				requestTestNotification := omit,
-				websockNotifConfig      := omit,
-				deliveryResult          := omit
-			} // End of template m_deviceTriggering_externalId
-			
-			template (present) DeviceTriggering mw_deviceTriggering_externalId(
-																																					template (present) ExternalId p_externalId := ?,
-																																					template (present) DurationSec p_validityPeriod := ?,
-																																					template (present) Priority p_priority := ?,
-																																					template (present) Port p_applicationPortId := ?,
-																																					template (present) Bytes p_triggerPayload := ?,
-																																					template (present) Link p_notificationDestination := ?
-																																					) := {
-				self_                   := *,
-				externalId              := p_externalId,
-				msisdn                  := omit,
-				supportedFeatures       := *,
-				validityPeriod          := p_validityPeriod,
-				priority                := p_priority,
-				applicationPortId       := p_applicationPortId,
-				appSrcPortId            := *,
-				triggerPayload          := p_triggerPayload,
-				notificationDestination := p_notificationDestination, 
-				requestTestNotification := *,
-				websockNotifConfig      := *,
-				deliveryResult          := *
-			} // End of template mw_deviceTriggeringTransaction
-			
-			template (value) DeviceTriggeringDeliveryReportNotification m_deviceTriggeringDeliveryReportNotification(
-																																																								in template (value) Link p_transaction, 
-																																																								in template (value) DeliveryResult p_result
-																																																								) := {
-				transaction := p_transaction, 
-				result      := p_result
-			} // End of template m_deviceTriggeringDeliveryReportNotification
-			
-			template (present) DeviceTriggeringDeliveryReportNotification mw_deviceTriggeringDeliveryReportNotification(
-																																																									template (present) Link p_transaction := ?, 
-																																																									template (present) DeliveryResult p_result := ?
-																																																									) := {
-				transaction := p_transaction, 
-				result      := p_result
-			} // End of template mw_deviceTriggeringDeliveryReportNotification
-			
-		} // End of group deviceTriggering
-		
-		group problemDetails {
-			
-			template (omit) ProblemDetails m_problemDetails(
-																											in charstring p_title,
-																											in integer p_status,
-																											in template (omit) charstring p_type := omit,
-																											in template (omit) charstring p_detail := omit,
-																											in template (omit) charstring p_instance := omit,
-																											in template (omit) charstring p_cause := omit,
-																											in template (omit) InvalidParams p_invalidParams := omit
-																											) := {
-				type_         := p_type,
-				title         := p_title,
-				status        := p_status,
-				detail        := p_detail,
-				instance      := p_instance,
-				cause         := p_cause,
-				invalidParams := p_invalidParams
-			} // End of template m_problemDetails
-			
-			template ProblemDetails mw_problemDetails(
-																								template charstring p_type := *,
-																								template charstring p_title := *,
-																								template integer p_status := *,
-																								template charstring p_detail := *,
-																								template charstring p_instance := *,
-																								template charstring p_cause := *,
-																								template InvalidParams p_invalidParams := *
-																								) := {
-				type_         := p_type,
-				title         := p_title,
-				status        := p_status,
-				detail        := p_detail,
-				instance      := p_instance,
-				cause         := p_cause,
-				invalidParams := p_invalidParams
-			} // End of template mw_problemDetails
-			
-		} // End of group problemDetails
-		
-}  // end of module
+/**
+ *  Copyright Notification
+ *  No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
+ *  The copyright and the foregoing restriction extend to reproduction in all media.
+ *  © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
+ *  All rights reserved.
+ *  
+ *  @author     oneM2M
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
+ *              $Id: OneM2M_Templates.ttcn 356 2017-08-21 12:25:14Z reinaortega $
+ *  @desc       Module containing templates for oneM2M
+ *
+ */
+module OneM2M_Templates {
+
+	import from XSD all;
+	import from OneM2M_Types all;
+	import from OneM2M_TypesAndValues all;
+	import from OneM2M_Pixits all;
+	//import from OneM2M_Functions all;
+	
+	import from OneM2M_Types_3GPP_T8 all;
+
+	/* Templates */
+	
+	group Primitives {
+    	/** 
+    	 * @desc Base template for request sending operations
+    	 * @param p_requestPrimitive
+    	 */
+    	template (value) MsgOut m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeAux_list p_forcedFields := omit) := {
+    		primitive := { requestPrimitive := p_requestPrimitive},
+    		host := "",
+    		xmlNamespace := PX_XML_NAMESPACE,
+    		protocolBinding := "",
+    		serialization := "", 
+    		forcedFields := p_forcedFields
+    	};
+    	
+		/** 
+		 * @desc Base template for response sending operations
+		 * @param p_responsePrimitive
+		 */
+		template (value) MsgOut m_response(in template (value) ResponsePrimitive p_responsePrimitive, in template (omit) AttributeAux_list p_forcedFields := omit) := {
+			primitive := { responsePrimitive := p_responsePrimitive},
+			host := "",
+			xmlNamespace := PX_XML_NAMESPACE,
+			protocolBinding := "",
+			serialization := "", 
+			forcedFields := p_forcedFields
+		};
+		
+		/** 
+		 * @desc Base template for response sending operations
+		 * @param p_responsePrimitive
+		 */
+		template (value) MsgOut m_httpResponse(in template (value) ResponsePrimitive p_responsePrimitive, in template (omit) AttributeAux_list p_forcedFields := omit) := {
+			primitive := { responsePrimitive := p_responsePrimitive},
+			host := "",
+			xmlNamespace := PX_XML_NAMESPACE,
+			protocolBinding := "",
+			serialization := "", 
+			forcedFields := p_forcedFields
+		};
+		
+		template MsgIn mw_request(in template RequestPrimitive p_requestPrimitive, template AttributeList_1 p_nullFields := *) := {
+			primitive := { requestPrimitive := p_requestPrimitive}, 
+			nullFields := p_nullFields
+		};
+    	
+		/** 
+		 * @desc Base template for response receiving operations
+		 * @param p_responsePrimitive
+		 */
+		template MsgIn mw_response(in template  ResponsePrimitive p_responsePrimitive := ?, template AttributeList_1 p_nullFields := *) := {
+			primitive := { responsePrimitive := p_responsePrimitive}, 
+			nullFields := p_nullFields
+		};
+    	
+	}//end of group primitives
+	
+	group RequestPrimitives { 
+		
+		group Retrieve {
+
+			/**
+			 * @desc Base RETRIEVE request primitive
+			 * @param p_targetResourceAddress Target resource address
+			 * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrieve(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
+				operation := int2,
+				to_ := p_targetResourceAddress,
+				from_ := p_originator,
+				requestIdentifier := "m_retrieve",
+				resourceType := omit,
+				primitiveContent := omit,
+				roleIDs := omit, 
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit,
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			};
+        	
+			/**
+			 * @desc RETRIEVE request primitive for child references
+			 * @param p_targetResourceAddress Target resource address
+			 * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrieveChildResourceRefs(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, template (omit) ResourceTypeList p_resourceTypeList := omit) modifies m_retrieve := {
+				filterCriteria := {
+					createdBefore := omit,
+					createdAfter := omit,
+					modifiedSince := omit,
+					unmodifiedSince := omit,
+					stateTagSmaller := omit,
+					stateTagBigger := omit,
+					expireBefore := omit,
+					expireAfter := omit,
+					labels := omit,
+					childLabels := omit,
+					parentLabels := omit,
+					labelsQuery := omit,
+					resourceType := p_resourceTypeList,
+					childResourceType := omit,
+					parentResourceType := omit,
+					sizeAbove := omit,
+					sizeBelow := omit,
+					contentType_list := {},
+					attribute_list := {},
+					childAttribute_list := {},
+					parentAttribute_list := {},
+					filterUsage := int1,
+					limit := omit,
+					semanticsFilter_list := {},
+					filterOperation := omit,
+					contentFilterSyntax := omit,
+					contentFilterQuery := omit,
+					level := omit,
+					offset := omit,
+					applyRelativePath := omit
+				}
+			};
+			
+			/**
+			 * @desc Base Receive RETRIEVE request primitive
+			 * @param p_targetResourceAddress Target resource address
+			 */
+			template RequestPrimitive mw_retrieve(template XSD.ID p_targetResourceAddress, template XSD.ID p_from := ?) := {
+				operation := int2,
+				to_ := p_targetResourceAddress,
+				from_ := p_from,
+				requestIdentifier := ?,
+				resourceType := omit,
+				primitiveContent := *,
+				roleIDs := *, 
+				originatingTimestamp := *,
+				requestExpirationTimestamp := *,
+				resultExpirationTimestamp := *,
+				operationExecutionTime := *,
+				responseType := *,
+				resultPersistence := *,
+				resultContent := *,
+				eventCategory := *,
+				deliveryAggregation := *,
+				groupRequestIdentifier := *,
+				filterCriteria := *,
+				desiredIdentifierResultType := *,
+				tokens := *,
+				tokenIDs := *,
+				localTokenIDs := *,
+				tokenRequestIndicator := *,
+				groupRequestTargetMembers := *,
+				authorSignIndicator := *,
+				authorSigns := *,
+				authorRelIndicator := *,
+				semanticQueryIndicator := *,
+				releaseVersionIndicator := ?,
+				vendorInformation := *
+			};
+        	
+			template RequestPrimitive mw_retrieveFormalOntology(template XSD.ID p_targetResourceAddress := ?, template XSD.ID p_from := ?, template XSD.AnyURI p_ontologyServerUri := ?) modifies mw_retrieve := {
+    		from_ := p_from,
+				requestIdentifier := ?,
+				primitiveContent := { flexContainer := mw_contentFlexContainer(p_ontologyServerUri) },
+				releaseVersionIndicator := "3"
+			};
+        	
+			/**
+			 * @desc RETRIEVE request primitive for a single attribute in To field ("targetResourceAddress#AttributeName")
+			 * @param p_targetResourceAddress Target resource address (including "#AttributeName")
+			 * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrieveAttributeToOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
+        		operation := int2,
+        		to_ := p_targetResourceAddress,
+        		from_ := p_originator,
+        		requestIdentifier := "m_retrieveResourceAttributeOptionTo",
+        		resourceType := omit,
+				primitiveContent := omit, 
+				roleIDs := omit,
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit,
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+        	};
+        	
+			/**
+			 * @desc RETRIEVE request primtive containing the target attributes in the primitiveContent field
+			 * @param p_targetResourceAddress Target resource address 
+			 * @param p_attributeList Target attribute list
+			 * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrieveAttributeContentOption(XSD.ID p_targetResourceAddress, in template (value) AttributeList_1 p_attributeList, in XSD.ID p_originator) := {
+				operation := int2,
+				to_ := p_targetResourceAddress,
+				from_ := p_originator,
+				requestIdentifier := "m_retrieveResourceAttributeContentOption",
+				resourceType := omit,
+				primitiveContent := {attributeList := p_attributeList},
+				roleIDs := omit,
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit,
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			};
+			
+			/**
+			  * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
+			  * @param p_targetResourceAddress Target resource address 
+			  * @param p_filterCriteria FilterCriteria
+			  * @param p_originator Originator (from)
+		     */
+			template (value) RequestPrimitive m_retrieveFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
+				requestIdentifier := "m_retrieveResourceFilterUsageOption",
+				filterCriteria := {
+					createdBefore := omit,
+					createdAfter := omit,
+					modifiedSince := omit,
+					unmodifiedSince := omit,
+					stateTagSmaller := omit,
+					stateTagBigger := omit,
+					expireBefore := omit,
+					expireAfter := omit,
+					labels := omit,
+					childLabels := omit,
+					parentLabels := omit,
+					labelsQuery := omit,
+					resourceType := omit,
+					childResourceType := omit,
+					parentResourceType := omit,
+					sizeAbove := omit,
+					sizeBelow := omit,
+					contentType_list := {},
+					attribute_list := {},
+					childAttribute_list := {},
+					parentAttribute_list := {},
+					filterUsage := int1,
+					limit := omit,
+					semanticsFilter_list := {},
+					filterOperation := omit,
+					contentFilterSyntax := omit,
+					contentFilterQuery := omit,
+					level := omit,
+					offset := omit,
+					applyRelativePath := omit
+				}
+			};
+			
+			/**
+			  * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
+			  * @param p_targetResourceAddress Target resource address 
+			  * @param p_filterCriteria FilterCriteria
+			  * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrieveFilterCriteria(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterCriteria p_filterCriteria) modifies m_retrieve := {
+				requestIdentifier := "m_retrieveResourceFilterUsageOption",
+				filterCriteria := p_filterCriteria
+			};
+			
+			/**
+			  * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
+			  * @param p_targetResourceAddress Target resource address 
+			  * @param p_originator Originator (from)
+			  * @param p_filterUsage FilterUsage
+			  * @param p_labels Labels
+			 */
+			template (value) RequestPrimitive m_retrieveFilterUsageOptionLabel(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage, in Labels p_labels) modifies m_retrieve := {
+				requestIdentifier := "m_retrieveResourceFilterUsageOptionLabel",
+				filterCriteria := {
+					createdBefore := omit,
+					createdAfter := omit,
+					modifiedSince := omit,
+					unmodifiedSince := omit,
+					stateTagSmaller := omit,
+					stateTagBigger := omit,
+					expireBefore := omit,
+					expireAfter := omit,
+					labels := p_labels,
+					childLabels := omit,
+					parentLabels := omit,
+					labelsQuery := omit,
+					resourceType := omit,
+					childResourceType := omit,
+					parentResourceType := omit,
+					sizeAbove := omit,
+					sizeBelow := omit,
+					contentType_list := {},
+					attribute_list := {},
+					childAttribute_list := {},
+					parentAttribute_list := {},
+					filterUsage := p_filterUsage, 
+					limit := omit,
+					semanticsFilter_list := {},
+					filterOperation := omit,
+					contentFilterSyntax := omit,
+					contentFilterQuery := omit,
+					level := omit,
+					offset := omit,
+					applyRelativePath := omit
+				}
+			};
+			/**
+			  * @desc RETRIEVE request primtive containing the Desired Identifier Result Type in the desiredIdentifierResultType field and Filter Criteria in the filterCriteria field
+			  * @param p_targetResourceAddress Target resource address 
+			  * @param p_filterCriteria FilterCriteria
+			  * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrieveDiscResTypeFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) DesIdResType p_desIdResType, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
+				requestIdentifier := "m_retrieveResourceFilterUsageOption",
+				filterCriteria := {
+					createdBefore := omit,
+					createdAfter := omit,
+					modifiedSince := omit,
+					unmodifiedSince := omit,
+					stateTagSmaller := omit,
+					stateTagBigger := omit,
+					expireBefore := omit,
+					expireAfter := omit,
+					labels := omit,
+					childLabels := omit,
+					parentLabels := omit,
+					labelsQuery := omit,
+					resourceType := omit,
+					childResourceType := omit,
+					parentResourceType := omit,
+					sizeAbove := omit,
+					sizeBelow := omit,
+					contentType_list := {},
+					attribute_list := {},
+					childAttribute_list := {},
+					parentAttribute_list := {},
+					filterUsage := p_filterUsage, 
+					limit := omit,
+					semanticsFilter_list := {},
+					filterOperation := omit,
+					contentFilterSyntax := omit,
+					contentFilterQuery := omit,
+					level := omit,
+					offset := omit,
+					applyRelativePath := omit
+				},
+				desiredIdentifierResultType := p_desIdResType
+			};
+			
+			/**
+			  * @desc RETRIEVE request primtive containing the Discovery Type in the desiredIdentifierResultType field and Filter Criteria in the filterCriteria field
+			  * @param p_targetResourceAddress Target resource address 
+			  * @param p_filterCriteria FilterCriteria
+			  * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrieveInvalidFormatOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
+				requestIdentifier := "m_retrieveResourceFilterUsageOption",
+				filterCriteria := {
+					createdBefore := omit,
+					createdAfter := omit,
+					modifiedSince := omit,
+					unmodifiedSince := omit,
+					stateTagSmaller := omit,
+					stateTagBigger := omit,
+					expireBefore := omit,
+					expireAfter := omit,
+					labels := omit,
+					childLabels := omit,
+					parentLabels := omit,
+					labelsQuery := omit,
+					resourceType := omit,
+					childResourceType := omit,
+					parentResourceType := omit,
+					sizeAbove := omit,
+					sizeBelow := omit,
+					contentType_list := {},
+					attribute_list := {},
+					childAttribute_list := {},
+					parentAttribute_list := {},
+					filterUsage := omit, 
+					limit := omit,
+					semanticsFilter_list := {},
+					filterOperation := omit,
+					contentFilterSyntax := omit,
+					contentFilterQuery := omit,
+					level := omit,
+					offset := omit,
+					applyRelativePath := omit
+				}
+			};
+			
+			/**
+			  * @desc RETRIEVE request primtive for polling request
+			  * @param p_targetResourceAddress Target resource address 
+			  * @param p_filterCriteria FilterCriteria
+			  * @param p_originator Originator (from)
+			 */
+			template (value) RequestPrimitive m_retrievePollingRequest(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
+				to_ := p_targetResourceAddress & "/pcu"
+			};
+			
+			/**
+			  * @desc FilterCriteria empty template
+			 */
+			template (value) FilterCriteria m_filterCriteria := {
+				createdBefore := omit,
+				createdAfter := omit,
+				modifiedSince := omit,
+				unmodifiedSince := omit,
+				stateTagSmaller := omit,
+				stateTagBigger := omit,
+				expireBefore := omit,
+				expireAfter := omit,
+				labels := omit,
+				childLabels := omit,
+				parentLabels := omit,
+				labelsQuery := omit,
+				resourceType := omit,
+				childResourceType := omit,
+				parentResourceType := omit,
+				sizeAbove := omit,
+				sizeBelow := omit,
+				contentType_list := {},
+				attribute_list := {},
+				childAttribute_list := {},
+				parentAttribute_list := {},
+				filterUsage := omit, 
+				limit := omit,
+				semanticsFilter_list := {},
+				filterOperation := omit,
+				contentFilterSyntax := omit,
+				contentFilterQuery := omit,
+				level := omit,
+				offset := omit,
+				applyRelativePath := omit
+			}
+			
+			
+			
+			
+			
+    	}//end group Retrieve
+
+    	group Update {
+    		
+    		template (value) RequestPrimitive m_update := {
+				operation := int3,
+				to_ := "NotInitialized",
+				from_ := "NotInitialized",
+				requestIdentifier := "m_update",
+				resourceType := omit,
+				primitiveContent:= omit,
+				roleIDs := omit, 
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit,
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			};
+        	
+						
+			template RequestPrimitive mw_update(template XSD.ID p_from := ?, template XSD.ID p_to := ?) := {
+				operation := int3,
+				to_ := p_to,
+				from_ := p_from,
+				requestIdentifier := ?,
+				resourceType := omit,
+				primitiveContent:= ?,
+				roleIDs := *, 
+				originatingTimestamp := *,
+				requestExpirationTimestamp := *,
+				resultExpirationTimestamp := *,
+				operationExecutionTime := *,
+				responseType := *,
+				resultPersistence := *,
+				resultContent := *,
+				eventCategory := *,
+				deliveryAggregation := *,
+				groupRequestIdentifier := *,
+				filterCriteria := *,
+				desiredIdentifierResultType := *, 
+				tokens := *,
+				tokenIDs := *,
+				localTokenIDs := *,
+				tokenRequestIndicator := *,
+				groupRequestTargetMembers := *,
+				authorSignIndicator := *,
+				authorSigns := *,
+				authorRelIndicator := *,
+				semanticQueryIndicator := *,
+				releaseVersionIndicator := ?,
+				vendorInformation := *
+			};
+        	
+			/**
+			 * @desc Base UPDATE request primitive for Ae resource
+			 */
+			template (value) RequestPrimitive m_updateAeBase modifies m_update:= {
+				requestIdentifier := "m_updateAe",
+				primitiveContent:= {aE := m_contentUpdateAe}
+			};
+        	
+			/**
+			 * @desc Reception template for update Ae resource
+			 */
+			template RequestPrimitive mw_updateAe(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				primitiveContent:= {aE := ?}
+			};
+			 
+        	
+			/**
+			 * @desc Base UPDATE request primitive for Container resource
+			 */
+			template (value) RequestPrimitive m_updateContainerBase modifies m_update:= {
+				requestIdentifier := "m_updateContainer",
+				primitiveContent:= {container := m_contentUpdateContainer}
+			};
+			
+			/**
+			 * @desc Base Reception template for update Container
+			 */
+			template RequestPrimitive mw_updateContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				primitiveContent := {container := ?}
+			}; 
+			
+			/**
+			 * @desc Base UPDATE request primitive for ContentInstance resource
+			 */
+			template (value) RequestPrimitive m_updateContentInstanceBase modifies m_update:= {
+				requestIdentifier := "m_updateContentInstance",
+				primitiveContent:= {contentInstance := m_contentUpdateContentInstance}
+			};
+			
+			/**
+			 * @desc Base UPDATE request primitive for AccessControlPolicy resource
+			 */        				
+			template (value) RequestPrimitive m_updateAcpBase modifies m_update := {
+				requestIdentifier := "m_updateAcp",
+				primitiveContent:= {accessControlPolicy := m_contentUpdateAcp}
+			};
+			
+			template (value) RequestPrimitive m_updateAcpPrivileges(in template(omit) SetOfAcrs p_privileges := omit, in template(omit) SetOfAcrs p_selfPrivileges := omit) modifies m_update := {
+				requestIdentifier := "m_updateAcp",
+				primitiveContent:= {accessControlPolicy := m_contentUpdateAcpPrivileges(p_privileges, p_selfPrivileges)}
+			};
+			
+			/**
+			 * @desc Base UPDATE request primitive for GenericInterworkingService resource
+			 */
+			template (value) RequestPrimitive m_updateGenericInterworkingServiceBase modifies m_update:= {
+				requestIdentifier := "m_updateGenericInterworkingService",
+				primitiveContent:= {genericInterworkingService := m_contentUpdateGenericInterworkingService}
+			};
+
+            /**
+			 * @desc Base UPDATE request primitive for GenericInterworkingService_invalid resource
+			 */
+			template (value) RequestPrimitive m_updateGenericInterworkingServiceBase_invalid modifies m_update:= {
+				requestIdentifier := "m_updateGenericInterworkingServiceInvalid",
+				primitiveContent:= {genericInterworkingService_invalid := m_contentUpdateGenericInterworkingService_invalid}
+			};
+
+            /**
+			 * @desc Base UPDATE request primitive for Group resource
+			 */
+			template (value) RequestPrimitive m_updateGroupBase modifies m_update := {
+				requestIdentifier := "m_updateGroup",
+				primitiveContent:= {group_ := m_contentUpdateGroup}
+			};
+			
+			/**
+			 * @desc Base UPDATE request primitive for CSEBase resource
+			 */
+			template (value) RequestPrimitive m_updateCSEBaseBase modifies m_update := {
+				requestIdentifier := "m_updateGroup",
+				primitiveContent:= {cSEBase := m_contentUpdateCSEBase}
+			};
+			
+			/**
+			 * @desc Base UPDATE request primitive for Schedule resource
+			 */
+			template (value) RequestPrimitive m_updateScheduleBase modifies m_update := {
+				requestIdentifier := "m_updateSchedule",
+				primitiveContent:= {schedule := m_contentUpdateSchedule}
+			};
+			
+			/**
+			 * @desc Base UPDATE request primitive for PollingChannel resource
+			 */
+			template (value) RequestPrimitive m_updatePollingChannelBase modifies m_update := {
+				requestIdentifier := "m_updatePollingChannel",
+				primitiveContent:= {pollingChannel := m_contentUpdatePollingChannel}
+			};
+			
+			/**
+			 * @desc Base UPDATE request primitive for Subscription resource
+			 */
+			template (value) RequestPrimitive m_updateSubscriptionBase modifies m_update := {
+				requestIdentifier := "m_updateSubscription",
+				primitiveContent:= {subscription := m_contentUpdateSubscription}
+			};
+			
+			template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) modifies m_update := {
+        	  	to_ 				:= p_locResourceAddress,
+        	  	requestIdentifier	:= "m_updateLocationPolicy",
+        	  	primitiveContent	:= {locationPolicy := m_contentUpdateLocationPolicy(p_accessControlPolicyIds, p_locationUpdatePeriod)}
+			  };
+        	
+        	template (value) RequestPrimitive m_updateNodeBase modifies m_update := {
+				requestIdentifier := "m_updateNode",
+				primitiveContent:= {node := m_contentUpdateNode}
+        	}
+        	
+        	template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
+			   requestIdentifier := "m_updateRemoteCSEBase",
+        	   primitiveContent := {remoteCSE := m_contentUpdateRemoteCSE}
+        	}
+
+			/**
+			 * @desc Reception template for update remoteCSE resource
+			 */
+			template RequestPrimitive mw_updateRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				primitiveContent:= {remoteCSE := ?}
+			};
+			       	
+			template (value) RequestPrimitive m_updateAEAnncBase modifies m_update:= {
+				requestIdentifier := testcasename() & "-m_updateAEAnnc",
+				primitiveContent := {aEAnnc := m_contentUpdateAEAnnc}
+			};
+			
+			template RequestPrimitive mw_updateAEAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update:= {
+				primitiveContent := {aEAnnc := ?}
+			};
+
+            /**
+			 * @desc Base Reception template for update ContainerAnnc
+			 */
+			template RequestPrimitive mw_updateContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				primitiveContent := {containerAnnc := ?}
+			}; 
+			
+			/**
+			 * @desc Base Reception template for update GroupAnnc
+			 */
+			template RequestPrimitive mw_updateGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				primitiveContent := {groupAnnc := ?}
+			}; 
+			
+			/**
+			 * @desc Base Reception template for update AccessControlPolicyAnnc
+			 */
+			template RequestPrimitive mw_updateAccessControlPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				primitiveContent := {accessControlPolicyAnnc := ?}
+			};
+			
+			
+			/**
+			 * @desc Base UPDATE request primitive for Semantic Descriptor resource
+			 */
+			template (value) RequestPrimitive m_updateSemanticDescriptorBase modifies m_update := {
+				requestIdentifier := "m_updateSemanticDescriptor",
+				primitiveContent:= {semanticDescriptor := m_contentUpdateSemanticDescriptor}
+			};	
+			
+		   /**
+			 * @desc Base UPDATE request primitive for Semantic Descriptor resource. Reusing m_contentCreateSemanticMashupJobProfile.
+			 */
+			template (value) RequestPrimitive m_updateSemanticMashupJobProfileBase modifies m_update := {
+				requestIdentifier := "m_updateSemanticMashupJobProfileBase",
+				primitiveContent:= {semanticMashupJobProfile := m_contentUpdateSemanticMashupJobProfile}
+			};			
+			
+			/**
+			 * @desc Base UPDATE request primitive for SemanticMashupInstance resource
+			 */
+			template (value) RequestPrimitive m_updateSemanticMashupInstanceBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createSemanticMashupInstance",
+				resourceType := int41,
+				primitiveContent := {semanticMashupInstance := m_contentUpdateSemanticMashupInstance }
+			};
+			 	
+			
+			/**
+			 * @desc Base UPDATE request primitive for TimeSeries resource
+			 */
+			template (value) RequestPrimitive m_updateTimeSeriesBase modifies m_update := {
+				requestIdentifier := "m_updateTimeSeries",
+				primitiveContent:= {timeSeries := m_contentUpdateTimeSeries}
+			};
+			
+			/**
+			 * @desc Base UPDATE request primitive for TimeSeriesInstance resource
+			 */
+			template (value) RequestPrimitive m_updateTimeSeriesInstanceBase modifies m_update:= {
+				requestIdentifier := "m_updateTimeSeriesInstance",
+				primitiveContent:= {timeSeriesInstance := m_contentUpdateTimeSeriesInstance}
+			};		
+			
+			/**
+			 * @desc Base Reception template for update TimeSeriesAnnc
+			 */
+			template RequestPrimitive mw_updateTimeSeriesAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
+				primitiveContent := {timeSeriesAnnc := ?}
+			}; 
+			
+			/**
+			 * @desc Base UPDATE request primitive for Role resource
+			 */
+			template (value) RequestPrimitive m_updateRoleBase modifies m_update:= {
+				requestIdentifier := "m_updateRole",
+				primitiveContent:= {role := m_contentUpdateRole}
+			};
+			
+			
+    	}//end group Update
+    	
+    	group Create {
+
+			template (value) RequestPrimitive m_create := {
+				operation := int1,
+				to_ := "NotInitialized",
+				from_ := "NotInitialized",
+				requestIdentifier := testcasename() & "-m_create",
+				resourceType := omit,
+				primitiveContent := omit,
+				roleIDs := omit,
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit,
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+
+			};
+        	
+			/**
+			 * @desc Base Reception template for create operation
+			 */
+			template RequestPrimitive mw_create(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
+				operation := int1,
+				to_ := p_to,
+				from_ := p_from,
+				requestIdentifier := ?,
+				resourceType := ?,
+				primitiveContent := ?,
+				roleIDs := *,
+				originatingTimestamp := *,
+				requestExpirationTimestamp := *,
+				resultExpirationTimestamp := *,
+				operationExecutionTime := *,
+				responseType := *,
+				resultPersistence := *,
+				resultContent := *,
+				eventCategory := *,
+				deliveryAggregation := *,
+				groupRequestIdentifier := *,
+				filterCriteria := *,
+				desiredIdentifierResultType := *,
+				tokens := *,
+				tokenIDs := *,
+				localTokenIDs := *,
+				tokenRequestIndicator := *,
+				groupRequestTargetMembers := *,
+				authorSignIndicator := *,
+				authorSigns := *,
+				authorRelIndicator := *,
+				semanticQueryIndicator := *,
+				releaseVersionIndicator := ?,
+				vendorInformation := *
+			}
+			
+			/**
+			 * @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)
+			}
+			
+			/**
+			 * @desc CREATE request primitive for AEAnnc resource
+			 * @param p_accessControlPolicyIds
+			 * @param p_to
+			 * @param p_from
+			 * @param p_appId
+			 * @param p_stemId
+			 */
+			template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_appId, XSD.AnyURI p_link := "NotInitialized") modifies m_create:= {
+				from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
+				requestIdentifier := testcasename() & "-m_createAEAnnc",
+				resourceType := int10002,
+				primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, p_link)}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for AEAnnc resource
+			 * @param p_accessControlPolicyIds
+			 * @param p_to
+			 * @param p_from
+			 * @param p_appId
+			 * @param p_stemId
+			 */
+			template (value) RequestPrimitive m_createAEAnncBase modifies m_create:= {
+				requestIdentifier := testcasename() & "-m_createAEAnnc",
+				resourceType := int10002,
+				primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, omit, -, -)}
+			};
+			
+			/**
+			 * @desc Reception template for CREATE AEAnnc for registration when AE-ID-Stem starts with S
+			 */
+			template RequestPrimitive mw_createAEAnnc_s_ae_id(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_createAnnc := {				
+				primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
+			};
+
+			/**
+			 * @desc Reception template for CREATE AEAnnc as announced resource
+			 */
+			template RequestPrimitive mw_createAEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := *, template XSD.AnyURI p_link := ?) modifies mw_create := {				
+				resourceType := int10002,
+				primitiveContent := {aEAnnc := mw_contentCreateAEAnnc(-, p_accessControlPolicyIds)}
+			};
+			
+			template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := PX_TS_AE1.aeIdStem, template (omit) ResourceName p_resourceName :=  c_defaultAe1ResourceName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
+				from_ := p_from,//It should be used either omit, or "s", or "c"
+				requestIdentifier := testcasename() & "-m_createAe",
+				resourceType := int2,
+				primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds,p_resourceName, p_appId, p_poaList)}
+			};
+        	
+			/**
+			 * @desc Reception template for AE registration
+			 */
+			template  RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?, template AE_optional p_ae := mw_contentCreateAeBase) modifies mw_create := {
+				resourceType := int2,
+				primitiveContent := {aE := p_ae}
+			};  
+			        	
+			/**
+			 * @desc Base CREATE request primitive for AccessControlPolicy resource
+			 */
+			template (value) RequestPrimitive m_createAcpBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createAcp",
+				resourceType := int1,
+				primitiveContent := {accessControlPolicy := m_contentCreateAcp ()}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for AccessControlPolicyAnnc resource
+			 */
+			template (value) RequestPrimitive m_createAcpAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createAcpAnnc",
+				resourceType := int10001,
+				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 := {
+				requestIdentifier := testcasename() & "-m_createAcp",
+        		resourceType := int1,
+        		primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
+        	};
+        	
+			/**
+			 * @desc Reception template for CREATE AcpAnnc
+			 */
+			template RequestPrimitive mw_createAccessControlPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				to_ := p_to,
+				from_ := p_from,
+				resourceType := int10001,
+				primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnncBase(-)}
+			};
+        	
+			/**
+			  * @desc Reception template for CREATE AcpAnnc
+			  */
+			template RequestPrimitive mw_createRemoteCSEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?) modifies mw_createAnnc := {
+				resourceType := int10016,
+				primitiveContent := {remoteCSEAnnc := mw_contentCreateRemoteCSEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
+			};
+       	
+			/**
+			 * @desc Base CREATE request primitive for CSEBase resource
+			 */
+			template (value) RequestPrimitive m_createCSEBaseBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createCSEBase",
+				resourceType := int5,
+				primitiveContent := {cSEBase := m_contentCreateCSEBase}
+			};
+			
+			/**
+			  * @desc Base CREATE request primitive for CSEBaseAnnc resource
+			  */
+			template RequestPrimitive m_createCSEBaseAnncBase(template (value) XSD.ID p_from := PX_TS_CSE1.cseId, template (omit) AcpType p_accessControlPolicyIds := omit, XSD.AnyURI p_link := "NotInitialized") modifies m_create := {
+				from_ := p_from,
+				resourceType := int10005,
+				primitiveContent := {cSEBaseAnnc := m_contentCreateCSEBaseAnnc(-, p_accessControlPolicyIds, p_link)}
+			}
+        	
+        	/**
+			  * @desc Reception template for CREATE CSEBaseAnnc
+			  */
+			template RequestPrimitive mw_createCSEBaseAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?) modifies mw_createAnnc := {
+				resourceType := int10005,
+				primitiveContent := {cSEBaseAnnc := mw_contentCreateCSEBaseAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
+			};
+        	
+       	
+			/**
+			 * @desc Base CREATE request primitive for Container resource
+			 */
+			template (value) RequestPrimitive m_createContainerBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createContainer",
+				resourceType := int3,
+				primitiveContent := {container := m_contentCreateContainer}
+			};
+			
+			/**
+			 * @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 := {
+				requestIdentifier := testcasename() & "-m_createDynamicAuthorizationConsultation",
+				resourceType := int34,
+				primitiveContent := {dynamicAuthorizationConsultation := m_contentDynamicAuthorizationConsultation(p_dyn_auth_enabled, p_name)}
+			};
+			
+			
+			/**
+			 * @desc Base CREATE request primitive for ContainerAnnc resource
+			 */
+			template (value) RequestPrimitive m_createContainerAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createContainerAnnc",
+				resourceType := int10003,
+				primitiveContent := {containerAnnc := m_contentCreateContainerAnnc}
+			};
+			       	
+			/**
+			 * @desc Base CREATE request primitive for Container resource using Container_update_invalid
+			 */
+			template (value) RequestPrimitive m_createContainerBaseInvalid modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createContainer",
+				resourceType := int3,
+				primitiveContent := {container_invalid := m_contentCreateContainerInvalid}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for remoteCSE resource
+			 */
+			template (value) RequestPrimitive m_createRemoteCSEBase(template (value) XSD.ID p_from := PX_TS_CSE1.cseId, template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName :=  c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId) modifies m_create := {
+				from_ := p_from,//Originator CSE-ID
+				requestIdentifier := testcasename() & "-m_createRemoteCSE",
+				resourceType := int16,
+				primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase)}
+			};
+			
+			/**
+			 * @desc CREATE request primitive for remoteCSE resource with poa
+			 */
+			template (value) RequestPrimitive m_createRemoteCSE_poa(template (value) XSD.ID p_from := PX_TS_CSE1.cseId, template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName :=  c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName, in template (omit) XSD.ID p_cSE_ID := PX_TS_CSE1.cseId, in PoaList p_poaList) modifies m_createRemoteCSEBase := {
+				primitiveContent := {remoteCSE := m_contentCreateRemoteCSE_poa(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_poaList)}
+			};
+			
+			/**
+			 * @desc Base reception template for CREATE RemoteCSE
+			 */
+			template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int16,
+				primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for remoteCSEAnnc resource
+			 */
+			template (value) RequestPrimitive m_createRemoteCSEAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createRemoteCSEAnnc",
+				resourceType := int10016,
+				primitiveContent := {remoteCSEAnnc := m_contentCreateRemoteCSEAnnc}
+			};			
+			
+			/**
+			 * @desc CREATE request primitive for Container resource wiht no resourceName provided
+			 */
+			template (value) RequestPrimitive m_createContainer_noResourceName modifies m_createContainerBase := {
+				primitiveContent := {container := m_contentCreateContainer(omit)}
+			};
+	
+    		template (value) RequestPrimitive m_createContainer(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_resourceName := c_defaultContainerResourceName) modifies m_create := {
+    			to_ := p_parentResourceAddress,
+				requestIdentifier := testcasename() & "-m_createContainer",
+    			resourceType := int3,
+    			primitiveContent := {container := m_contentCreateContainer(p_resourceName)}
+    		};
+        	
+			/**
+			 * @desc Reception template for CREATE Container
+			 */
+			template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int3,
+				primitiveContent := {container := mw_contentCreateContainerBase}
+			};  
+			
+			/**
+			 * @desc Base Reception template for CREATE ContainerAnnc
+			 */
+			template RequestPrimitive mw_createContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				resourceType := int10003,
+				primitiveContent := {containerAnnc := mw_contentCreateContainerAnncBase}
+			};
+			
+			/**
+			 * @desc Reception template for CREATE FlexContainer
+			 */
+			template RequestPrimitive mw_createFlexContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {flexContainer := ?}
+			};  
+			
+			/**
+			 * @desc Base CREATE request primitive for GenericInterworkingService resource
+			 */
+			template (value) RequestPrimitive m_createGenericInterworkingServiceBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createGenericInterworkingService",
+				resourceType := int28,
+				primitiveContent := {genericInterworkingService := m_contentCreateGenericInterworkingService()}
+			};
+
+            /**
+			 * @desc Reception template for CREATE GenericInterworkingOperationInstance
+			 */
+			template RequestPrimitive mw_createGenericIwkOpInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28,  // FIXME: not found in TS004
+				primitiveContent := {genericInterworkingOperationInstance := ?}
+			}; 
+        	
+			/**
+			 * @desc Base CREATE request primitive for Content Instance resource
+			 */
+			template (value) RequestPrimitive m_createContentInstanceBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createContentInstance",
+				resourceType := int4,
+				primitiveContent := {contentInstance := m_contentCreateContentInstance}
+			};
+				
+			/**
+			 * @desc Base CREATE request primitive for ContentInstanceAnnc resource
+			 */
+			template (value) RequestPrimitive m_createContentInstanceAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createContentInstanceAnnc",
+				resourceType := int10004,
+				primitiveContent := {contentInstanceAnnc := m_contentCreateContentInstanceAnnc}
+			};
+				
+			/**
+			 * @desc CREATE request primitive for Content Instance resource with no resourceName provided
+			 */
+			template (value) RequestPrimitive m_createContentInstance_noResourceName modifies m_createContentInstanceBase := {
+				primitiveContent := {contentInstance := m_contentCreateContentInstance(omit)}
+			};
+    		
+    		template (value) RequestPrimitive m_createContentInstance(XSD.ID p_parentResourceAddress, XSD.String p_primitiveContent) modifies m_create := {
+    			to_ := p_parentResourceAddress,
+    			from_ := "admin:admin",
+				requestIdentifier := testcasename() & "-m_createContentInstance",
+    			resourceType := int4,
+    			primitiveContent := {contentInstance := m_contentCreateContentInstance(-, p_primitiveContent)}
+    		};
+    		
+			/**
+			 * @desc Reception template for CREATE ContentInstanceAnnc
+			 */
+			template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				resourceType := int10004,
+				primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
+			};  
+			
+			/**
+			 * @desc Reception template for CREATE ContentInstance
+			 */
+			template RequestPrimitive mw_createContentInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int4,
+				primitiveContent := {contentInstance := mw_contentCreateContentInstanceBase}
+			}; 
+			
+			/**
+			 * @desc Base CREATE request primitive for Delivery resource
+			 */
+			/*template (value) RequestPrimitive m_createDeliveryBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createDelivery" & f_rnd(1, 1000000),
+				resourceType := int6,
+				primitiveContent := {delivery := m_contentCreateDelivery()}
+			};*/
+        	    		
+       	
+			/**
+			 * @desc Base CREATE request primitive for Group resource
+			 */
+			template (value) RequestPrimitive m_createGroupBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createGroup",
+				resourceType := int9,
+				primitiveContent := {group_ := m_contentCreateGroup (1, {"NotInitialized"}, omit, omit)}	//TODO: p_resourceId
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for GroupAnnc resource
+			 */
+			template (value) RequestPrimitive m_createGroupAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createGroupAnnc",
+				resourceType := int10009,
+				primitiveContent := {groupAnnc := m_contentCreateGroupAnnc (1, {"NotInitialized"}, omit, omit)}	//TODO: p_resourceId
+			};
+        	
+        	template (value) RequestPrimitive m_createGroup(in template (value) XSD.NonNegativeInteger p_maxNrOfMembers,
+															in template (value) ListOfURIs p_memberIds := {"NotInitialized"},
+															in template (omit) AcpType p_accessControlPolicyIds,
+															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 := {
+				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
+        	};
+        	
+			/**
+			 * @desc Reception template for CREATE Group
+			 */
+			template  RequestPrimitive mw_createGroup(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int9,
+				primitiveContent := {group_ := mw_contentCreateGroupBase}
+			};  
+			  	
+			/**
+			 * @desc Reception template for CREATE GroupAnnc
+			 */
+			template RequestPrimitive mw_createGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				resourceType := int10009,
+				primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
+			};  
+			
+			/**
+			 * @desc Base CREATE request primitive for MgmtCmd resource
+			 */
+			template (value) RequestPrimitive m_createMgmtCmdBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createMgmtCmd",
+				resourceType := int12,
+				primitiveContent := {mgmtResource := m_contentCreateMgmtCmd (-,-)}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for MgmtObj resource
+			 */
+			template (value) RequestPrimitive m_createMgmtObjBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createMgmtObj",
+				resourceType := int13,
+				primitiveContent := {mgmtResource := m_contentCreateMgmtObj (-,-)}
+			};
+        	
+			/**
+			 * @desc CREATE request primitive for MgmtObj resource
+			 */
+			template (value) RequestPrimitive m_createMgmtObj modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createMgmtObj",
+				resourceType := int13,
+				primitiveContent := {mgmtResource := m_contentCreateMgmtObj (-, -)}
+			};
+        	
+			/**
+			 * @desc Reception template for CREATE MgmtObjAnnc
+			 */
+			template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				resourceType := int10013,
+				primitiveContent := {announcedMgmtResource := mw_contentCreateMgmtObjAnncBase}
+			};  
+			
+			/**
+			 * @desc Base CREATE request primitive for Node resource
+			 */
+			template (value) RequestPrimitive m_createNodeBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createNode",
+				resourceType := int14,
+				primitiveContent := {node := m_contentCreateNode(-, -, -) }
+			};
+        	
+			/**
+			 * @desc CREATE request primitive for Node resource
+			 */
+			template (value) RequestPrimitive m_createNode modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createNode",
+				resourceType := int14,
+				primitiveContent := {node := m_contentCreateNode(-,-,-) }
+			};
+        	
+			/**
+			 * @desc Reception template for CREATE NodeAnnc
+			 */
+			template RequestPrimitive mw_createNodeAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				resourceType := int10014,
+				primitiveContent := {nodeAnnc := mw_contentCreateNodeAnncBase}
+			};  
+       	
+			/**
+			 * @desc Base CREATE request primitive for PollingChannel resource
+			 */
+			template (value) RequestPrimitive m_createPollingChannelBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createPollingChannel",
+				resourceType := int15,
+				primitiveContent := {pollingChannel := m_contentCreatePollingChannel (-)}
+			};
+        	
+        	template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_parentResourceAddress, in template (value)XSD.ID p_originatorId) modifies m_create := {
+        		to_ := p_parentResourceAddress,
+        		from_ := p_originatorId,
+				requestIdentifier := testcasename() & "-m_createPollingChannel",
+        		resourceType := int15,
+        		primitiveContent := {pollingChannel := m_contentCreatePollingChannel ()}
+        	};
+        	
+			template RequestPrimitive mw_createPollingChannel(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				to_ := p_to,
+				from_ := p_from,
+				primitiveContent := {pollingChannel := mw_contentCreatePollingChannel}
+			};
+        	
+			/**
+			 * @desc Base CREATE request primitive for Schedule resource
+			 */
+        	template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createSchedule",
+        		resourceType := int18,
+				primitiveContent := {schedule := m_contentCreateSchedule ({{"* * * * * * *"}})}
+        	};
+        	
+			/**
+			 * @desc Base CREATE request primitive for ScheduleAnnc resource
+			 */
+        	template (value) RequestPrimitive m_createScheduleAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createScheduleAnnc",
+        		resourceType := int10018,
+				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 := {
+        		to_ := p_parentResourceAddress,
+				requestIdentifier := testcasename() & "-m_createSchedule",
+        		resourceType := int18,
+        		primitiveContent := {schedule := m_contentCreateSchedule (p_scheduleElement, p_name)}
+        	};
+        	
+			/**
+			 * @desc Reception template for CREATE ScheduleAnnc
+			 */
+			template RequestPrimitive mw_createScheduleAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				resourceType := int10018,
+				primitiveContent := {scheduleAnnc := mw_contentCreateScheduleAnncBase}
+			};  
+			
+			template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
+				resourceType := int19,//FIXME Is this the correct value?
+				primitiveContent := {serviceSubscribedAppRule := m_contentCreateServiceSubscribedAppRule (p_applicableCredIDs, p_allowedAppIDs, p_allowedAEs)}
+			};
+        	
+			/**
+			 * @desc Base CREATE request primitive for ServiceSubscribedAppRule Resource
+			 */
+			template (value) RequestPrimitive m_createServiceSubscribedAppRuleBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRuleBase",
+				resourceType := int19,
+				primitiveContent := {serviceSubscribedAppRule := m_contentCreateServiceSubscribedAppRuleBase}
+			};
+       	
+			/**
+			 * @desc Base CREATE request primitive for ServiceSubscribedNode Resource
+			 */
+			template (value) RequestPrimitive m_createServiceSubscribedNode modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createServiceSubscribedNode",
+				resourceType := int20,
+				primitiveContent := {serviceSubscribedNode := m_contentServiceSubscribedNode}
+			};
+			       	
+			/**
+			 * @desc Base CREATE request primitive for Subscription resource
+			 */
+			template (value) RequestPrimitive m_createSubscriptionBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createSubscription",
+				resourceType := int23,
+				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 := {
+        		to_ := p_to,
+				requestIdentifier := testcasename() & "-m_createSubscription",
+        		resourceType := int23,
+        		primitiveContent := {subscription := m_contentCreateSubscription (p_notificationURI, p_name)}
+        	};
+        	
+        	/**
+			 * @desc Reception template for CREATE Subscription
+			 */
+			template RequestPrimitive mw_createSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int23,
+				primitiveContent := {subscription := mw_contentCreateSubscriptionBase}
+			};
+        	
+
+			/**
+			 * @desc Base CREATE request primitive for OntologyRepository resource
+			 */        	
+			template (value) RequestPrimitive m_createOntologyRepositoryBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createOntologyRepository",
+				resourceType := int38,
+				primitiveContent := {ontologyRepository := m_contentCreateOntologyRepository }
+			};
+			
+		    /**
+			 * @desc Base CREATE request primitive for Ontology resource
+			 */        	
+			template (value) RequestPrimitive m_createOntologyBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createOntologyRepository",
+				resourceType := int39,
+				primitiveContent := {ontology := m_contentCreateOntology }
+			};
+
+			/**
+			 * @desc Base CREATE request primitive for SemanticDescriptor resource
+			 */        	
+			template (value) RequestPrimitive m_createSemanticDescriptorBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createSemanticDescriptor",
+				resourceType := int24,
+				primitiveContent := {semanticDescriptor := m_contentCreateSemanticDescriptor }
+			};
+        	
+			/**
+			 * @desc Base CREATE request primitive for SemanticMashupJobProfile resource
+			 */        	
+			template (value) RequestPrimitive m_createSemanticMashupJobProfileBase (in template (value) Sparql p_memberFilter := c_defaultMmemberFilter,
+			                                                                        in template (value) XSD.Base64Binary p_outputDescriptor := int2oct(0,65537),
+			                                                                        in template (value) XSD.Base64Binary p_functionDescriptor := int2oct(0,65537) ) modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createSemanticMashupJobProfile",
+				resourceType := int40,
+				primitiveContent := {semanticMashupJobProfile := m_contentCreateSemanticMashupJobProfile (p_memberFilter, p_outputDescriptor, p_functionDescriptor) }
+			};
+
+        	/**
+			 * @desc Base CREATE request primitive for SemanticMashupInstance resource
+			 */
+			template (value) RequestPrimitive m_createSemanticMashupInstanceBase (in XSD.AnyURI p_smjpID := "/AEID",
+			                                                                      in XSD.Base64Binary p_smjpInputParameter := '1234'O,
+			                                                                      in MashupMemberStoreType p_memberStoreType := int1,
+			                                                                      in MashupResultGenType p_mashupMember := int2) modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createSemanticMashupInstance",
+				resourceType := int41,
+				primitiveContent := {semanticMashupInstance := m_contentCreateSemanticMashupInstance (p_smjpID, p_smjpInputParameter, p_memberStoreType, p_mashupMember) }
+			};
+			
+			
+			/**
+			 * @desc Base CREATE request primitive for SemanticMashupResult resource
+			 */
+			template (value) RequestPrimitive m_createSemanticMashupResultBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createsemanticMashupResult",
+				resourceType := int42,
+				primitiveContent := {semanticMashupResult := m_contentCreateSemanticMashupResult}
+			};
+        	
+			template (value) RequestPrimitive m_createSubscriptionAdvanced(	template (omit) XSD.ID p_to := "NotInitialized", 
+																		   in template (omit)  XSD.String 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,
+																		   in template (omit) BatchNotify p_batchNotify := omit,
+																		   in template (omit) XSD.Boolean p_latestNotify := omit,
+																		   in template (omit) XSD.AnyURI p_subscriberURI := omit,
+																		   in template (omit) NotificationContentType p_notificationContentType := int1,
+			                                                               in template (omit) PendingNotification p_pendingNotification) modifies m_createSubscription := {
+				primitiveContent := {subscription := m_contentCreateSubscriptionAdvanced (p_notificationURI, p_name, p_eventNotificationCriteria, p_expirationCounter, p_batchNotify, p_latestNotify, p_subscriberURI, p_notificationContentType, p_pendingNotification)}
+			};
+        	
+        	/**
+			 * @desc Base CREATE request primitive for Location Policy resource
+			 */
+			template (value) RequestPrimitive m_createLocationPolicyBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createLocationPolicy",
+				resourceType := int10,
+				primitiveContent := {locationPolicy := m_contentCreateLocationPolicyBase}
+			};
+        	
+			template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) ListOfDuration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
+        		
+				requestIdentifier	:= testcasename() & "-m_createLocationPolicy", //the requestIdentifier is supposed to be set similar as "C190XX7T/001"  by prepending the AE-ID-Stem and slash(‘/’) in front of it
+        	  	resourceType		:= int10,
+        	  	primitiveContent	:= {locationPolicy := m_contentCreateLocationPolicy(p_locationSource, p_accessControlPolicyIds, p_locationUpdatePeriod, p_locationTargetID, p_locationServerAddress) },
+			  	resultContent := int1//default
+        	};
+        	
+			/**
+			 * @desc Reception template for CREATE LocationPolicyAnnc
+			 */
+			template RequestPrimitive mw_createLocationPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				resourceType := int10010,
+				primitiveContent := {locationPolicyAnnc := mw_contentCreateLocationPolicyAnncBase}
+			}; 
+			
+        	template (value) RequestPrimitive m_createNotification(in template (value) Representation p_resourcePresentation, in template (omit)NotificationEventType p_notifEventType, in template (omit) XSD.AnyURI p_subscriptionReference, in template (omit) XSD.AnyURI p_notifForwardingURI) modifies m_create := {
+			  requestIdentifier	:= testcasename() & "-m_createNotification",
+        	  primitiveContent	:= {notification := m_contentCreateNotification(p_resourcePresentation, p_notifEventType, p_subscriptionReference, p_notifForwardingURI)},
+        	  resultContent		:= int1 //default
+        	  
+        	};
+        	
+			/**
+			 * @desc Reception template for SemanticDescriptor creation
+			 */
+			template RequestPrimitive mw_createSemanticDescriptor(template XSD.ID p_from := *, template XSD.ID p_to := ?, template SemanticDescriptor_optional p_semanticDescriptor := mw_contentCreateSemanticDescriptor) modifies mw_create := {
+				resourceType := int24,
+				primitiveContent := {semanticDescriptor := p_semanticDescriptor}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for Stats Config resource
+			 */
+			template (value) RequestPrimitive m_createStatsConfigBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createStatsConfig",
+				resourceType := int22,
+				primitiveContent := {statsConfig := m_contentCreateStatsConfigBase}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for Stats Config resource
+			 */
+			template (value) RequestPrimitive m_createStatsCollectBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createStatsCollect",
+				resourceType := int21,
+				primitiveContent := {statsCollect := m_contentCreateStatCollectBase}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for M2mServiceSubscriptionProfile resource
+			 */
+			template (value) RequestPrimitive m_createM2mServiceSubscriptionProfileBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createM2mServiceSubscriptionProfile",
+				resourceType := int11,
+				primitiveContent := {m2mServiceSubscriptionProfile := m_contentCreatem2mServiceSubscriptionProfileBase}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for timeSeries resource
+			 */
+			template (value) RequestPrimitive m_createTimeSeriesBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createTimeSeries",
+				resourceType := int29,
+				primitiveContent := {timeSeries := m_contentCreateTimeSeries ()}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for timeSeriesAnnc resource
+			 */
+			template (value) RequestPrimitive m_createTimeSeriesAnncBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createTimeSeriesAnnc",
+				resourceType := int10029,
+				primitiveContent := {timeSeriesAnnc := m_contentCreateTimeSeriesAnnc}
+			};
+        	
+			template (value) RequestPrimitive m_createTimeSeries(in template (omit)  XSD.String p_name := c_defaultTimeSeriesResourceName,
+																 in XSD.Boolean p_missingDataDetect := true,
+																 in XSD.NonNegativeInteger p_periodicInterval := 5000,
+																 in XSD.NonNegativeInteger p_missingDataMaxNr := 5, 
+																 in XSD.NonNegativeInteger p_missingDataDetectTimer := 2000) modifies m_createTimeSeriesBase := {
+				primitiveContent := {timeSeries := m_contentCreateTimeSeriesAttributes (p_name, p_missingDataDetect, p_periodicInterval, p_missingDataMaxNr, p_missingDataDetectTimer)}
+			};
+        	
+			/**
+			 * @desc Reception template for CREATE timeSeries
+			 */
+			template RequestPrimitive mw_createTimeSeries(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int29,
+				primitiveContent := {timeSeries := ?}
+			};
+			
+			/**
+			 * @desc Base CREATE request primitive for timeSeriesInstance resource
+			 */
+			template (value) RequestPrimitive m_createTimeSeriesInstanceBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createTimeSeriesInstance",
+				resourceType := int30,
+				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 := {
+				to_ := p_parentResourceAddress,
+				requestIdentifier := testcasename() & "-m_createTimeSeriesInstance",
+				resourceType := int30,
+				primitiveContent := {timeSeriesInstance := m_contentCreateTimeSeriesInstance (p_name)}
+			};
+        	
+			/**
+			 * @desc Base Reception template for CREATE SemanticMashupJobProfile resource
+			 */        	
+			template RequestPrimitive mw_createSemanticMashupJobProfile(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int40,
+				primitiveContent := {semanticMashupJobProfile := mw_contentCreateSemanticMashupJobProfileBase }
+			};
+
+        	/**
+			 * @desc Base Reception template for CREATE SemanticMashupInstance resource
+			 */
+			template RequestPrimitive mw_createSemanticMashupInstance (template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int41,
+				primitiveContent := {semanticMashupInstance := mw_contentCreateSemanticMashupInstanceBase }
+			};
+			
+			
+			/**
+			 * @desc Base Reception template for CREATE SemanticMashupResult resource
+			 */
+			template RequestPrimitive mw_createSemanticMashupResult (template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int42,
+				primitiveContent := {semanticMashupResult := mw_contentCreateSemanticMashupResultBase}
+			};
+			
+			
+			/**
+			 * @desc Reception template for CREATE timeSeriesInstance
+			 */
+			template RequestPrimitive mw_createTimeSeriesInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int30,
+				primitiveContent := {timeSeriesInstance := mw_contentCreateTimeSeriesInstanceBase}
+			};
+			
+			/**
+			 * @desc Base Reception template for CREATE TimeSeriesAnnc
+			 */
+			template RequestPrimitive mw_createTimeSeriesAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int10029,
+				primitiveContent := {timeSeriesAnnc := mw_contentCreateTimeSeriesAnncBase}
+			};  
+			
+			/**
+			 * @desc Base CREATE request primitive for TimeSeriesInstanceAnnc
+			 */
+			template (value) RequestPrimitive m_createTimeSeriesInstanceAnnc modifies m_create := {
+				resourceType := int10030,
+				primitiveContent := {timeSeriesInstanceAnnc := m_contentCreateTimeSeriesInstanceAnnc}
+			};  
+						/**
+			 * @desc Base Reception template for CREATE TimeSeriesInstanceAnnc
+			 */
+			template RequestPrimitive mw_createTimeSeriesInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_createAnnc := {
+				resourceType := int10030,
+				primitiveContent := {timeSeriesInstanceAnnc := mw_contentCreateTimeSeriesInstanceAnncBase}
+			};  
+			
+			/**
+			 * @desc Base CREATE request primitive for role resource
+			 */
+			template (value) RequestPrimitive m_createRoleBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createRole",
+				resourceType := int31,
+				primitiveContent := {role := m_contentCreateRole()}
+			};
+			
+			/**
+			 * @desc Reception template for CREATE role resource
+			 */
+			template RequestPrimitive mw_createRole(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int31,
+				primitiveContent := {role := mw_contentCreateRoleBase()}
+			};  
+			
+			/**
+			 * @desc Base CREATE request primitive for token resource
+			 */
+			template (value) RequestPrimitive m_createTokenBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createToken",
+				resourceType := int32,
+				primitiveContent := {token := m_contentCreateToken()}
+			};
+			
+			/**
+			 * @desc Reception template for CREATE token resource
+			 */
+			template RequestPrimitive mw_createToken(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int31,
+				primitiveContent := {token := mw_contentCreateTokenBase}
+			};  
+			
+			/**
+			 * @desc Reception template for CREATE DeviceAirConditioner
+			 */
+			template RequestPrimitive mw_createDeviceAirConditioner(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceAirConditioner := ?}
+			}; 
+			
+			/**
+			 * @desc Reception template for CREATE DeviceClothesWasherDryer
+			 */
+			template RequestPrimitive mw_createDeviceClothesWasherDryer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceClothesWasherDryer := ?}
+			};			
+
+			/**
+			 * @desc Reception template for CREATE DeviceElectricVehicleCharger
+			 */
+			template RequestPrimitive mw_createDeviceElectricVehicleCharger(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceElectricVehicleCharger := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceLight
+			 */
+			template RequestPrimitive mw_createDeviceLight(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceLight := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceMicrogeneration
+			 */
+			template RequestPrimitive mw_createDeviceMicrogeneration(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceMicrogeneration := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceOven
+			 */
+			template RequestPrimitive mw_createDeviceOven(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceOven := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceRefrigerator
+			 */
+			template RequestPrimitive mw_createDeviceRefrigerator(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceRefrigerator := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceRobotCleaner
+			 */
+			template RequestPrimitive mw_createDeviceRobotCleaner(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceRobotCleaner := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceSmartElectricMeter
+			 */
+			template RequestPrimitive mw_createDeviceSmartElectricMeter(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceSmartElectricMeter := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceStorageBattery
+			 */
+			template RequestPrimitive mw_createDeviceStorageBattery(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceStorageBattery := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceTelevision
+			 */
+			template RequestPrimitive mw_createDeviceTelevision(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceTelevision := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceThermostat
+			 */
+			template RequestPrimitive mw_createDeviceThermostat(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceThermostat := ?}
+			};
+			
+			/**
+			 * @desc Reception template for CREATE DeviceWaterHeater
+			 */
+			template RequestPrimitive mw_createDeviceWaterHeater(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {deviceWaterHeater := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE BinarySwitch
+			 */
+			template RequestPrimitive mw_createBinarySwitch(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {binarySwitch := ?}
+			};		
+
+			/**
+			 * @desc Reception template for CREATE BinarySwitchRequired
+			 */
+			template RequestPrimitive mw_createBinarySwitchRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {binarySwitch := mw_contentBinarySwitchBase}
+			};		
+
+			/**
+			 * @desc Reception template for CREATE FaultDetection
+			 */
+			template RequestPrimitive mw_createFaultDetection(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {faultDetection := ?}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE FaultDetectionRequired
+			 */
+			template RequestPrimitive mw_createFaultDetectionRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {faultDetection := mw_contentFaultDetectionBase}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE RunState
+			 */
+			template RequestPrimitive mw_createRunState(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {runState := ?}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE RunStateRequired
+			 */
+			template RequestPrimitive mw_createRunStateRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {runState := mw_contentRunStateBase}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE Battery
+			 */
+			template RequestPrimitive mw_createBattery(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {battery := ?}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE BatteryRequired
+			 */
+			template RequestPrimitive mw_createBatteryRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {battery := mw_contentBatteryBase}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE ElectricVehicleConnector
+			 */
+			template RequestPrimitive mw_createElectricVehicleConnector(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {electricVehicleConnector := ?}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE ElectricVehicleConnectorRequired
+			 */
+			template RequestPrimitive mw_createElectricVehicleConnectorRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {electricVehicleConnector := mw_contentElectricVehicleConnectorBase}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE EnergyGeneration
+			 */
+			template RequestPrimitive mw_createEnergyGeneration(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {energyGeneration := ?}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE EnergyConsumption
+			 */
+			template RequestPrimitive mw_createEnergyConsumption(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {energyConsumption := ?}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE EnergyConsumptionRequired
+			 */
+			template RequestPrimitive mw_createEnergyConsumptionRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {energyConsumption := mw_contentEnergyConsumptionBase}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE Temperature
+			 */
+			template RequestPrimitive mw_createTemperature(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {temperature := ?}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE TemperatureRequired
+			 */
+			template RequestPrimitive mw_createTemperatureRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {temperature := mw_contentTemperatureBase}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE TurboRequired
+			 */
+			template RequestPrimitive mw_createTurboRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {turbo := mw_contentTurboBase}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE AirFlowRequired
+			 */
+			template RequestPrimitive mw_createAirFlowRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {airFlow := mw_contentAirFlowBase}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE SpinLevelRequired
+			 */
+			template RequestPrimitive mw_createSpinLevelRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {spinLevel := mw_contentSpinLevelBase}
+			};	
+			
+			/**
+			 * @desc Reception template for CREATE WaterFlowRequired
+			 */
+			template RequestPrimitive mw_createWaterFlowRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {waterFlow := mw_contentWaterFlowBase}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE BrightnessRequired
+			 */
+			template RequestPrimitive mw_createBrightnessRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {brightness := mw_contentBrightnessBase}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE ColourRequired
+			 */
+			template RequestPrimitive mw_createColourRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {colour := mw_contentColourBase}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE ColourSaturationRequired
+			 */
+			template RequestPrimitive mw_createColourSaturationRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {colourSaturation := mw_contentColourSaturationBase}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE DoorStatusRequired
+			 */
+			template RequestPrimitive mw_createDoorStatusRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {doorStatus := mw_contentDoorStatusBase}
+			};	
+
+			/**
+			 * @desc Reception template for CREATE PowerSaveRequired
+			 */
+			template RequestPrimitive mw_createPowerSaveRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {powerSave := mw_contentPowerSaveBase}
+			};
+
+			/**
+			 * @desc Reception template for CREATE MediaInputRequired
+			 */
+			template RequestPrimitive mw_createMediaInputRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {mediaInput := mw_contentMediaInputBase}
+			};
+
+			/**
+			 * @desc Reception template for CREATE AudioVolumeRequired
+			 */
+			template RequestPrimitive mw_createAudioVolumeRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {audioVolume := mw_contentAudioVolumeBase}
+			};
+
+			/**
+			 * @desc Reception template for CREATE TelevisionChannelRequired
+			 */
+			template RequestPrimitive mw_createTelevisionChannelRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {televisionChannel := mw_contentTelevisionChannelBase}
+			};
+
+			/**
+			 * @desc Reception template for CREATE BoilerRequired
+			 */
+			template RequestPrimitive mw_createBoilerRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {boiler := mw_contentBoilerBase}
+			};
+
+			/**
+			 * @desc Reception template for CREATE ClockRequired
+			 */
+			template RequestPrimitive mw_createClockRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {clock := mw_contentClockBase}
+			};
+
+			/**
+			 * @desc Reception template for CREATE HotWaterSupplyRequired
+			 */
+			template RequestPrimitive mw_createHotWaterSupplyRequired(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int28, 
+				primitiveContent := {hotWaterSupply := mw_contentHotWaterSupplyBase}
+			};
+
+			/**
+			 * @desc Reception template for CREATE Node
+			 */
+			template RequestPrimitive mw_createNode(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int14, 
+				primitiveContent := {node := ?}
+			};
+
+			/**
+			 * @desc Reception template for CREATE DeviceInfo
+			 */
+			template RequestPrimitive mw_createDeviceInfo(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int13, 
+				primitiveContent := {deviceInfo := ?}
+			};
+			/**
+			 * @desc Base CREATE request primitive for TriggerRequest Resource
+			 */
+			template (value) RequestPrimitive m_createTriggerRequest modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createTriggerRequest",
+				resourceType := int47,
+				primitiveContent := {triggerRequest := m_contentTriggerRequest}
+			};			
+			/**
+			 * @desc Base Reception template for CREATE DynamicAuthorizationC
+			 */
+			/*template (value) RequestPrimitive m_createDynamicAuthorizationConsultationBase modifies m_create := {
+				requestIdentifier := testcasename() & "-m_createDynamicAuthorizationConsultation",
+				resourceType := int10003,
+				primitiveContent := {dynamicAuthorizationConsultation := m_contentCreateContainerAnnc}
+			};*/
+			
+    	}//end group Create
+    	
+    	group Delete {
+    	
+			template (value) RequestPrimitive m_delete(XSD.ID p_resourceAddress, in XSD.ID p_originator := PX_SUPER_AE_ID) := {
+        		operation := int4,
+        		to_ := p_resourceAddress,
+        		from_ := p_originator,
+				requestIdentifier := testcasename() & "-m_delete",
+        		resourceType := omit,
+        		primitiveContent := omit, 
+				roleIDs := omit, 
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit, 
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			};
+
+			template RequestPrimitive mw_delete(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := ?) := {
+				operation := int4,
+				to_ := p_resourceAddress,
+				from_ := p_from,
+				requestIdentifier := ?,
+				resourceType := omit,
+				primitiveContent := omit, 
+				roleIDs := *, 
+				originatingTimestamp := *,
+				requestExpirationTimestamp := *,
+				resultExpirationTimestamp := *,
+				operationExecutionTime := *,
+				responseType := *,
+				resultPersistence := *,
+				resultContent := *,
+				eventCategory := *,
+				deliveryAggregation := *,
+				groupRequestIdentifier := *,
+				filterCriteria := *,
+				desiredIdentifierResultType := *, 
+				tokens := *,
+				tokenIDs := *,
+				localTokenIDs := *,
+				tokenRequestIndicator := *,
+				groupRequestTargetMembers := *,
+				authorSignIndicator := *,
+				authorSigns := *,
+				authorRelIndicator := *,
+				semanticQueryIndicator := *,
+				releaseVersionIndicator := ?,
+				vendorInformation := *
+        	};
+        	
+			/**
+			  * @desc Base UPDATE request primitive for PollingChannel resource
+			 */
+			 template (value) RequestPrimitive m_deletePollingChannelBase(XSD.ID p_resourceAddress, in XSD.ID p_originator := PX_SUPER_AE_ID) modifies m_delete := {
+				requestIdentifier := "m_deletePollingChannel",
+				primitiveContent:= {pollingChannel := m_contentDeletePollingChannel}
+			 };
+        	
+    	}//end group Delete
+    	
+    	group Notify {
+    		
+			/**
+			 * @desc Base NOTIFY request primitive
+			 */
+			template (value) RequestPrimitive m_notify(XSD.ID p_resourceAddress) := {
+				operation := int5,
+				to_ := p_resourceAddress,
+				from_ := "NotInitialized",
+				requestIdentifier := testcasename() & "-m_notify",
+				resourceType := omit,
+				primitiveContent := {notification := m_contentNotification_allOmit},
+				roleIDs := omit,
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit,
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			};
+			
+
+			/**
+			 * @desc Base NOTIFY request primitive
+			 */
+			template (value) RequestPrimitive m_notifyNotification(XSD.ID p_resourceAddress, template (value) Notification p_notification, template (omit) AbsRelTimestamp p_requestExpirationTimestamp := omit) modifies m_notify := {
+				primitiveContent := {notification := p_notification},
+				requestExpirationTimestamp := p_requestExpirationTimestamp//Needed for polling
+			};
+			
+			/**
+			 * @desc Base NOTIFY request primitive carrying a responsePrimitive
+			 */
+			template (value) RequestPrimitive m_notifyResponsePrimitive(XSD.ID p_resourceAddress, ResponsePrimitive p_responsePrimitive) modifies m_notify := {
+				primitiveContent := {responsePrimitive := p_responsePrimitive}
+			};
+			
+			/**
+			 * @desc Base NOTIFY Aggregated request primitive
+			 */
+			template (value) RequestPrimitive m_notifyAggregatedNotification := {
+				operation := int5,
+				to_ := "NotInitialized",
+				from_ := omit,
+				requestIdentifier := testcasename() & "-m_notifyAggregatedNotification",
+				resourceType := omit,
+				primitiveContent := {aggregatedNotification := {notification_list := {m_contentNotification_allOmit,m_contentNotification_allOmit}}},
+				roleIDs := omit,
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit,
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			};
+    		
+    		/**
+			* @desc Base NOTIFY request primitive
+			*/
+			template RequestPrimitive mw_notify := {
+				operation := int5,
+				to_ := ?,
+				from_ := *,
+				requestIdentifier := ?,
+				resourceType := omit,
+				primitiveContent := {notification := mw_contentNotificationBase},
+				roleIDs := *,
+				originatingTimestamp := *,
+				requestExpirationTimestamp := *,
+				resultExpirationTimestamp := *,
+				operationExecutionTime := *,
+				responseType := *,
+				resultPersistence := omit,
+				resultContent := int0 ifpresent,
+				eventCategory := *,
+				deliveryAggregation := *,
+				groupRequestIdentifier := *,
+				filterCriteria := *,
+				desiredIdentifierResultType := *,
+				tokens := *,
+				tokenIDs := *,
+				localTokenIDs := *,
+				tokenRequestIndicator := *,
+				groupRequestTargetMembers := *,
+				authorSignIndicator := *,
+				authorSigns := *,
+				authorRelIndicator := *,
+				semanticQueryIndicator := *,
+				releaseVersionIndicator := ?,
+				vendorInformation := *
+			};
+			
+			/**
+			 * @desc Base NOTIFY request primitive
+			 */
+			template RequestPrimitive mw_notifyAggregatedNotification (in template AggregatedNotification p_aggregatedNotification := ?) modifies mw_notify := {
+				primitiveContent := { aggregatedNotification := p_aggregatedNotification}
+			};
+			
+			/**
+			 * @desc Base NOTIFY request primitive
+			 */
+			
+			template RequestPrimitive mw_notifyNotification(in template Notification p_notification) modifies mw_notify := {
+				primitiveContent := {notification := p_notification}
+			};
+			
+			/**
+			 * @desc Base NOTIFY request primitive for ResponsePrimitive
+			 */
+
+			template RequestPrimitive mw_notifyResponsePrimitive(in template ResponsePrimitive p_responsePrimitive) modifies mw_notify := {
+				primitiveContent := {responsePrimitive := p_responsePrimitive}
+			};		
+
+			
+    		
+    	}//end of group Notify
+	}//end group RequestPrimitives
+	
+	group ContentCreate {
+		
+		template (value) PrimitiveContent m_primitiveContentAccessControlPolicy(template (value) AccessControlPolicy_optional p_acp) := {
+			accessControlPolicy := p_acp
+		}
+		
+		template (value) PrimitiveContent m_primitiveContentAe(template (value) AE_optional p_ae) := {
+			aE := p_ae
+		}
+
+		
+		template (value) PrimitiveContent m_primitiveContentOntologyRepository(template (value) OntologyRepository_optional p_ontologyRepository) := {
+			ontologyRepository := p_ontologyRepository
+		}
+		
+	    template (value) PrimitiveContent m_primitiveContentOntology(template (value) Ontology_optional p_ontology) := {
+			ontology := p_ontology
+		}
+				
+		template (value) PrimitiveContent m_primitiveContentContainer(template (value) Container_optional p_container) := {
+			container := p_container
+		}
+		
+		template (value) PrimitiveContent m_primitiveContentContentInstance(template (value) ContentInstance_optional p_contentInstance) := {
+			contentInstance := p_contentInstance
+		}
+		            
+        template (value) PrimitiveContent m_primitiveContentCSEBase(template (value) CSEBase_optional p_cSEBase) := {
+	        cSEBase := p_cSEBase
+		}
+
+		template (value) PrimitiveContent m_primitiveContentPollingChannel(template (value) PollingChannel_optional p_pollingChannel) := {
+			pollingChannel := p_pollingChannel
+		}
+
+		template (value) PrimitiveContent m_primitiveContentRemoteCSE(template (value) RemoteCSE_optional p_remoteCSE) := {
+			remoteCSE := p_remoteCSE
+		}
+		
+		template (value) PrimitiveContent m_primitiveContentRemoteCSEAnnc(template (value) RemoteCSEAnnc_optional p_remoteCSEAnnc) := {
+			remoteCSEAnnc := p_remoteCSEAnnc
+		}
+
+		template (value) PrimitiveContent m_primitiveContentResponsePrimitive(template (value) ResponsePrimitive p_responsePrimitive) := {
+			responsePrimitive := p_responsePrimitive
+		}		
+		
+		template (value) PrimitiveContent m_primitiveContentSchedule(template (value) Schedule_optional p_schedule) := {
+			schedule := p_schedule
+		}
+
+		template (value) PrimitiveContent m_primitiveContentSubscription(template (value) Subscription_optional p_subscription) := {
+			subscription := p_subscription
+		}
+
+		template (value) PrimitiveContent m_primitiveContentTimeSeries(template (value) TimeSeries_optional p_timeSeries) := {
+			timeSeries := p_timeSeries
+		}
+		
+		template (value) PrimitiveContent m_primitiveContentTimeSeriesInstance(template (value) TimeSeriesInstance_optional p_timeSeriesInstance) := {
+			timeSeriesInstance := p_timeSeriesInstance
+		}
+
+		template (value) PrimitiveContent m_primitiveContentSemanticDescriptor(template (value) SemanticDescriptor_optional p_SemanticDescriptor) := {
+			semanticDescriptor := p_SemanticDescriptor
+		}
+		
+		template (value) PrimitiveContent m_primitiveContentSemanticMashupInstance(template (value) SemanticMashupInstance_optional p_semanticMashupInstance) := {
+			semanticMashupInstance := p_semanticMashupInstance
+		}
+				
+		template (value) PrimitiveContent m_primitiveContentGroup(template (value) Group_optional p_group) := {
+			group_ := p_group
+		}
+				
+		template PrimitiveContent mw_primitiveContent := ?;
+		
+		template PrimitiveContent mw_primitiveContentNotification (template Notification p_notification) := {
+			notification := p_notification
+		};
+		 
+		template (present) PrimitiveContent mw_primitiveContentFlexContainer(template (present) FlexContainerResource_optional p_flexContainer := ?) := {
+			flexContainer := p_flexContainer
+		};
+		 
+		 
+		/**
+		 * @desc Base primitiveContent for CREATE operation for AEAnnc resource
+		 * @param p_labels Labels
+		 * @param p_accessControlPolicyIds AcpIDs
+		 * @param p_appId App ID
+		 * @param p_nodeLink Node link
+		 */
+		template (value) AEAnnc_optional m_contentCreateAEAnnc (in template (omit)  Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, template (omit) XSD.ID p_appId := omit, in template (omit) XSD.AnyURI p_link := "NotInitialized") := {
+			resourceName := omit,//NA 
+			resourceType := omit,//NA
+			resourceID := omit,//NA
+			parentID := omit,//NA
+			creationTime := omit,//NA
+			lastModifiedTime := omit,//NA
+			labels := p_labels,//MA
+			accessControlPolicyIDs := p_accessControlPolicyIds,//MA Special case, mandatory for announced resources
+			expirationTime := "20301231T012345",//MA
+			link := p_link,//M
+			dynamicAuthorizationConsultationIDs := omit, //OA			
+			appName := omit,//OA
+			app_ID := p_appId,//OA
+			aE_ID := omit,//OA
+			pointOfAccess := omit, //OA
+			ontologyRef := omit,//OA
+			nodeLink := omit,//OA
+			requestReachability := omit,//OA
+			contentSerialization := omit,//OA
+			e2eSecInfo := omit, //MA TODO Check whether it is optional or mandatory for create operation
+			supportedReleaseVersions := omit, //MA
+			registrationStatus := omit,//OA
+			trackRegistrationPoints := omit,//OA
+			sessionCapabilities := omit,//OA
+			triggerEnable := omit,//OA
+			activityPatternElements := omit,//OA
+			choice := omit//NP
+		};	
+
+		/**
+		 * @desc Base reception template of primitiveContent for CREATE operation for AEAnnc resource
+		 * @param p_labels Labels
+		 * @param p_accessControlPolicyIds AcpIDs
+		 * @param p_appId App ID
+		 * @param p_nodeLink Node link
+		 */
+		template AEAnnc_optional mw_contentCreateAEAnnc (in template  Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
+    		resourceName := omit,//NA M
+    		resourceType := omit,//NA M
+    		resourceID := omit,//NA M
+    		parentID := omit,//NA M
+    		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
+    		dynamicAuthorizationConsultationIDs := *, //OA O			
+			appName := *,//OA O
+			app_ID := *,//OA M
+			aE_ID := *,//OA M
+			pointOfAccess := *, //OA O
+			ontologyRef := *,//OA O
+			nodeLink := *,//OA O
+			requestReachability := *,//OA M
+			contentSerialization := *,//OA O
+			e2eSecInfo := *, //MA O
+			supportedReleaseVersions := ?,//MA M Mandatory for AEAnnc from Release 2
+			registrationStatus := *,//OA O
+			trackRegistrationPoints := *,//OA O
+			sessionCapabilities := *,//OA O
+			triggerEnable := *,//OA O
+			activityPatternElements := *,//OA O
+			choice := omit//NA
+		};	
+		
+		/**
+		 * @desc Base reception template of primitiveContent for CREATE operation for RemoteCSEAnnc resource
+		 * @param p_labels Labels
+		 * @param p_accessControlPolicyIds AcpIDs
+		 * @param p_appId App ID
+		 * @param p_nodeLink Node link
+		 */
+		template RemoteCSEAnnc_optional mw_contentCreateRemoteCSEAnnc (in template  Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			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
+			dynamicAuthorizationConsultationIDs := omit, //OA O
+			cseType := *,//OA O
+			pointOfAccess := *,//OA O
+			cSEBase := *,//OA M
+			cSE_ID := *,//OA M
+			requestReachability := *,//OA M
+			nodeLink := *,//OA O
+			contentSerialization := *,//OA O
+			e2eSecInfo := ?,//OA O
+			descendantCSEs := *,//OA O
+			supportedReleaseVersions := ?, //MA M Mandatory for RemoteCSE from Release 2
+			multicastCapability := *,//OA O
+			externalGroupID := *,//OA O
+			triggerEnable := *,//OA O
+			activityPatternElements := *,//OA O
+			choice := omit//NA
+		};
+		
+    	/**
+    	 * @desc Base primitiveContent for CREATE operation for AE resource
+    	 * @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) := {
+
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+    		dynamicAuthorizationConsultationIDs := omit, //O
+    		announceTo := omit,//O
+    		announcedAttribute := 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"},
+    		ontologyRef := omit,//O
+    		nodeLink := omit,//NP
+    		requestReachability := false,//M
+    		contentSerialization := omit,//O
+			e2eSecInfo := omit, //O
+			m2M_Ext_ID := omit, //O
+			supportedReleaseVersions := {"1", "2", "2a", "3"}, //M
+			registrationStatus := omit, //O
+			trackRegistrationPoints := omit, //O
+			sessionCapabilities := omit, //O
+			triggerEnable := omit, //O
+			activityPatternElements := omit, //O
+    		choice := omit//NP
+    	};	
+    	
+    	/**
+    	 * @desc Base reception template of primitiveContent for CREATE operation for AE resource
+    	 */
+    	template AE_optional mw_contentCreateAeBase := {
+
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+    		dynamicAuthorizationConsultationIDs := *, //O
+    		announceTo := *,//O
+    		announcedAttribute := *,//O
+    		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"},
+    		ontologyRef := *,//O
+    		nodeLink := *,//NP
+    		requestReachability := ?,//M
+    		contentSerialization := *,//O
+			e2eSecInfo := *, //O
+			m2M_Ext_ID := *, //O
+			supportedReleaseVersions := ?, //M
+			registrationStatus := *, //O
+			trackRegistrationPoints := *, //O
+			sessionCapabilities := *, //O
+			triggerEnable := *, //O
+			activityPatternElements := *, //O
+			choice := *//NP
+    	};	
+    	
+    	/**
+    	 * @desc Base primitiveContent for CREATE operation for AccessControlPolicy resource
+    	 * @param p_name Resource name
+    	 * @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 ) := {
+			resourceName := p_name,//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
+			privileges := {
+				accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
+			},//M
+			selfPrivileges := {
+				accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}
+			},//M
+			authorizationDecisionResourceIDs := omit,//O
+			authorizationPolicyResourceIDs := omit,//O
+			authorizationInformationResourceIDs := omit,//O		
+			choice := omit //NP
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
+		 * @param p_name Resource name
+		 * @param p_acor Allowed originators
+		 * @param p_allowedOperations Allowed operations
+		 */
+		template (value) AccessControlPolicyAnnc_optional m_contentCreateAcpAnnc (in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
+			resourceName := omit,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			expirationTime := omit,//O
+			link := omit,//M TODO Put the right value
+			privileges := {
+				accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
+			},//M
+			selfPrivileges := {
+				accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}
+			},//M
+			authorizationDecisionResourceIDs := omit,//O
+			authorizationPolicyResourceIDs := omit,//O
+			authorizationInformationResourceIDs := omit,//O	
+			choice := omit //NP
+		};
+		
+		/**
+		 * @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
+		 * @param p_labels Labels
+		 */
+		template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnncBase (in template Labels p_labels := *) := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := p_labels,//MA O
+			expirationTime := ?,//MA M
+			link := ?,//M
+			privileges := ?,//MA M
+			selfPrivileges := ?,//MA M
+			authorizationDecisionResourceIDs := *,//MA O
+			authorizationPolicyResourceIDs := *,//MA O
+			authorizationInformationResourceIDs := *,//MA O	
+			choice := omit//NA
+		};	
+		
+		template (value) AccessControlRule m_createAcr (in template (value) ListOfURIs p_acor, in template (value) AccessControlOperations p_allowedOperations) := {
+			accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
+			accessControlOperations := p_allowedOperations,
+			accessControlContexts_list := omit,
+			accessControlAuthenticationFlag := omit, 
+			accessControlObjectDetails_list := omit
+		}
+    	
+		/*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
+			resourceName := omit,
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			accessControlPolicyIDs := omit,
+			cseType := omit,
+			cSE_ID := omit,
+			supportedResourceType := omit,
+			pointOfAccess := omit,
+			nodeLink := omit,
+			e2eSecInfo := omit, 
+			choice := {
+				choice_list := {{
+				  serviceSubscribedAppRule := p_serviceSubscribedAppRule
+				}}
+			}
+		}*/
+		
+		/**
+		 * @desc Base primitiveContent for CSEBase resource
+		 * @param p_name Resource name
+		 */
+		template (value) CSEBase_optional m_contentCSEBase(in CseSimuComponentDesc p_componentDesc):= {
+			resourceName := p_componentDesc.cseName,//O
+			resourceType := int5,
+			resourceID := p_componentDesc.cseResourceId,
+			parentID := "",//Following TS-0001, it must be NULL. Set to a value for Codec to set it to null
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			accessControlPolicyIDs := omit,
+			cseType := omit,
+			cSE_ID := p_componentDesc.cseId,
+			supportedResourceType := p_componentDesc.supportedResourceType,
+			pointOfAccess := {"NotInitialized"},
+			nodeLink := omit,
+			dynamicAuthorizationConsultationIDs := omit,
+			contentSerialization := omit,
+			e2eSecInfo := omit, 
+			supportedReleaseVersions := {"1", "2", "2a", "3"},
+			choice := omit
+		};
+
+		/**
+		 * @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):= {
+			resourceName := p_name,//O
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			accessControlPolicyIDs := omit,
+			cseType := omit,
+			cSE_ID := omit,
+			supportedResourceType := omit,
+			pointOfAccess := omit,
+			nodeLink := omit,
+			dynamicAuthorizationConsultationIDs := omit,
+			contentSerialization := omit,
+			e2eSecInfo := omit, 
+			supportedReleaseVersions := {"1", "2", "2a", "3"},
+			choice := omit
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for CSEBaseAnnc resource
+		 * @param p_name Resource name
+		 */
+		template (value) CSEBaseAnnc_optional m_contentCreateCSEBaseAnnc (template (omit)  Labels p_labels := (omit), template (omit)AcpType p_accessControlPolicyIds := omit, template (value) XSD.AnyURI p_link) := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := p_labels,//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
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for CSEBaseAnnc resource
+		 * @param p_name Resource name
+		 */
+		template CSEBaseAnnc_optional mw_contentCreateCSEBaseAnnc (in template  Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := p_labels,//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
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for PollingChannel resource
+		 * @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, 
+																	in template (omit) AcpType p_accessControlPolicyIds,
+																	in template (value) XSD.ID p_source,
+																	in template (value) XSD.ID p_target,
+																	in template (value) Timestamp p_lifespan,
+																	in template (value) EventCat p_eventCat,
+																	in template (value) DeliveryMetaData p_deliveryMetaData) := {
+			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,//O
+			source := p_source,//M
+			target := p_target,//M
+			lifespan := p_lifespan,//M
+			eventCat := p_eventCat,//M
+			deliveryMetaData := p_deliveryMetaData,//M
+			aggregatedRequest := omit,//O
+			choice := omit//NP
+			
+		};    
+    	
+        /**
+		 * @desc Base primitiveContent for CREATE operation for GenericInterworkingService resource
+		 * @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, 
+																	in template (omit) AcpType p_accessControlPolicyIds := omit) := {
+			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := PX_CND_GENERIC_INTERWORKING_SERVICE,//M
+			ontologyRef := omit,//O
+			contentSize := omit,//NP
+			serviceName := "MyService",//M??
+			inputDataPointLinks := omit,//O
+			outputDataPointLinks := omit,//O		
+			choice := omit//NP
+			
+		};
+
+        /**
+    	 * @desc Base primitiveContent for CREATE operation for Group resource
+    	 * @param p_maxNrOfMembers Max number of members
+    	 * @param p_memberIds Member IDs
+    	 * @param p_accessControlPolicyIds ACP IDs for the Group
+    	 * @param p_name Resource name
+    	 */
+    	template (value) Group_optional m_contentCreateGroup (	in template (value) XSD.PositiveInteger p_maxNrOfMembers,
+    															in template (value) ListOfURIs p_memberIds,
+    															in template (omit) AcpType p_accessControlPolicyIds,
+    															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) XSD.Boolean p_semanticSupportIndicator := true) := {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+    		dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			creator := omit,//O
+			memberType := p_memberType,//O
+			specializationType := omit,//O
+			currentNrOfMembers := omit,//NP
+			maxNrOfMembers := p_maxNrOfMembers,//M
+			memberIDs := p_memberIds,//M
+			membersAccessControlPolicyIDs := p_membersAccessControlPolicyIDs,//O
+			memberTypeValidated := omit,//NP
+			consistencyStrategy := p_consistencyStrategy,//O
+			groupName := omit,//O
+			semanticSupportIndicator := omit,//O
+			notifyAggregation := omit,//O
+			choice := omit//NP
+    	};  
+    	
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Group resource
+		 * @param p_maxNrOfMembers Max number of members
+		 * @param p_memberIds Member IDs
+		 * @param p_accessControlPolicyIds ACP IDs for the Group
+		 * @param p_name Resource name
+		 */
+		template Group_optional mw_contentCreateGroupBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			creator := *,//O
+			memberType := *,//O
+			specializationType := *,//O
+			currentNrOfMembers := omit,//NP
+			maxNrOfMembers := ?,//M
+			memberIDs := ?,//M
+			membersAccessControlPolicyIDs := *,//O
+			memberTypeValidated := omit,//NP
+			consistencyStrategy := *,//O
+			groupName := *,//O
+			semanticSupportIndicator := *,//O
+			notifyAggregation := *,//O
+			choice := omit//NP
+		};  
+    	
+    	
+		/**
+		 * @desc Base primitiveContent for CREATE operation for GroupAnnc resource
+		 * @param p_maxNrOfMembers Max number of members
+		 * @param p_memberIds Member IDs
+		 * @param p_accessControlPolicyIds ACP IDs for the GroupAnnc
+		 * @param p_name Resource name
+		 */
+		template (value) GroupAnnc_optional m_contentCreateGroupAnnc (	in template (value) XSD.PositiveInteger p_maxNrOfMembers,
+																in template (value) ListOfURIs p_memberIds,
+																in template (omit) AcpType p_accessControlPolicyIds,
+																in template (omit) MemberType p_memberType := omit,
+																in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
+																in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit) := {	
+			resourceName := omit,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			link := omit,//M TODO Put the right value
+			dynamicAuthorizationConsultationIDs := omit, //O
+			memberType := p_memberType,//O
+			specializationType := omit,//O
+			currentNrOfMembers := omit,//NP
+			maxNrOfMembers := p_maxNrOfMembers,//M
+			memberIDs := p_memberIds,//M
+			membersAccessControlPolicyIDs := p_membersAccessControlPolicyIDs,//O
+			memberTypeValidated := omit,//NP
+			consistencyStrategy := p_consistencyStrategy,//O
+			groupName := omit,//O
+			semanticSupportIndicator := omit,//O
+			notifyAggregation := omit,//O
+			choice := omit//NP
+		};  
+    	
+		  /**
+		  * @desc Base reception template of primitiveContent for CREATE operation for GroupAnnc resource
+		  */
+		  template GroupAnnc_optional mw_contentCreateGroupAnncBase := {
+			  resourceName := omit,//NA M
+			  resourceType := omit,//NA M
+			  resourceID := omit,//NA M
+			  parentID := omit,//NA M
+			  creationTime := omit,//NA M
+			  lastModifiedTime := omit,//NA M
+			  labels := *,//MA O
+			  accessControlPolicyIDs := *,//MA O //TODO Fix if acpi is mandatory for announced resources (SDS discussion)
+			  expirationTime := ?,//MA M
+			  link := ?,//M
+			  dynamicAuthorizationConsultationIDs := *, //OA O
+			  memberType := *, //OA M
+			  specializationType := *,//O O
+			  currentNrOfMembers := *,//OA M
+			  maxNrOfMembers := *, //OA M
+			  memberIDs := *,//OA M
+			  membersAccessControlPolicyIDs := *,//OA O
+			  memberTypeValidated := *,//OA O
+			  consistencyStrategy := *,//OA M
+			  groupName := *,//OA O
+			  semanticSupportIndicator := *,//OA O
+			  notifyAggregation := *,//OA O
+			  choice := omit //NA
+		  };
+    	
+		/**
+		 * @desc Base primitiveContent for CREATE operation for MgmtObj resource
+		 * @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) := {
+			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			mgmtDefinition := omit,//O
+			objectIDs := omit,//O
+			objectPaths := omit,//O
+			description := omit,//O
+			mgmtSchema := omit//O
+		};	  	
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for MgmtCmd resource
+		 * @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) := {
+			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			mgmtDefinition := omit,//O
+			objectIDs := omit,//O
+			objectPaths := omit,//O
+			description := omit,//O
+			mgmtSchema := omit//O
+		};
+		
+		/**
+		 * @desc Base reception template of primitiveContent for CREATE operation for MgmtObjAnnc resource
+		 */
+		template AnnouncedMgmtResource_optional mw_contentCreateMgmtObjAnncBase := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := *,//MA
+			accessControlPolicyIDs := ?,//MA
+			expirationTime := ?,//MA M
+			link := ?,
+			dynamicAuthorizationConsultationIDs := *, //OA
+			mgmtDefinition := ?, //MA
+			objectIDs := *, //OA
+			objectPaths := *, //OA
+			description := * ,//OA
+			mgmtSchema := omit//OA
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Node resource
+		 * @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
+			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			nodeID := p_nodeId,//M
+			hostedCSELink := omit,//O
+			hostedAELinks := omit,//O
+			hostedServiceLinks := omit,//O
+			mgmtClientAddress := omit,//O
+			roamingStatus := omit,//O
+			networkID := omit,//O
+			choice := omit//O
+		};	  	
+
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for Node resource
+		 * @param p_name Resource name
+		 */
+		template Node_optional mw_contentCreateNodeBase (template XSD.String p_name := *) := {
+			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			nodeID := ?,//M
+			hostedCSELink := *,//O
+			hostedAELinks := *,//O
+			hostedServiceLinks := *,//O
+			mgmtClientAddress := *,//O
+			roamingStatus := *,//O
+			networkID := *,//O
+			
+			choice := *//O
+		};	
+		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for NodeAnnc resource
+		 * @param p_name Resource name
+		 */
+		template NodeAnnc_optional mw_contentCreateNodeAnncBase := {
+			
+			resourceName := omit,//NP
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := ?,//M
+			accessControlPolicyIDs := ?,//M
+			expirationTime := ?,//M
+			link := ?,//M
+			dynamicAuthorizationConsultationIDs := *, //O
+			nodeID := ?,//M
+			hostedCSELink := *,//O
+			hostedAELinks := *,//O
+			hostedServiceLinks := *,//O
+			mgmtClientAddress := *,//O
+			roamingStatus := *,//O
+			networkID := *,//O
+			choice := omit//NP
+		};	
+    	
+    	/**
+    	 * @desc Base primitiveContent for CREATE operation for PollingChannel resource
+    	 * @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) := {
+			resourceName := p_name,//O
+            resourceType := omit,//NP
+            resourceID := omit,//NP
+            parentID := omit,//NP
+            creationTime := omit,//NP
+            lastModifiedTime := omit,//NP
+            labels := omit,//O
+            expirationTime := omit,//O
+            choice := omit//NP
+    	};   	   	
+    	
+		/**
+		 * @desc Base reception template of primitiveContent for CREATE operation for PollingChannel resource
+		 * @param p_accessControlPolicyIds ACP IDs for the PollingChannel
+		 * @param p_name Resource name
+		 */
+		template PollingChannel_optional mw_contentCreatePollingChannel := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			expirationTime := *,//O
+			choice := omit//NP
+		};   	   	
+    	
+    	/**
+    	 * @desc Base primitiveContent for CREATE operation for Schedule resource
+    	 * @param p_scheduleElement Schedule
+    	 * @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) := {
+			resourceName := p_name,//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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			scheduleElement := p_scheduleElement,//M
+			networkCoordinated := omit,//O
+			choice := omit//NP
+    	};  
+    	
+		/**
+		 * @desc Base primitiveContent for CREATE operation for ScheduleAnnc resource
+		 */
+		template (value) ScheduleAnnc_optional m_contentCreateScheduleAnnc (in template (omit) AcpType p_accessControlPolicyIds,in template (omit) ScheduleEntries p_scheduleEntries) := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := omit,//MA O
+			accessControlPolicyIDs := omit,//NA O
+			expirationTime := "29991231T235959",//MA M
+			dynamicAuthorizationConsultationIDs := omit,//NA O
+			link := "NotInitialized",//M
+			scheduleElement := p_scheduleEntries,//OA M
+			networkCoordinated := omit,//OA O
+			choice := omit//NP
+		};  	
+
+		/**
+		 * @desc Base reception template of primitiveContent for CREATE operation for ScheduleAnnc resource
+		 */
+		template ScheduleAnnc_optional mw_contentCreateScheduleAnncBase := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := *,//MA O
+			accessControlPolicyIDs := omit,//NA O
+			expirationTime := ?,//MA M
+			dynamicAuthorizationConsultationIDs := omit,//NA O
+			link := ?,//M
+			scheduleElement := * ,//OA M
+			networkCoordinated := *,//OA O
+			choice := omit//NP
+		};  	
+    	
+		template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) := {
+		  	resourceName := omit,//TODO TS-0004 7.4.29.1 2 Missing attribute
+			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
+			applicableCredIDs := p_applicableCredIDs,//O
+			allowedApp_IDs := p_allowedAppIDs,//O
+			allowedAEs := p_allowedAEs,//O
+			allowedRole_IDs := omit,//O
+			choice := omit //O
+		}
+		
+		/**
+		 * @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) := {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			creator := omit,//O
+			choice := omit//O
+		};  
+    	
+
+    	/**
+    	 * @desc Base primitiveContent for CREATE operation for Subscription resource
+    	 * @param p_notificationURI Notification URI
+    	 * @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) := {
+			resourceName := p_name,//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
+			creator := omit,//O
+			eventNotificationCriteria := omit,//O
+			expirationCounter := omit,//O
+			notificationURI := p_notificationURI,//M
+			groupID := omit,//O
+			notificationForwardingURI := omit,//O
+			batchNotify := omit,//O
+			rateLimit := omit,//O
+			preSubscriptionNotify := omit,//O
+			pendingNotification := omit,//O
+			notificationStoragePriority := omit,//O
+			latestNotify := omit,//O
+			notificationContentType := omit, //O
+			notificationEventCat := omit,//O
+			subscriberURI := omit,//O
+			associatedCrossResourceSub := omit,//O
+			choice := omit//NP
+    	};   	
+    	
+    			
+		template (value) OntologyRepository_optional m_contentCreateOntologyRepository := {
+			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
+			announceTo := omit,	//O
+			announcedAttribute := omit,	//O
+			stateTag := omit,	//NP
+			creator := omit,	//O
+			choice := omit	//NP
+		};
+		
+		template (value) Ontology_optional m_contentCreateOntology(SemanticFormat p_ontologyFormat := int1, 
+                                                           // TO DO: May have to URI encode it
+		                                                   XSD.AnySimpleType p_ontologyContent := "https://git.onem2m.org/MAS/BaseOntology/raw/3_6_0/base_ontology.owl") := {
+			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
+			announceTo := omit,	//O
+			announcedAttribute := omit,	//O
+			creator := omit,	//O
+            description := omit, //O
+            ontologyFormat := p_ontologyFormat, //M
+            ontologyContent := p_ontologyContent, //M
+            semanticOpExec := omit, //O
+            choice := omit//O
+		};
+
+    			
+    	/**
+		 * @desc 	Base primitiveContent for CREATE operation for SemanticDescriptor resource
+		 */
+		template (value) SemanticDescriptor_optional m_contentCreateSemanticDescriptor(in SemanticFormat p_descriptorRepresentation := int4,
+																						in XSD.Base64Binary p_descriptor := c_validDescriptor) := {			
+			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
+			announceTo := omit,                             //O
+			announcedAttribute := omit,                     //O
+			creator := omit,                                //O
+			descriptorRepresentation := p_descriptorRepresentation,               //M
+			semanticOpExec := omit,                         //NP
+			descriptor := p_descriptor,       //M
+			ontologyRef := omit,                            //O
+			relatedSemantics := omit,                       //O
+			semanticValidated := omit,                      //NP
+			validationEnable := omit,                       //O
+			choice := omit//O
+		} 
+		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for SemanticDescriptor resource
+		 * @param NULL
+		 */	
+		template SemanticDescriptor_optional mw_contentCreateSemanticDescriptor := {			
+			resourceName := *,                              //O
+			resourceType := omit,                           //NP
+			resourceID := omit,                             //NP
+			parentID := omit,                               //NP
+			creationTime := omit,                           //NP
+			lastModifiedTime := omit,                       //NP
+			labels := *,                                 //O
+			accessControlPolicyIDs := *,                 //O
+			expirationTime := *,                         //O
+			dynamicAuthorizationConsultationIDs := *,    //O
+			announceTo := *,                             //O
+			announcedAttribute := *,                     //O
+			creator := *,                                //O
+			descriptorRepresentation := ?,               //M
+			semanticOpExec := omit,                         //NP
+			descriptor := ?,                             //M
+			ontologyRef := *,                            //O
+			relatedSemantics := *,                       //O
+			semanticValidated := omit,                      //NP
+			validationEnable := *,                       //O
+			choice := *//O
+		} 		
+    	
+    	/**
+    	 * @desc Base primitiveContent for CREATE operation for SemanticMashupJobProfile resource
+    	 * @param TODO 
+    	 * @param TODO
+    	 */   	
+		template SemanticMashupJobProfile_optional m_contentCreateSemanticMashupJobProfile (in template (value) Sparql p_memberFilter,
+		                                                                                    in template (value) XSD.Base64Binary p_outputDescriptor, 
+		                                                                                    in template (value) XSD.Base64Binary p_functionDescriptor)  := {		
+			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
+			announceTo := omit,	//O
+			announcedAttribute := omit,	//O
+			creator := omit,	//O
+			memberFilter := p_memberFilter,	//M
+			smiID := omit,	//O
+			inputDescriptor := omit,	//O
+			outputDescriptor := p_outputDescriptor,	//M
+			functionDescriptor := p_functionDescriptor	//M
+		}
+		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for SemanticMashupJobProfile resource
+		 * @param NULL
+		 */			
+		template SemanticMashupJobProfile_optional mw_contentCreateSemanticMashupJobProfileBase  := {		
+			resourceName := *,	//O
+			resourceType := omit,	//NP
+			resourceID := omit,	//NP
+			parentID := omit,	//NP
+			creationTime := omit,	//NP
+			lastModifiedTime := omit,	//NP
+			labels := *,	//O
+			accessControlPolicyIDs := *,	//O
+			expirationTime := *,	//O
+			dynamicAuthorizationConsultationIDs := *,	//O
+			announceTo := *,	//O
+			announcedAttribute := *,	//O
+			creator := *,	//O
+			memberFilter := ?,	//M
+			smiID := *,	//O
+			inputDescriptor := *,	//O
+			outputDescriptor := ?,	//M
+			functionDescriptor := ?	//M
+		}
+    	
+    	
+    	
+    	/**
+    	 * @desc Base primitiveContent for CREATE operation for SemanticMashupInstance resource
+    	 */    	
+  		template SemanticMashupInstance_optional m_contentCreateSemanticMashupInstance (in XSD.AnyURI p_smjpID,
+		                                                                                in XSD.Base64Binary p_smjpInputParameter,
+		                                                                                in MashupMemberStoreType p_memberStoreType,
+		                                                                                in MashupResultGenType p_mashupMember)  := {
+  			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
+			announceTo := omit,	//O
+			announcedAttribute := 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
+		}   	
+    	
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for SemanticMashupInstance resource
+		 * @param NULL
+		 */    	
+  		template SemanticMashupInstance_optional mw_contentCreateSemanticMashupInstanceBase  := {
+  			resourceName := *,	//O
+			resourceType := omit,	//NP
+			resourceID := omit,	//NP
+			parentID := omit,	//NP
+			creationTime := omit,	//NP
+			lastModifiedTime := omit,	//NP
+			labels := *,	//O
+			accessControlPolicyIDs := *,	//O
+			expirationTime := *,	//O
+			dynamicAuthorizationConsultationIDs := *,	//O
+			announceTo := *,	//O
+			announcedAttribute := *,	//O
+			creator := *,	//O
+			smjpID := ?,	//M
+			smjpInputParameter := ?,	//M
+			memberStoreType := ?,	//M
+			mashupMember := *,	//O
+			resultGenType := ?,	//M
+			periodForResultGen := *	//O
+		}   	
+
+
+    	
+		/**
+		 * @desc Base primitiveContent for CREATE operation for SemanticMashupResult resource
+		 */    	
+		template (value) SemanticMashupResult_optional m_contentCreateSemanticMashupResult  := {    	
+			resourceName := omit,	//NP
+			resourceType := omit,	//NP
+			resourceID := omit,	//NP
+			parentID := omit,	//NP
+			creationTime := omit,	//NP
+			lastModifiedTime := omit,	//NP
+			labels := omit,	//NP
+			accessControlPolicyIDs := omit,	//NP
+			expirationTime := omit,	//NP
+			dynamicAuthorizationConsultationIDs := omit,	//NP
+			announceTo := omit,	//NP
+			announcedAttribute := omit,	//NP
+			creator := omit,	//NP
+			smjpInputParameter := omit,	//NP
+			mashupResultFormat := omit,	//NP
+			mashupResult := omit	//NP
+		}
+		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for SemanticMashupResult resource
+		 * @param NULL
+		 */		
+		template SemanticMashupResult_optional mw_contentCreateSemanticMashupResultBase  := {    	
+			resourceName := omit,	//NP
+			resourceType := omit,	//NP
+			resourceID := omit,	//NP
+			parentID := omit,	//NP
+			creationTime := omit,	//NP
+			lastModifiedTime := omit,	//NP
+			labels := omit,	//NP
+			accessControlPolicyIDs := omit,	//NP
+			expirationTime := omit,	//NP
+			dynamicAuthorizationConsultationIDs := omit,	//NP
+			announceTo := omit,	//NP
+			announcedAttribute := omit,	//NP
+			creator := omit,	//NP
+			smjpInputParameter := omit,	//NP
+			mashupResultFormat := omit,	//NP
+			mashupResult := omit	//NP
+		}
+		
+		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for Subscription resource
+		 * @param p_notificationURI Notification URI
+		 * @param p_name Resource name
+		 */
+		template Subscription_optional mw_contentCreateSubscriptionBase (template XSD.String p_name := *) := {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+    		dynamicAuthorizationConsultationIDs := *, //O
+			creator := *,//O
+			eventNotificationCriteria := *,//O
+			expirationCounter := *,//O
+			notificationURI := ?,//M
+			groupID := *,//O
+			notificationForwardingURI := *,//O
+			batchNotify := *,//O
+			rateLimit := *,//O
+			preSubscriptionNotify := *,//O
+			pendingNotification := *,//O
+			notificationStoragePriority := *,//O
+			latestNotify := *,//O
+			notificationContentType := *, //O
+			notificationEventCat := *,//O
+			subscriberURI := *,//O
+			associatedCrossResourceSub := *,//O
+			choice := *//O
+		};   	
+
+		template (value) Subscription_optional m_contentCreateSubscriptionAdvanced (in template (value) ListOfURIs p_notificationURI,
+																					in template (omit)  XSD.String p_name := c_defaultSubscriptionResourceName,
+																					in template (omit) EventNotificationCriteria p_eventNotificationCriteria,
+																					in template (omit) XSD.PositiveInteger p_expirationCounter,
+																					in template (omit) BatchNotify p_batchNotify,
+																					in template (omit) XSD.Boolean p_latestNotify,
+																					in template (omit) XSD.AnyURI p_subscriberURI,
+																					in template (omit) NotificationContentType p_notificationContentType,
+		                                                                            in template (omit) PendingNotification p_pendingNotification) modifies m_contentCreateSubscription := {
+			eventNotificationCriteria := p_eventNotificationCriteria,//O
+			expirationCounter := p_expirationCounter,//O
+			batchNotify := p_batchNotify,//O
+			pendingNotification := p_pendingNotification,//O
+			latestNotify := p_latestNotify,//O
+			notificationContentType := p_notificationContentType, //TODO Set to omit once xsd is fixed,//O
+			subscriberURI := p_subscriberURI//O
+		}; 
+		
+		template (value) EventNotificationCriteria m_eventNotificationCriteria ( template (omit) EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := omit, template (omit) EventNotificationCriteria.attribute p_attribute_list := omit) := { //the parameter should be a list of NotificationEventTypeEventType
+			createdBefore := omit,
+			createdAfter := omit,
+			modifiedSince := omit,
+			unmodifiedSince := omit,
+			stateTagSmaller := omit,
+			stateTagBigger := omit,
+			expireBefore := omit,
+			expireAfter := omit,
+			sizeAbove := omit,
+			sizeBelow := omit,
+			operationMonitor_list := omit,
+			attribute := p_attribute_list, 
+			notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
+			childResourceType := omit,
+			missingData := omit,
+			filterOperation := omit
+		};
+        
+		template (value) BatchNotify m_batchNotify (in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration := "PT20S") := {
+			number := p_number,
+			duration := p_duration //TODO duration has to be set to 1s and match to the Duration regex 
+		};
+		//normaly duration can be omited
+		
+		
+         	
+    	
+    	/**
+    	 * @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") := {
+			resourceName := p_name,//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 := "text/strings:0",//O
+			contentSize := omit,//NP
+			contentRef := omit, //O
+			ontologyRef := omit,//O
+			content := p_primitiveContent,//M
+			choice := omit //O
+		};
+
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for ContentInstance resource
+		 * @param p_primitiveContent Content for the ContentInstance
+		 */
+		template ContentInstance_optional mw_contentCreateContentInstanceBase(template XSD.String p_name := *) := {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			expirationTime := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			contentInfo := *,//O
+			contentSize := omit,//NP
+			contentRef := *, //O
+			ontologyRef := *,//O
+			content := ?,//M
+			choice := * //O
+		};
+					
+		/**
+		 * @desc Base primitiveContent for CREATE operation for ContentInstanceAnnc resource
+		 */
+		template (value) ContentInstanceAnnc_optional m_contentCreateContentInstanceAnnc := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := omit,//MA O
+			expirationTime := "29991231T235959",//NA M
+			link := "NotInitialized", //M
+			stateTag := omit,//OA M
+			contentInfo := omit,//OA O
+			contentSize := omit,//OA M
+			ontologyRef := omit,//OA O
+			content := omit, //OA M
+			choice := omit //O
+		};
+
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for ContentInstanceAnnc resource
+		 */
+		template ContentInstanceAnnc_optional mw_contentCreateContentInstanceAnncBase := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := *,//MA O
+			expirationTime := ?,//NA M
+			link := ?, //M
+			stateTag := *,//OA M
+			contentInfo := *,//OA O
+			contentSize := *,//OA M
+			ontologyRef := *,//OA O
+			content := *, //OA M
+			choice := omit //O
+		};
+		
+    	/**
+    	 * @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):= {
+			resourceName := p_name,//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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			locationID := omit,//O
+			ontologyRef := omit,//O
+			disableRetrieval := omit, //O
+			choice := omit//NP
+    	};
+    	
+		/**
+		 * @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):= {
+			resourceName := p_name,//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
+			dynamicAuthorizationEnabled := p_dyn_auth_enabled,//M
+			dynamicAuthorizationPoA := omit,//O
+			dynamicAuthorizationLifetime := omit,//O	
+			choice := omit
+		};
+    	
+    	
+    	
+		/**
+		 * @desc Base primitiveContent for CREATE operation for ContainerAnnc resource
+		 * @param p_name Resource name
+		 */
+		template (value) ContainerAnnc_optional m_contentCreateContainerAnnc := {
+			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
+			link := "NotInitialized",//M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			stateTag := omit,//NP
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			locationID := omit,//O
+			ontologyRef := omit,//O
+			disableRetrieval := omit, //O
+			choice := omit//NP
+		};
+		
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for Container resource
+		 * @param p_name Resource name
+		 */
+		template Container_optional mw_contentCreateContainerBase (template XSD.String p_name := *):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			locationID := *,//O
+			ontologyRef := *,//O
+			disableRetrieval := *, //O
+			choice := *//NP
+		};
+    	
+		/**
+		 * @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
+		 * @param p_name Resource name
+		 */
+		template (value) Container_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			expirationCounter := omit,//Field not existing in container resource
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			locationID := omit,//O
+			ontologyRef := omit,//O
+			disableRetrieval := omit,//O
+			choice := omit//NP
+		};
+    	
+		/**
+		 * @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):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			cseType := omit,//O
+			pointOfAccess := omit,//O
+			cSEBase := valueof(p_cSEBase),//M
+			cSE_ID := omit,//M
+			m2M_Ext_ID := omit,//O
+			trigger_Recipient_ID := omit,//O
+			requestReachability := false,//M
+			nodeLink := omit,//O
+			triggerReferenceNumber := omit,//O
+			contentSerialization := omit,//O
+			e2eSecInfo := omit,//O
+			descendantCSEs := omit,//O
+			supportedReleaseVersions := {"1", "2", "2a", "3"}, //M
+			multicastCapability := omit,//O
+			externalGroupID := omit,//O
+			triggerEnable := omit,//O
+			activityPatternElements := omit,//O
+			choice := omit//O
+		};
+    	
+		/**
+		 * @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):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			cseType := omit,//O
+			pointOfAccess := p_poaList,//O
+			cSEBase := valueof(p_cSEBase),//M
+			cSE_ID := omit,//M
+			m2M_Ext_ID := omit,//O
+			trigger_Recipient_ID := omit,//O
+			requestReachability := true,//M
+			nodeLink := omit,//O
+			triggerReferenceNumber := omit,//O
+			contentSerialization := omit,//O
+			e2eSecInfo := omit,//O
+			descendantCSEs := omit,//O
+			supportedReleaseVersions := {"1", "2", "2a", "3"}, //M
+			multicastCapability := omit,//O
+			externalGroupID := omit,//O
+			triggerEnable := omit,//O
+			activityPatternElements := omit,//O
+			choice := omit//O
+		};
+		
+		/**
+		* @desc Base reception template of primitiveContent for CREATE operation for remoteCSE resource
+		*/
+		template RemoteCSE_optional mw_contentCreateRemoteCSEBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			cseType := *,//O
+			pointOfAccess := *,//O
+			cSEBase := ?,//M
+			cSE_ID := *,//M
+			m2M_Ext_ID := *,//O
+			trigger_Recipient_ID := *,//O
+			requestReachability := ?,//M
+			nodeLink := *,//O
+			triggerReferenceNumber := *,//O
+			contentSerialization := *,//O
+			e2eSecInfo := *,//O
+			descendantCSEs := *,//O
+			supportedReleaseVersions := {"1", "2", "2a", "3"}, //M
+			multicastCapability := *,//O
+			externalGroupID := *,//O
+			triggerEnable := *,//O
+			activityPatternElements := *,//O
+			choice := *//O
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for RemoteCSEAnnc resource
+		 * @param p_name Resource name
+		 */
+		template (value) RemoteCSEAnnc_optional m_contentCreateRemoteCSEAnnc := {
+			resourceName := omit,//NA NP
+			resourceType := omit,//NA NP
+			resourceID := omit,//NA NP
+			parentID := omit,//NA NP
+			creationTime := omit,//NA NP
+			lastModifiedTime := omit,//NA NP
+			labels := omit,//MA O
+			accessControlPolicyIDs := omit,//MA O
+			expirationTime := "29991231T235959",//MA M
+			link := "NotInitialized",//M
+			dynamicAuthorizationConsultationIDs := omit,//OA O 
+			cseType := omit,//OA O
+			pointOfAccess := omit,//OA O
+			cSEBase := omit,//OA O
+			cSE_ID := omit,//OA O
+			requestReachability := false,//OA O
+			nodeLink := omit,//OA O
+			contentSerialization := omit,//OA O
+			e2eSecInfo := omit,//MA M
+			descendantCSEs := omit,//OA O
+			supportedReleaseVersions := {"1", "2", "2a", "3"}, //MA M
+			multicastCapability := omit,//OA O
+			externalGroupID := omit,//OA O
+			triggerEnable := omit,//OA O
+			activityPatternElements := omit,//OA O
+			choice := omit//OA O
+		};
+		
+		/**
+		* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
+		*/
+		template ContainerAnnc_optional mw_contentCreateContainerAnncBase := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := *,//MA O
+			accessControlPolicyIDs := *,//MA O
+			expirationTime := ?,//MA M
+			link := ?, //M
+			dynamicAuthorizationConsultationIDs := *,//OA O
+			stateTag := *,//OA M
+			maxNrOfInstances := *,//OA O
+			maxByteSize := *, //OA O
+			maxInstanceAge := *, //OA O
+			currentNrOfInstances := *, //OA M
+			currentByteSize := *, //OA M
+			locationID := *, //OA O
+			ontologyRef := *, //OA O
+			disableRetrieval := *, //OA O
+			choice := omit //NA
+		};
+    	
+		template (value) LocationPolicy_optional m_contentCreateLocationPolicy (in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) ListOfDuration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) := {
+    	  	resourceName 				:= c_defaultLocationPolicyResourceName, //O
+    	  	resourceType				:= omit, //NP
+    	    resourceID					:= omit, //NP
+    	    parentID					:= omit, //NP
+    	  	creationTime				:= omit, //NP
+    	  	lastModifiedTime			:= omit, //NP
+    	  	labels 						:= PX_LABELS,//O
+    	  	accessControlPolicyIDs 	:= p_accessControlPolicyIds, //O
+ 	  	  	expirationTime 			:= omit, //O
+      		dynamicAuthorizationConsultationIDs := omit, //O
+    	  	announceTo 				:= omit, 				   //O
+    	  	announcedAttribute		:= omit, 			      //O
+    		locationSource 			:= p_locationSource, //M
+    		locationInformationType := omit,//O
+    		locationUpdatePeriod 		:= p_locationUpdatePeriod, //O
+    		locationTargetID 			:= p_locationTargetID, 	//O
+    		locationServer 			:= p_locationServerAddress,//O
+    		locationContainerID		:= omit,    		   //NP
+    		locationContainerName 	:= PX_LOCATION_CONTAINER_NAME,//O    		
+    	  	locationStatus				:= omit,              //NP
+			geographicalTargetArea := omit, //O
+			geofenceEventCriteria := omit, //O
+			authID := omit, //O
+			retrieveLastKnownLocation := omit, //O
+			locationUpdateEventCriteria := omit, //O
+			choice 					:= omit  	         //NP
+    	   	  	
+    	};
+    	
+		template (value) LocationPolicy_optional m_contentCreateLocationPolicyBase := {
+				resourceName 				:= c_defaultLocationPolicyResourceName, //O
+				resourceType				:= omit, //NP
+				resourceID					:= omit, //NP
+				parentID					:= omit, //NP
+				creationTime				:= omit, //NP
+				lastModifiedTime			:= omit, //NP
+				labels 						:= PX_LABELS,//O
+				accessControlPolicyIDs 	:= omit, //O
+				expirationTime 			:= omit, //O
+				dynamicAuthorizationConsultationIDs := omit, //O
+				announceTo 				:= omit, 				   //O
+				announcedAttribute		:= omit, 			      //O
+				locationSource 			:= int1, //M
+				locationInformationType := omit,//O
+				locationUpdatePeriod 		:= omit, //O
+				locationTargetID 			:= omit, 	//O
+				locationServer 			:= omit,//O
+				locationContainerID		:= omit,    		   //NP
+				locationContainerName 	:= PX_LOCATION_CONTAINER_NAME,//O    		
+				locationStatus				:= omit,              //NP
+				geographicalTargetArea := omit, //O
+				geofenceEventCriteria := omit, //O
+				authID := omit, //O
+				retrieveLastKnownLocation := omit, //O
+				locationUpdateEventCriteria := omit, //O
+				choice 					:= omit  	         //NP
+			};
+    	
+	  /**
+	  * @desc Base reception template of primitiveContent for CREATE operation for LocationPolicyAnnc resource
+	  */
+	  template LocationPolicyAnnc_optional mw_contentCreateLocationPolicyAnncBase := {
+		  resourceName := omit,//NA M
+		  resourceType := omit,//NA M
+		  resourceID := omit,//NA M
+		  parentID := omit,//NA M
+		  creationTime := omit,//NA M
+		  lastModifiedTime := omit,//NA M
+		  labels := *,//MA
+		  accessControlPolicyIDs := ?,//MA
+		  expirationTime := ?,//MA M
+		  link := ?,
+		  dynamicAuthorizationConsultationIDs := *, //OA
+		  locationSource := *, //OA
+		  locationInformationType := *,//OA
+		  locationUpdatePeriod := *, //OA
+		  locationTargetID := *, //OA
+		  locationServer := *, //OA
+		  locationContainerID := *, //OA
+		  locationContainerName := *, //OA
+		  locationStatus := *,//OA
+		  geographicalTargetArea := omit, //O
+		  geofenceEventCriteria := omit, //O
+		  authID := omit, //O
+		  retrieveLastKnownLocation := omit, //O
+		  locationUpdateEventCriteria := omit, //O
+		  choice := omit//NP
+	    };
+    	
+    	template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation, 
+    																in template (omit) NotificationEventType p_notifEventType, 
+    																in template (omit) XSD.AnyURI p_subReference, 
+    																in template (omit) XSD.AnyURI p_notifForwardingURI) := {
+    	  notificationEvent := {
+    	    representation := p_resourcePresentation,
+        	operationMonitor := {
+        		operation := omit,
+        	    originator := omit
+        	},
+        	notificationEventType := p_notifEventType    	    
+    	  },
+    	  verificationRequest := omit,
+    	  subscriptionDeletion := omit,
+    	  subscriptionReference := p_subReference,
+    	  creator := omit,
+    	  notificationForwardingURI := p_notifForwardingURI,
+		  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
+		 * @param p_ontologyRef  Expected OntologyRef value
+		 */
+		//template SemanticDescriptor_optional mw_contentCreateSemanticDescriptor_ontologyRef(template XSD.AnyURI p_ontologyRef) modifies mw_contentCreateSemanticDescriptor := {
+		//	ontologyRef := p_ontologyRef
+		//}  
+		
+		/**
+			 * @desc Base primitiveContent for CREATE operation for StatConfig resource
+			 * @param p_primitiveConten t Content for the StatConfig
+			 */
+		template (value) StatsConfig_optional m_contentCreateStatsConfigBase := {
+			resourceName 				:= c_defaultStatsConfigResourceName, //O
+			resourceType				:= omit, //NP
+			resourceID					:= omit, //NP
+			parentID					:= omit, //NP
+			creationTime				:= omit, //NP
+			lastModifiedTime			:= omit, //NP
+			labels 						:= PX_LABELS,//O
+			accessControlPolicyIDs 	:= omit, //O
+			expirationTime 			:= omit, //O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			creator                 := omit,
+			choice 					:= omit  	         //NP
+		};
+		
+		/**
+			 * @desc Base primitiveContent for CREATE operation for StatCollect resource
+			 * @param p_primitiveContent Content for the StatCollect
+			 */
+		template (value) StatsCollect_optional m_contentCreateStatCollectBase := {
+			resourceName 				:= c_defaultStatsCollectResourceName, //O
+			resourceType				:= omit, //NP
+			resourceID					:= omit, //NP
+			parentID					:= omit, //NP
+			creationTime				:= omit, //NP
+			lastModifiedTime			:= omit, //NP
+			labels 						:= PX_LABELS,//O
+			accessControlPolicyIDs 	:= omit, //O
+			expirationTime 			:= omit, //O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			creator                 := omit,
+			statsCollectID          := omit,
+			collectingEntityID      := omit,
+			collectedEntityID       := omit,
+			statsRuleStatus         := omit,
+			statModel               := omit,
+			collectPeriod           := omit,
+			eventID                 := omit,
+			choice 					:= omit  	         //NP
+		};
+		
+		/**
+			 * @desc Base primitiveContent for CREATE operation for M2mServiceSubscriptionProfile resource
+			 * @param p_primitiveContent Content for the M2mServiceSubscriptionProfile
+			 */
+		template (value) M2mServiceSubscriptionProfile_optional m_contentCreatem2mServiceSubscriptionProfileBase := {
+			resourceName 				:= c_defaultm2mServiceSubscriptionProfileResourceName, //O
+			resourceType				:= omit, //NP
+			resourceID					:= omit, //NP
+			parentID					:= omit, //NP
+			creationTime				:= omit, //NP
+			lastModifiedTime			:= omit, //NP
+			labels 						:= PX_LABELS,//O
+			accessControlPolicyIDs 	:= omit, //O
+			expirationTime 			:= omit, //O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			choice 					:= omit  	         //NP
+		};
+		
+		/**
+		  * @desc Base primitiveContent for CREATE operation for ServiceSubscribedAppRule_optional resource
+		  * @param p_primitiveContent Content for the ServiceSubscribedAppRule_optional
+		 */
+		template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRuleBase := {
+			resourceName 				:= c_defaultServiceSubscribedAppRuleResourceName, //O
+			resourceType				:= omit, //NP
+			resourceID					:= omit, //NP
+			parentID					:= omit, //NP
+			creationTime				:= omit, //NP
+			lastModifiedTime			:= omit, //NP
+			labels 						:= PX_LABELS,//O
+			accessControlPolicyIDs 	:= omit, //O
+			expirationTime 			:= omit, //O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			applicableCredIDs       := omit,
+			allowedApp_IDs          := omit,
+			allowedAEs              := omit,
+			allowedRole_IDs			:= omit,
+			choice 					:= omit  	         //NP   
+		};
+		
+		template (value) ServiceSubscribedNode_optional m_contentServiceSubscribedNode := {
+			resourceName 			:= "MyServiceServiceSubscribedNodeResource", //O
+			resourceType 			:= omit, //M
+			resourceID 				:= omit, //M
+			parentID 				:= omit, //M
+			creationTime 			:= omit, //M
+			lastModifiedTime 		:= omit, //M
+			labels 					:= omit, //O
+			accessControlPolicyIDs 	:= omit, //O
+			expirationTime 			:= omit, //M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			nodeID 					:= omit, //M
+			cSE_ID 					:= omit, //O
+			deviceIdentifier 		:= omit, //M
+			ruleLinks 				:= omit, //O
+			niddRequired 			:= omit, //O
+			choice 					:= omit //O
+		};
+		
+			template (value) TriggerRequest_optional m_contentTriggerRequest := {
+			resourceName 			:= "MyTriggerRequestResource", //O
+			resourceType 			:= omit, //M
+			resourceID 			:= omit, //M
+			parentID 			:= omit, //M
+			creationTime 			:= omit, //M
+			lastModifiedTime 		:= omit, //M
+			labels 				:= omit, //O
+			accessControlPolicyIDs 		:= omit, //O
+			expirationTime 			:= omit, //M
+			dynamicAuthorizationConsultationIDs := omit,//O
+		
+			m2M_Ext_ID 			:= omit, //M,
+			trigger_Recipient_ID 		:= omit, //M,
+			triggerPurpose 			:= omit, //O,
+			triggerStatus 			:= omit, //O,
+			triggerValidityTime 		:= omit, //M,
+			triggerInfoAE_ID 		:= omit, //O,
+			triggerInfoAddress 		:= omit, //O,
+			triggerInfoOperation 		:= omit, //O,
+			targetedResourceType 		:= omit, //O,
+			triggerReference 		:= omit	 //O,			
+
+		};
+		
+		
+		/**
+		 * @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):= {
+			resourceName := p_name,//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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			creator := omit,//O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			contentInfo := omit,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base reception template primitiveContent for CREATE operation for timeSeries resource 
+		 * @param p_name Resource name
+		 */
+		template TimeSeries_optional mw_contentCreateTimeSeriesBase (template XSD.String p_name := *):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			creator := *,//O
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := *,//O
+			missingDataDetect := *,//O
+			missingDataMaxNr := *,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := *,//O
+			ontologyRef := *,//O
+			contentInfo := omit,//O
+			choice := *//NP
+		};
+				
+		/**
+		 * @desc Base primitiveContent for CREATE operation for timeSeriesAnnc resource 
+		 * @param p_name Resource name
+		 */
+		template (value) TimeSeriesAnnc_optional m_contentCreateTimeSeriesAnnc := {			
+			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
+			link := "NotInitialized",//M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			contentInfo := omit,//O
+			choice := omit//NP
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for TimeSeriesAnnc resource
+		 * @param p_primitiveContent Content for the TimeSeriesAnnc
+		 */
+		template TimeSeriesAnnc_optional mw_contentCreateTimeSeriesAnncBase := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := *,//MA
+			accessControlPolicyIDs := *,//MA
+			expirationTime := ?,//MA M
+			link := ?, //M NA
+			dynamicAuthorizationConsultationIDs := *, //OA			
+			maxNrOfInstances := *,//O OA		
+			maxByteSize := *,//O OA	
+			maxInstanceAge := *,//O OA	
+			currentNrOfInstances := *,//M OA
+			currentByteSize := *,//M OA
+			periodicInterval := *,//O OA
+			missingDataMaxNr := *,//O OA
+			missingDataList := *,//O OA
+			missingDataCurrentNr := *,//O OA
+			missingDataDetectTimer := *,//O OA
+			ontologyRef := *,//O OA
+			contentInfo := omit,//O
+			choice := omit //O
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for TimeSeriesInstanceAnnc resource
+		 * @param p_primitiveContent Content for the TimeSeriesInstanceAnnc
+		 */
+		template TimeSeriesInstanceAnnc_optional mw_contentCreateTimeSeriesInstanceAnncBase := {			
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := *,//MA
+			expirationTime := ?,//MA M To be double checked SDS-2019-0668R01
+			link := ?, //M NA
+			dataGenerationTime := *,//M OA
+			content := *,//M OA
+			sequenceNr := *,//O OA
+			contentSize := *,//M OA
+			choice := omit//NP			
+		}		
+		
+		/**
+		 * @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,
+																		in template (omit) XSD.Boolean p_missingDataDetect := omit,
+																		in template (omit) XSD.NonNegativeInteger p_periodicInterval := omit,
+																		in template (omit) XSD.NonNegativeInteger p_missingDataMaxNr := omit, 
+																		in template (omit) XSD.NonNegativeInteger p_missingDataDetectTimer := omit) modifies m_contentCreateTimeSeries := {
+		
+			periodicInterval := p_periodicInterval,//O
+			missingDataDetect := p_missingDataDetect,//O
+			missingDataMaxNr := p_missingDataMaxNr,//O
+			missingDataDetectTimer := p_missingDataDetectTimer//O
+		}
+		
+		/**
+		 * @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):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			expirationCounter := omit,//Field not existing in container resource
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			contentInfo := omit,//O
+			choice := omit//NP
+		};
+		
+		/**
+		 * @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):= {
+			resourceName := p_name,//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
+			dataGenerationTime := {alt_ := "00000101T000000"},//M
+			content := "AnyValue",//M
+			sequenceNr := omit,//O
+			contentSize  := omit,//NP
+			choice := omit//O
+		};
+		
+		/**
+		 * @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 := *):= {
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			expirationTime := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			dataGenerationTime := ?,//M
+			content := ?,//M
+			sequenceNr := *,//O
+			contentSize  := omit,//NP
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for TimeSeriesInstanceAnnc resource
+		 * @param p_name Resource name
+		 */
+		template (value) TimeSeriesInstanceAnnc_optional m_contentCreateTimeSeriesInstanceAnnc := {
+			resourceName := omit,//NA M
+			resourceType := omit,//NA M
+			resourceID := omit,//NA M
+			parentID := omit,//NA M
+			creationTime := omit,//NA M
+			lastModifiedTime := omit,//NA M
+			labels := omit,//MA O
+			expirationTime := omit,//NA M
+			link := "NotInitialized", //M
+			dataGenerationTime := omit,//OA M
+			content := omit,//OA M
+			sequenceNr := omit,//OA O
+			contentSize  := omit,//OA M
+			choice := omit//NA O
+		};
+		
+		template (value) MissingData m_missingData( in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration) := {
+			number := p_number,
+			duration := p_duration
+		};
+	
+		/**
+		 * @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):= {
+			resourceName := p_name,//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
+			roleID := "roleID@a.b", //M
+			issuer := "issuer", //M
+			holder := "holder", //M
+			notBefore := "00000101T000000",//M
+			notAfter := "00000101T000000",//M
+			roleName := omit, //O
+			tokenLink := omit, //O
+			choice := omit//O
+		};
+		
+		/**
+		 * @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 := *):= {
+			resourceName := p_name,//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
+			roleID := ?, //M
+			issuer := ?, //M
+			holder := ?, //M
+			notBefore := ?,//M
+			notAfter := ?,//M
+			roleName := omit, //O
+			tokenLink := omit, //O
+			choice := omit//O
+		};
+		
+		/**
+		 * @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):= {
+			resourceName := p_name,//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
+			tokenID := "roleID@a.b", //M
+			tokenObject := {alt_ := "oneM2M.oneM2M.oneM2M"}, //M
+			version := omit, //O
+			issuer := omit, //O
+			holder := omit, //O
+			notBefore := omit,//O
+			notAfter := omit,//O
+			tokenName := omit,//O
+			audience := omit,//O
+			permissions := omit,//O
+			extension_ := omit,//O
+			choice := omit//O
+		};
+		
+		/**
+		 * @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 := *):= {
+			resourceName := p_name,//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
+			tokenID := ?, //M
+			tokenObject := ?, //M
+			version := omit, //O
+			issuer := omit, //O
+			holder := omit, //O
+			notBefore := omit,//O
+			notAfter := omit,//O
+			tokenName := omit,//O
+			audience := omit,//O
+			permissions := omit,//O
+			extension_ := omit,//O
+			choice := omit//O
+		};
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for BinarySwitch resource
+		 * @param 
+		 */
+		template BinarySwitch_optional mw_contentBinarySwitchBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			powerState := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for FaultDetection resource
+		 * @param 
+		 */
+		template FaultDetection_optional mw_contentFaultDetectionBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			status := ?,//M
+			code := *,//O
+			description := *,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for RunState resource
+		 * @param 
+		 */
+		template RunState_optional mw_contentRunStateBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+ 			currentMachineState := ?,//M 
+			machineStates := ?,//M
+		    currentJobState := *,//O
+			jobStates := *,//O
+			progressPercentage := *,//O
+			choice := omit//NP
+		};
+
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Battery resource
+		 * @param 
+		 */
+		template Battery_optional mw_contentBatteryBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			level := ?,//M
+			capacity := *,//O
+			charging := *,//O
+			discharging := *,//O
+			lowBattery := *,//O
+			batteryThreshold := *,//O
+			electricEnergy := *,//O
+			voltage := *,//O
+			material := *,//O
+			choice := omit//NP
+		};
+
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for ElectricVehicleConnector resource
+		 * @param 
+		 */
+		template ElectricVehicleConnector_optional mw_contentElectricVehicleConnectorBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			status := ?,//M
+			chargingCapacity := *,//O
+			dischargingCapacity := *,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for EnergyConsumption resource
+		 * @param 
+		 */
+		template EnergyConsumption_optional mw_contentEnergyConsumptionBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			power := ?,//M
+			absoluteEnergyConsumption := *,//O
+			roundingEnergyConsumption := *,//O
+			significantDigits := *,//O
+			multiplyingFactors := *,//O
+			voltage := *,//O
+			current := *,//O
+			frequency := *,//O
+			measuringScope := *,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Temperature resource
+		 * @param 
+		 */
+		template Temperature_optional mw_contentTemperatureBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			currentTemperature := ?,//M
+			targetTemperature := *,//O
+			unit := *,//O
+			minValue := *,//O
+			maxValue := *,//O
+			stepValue := *,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Turbo resource
+		 * @param 
+		 */
+		template Turbo_optional mw_contentTurboBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			turboEnabled := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for AirFlow resource
+		 * @param 
+		 */
+		template AirFlow_optional mw_contentAirFlowBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			speed := ?,//M
+			minSpeed := *,//O
+			maxSpeed := *,//O
+			verticalDirection := *,//O
+			supportedVerticalDirection := *,//O
+			horizontalDirection := *,//O
+			supportedHorizontalDirection := *,//O
+			automode := *,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for SpinLevel resource
+		 * @param 
+		 */
+		template SpinLevel_optional mw_contentSpinLevelBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			spinLevelStrength := ?,//M
+			choice := omit//NP
+		};
+	
+		/**
+		 * @desc Base primitiveContent for CREATE operation for WaterFlow resource
+		 * @param 
+		 */
+		template WaterFlow_optional mw_contentWaterFlowBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+		 	waterFlowStrength := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for TelevisionChannel resource
+		 * @param 
+		 */
+		template TelevisionChannel_optional mw_contentTelevisionChannelBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			channelId := ?,//M
+			availableChannels := *,//O
+			previousChannel := *,//O
+			channelName := *,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Brightness resource
+		 * @param 
+		 */
+		template Brightness_optional mw_contentBrightnessBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			brightness := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Colour resource
+		 * @param 
+		 */
+		template Colour_optional mw_contentColourBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			red := ?,//M
+			green := ?,//M
+			blue := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for ColourSaturation resource
+		 * @param 
+		 */
+		template ColourSaturation_optional mw_contentColourSaturationBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			colourSaturation := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for DoorStatus resource
+		 * @param 
+		 */
+		template DoorStatus_optional mw_contentDoorStatusBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			doorState := ?,//M
+			openDuration := *,//O
+			openAlarm := *,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for PowerSave resource
+		 * @param 
+		 */
+		template PowerSave_optional mw_contentPowerSaveBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			powerSaveEnabled := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for MediaInput resource
+		 * @param 
+		 */
+		template MediaInput_optional mw_contentMediaInputBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			mediaID := ?,//M
+			supportedMediaSources := ?,//M
+			mediaName := *,//O
+			status := *,//O
+			mediaType := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for AudioVolume resource
+		 * @param 
+		 */
+		template AudioVolume_optional mw_contentAudioVolumeBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			volumePercentage := ?,//M
+			stepValue := *,//O
+			maxValue := *,//O
+			muteEnabled := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Boiler resource
+		 * @param 
+		 */
+		template Boiler_optional mw_contentBoilerBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			status := ?,//M
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for Clock resource
+		 * @param 
+		 */
+		template Clock_optional mw_contentClockBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			currentTime := ?,//M
+			currentDate := ?,//M
+			currentTimeZone := *,//O
+			choice := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for HotWaterSupply resource
+		 * @param 
+		 */
+		template HotWaterSupply_optional mw_contentHotWaterSupplyBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := omit,//NP
+			creator := *,//O
+			containerDefinition := ?,//M
+			ontologyRef := *,//O
+			contentSize := omit,//NP
+			nodeLink := *,//O
+			bath := *,//O
+			choice := omit//NP
+		};
+	
+	}//end group ContentCreate
+	
+	group ContentUpdate {
+		
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for AE resource
+		 */
+		template (value) AE_optional m_contentUpdateAe := {
+			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
+			appName := omit,//O
+			app_ID := omit,//NP
+			aE_ID := omit,//NP
+			pointOfAccess := omit,//O
+			ontologyRef := omit,//O
+			nodeLink := omit,//O
+			requestReachability := omit,//O
+			contentSerialization := 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
+			choice := omit //NP
+		};	
+    	
+		/**
+		 * @desc Base reception primitiveContent for UPDATE operation for AE resource
+		 */
+		template AE_optional mw_contentUpdateAe modifies mw_contentAe_any := {
+			resourceName := omit,//NP
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			app_ID := omit,//NP
+			aE_ID := omit//NP
+		};
+
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for AccessControlPolicy resource
+		 */
+		template (value) AccessControlPolicy_optional m_contentUpdateAcp := {
+			resourceName := omit,//NP
+			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
+			privileges := omit,//O
+			selfPrivileges := omit,//O
+			authorizationDecisionResourceIDs := omit,//O
+			authorizationPolicyResourceIDs := omit,//O
+			authorizationInformationResourceIDs := omit,//O	
+			choice := omit //NP
+		};
+		
+		template (value) AccessControlPolicy_optional m_contentUpdateAcpPrivileges(in template(omit) SetOfAcrs p_privileges, in template(omit) SetOfAcrs p_selfPrivileges) modifies m_contentUpdateAcp := {
+			privileges := p_privileges,//O
+			selfPrivileges := p_selfPrivileges//O
+		};
+    	
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for GenericInterworkingService resource
+		 */
+		template (value) GenericInterworkingService_optional m_contentUpdateGenericInterworkingService := {
+			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
+			stateTag := omit,//NP
+			creator := omit,//NP
+			containerDefinition := omit,//NP
+			ontologyRef := omit,//O
+			contentSize := omit,//NP
+			serviceName := omit,//NP
+			inputDataPointLinks := omit,//O
+			outputDataPointLinks := omit,//O
+			choice := omit//NP
+		};
+		  	
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for GenericInterworkingService_invalid resource
+		 */
+		template (value) GenericInterworkingService_invalid m_contentUpdateGenericInterworkingService_invalid := {
+			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
+			stateTag := omit,//NP
+			creator := omit,//NP
+			containerDefinition := omit,//NP
+			ontologyRef := omit,//O
+			contentSize := omit,//NP
+			serviceName := omit,//NP
+			expirationCounter:= omit,//Invalid attribute
+			inputDataPointLinks := omit,//O
+			outputDataPointLinks := omit,//O
+			choice := omit//NP
+		};
+
+        /**
+		 * @desc Base primitiveContent for UPDATE operation for Group resource
+		 */
+		template (value) Group_optional m_contentUpdateGroup := {
+			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
+			creator := omit,//NP
+			memberType := omit,//NP
+			specializationType := omit,//NP
+			currentNrOfMembers := omit,//NP
+			maxNrOfMembers := omit,//O
+			memberIDs := omit,//O
+			membersAccessControlPolicyIDs := omit,//O
+			memberTypeValidated := omit,//NP
+			consistencyStrategy := omit,//NP
+			groupName := omit,//O
+			semanticSupportIndicator := omit,//O
+			notifyAggregation := omit,//O
+			choice := omit//NP
+
+		};
+		
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for CSEBase resource
+		 */
+		template (value) CSEBase_optional m_contentUpdateCSEBase := {
+			resourceName := omit,
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			accessControlPolicyIDs := omit,
+			cseType := omit,
+			cSE_ID := omit,
+			supportedResourceType := omit,
+			pointOfAccess := omit,
+			nodeLink := omit,
+			dynamicAuthorizationConsultationIDs := omit,
+			contentSerialization := omit,
+			e2eSecInfo := omit, 
+			supportedReleaseVersions := omit,
+			choice := omit
+
+		};
+    	
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for PollingChannel resource
+		 */
+		template (value) PollingChannel_optional m_contentUpdatePollingChannel := {
+			resourceName := omit,//NP
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			expirationTime := omit,//O
+			choice := omit
+		};
+    	
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for Schedule resource
+		 */
+		template (value) Schedule_optional m_contentUpdateSchedule := {
+			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
+			scheduleElement := omit,//O
+			networkCoordinated := omit,//O
+			choice := omit//NP
+		};
+    	
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for Subscription resource
+		 */
+		template (value) Subscription_optional m_contentUpdateSubscription := {
+			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
+			creator := omit,//NP
+			eventNotificationCriteria := omit,//O
+			expirationCounter := omit,//O
+			notificationURI := omit,//O
+			groupID := omit,//O
+			notificationForwardingURI := omit,//O
+			batchNotify := omit,//O
+			rateLimit := omit,//O
+			preSubscriptionNotify := omit,//NP
+			pendingNotification := omit,//O
+			notificationStoragePriority := omit,//O
+			latestNotify := omit,//O
+			notificationContentType := omit,//O
+			notificationEventCat := omit,//O
+			subscriberURI := omit,//NP
+			associatedCrossResourceSub := omit,//O
+			choice := omit//NP
+		};
+				
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for Container resource
+		 */
+		template (value) Container_optional m_contentUpdateContainer := {
+			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
+			stateTag := omit,//NP
+			creator := omit,//NP
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			locationID := omit,//O
+			ontologyRef := omit,//O
+    		disableRetrieval := omit, //NP
+			choice := omit//NP
+		};
+		
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for ContentInstance resource
+		 */
+		template (value) ContentInstance_optional m_contentUpdateContentInstance := {
+			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) := {
+    	  	resourceName 			:= omit,//NP
+    	  	resourceType			:= omit,//NP
+    	    resourceID				:= omit,//NP
+    	    parentID				:= omit,//NP
+    	  	creationTime			:= omit,//NP
+    	  	lastModifiedTime		:= omit,//NP
+    	  	labels 					:= PX_LABELS,//O
+    	  	accessControlPolicyIDs 	:= p_accessControlPolicyIds,//O
+    	  	expirationTime 			:= omit,//O    	  	
+    		dynamicAuthorizationConsultationIDs := omit, //O
+    	  	announceTo 				:= omit,//O
+    	  	announcedAttribute		:= omit,//O
+    		locationSource 			:= omit,//NP
+			locationInformationType := omit,//O
+			locationUpdatePeriod 	:= {p_locationUpdatePeriod}, //O
+    		locationTargetID 		:= omit, //NP
+    		locationServer 			:= omit, //NP
+    		locationContainerID		:= omit, //NP  
+    		locationContainerName 	:= PX_LOCATION_CONTAINER_NAME, //O    		 		
+    	  	locationStatus			:= omit, //NP
+			geographicalTargetArea := omit, //O
+			geofenceEventCriteria := omit, //O
+			authID := omit, //O
+			retrieveLastKnownLocation := omit, //O
+			locationUpdateEventCriteria := omit, //O
+			choice 					:= omit  //NP	   	  	
+    	};
+    	
+    	template (value) Node_optional m_contentUpdateNode := {
+			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
+			hostedAELinks := omit,//O
+			hostedServiceLinks := omit,//O
+			mgmtClientAddress := omit,//O
+			roamingStatus := omit,//O
+			networkID := omit,//O
+			choice := omit
+    	}
+    	
+    	template (value) RemoteCSE_optional m_contentUpdateRemoteCSE := {
+			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
+			contentSerialization := omit,//O
+			e2eSecInfo := omit,//O
+			descendantCSEs := omit,//O
+			supportedReleaseVersions := omit, //O
+			multicastCapability := omit,//O
+			externalGroupID := omit,//O
+			triggerEnable := omit,//O
+			activityPatternElements := omit,//O
+			choice := omit
+    	}
+    	
+		template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
+			resourceName := omit,
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			accessControlPolicyIDs := omit,
+			expirationTime := omit,
+			link := omit,
+			dynamicAuthorizationConsultationIDs := omit,
+			appName := omit,
+			app_ID := omit,
+			aE_ID := omit,
+			pointOfAccess := omit,
+			ontologyRef := omit,
+			nodeLink := omit,
+			requestReachability := omit,
+			contentSerialization := omit,
+			e2eSecInfo := omit,
+			supportedReleaseVersions := omit,
+			registrationStatus := omit,//O
+			trackRegistrationPoints := omit,//O
+			sessionCapabilities := omit,//O
+			triggerEnable := omit,//O
+			activityPatternElements := omit,//O
+			choice := omit
+    	}
+    	
+		template (value) ContainerAnnc_optional m_contentUpdateContainerAnnc := {
+			resourceName := omit,
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			accessControlPolicyIDs := omit,
+			expirationTime := omit,
+			link := omit,
+			dynamicAuthorizationConsultationIDs := omit,
+			stateTag := omit,
+			maxNrOfInstances := omit,
+			maxByteSize := omit,
+			maxInstanceAge := omit,
+			currentNrOfInstances := omit,
+			currentByteSize := omit,
+			locationID := omit,
+			ontologyRef := omit,
+			disableRetrieval := omit,
+			choice := omit
+		};
+		
+		template (value) GroupAnnc_optional m_contentUpdateGroupAnnc := {
+			resourceName := omit,
+		  	resourceType := omit,
+		  	resourceID := omit,
+		  	parentID := omit,
+		  	creationTime := omit,
+		  	lastModifiedTime := omit,
+		  	labels := omit,
+		  	accessControlPolicyIDs := omit,
+		  	expirationTime := omit,
+		  	link := omit,
+		  	dynamicAuthorizationConsultationIDs := omit,
+		  	memberType := omit,
+			specializationType := omit,
+			currentNrOfMembers := omit, 
+		  	maxNrOfMembers := omit,
+		  	memberIDs := omit, 
+		  	membersAccessControlPolicyIDs := omit,
+		  	memberTypeValidated := omit,
+		  	consistencyStrategy := omit, 
+		  	groupName := omit, 
+		  	semanticSupportIndicator := omit,
+		  	notifyAggregation := omit,
+		  	choice := omit
+		};	
+		
+    			
+		/**
+		 * @desc 	Base primitiveContent for UPDATE operation for SemanticDescriptor resource
+		 */
+		template (value) SemanticDescriptor_optional m_contentUpdateSemanticDescriptor := {			
+			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
+			announceTo := omit,                             //O
+			announcedAttribute := omit,                     //O
+			creator := omit,                                //O
+			descriptorRepresentation := omit,               //M
+			semanticOpExec := omit,                         //NP
+			descriptor := omit,                             //M
+			ontologyRef := omit,                            //O
+			relatedSemantics := omit,                       //O
+			semanticValidated := omit,                      //NP
+			validationEnable := omit,                       //O
+			choice := omit//O
+		} 
+		
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for TimeSeries resource
+		 */
+		template (value) TimeSeries_optional m_contentUpdateTimeSeries := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			creator := omit,//O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			contentInfo := omit,//O
+			choice := omit//NP
+		};
+		
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for TimeSeriesInstance resource
+		 */
+		template (value) TimeSeriesInstance_optional m_contentUpdateTimeSeriesInstance := {
+			resourceName := omit,
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			expirationTime := omit,
+			announceTo := omit,
+			announcedAttribute := omit,
+			dataGenerationTime := omit,
+			content := omit,
+			sequenceNr := omit,
+			contentSize := omit,
+			choice := omit
+		};
+		
+		/**
+		 * @desc Base primitiveContent for UPDATE operation for TimeSeriesInstance resource
+		 */
+		template (value) Role_optional m_contentUpdateRole := {
+			resourceName := omit,
+			resourceType := omit,
+			resourceID := omit,
+			parentID := omit,
+			creationTime := omit,
+			lastModifiedTime := omit,
+			labels := omit,
+			accessControlPolicyIDs := omit,
+			expirationTime := omit,
+			dynamicAuthorizationConsultationIDs := omit,
+			roleID := omit,
+			issuer := omit,
+			holder := omit,
+			notBefore := omit,
+			notAfter := omit,
+			roleName := omit,
+			tokenLink := omit,
+			choice := omit
+		};
+		/**
+		 * @desc Base primitiveContent for CREATE operation for SemanticMashupJobProfile resource
+		 */   	
+		template (value) SemanticMashupJobProfile_optional m_contentUpdateSemanticMashupJobProfile := {		
+			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
+			announceTo := omit,	//O
+			announcedAttribute := omit,	//O
+			creator := omit,	//O
+			memberFilter := omit,	//M
+			smiID := omit,	//O
+			inputDescriptor := omit,	//O
+			outputDescriptor := omit,	//O
+			functionDescriptor := omit	//O
+		}
+		
+		/**
+		 * @desc Base primitiveContent for CREATE operation for SemanticMashupInstance resource
+		 */    	
+		template (value) SemanticMashupInstance_optional m_contentUpdateSemanticMashupInstance := {
+			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
+			announceTo := omit,	//O
+			announcedAttribute := omit,	//O
+			creator := omit,	//O
+			smjpID := omit,	//O
+			smjpInputParameter := omit,	//O
+			memberStoreType := omit,	//O
+			mashupMember := omit,	//O
+			resultGenType := omit,   //O
+			periodForResultGen := omit	//O
+		} 
+	}//end group ContentUpdate
+	
+	group ContentRetrieve {
+		/**
+		  * @desc Base primitiveContent for DELETE operation for PollingChannel resource
+		 */
+		template (value) PollingChannel_optional m_contentRetrievePollingChannel := {
+			resourceName := omit,//NP
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			expirationTime := omit,//O
+			choice := omit//NP
+		};
+	}
+	
+	group ContentDelete {
+		
+		/**
+		  * @desc Base primitiveContent for DELETE operation for PollingChannel resource
+		 */
+		template (value) PollingChannel_optional m_contentDeletePollingChannel := {
+			resourceName := omit,//NP
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			expirationTime := omit,//O
+			choice := omit//NP
+		};
+				
+	} //end group ContentDelete
+
+	group ResponseContent {
+		
+		template AE_optional mw_contentAeBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+    		dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			appName := *,//O
+			app_ID := ?,//M
+			aE_ID := ?,//M
+			pointOfAccess := *,//O
+			ontologyRef := *,//O
+			nodeLink := *,//O
+			requestReachability := ?,//M
+			contentSerialization := *,//O
+			e2eSecInfo := *, //O
+			m2M_Ext_ID := *, //O
+			supportedReleaseVersions := ?,//M
+			registrationStatus := *, //O
+			trackRegistrationPoints := *, //O
+			sessionCapabilities := *, //O
+			triggerEnable := *, //O
+			activityPatternElements := *, //O			
+			choice := *//O
+		};
+    	
+		template (value) AE_optional m_contentAe_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			appName := omit,//O
+			app_ID := omit,//M
+			aE_ID := omit,//M
+			pointOfAccess := omit,//O
+			ontologyRef := omit,//O
+			nodeLink := omit,//O
+			requestReachability := omit,//M
+			contentSerialization := omit,//O
+			e2eSecInfo:= omit, //O
+			m2M_Ext_ID := omit,//O
+			supportedReleaseVersions := omit,//M
+			registrationStatus := omit,//O
+			trackRegistrationPoints := omit,//O
+			sessionCapabilities := omit,//O
+			triggerEnable := omit,//O
+			activityPatternElements := omit,//O
+			choice := omit//O
+		};
+		
+		template AE_optional mw_contentAe_any := {
+			resourceName := *,//M
+			resourceType := *,//M
+			resourceID := *,//M
+			parentID := *,//M
+			creationTime := *,//M
+			lastModifiedTime := *,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//M
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			appName := *,//O
+			app_ID := *,//M
+			aE_ID := *,//M
+			pointOfAccess := *,//O
+			ontologyRef := *,//O
+			nodeLink := *,//O
+			requestReachability := *,//M
+			contentSerialization := *,//O
+			e2eSecInfo:= *, //O
+			m2M_Ext_ID := *, //O
+			supportedReleaseVersions := ?, //M
+			registrationStatus := *, //O
+			trackRegistrationPoints := *, //O
+			sessionCapabilities := *, //O
+			triggerEnable := *, //O
+			activityPatternElements := *, //O
+			choice := *//O
+		};
+    	
+		template AEAnnc_optional mw_contentAeAnnc_base := {
+			resourceName := ?,//M NA
+			resourceType := ?,//M NA
+			resourceID := ?,//M NA
+			parentID := ?,//M NA
+			creationTime := ?,//M NA
+			lastModifiedTime := ?,//M NA
+			labels := *,//O MA
+			accessControlPolicyIDs := *,//O MA Special case: acpi mandatory for announced resources
+			expirationTime := ?,//M MA
+			link := ?,//M,
+			dynamicAuthorizationConsultationIDs := *, //O OA
+			appName := *,//O OA
+			app_ID := *,//M OA
+			aE_ID := *,//M OA
+			pointOfAccess := *,//O OA
+			ontologyRef := *,//O OA
+			nodeLink := *,//O OA
+			requestReachability := *,//M OA
+			contentSerialization := *,//O OA
+			e2eSecInfo:= *, //O MA
+			supportedReleaseVersions := *,//O MA
+			registrationStatus := *,//O,
+			trackRegistrationPoints := *,//O,
+			sessionCapabilities := *,//O,
+			triggerEnable := *,//O,
+			activityPatternElements := *,//O,
+			choice := *//O
+		};
+		
+
+        template AEAnnc_optional mw_contentAeAnnc_any := {
+			resourceName := *,//M
+			resourceType := *,//M
+			resourceID := *,//M
+			parentID := *,//M
+			creationTime := *,//M
+			lastModifiedTime := *,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//M
+			link := *,//M,
+			dynamicAuthorizationConsultationIDs := *, //O
+			appName := *,//O
+			app_ID := *,//M
+			aE_ID := *,//M
+			pointOfAccess := *,//O
+			ontologyRef := *,//O
+			nodeLink := *,//O
+			requestReachability := *,//M
+			contentSerialization := *,//O
+			e2eSecInfo:= *, //O
+			supportedReleaseVersions := ?,//M
+			registrationStatus := *,//O,
+			trackRegistrationPoints := *,//O,
+			sessionCapabilities := *,//O,
+			triggerEnable := *,//O,
+			activityPatternElements := *,//O,
+			choice := *//O
+		};
+
+        template AccessControlPolicy_optional mw_contentAcpBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			expirationTime := ?,//M
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			privileges := ?,//M
+			selfPrivileges := ?,//M
+			authorizationDecisionResourceIDs := *,//O
+			authorizationPolicyResourceIDs := *,//O
+			authorizationInformationResourceIDs := *,//O
+			choice := *//O
+		};
+		
+		template AccessControlPolicy_optional mw_contentAcp_any := {
+			resourceName := *,//M
+			resourceType := *,//M
+			resourceID := *,//M
+			parentID := *,//M
+			creationTime := *,//M
+			lastModifiedTime := *,//M
+			labels := *,//O
+			expirationTime := *,//M
+			announceTo := *,//O
+			announcedAttribute := *,//M
+			privileges := *,//M
+			selfPrivileges := *,//M
+			authorizationDecisionResourceIDs := *,//O
+			authorizationPolicyResourceIDs := *,//O
+			authorizationInformationResourceIDs := *,//O
+			choice := *//O
+		}
+		
+		template AccessControlPolicy_optional mw_contentAcp_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			expirationTime := omit,//M
+			announceTo := omit,//O
+			announcedAttribute := omit,//M
+			privileges := omit,//M
+			selfPrivileges := omit,//M
+			authorizationDecisionResourceIDs := omit,//O
+			authorizationPolicyResourceIDs := omit,//O
+			authorizationInformationResourceIDs := omit,//O
+			choice := omit//O
+		}
+		
+		template (value) LocationPolicy_optional m_contentLocationPolicy_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			locationSource := omit,//M
+			locationInformationType := omit,//O
+			locationUpdatePeriod := omit,//O
+			locationTargetID := omit,//O
+			locationServer := omit,//O
+			locationContainerID := omit,//O
+			locationContainerName := omit,//O
+			locationStatus := omit,//M
+			geographicalTargetArea := omit, //O
+			geofenceEventCriteria := omit, //O
+			authID := omit, //O
+			retrieveLastKnownLocation := omit, //O
+			locationUpdateEventCriteria := omit, //O
+			choice := omit//O
+		}
+		
+		template AccessControlPolicy_optional mw_contentAcp_rc1 modifies mw_contentAcpBase := {
+			choice := omit	//O
+		}
+		
+		template XSD.AnyURI mw_contentAcp_rc2 := ?;
+		
+		template Resource mw_contentAcp_rc3 := {
+			choice := {accessControlPolicy := ?},
+			uRI := ? 	
+		}
+		
+		template AccessControlPolicy_optional mw_contentAcp_rc4 modifies mw_contentAcpBase := {
+			choice := {choice_list := ?}	//O
+		}
+		
+		template AccessControlPolicy_optional mw_contentAcp_rc5 modifies mw_contentAcpBase := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template AccessControlPolicy_optional mw_contentAcp_rc6 modifies mw_contentAcp_allOmit := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template AccessControlPolicy_optional mw_contentAcp_rc7 modifies mw_contentAcpBase := {
+			
+		}
+		
+		template AccessControlPolicy_optional mw_contentAcp_rc8 modifies mw_contentAcp_allOmit := {
+			choice := {choice_list := ?}	//O
+		}
+		
+	   template AccessControlPolicyAnnc_optional mw_contentAcpAnncBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			expirationTime := ?,//M
+			link := ?,//M
+			privileges := ?,//M
+			selfPrivileges := ?,//M
+			authorizationDecisionResourceIDs := *,//O
+			authorizationPolicyResourceIDs := *,//O
+			authorizationInformationResourceIDs := *,//O
+			choice := *//O
+		};
+    	
+		template Group_optional mw_contentGroupBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+    		dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			creator := *,//O
+			memberType := ?,//M
+			specializationType := *,//O
+			currentNrOfMembers := ?,//M
+			maxNrOfMembers := ?,//M
+			memberIDs := ?,//M
+			membersAccessControlPolicyIDs := *,//O
+			memberTypeValidated := *,//O
+			consistencyStrategy := *,//O
+			groupName := *,//O
+			semanticSupportIndicator := *,//O
+			notifyAggregation := *,//O
+			choice := *//O
+		};
+		
+		template Group_optional mw_contentGroup_any := {
+			resourceName := *,//M
+			resourceType := *,//M
+			resourceID := *,//M
+			parentID := *,//M
+			creationTime := *,//M
+			lastModifiedTime := *,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//M
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//M
+			creator := *,//O
+			memberType := *,//M
+			specializationType := *,//O
+			currentNrOfMembers := *,//M
+			maxNrOfMembers := *,//M
+			memberIDs := *,//M
+			membersAccessControlPolicyIDs := *,//O
+			memberTypeValidated := *,//M
+			consistencyStrategy := *,//O
+			groupName := *,//O
+			semanticSupportIndicator := *,//O
+			notifyAggregation := *,//O
+			choice := *//O
+		}
+		
+		template Group_optional mw_contentGroup_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//M
+			creator := omit,//O
+			memberType := omit,//M
+			specializationType := omit,//O
+			currentNrOfMembers := omit,//M
+			maxNrOfMembers := omit,//M
+			memberIDs := omit,//M
+			membersAccessControlPolicyIDs := omit,//O
+			memberTypeValidated := omit,//M
+			consistencyStrategy := omit,//O
+			groupName := omit,//O
+			semanticSupportIndicator := omit,//O
+			notifyAggregation := omit,//O
+			choice := omit//O
+		}
+		
+		template Group_optional mw_contentGroup_rc1 modifies mw_contentGroupBase := {
+			choice := omit	//O
+		}
+		
+		template XSD.AnyURI mw_contentGroup_rc2 := ?; 
+		
+		template Resource  mw_contentGroup_rc3 := {
+			choice := {group_ := ?},
+			uRI := ?
+		}
+		
+		template Group_optional mw_contentGroup_rc4 modifies mw_contentGroupBase := {
+			choice := {choice_list := {{subscription := ?}}}	//O
+		}
+		
+		template Group_optional mw_contentGroup_rc5 modifies mw_contentGroupBase := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template Group_optional mw_contentGroup_rc6 modifies mw_contentGroup_allOmit := { 
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template Group_optional mw_contentGroup_rc7 modifies mw_contentGroupBase := {
+			
+		}
+		
+		template Group_optional mw_contentGroup_rc8 modifies mw_contentGroup_allOmit := {
+			choice := {choice_list := ?}	//O
+		}
+		
+		template GroupAnnc_optional mw_contentGroupAnncBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+			link := ?,//M
+			dynamicAuthorizationConsultationIDs := *, //O
+			memberType := *,//O
+			specializationType := *,//O
+			currentNrOfMembers := *,//O
+			maxNrOfMembers := *,//O
+			memberIDs := *,//O
+			membersAccessControlPolicyIDs := *,//O
+			memberTypeValidated := *,//O
+			consistencyStrategy := *,//O
+			groupName := *,//O
+			semanticSupportIndicator := *,//O
+			notifyAggregation := *,//O
+			choice := *//O
+		};
+		
+		template (value) MgmtCmd_optional m_contentMgmtCmd_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			description := omit,//O
+			cmdType := omit,//M
+			execReqArgs := omit,//O
+			execEnable := omit,//M
+			execTarget := omit,//M
+			execMode := omit,//O
+			execFrequency := omit,//O
+			execDelay := omit,//O
+			execNumber := omit,//O
+			choice := omit//M
+		}
+    	
+		template PollingChannel_optional mw_contentPollingChannelBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			expirationTime := ?,//M
+			choice := omit//NP
+		};
+		
+		template PollingChannel_optional mw_contentPollingChannel_any := {
+			resourceName := *,//M
+			resourceType := *,//M
+			resourceID := *,//M
+			parentID := *,//M
+			creationTime := *,//M
+			lastModifiedTime := *,//M
+			labels := *,//O
+			expirationTime := *,//M
+			choice := omit//NP
+		};
+		
+		template PollingChannel_optional mw_contentPollingChannel_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			expirationTime := omit,//M
+			choice := omit//NP
+		};
+		
+		template PollingChannel_optional mw_contentPollingChannel_rc1 modifies mw_contentPollingChannelBase := {
+		}
+		
+		template XSD.AnyURI mw_contentPollingChannel_rc2 := ?; 
+		
+		template Resource  mw_contentPollingChannel_rc3 := {
+			choice := {pollingChannel := ?},
+			uRI := ?
+		}
+		
+		template PollingChannel_optional mw_contentPollingChannel_rc4 modifies mw_contentPollingChannelBase := {
+		}
+		
+		template PollingChannel_optional mw_contentPollingChannel_rc5 modifies mw_contentPollingChannelBase := {
+		}
+		
+		template PollingChannel_optional mw_contentPollingChannel_rc6 modifies mw_contentPollingChannel_allOmit := { 
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template PollingChannel_optional mw_contentPollingChannel_rc8 modifies mw_contentPollingChannel_allOmit := {
+			choice := {choice_list := ?}	//O
+		}
+
+		template (value) RemoteCSE_optional m_contentRemoteCSE_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			cseType := omit,//O
+			pointOfAccess := omit,//O
+			cSEBase := omit,//M
+			cSE_ID := omit,//M
+			m2M_Ext_ID := omit,//O
+			trigger_Recipient_ID := omit,//O
+			requestReachability := omit,//M
+			nodeLink := omit,//O
+			triggerReferenceNumber := omit,//O
+			contentSerialization := omit,//O
+			e2eSecInfo := omit,//O
+			descendantCSEs := omit,//O
+			supportedReleaseVersions := omit,//M
+			multicastCapability := omit,//O
+			externalGroupID := omit,//O
+			triggerEnable := omit,//O
+			activityPatternElements := omit,//O
+			choice := omit//O
+		};
+		
+		template (value) RemoteCSE_optional m_contentRemoteCSE_e2eSecInfo (in E2eSecInfo p_e2eSecInfo, in charstring p_pointOfAccess, in CseSimuComponentDesc p_componentDesc)  modifies m_contentRemoteCSE_allOmit := {
+			resourceName := p_componentDesc.cseName,//M
+			resourceType := int16,//M
+			resourceID := p_componentDesc.cseResourceId,//M
+			pointOfAccess := {p_pointOfAccess},//O
+			cSEBase := p_componentDesc.cseId & "/" & p_componentDesc.cseName,//M
+			cSE_ID := p_componentDesc.cseId,//M
+			requestReachability := true,//M
+			e2eSecInfo := p_e2eSecInfo//O
+		};
+		
+		
+		template (value) RemoteCSE_optional m_contentMyRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
+			resourceName := PX_TS_CSE1.cseName,//M
+			resourceType := int16,//M
+			resourceID := PX_TS_CSE1.cseResourceId,//M
+			pointOfAccess := {p_pointOfAccess},//O
+			cSEBase := PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName,//M
+			cSE_ID := PX_TS_CSE1.cseId,//M
+			requestReachability := true//M
+		};
+		
+		template (value) RemoteCSE_optional m_contentLocalRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
+			resourceName := PX_CSE_NAME,//M
+			resourceType := int16,//M
+			resourceID := PX_CSE_RESOURCE_ID,//M
+			pointOfAccess := {p_pointOfAccess},//O
+			cSEBase := PX_CSE_ID & "/" & PX_CSE_NAME,//M
+			cSE_ID := PX_CSE_ID,//M
+			requestReachability := true//M
+		};
+		
+		template RemoteCSE_optional mw_contentRemoteCSEBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			cseType := *,//O
+			pointOfAccess := *,//O
+			cSEBase := ?,//M
+			cSE_ID := ?,//M
+			m2M_Ext_ID := *,//O
+			trigger_Recipient_ID := *,//O
+			requestReachability := ?,//M
+			nodeLink := *,//O
+			triggerReferenceNumber := *,//O
+			contentSerialization := *,//O
+			e2eSecInfo := *,//O
+			descendantCSEs := *,//O
+			supportedReleaseVersions := ?,//M
+			multicastCapability := *,//O
+			externalGroupID := *,//O
+			triggerEnable := *,//O
+			activityPatternElements := *,//O
+			choice := *//O
+		};
+		
+		template Request_optional mw_contentRequestBase := {			
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+			dynamicAuthorizationConsultationIDs := *,//O
+			stateTag := ?,//M
+			operation := ?,//M
+			target := ?,//M
+			originator := ?,//M	
+			requestID := ?,//M
+			metaInformation := ?,//M
+			primitiveContent := *,//O
+			requestStatus := ?,//M
+			operationResult := *,//M
+			choice := *//O
+		};
+		
+		template Schedule_optional mw_contentScheduleBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			scheduleElement := ?,//M
+			networkCoordinated := ?,//M
+			choice := *//O
+		};
+		
+		template Schedule_optional mw_contentSchedule_any := {
+			resourceName := *,//M
+			resourceType := *,//M
+			resourceID := *,//M
+			parentID := *,//M
+			creationTime := *,//M
+			lastModifiedTime := *,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//M
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//M
+			scheduleElement := *,//M
+			networkCoordinated := ?,//M
+			choice := *//O
+		}
+		
+		template Schedule_optional mw_contentSchedule_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//M
+			scheduleElement := omit,//M
+			networkCoordinated := omit,//M
+			choice := omit//O
+		}
+		
+		template Schedule_optional mw_contentSchedule_rc1 modifies mw_contentScheduleBase := {
+			choice := omit	//O
+		}
+		
+		template XSD.AnyURI mw_contentSchedule_rc2 := ?; 
+		
+		template Resource mw_contentSchedule_rc3 := {
+			choice := {schedule := ?},
+			uRI := ?
+		}
+		
+		template Schedule_optional mw_contentSchedule_rc4 modifies mw_contentScheduleBase := {
+			choice := {choice_list := ?}	//O
+		}
+		
+		template Schedule_optional mw_contentSchedule_rc5 modifies mw_contentScheduleBase := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template Schedule_optional mw_contentSchedule_rc6 modifies mw_contentSchedule_allOmit := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template Schedule_optional mw_contentSchedule_rc7 modifies mw_contentScheduleBase := {
+			
+		}
+		
+		template Schedule_optional mw_contentSchedule_rc8 modifies mw_contentSchedule_allOmit := {
+			choice := {choice_list := ?}	//O
+		}
+		
+		template (value) StatsCollect_optional m_contentStatsCollect_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			creator := omit,//O
+			statsCollectID := omit,//M
+			collectingEntityID := omit,//M
+			collectedEntityID := omit,//M
+			statsRuleStatus := omit,//M
+			statModel := omit,//M
+			collectPeriod := omit,//O
+			eventID := omit,//O
+			choice := omit//M
+		}
+		
+		//Ontology Repository Internal resource at CSE as per TS-001
+		template SemanticMashupInstance_optional m_contentSemanticMashupInstance (XSD.ID resourceID := "NotInitialized",
+																				  ResourceName p_resourceName := "NotInitialized",
+																				  NhURI p_parentID := "NotInitialized",
+																				  Timestamp p_expirationTime := "20301231T012345",
+																				  Timestamp p_creationTime := "21001231T012345",
+																				  Timestamp p_lastModifiedTime := "21001231T012345",
+																				  XSD.AnyURI p_smjpID := "NotInitialized",
+		                                                                          MashupMemberStoreType p_memberStoreType := int1,
+																				  MashupResultGenType p_resultGenType := int1 ) := {  //when SMI is created
+
+			resourceName := p_resourceName, //M
+			resourceType := int41, //M
+			resourceID := omit, //M
+			parentID := p_parentID, //M
+			creationTime := p_creationTime, //M
+			lastModifiedTime := p_lastModifiedTime, //M
+			labels := omit, //O
+			accessControlPolicyIDs := omit, //O
+			expirationTime := p_expirationTime, //M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit, //O
+			announcedAttribute := 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
+		};
+		
+		template (value) StatsConfig_optional m_contentStatsConfig_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			creator := omit,//O
+			choice := omit//M
+		}
+    	
+		template Subscription_optional mw_contentSubscriptionBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+    		dynamicAuthorizationConsultationIDs := *, //O
+			creator := *,//O
+			eventNotificationCriteria := *,//O
+			expirationCounter := *,//O
+			notificationURI := ?,//M
+			groupID := *,//O
+			notificationForwardingURI := *,//O
+			batchNotify := *,//O
+			rateLimit := *,//O
+			preSubscriptionNotify := *,//O
+			pendingNotification := *,//O
+			notificationStoragePriority := *,//O
+			latestNotify := *,//O
+			notificationContentType := *,//O
+			notificationEventCat := *,//O
+			subscriberURI := *,//O
+			associatedCrossResourceSub := *,//O
+			choice := *//O
+		};
+		template Subscription_optional mw_contentSubscription_any := {
+			resourceName := *,//M
+			resourceType := *,//M
+			resourceID := *,//M
+			parentID := *,//M
+			creationTime := *,//M
+			lastModifiedTime := *,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//M
+		    dynamicAuthorizationConsultationIDs := *, //O
+			creator := *,//O
+			eventNotificationCriteria := *,//O
+			expirationCounter := *,//O
+			notificationURI := *,//M
+			groupID := *,//O
+			notificationForwardingURI := *,//O
+			batchNotify := *,//O
+			rateLimit := *,//O
+			preSubscriptionNotify := *,//O
+			pendingNotification := *,//O
+			notificationStoragePriority := *,//O
+			latestNotify := *,//O
+			notificationContentType := *,//M
+			notificationEventCat := *,//O
+			subscriberURI := *,//O
+			associatedCrossResourceSub := *,//O
+			choice := *//O
+		}
+		
+		template Subscription_optional mw_contentSubscription_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			creator := omit,//O
+			eventNotificationCriteria := omit,//O
+			expirationCounter := omit,//O
+			notificationURI := omit,//M
+			groupID := omit,//O
+			notificationForwardingURI := omit,//O
+			batchNotify := omit,//O
+			rateLimit := omit,//O
+			preSubscriptionNotify := omit,//O
+			pendingNotification := omit,//O
+			notificationStoragePriority := omit,//O
+			latestNotify := omit,//O
+			notificationContentType := omit,//M
+			notificationEventCat := omit,//O
+			subscriberURI := omit,//O
+			associatedCrossResourceSub := omit,//O
+			choice := omit//O
+		}
+		
+		template (value) Subscription_optional m_contentSubscription modifies mw_contentSubscription_allOmit := {
+			resourceType := int23	//M
+		}
+		
+		template Subscription_optional mw_contentSubscription_rc1 modifies mw_contentSubscriptionBase := {
+			choice := omit	//O
+		}
+		
+		template XSD.AnyURI mw_contentSubscription_rc2 := ?;  
+		
+		template Resource mw_contentSubscription_rc3 := {
+			choice := {subscription := ?},
+			uRI := ?
+		}
+		
+		template Subscription_optional mw_contentSubscription_rc4 modifies mw_contentSubscriptionBase := {
+			choice := { choice_list := {{schedule := ?}}}	//O
+		}
+		
+		template Subscription_optional mw_contentSubscription_rc5 modifies mw_contentSubscriptionBase := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template Subscription_optional mw_contentSubscription_rc6 modifies mw_contentSubscription_allOmit := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template Subscription_optional mw_contentSubscription_rc7 modifies mw_contentSubscriptionBase := {
+			
+		}
+		
+		template Subscription_optional mw_contentSubscription_rc8 modifies mw_contentSubscription_allOmit := {
+			choice := {choice_list := ?}	//O
+		}
+    	
+		template ContentInstance_optional mw_contentContentInstanceBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			expirationTime := ?,//M
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := ?,//M
+			creator := *,//O
+			contentInfo := *,//O
+			contentSize := ?,//M
+			contentRef := *, //O
+			ontologyRef := *,//O
+			content := ?,//M
+			choice := * //O
+			
+		};
+		
+		template ContentInstance_optional mw_contentContentInstance_rc1 modifies mw_contentContentInstanceBase := {
+			choice := omit	//O
+		}
+		
+		template (value) ContentInstance_optional m_contentContentInstance_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit ,//O
+			expirationTime := omit,//M
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//M
+			creator := omit,//O
+			contentInfo := omit,//O
+			contentSize := omit,//M
+			contentRef := omit,
+			ontologyRef := omit,//O
+			content := omit, //M
+			choice := omit
+		};
+		
+		template ContentInstanceAnnc_optional mw_contentContentInstanceAnncBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			expirationTime := ?,//M
+			link := ?,//M
+			stateTag := *,//O
+			contentInfo := *,//O
+			contentSize := *,//O
+			ontologyRef := *,//O
+			content := *,//O
+			choice := * //O
+			
+		};
+		
+		template Container_optional mw_contentContainerBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+    		dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := ?,//M
+			creator := *,//O
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := ?,//M
+			currentByteSize := ?,//M
+			locationID := *,//O
+			ontologyRef := *,//O
+			disableRetrieval := *, //O
+			choice := *//O
+		};
+		
+		template Container_optional mw_contentContainer_any := {
+			resourceName := *,//M
+			resourceType := *,//M
+			resourceID := *,//M
+			parentID := *,//M
+			creationTime := *,//M
+			lastModifiedTime := *,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//M
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//M
+			stateTag := *,//M
+			creator := *,//M
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := *,//M
+			currentByteSize := *,//M
+			locationID := *,//O
+			ontologyRef := *,//O
+			disableRetrieval := *, //O
+			choice := *//O
+		}
+		
+		template Container_optional mw_contentContainer_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//M
+			stateTag := omit,//M
+			creator := omit,//M
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//M
+			currentByteSize := omit,//M
+			locationID := omit,//O
+			ontologyRef := omit,//O
+			disableRetrieval := omit, //O
+			choice := omit//O
+		}
+		
+		template (value) Delivery_optional m_contentDelivery_allOmit := {
+	
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			source := omit,//M
+			target := omit,//M
+			lifespan := omit,//M
+			eventCat := omit,//M
+			deliveryMetaData := omit,//M
+			aggregatedRequest := omit,//M
+			choice := omit//O
+	
+		};    
+		
+		template Container_optional mw_contentContainer_rc1 modifies mw_contentContainerBase := {
+			choice := omit	//O
+		}
+		
+		template XSD.AnyURI mw_contentContainer_rc2 := ?;
+		
+		template Resource mw_contentContainer_rc3 := {
+			choice := {container := ?},
+			uRI := ?
+		}
+		
+		template Container_optional mw_contentContainer_rc4 modifies mw_contentContainerBase := {
+			choice := {choice_list := ?}	//O
+		}
+		
+		template Container_optional mw_contentContainer_rc5 modifies mw_contentContainerBase := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template Container_optional mw_contentContainer_rc6 modifies mw_contentContainer_allOmit := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template Container_optional mw_contentContainer_rc7 modifies mw_contentContainerBase := {
+		
+		}
+		
+		template Container_optional mw_contentContainer_rc8 modifies mw_contentContainer_allOmit := {
+			choice := {choice_list := ?}	//O
+		}
+		
+		template ContainerAnnc_optional mw_contentContainerAnncBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+			link := ?,//M
+			dynamicAuthorizationConsultationIDs := *, //O
+			stateTag := *,//O
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := *,//O
+			currentByteSize := *,//O
+			locationID := *,//O
+			ontologyRef := *,//O
+			disableRetrieval := *, //O
+			choice := *//O
+		};
+		
+		template (value) Notification m_contentNotification_allOmit := {
+			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
+		};
+		
+		template (value) Notification m_contentNotification_subscriptionVerification(XSD.ID p_creator) modifies m_contentNotification_allOmit:= {
+			verificationRequest := true,
+			creator := p_creator
+		};
+		
+		template Notification mw_contentNotification_any := {
+			notificationEvent := *,
+			verificationRequest := *,
+			subscriptionDeletion := *,
+			subscriptionReference := *,
+			creator := *,
+			notificationForwardingURI := *,
+			notificationTarget := *,
+			targetRemovalRequest := *,
+			targetRemovalAllowance := *,
+			iPEDiscoveryRequest := *,
+			aERegistrationPointChange := *,
+			aEReferenceIDChange := *,
+			trackingID1 := *,
+			trackingID2 := *
+		};
+
+		template Notification mw_contentNotificationBase := {
+			notificationEvent := *,//O
+			verificationRequest := *,//O
+			subscriptionDeletion := *,//O
+			subscriptionReference := *,//M //TODO Put it back to ? subscriptionReference is mandatory
+			creator := *,//O
+			notificationForwardingURI := *,//O
+			notificationTarget := *,
+			targetRemovalRequest := *,
+			targetRemovalAllowance := *,
+			iPEDiscoveryRequest := *,//O
+			aERegistrationPointChange := *,//O
+			aEReferenceIDChange := *,//O
+			trackingID1 := *,//O
+			trackingID2 := *//O
+		};
+		
+		template Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := {
+			verificationRequest := true,
+			creator := ?
+		}
+
+
+		template Notification mw_contentNotification (in template  Representation p_representation) modifies mw_contentNotificationBase := {
+			notificationEvent := {
+				representation := p_representation,
+				operationMonitor := *,
+				notificationEventType := ?
+			}
+		};
+		
+		template Representation mw_timeSeriesNotification (TimeSeriesNotification p_timeSeriesNotification) := {
+			timeSeriesNotification := p_timeSeriesNotification
+		}
+		
+		template (value) Node_optional m_contentNode_allOmit := {
+			
+			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,
+			hostedAELinks := omit,//O
+			hostedServiceLinks := omit,//O
+			mgmtClientAddress := omit,//O
+			roamingStatus := omit,//O
+			networkID := omit,//O
+			choice := omit			
+			
+		};
+		
+		template CSEBase_optional mw_contentCSEBaseBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := "",//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			cseType := *,//O
+			cSE_ID := ?,//M
+			supportedResourceType := ?,//M
+			pointOfAccess := ?,//M
+			nodeLink := *,//O
+			dynamicAuthorizationConsultationIDs := *,
+			contentSerialization := *,
+			e2eSecInfo := *,//O			
+			supportedReleaseVersions := ?,//M
+			choice := *//O
+		};
+
+		template CSEBase_optional mw_contentCSEBase_rc1 modifies mw_contentCSEBaseBase := {
+			choice := omit	//O
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_allOmit := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			creator := omit,//M
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//M
+			currentByteSize := omit,//M
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//O
+			missingDataCurrentNr := omit,//O
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			contentInfo := omit,//O
+			choice := omit//O
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeriesBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+			dynamicAuthorizationConsultationIDs := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			creator := *,//O TODO XSD should be changed to optional for creator in TimeSeries
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := ?,//M
+			currentByteSize := ?,//M
+			periodicInterval := *,//O
+			missingDataDetect := *,//O
+			missingDataMaxNr := *,//O
+			missingDataList := *,//O
+			missingDataCurrentNr := *,//O
+			missingDataDetectTimer := *,//O
+			ontologyRef := *,//O
+			contentInfo := *,//O
+			choice := *//O
+		};
+		
+		template TimeSeries_optional mw_contentTimeSeries(in template MissingDataList p_missingDataList := *, in template XSD.NonNegativeInteger p_missingDataCurrentNr := *) modifies mw_contentTimeSeriesBase := {
+			missingDataList := p_missingDataList,
+			missingDataCurrentNr := p_missingDataCurrentNr
+		}
+
+		template TimeSeriesNotification mw_contentTimeSeriesNotification(in template MissingDataList p_missingDataList := *, in template XSD.NonNegativeInteger p_missingDataCurrentNr := *) := {
+			missingDataList := p_missingDataList,
+			missingDataCurrentNr := p_missingDataCurrentNr
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc1 modifies mw_contentTimeSeriesBase := {
+			choice := omit	//O
+		}
+		
+		template XSD.AnyURI mw_contentTimeSeries_rc2 := ?;
+		
+		template Resource mw_contentTimeSeries_rc3 := {
+			choice := {timeSeries := ?},
+			uRI := ?
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc4 modifies mw_contentTimeSeriesBase := {
+			choice := { choice_list := {{subscription := ?}}}	//O
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc5 modifies mw_contentTimeSeriesBase := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc6 modifies mw_contentTimeSeries_allOmit := {
+			choice := {childResource_list := ?}	//O
+		}
+		
+		template TimeSeries_optional mw_contentTimeSeries_rc8 modifies mw_contentTimeSeries_allOmit := {
+			choice := {choice_list := ?}	//O
+		}
+
+		template TimeSeriesAnnc_optional mw_contentTimeSeriesAnncBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := ?,//M
+			link := ?,//M
+			dynamicAuthorizationConsultationIDs := *,//O
+			maxNrOfInstances := *,//O
+			maxByteSize := *,//O
+			maxInstanceAge := *,//O
+			currentNrOfInstances := *,//O
+			currentByteSize := *,//O
+			periodicInterval := *,//O
+			missingDataMaxNr := *,//O
+			missingDataList := *,//O
+			missingDataCurrentNr := *,//O
+			missingDataDetectTimer := *,//O
+			ontologyRef := *,//O
+			contentInfo := *,//O
+			choice := *//O
+		};
+		
+		template TimeSeriesInstance_optional mw_contentTimeSeriesInstanceBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			expirationTime := ?,//M
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			dataGenerationTime := ?,//M
+			content := ?,//M
+			sequenceNr := *,//O
+			contentSize  := ?,//M
+			choice := *//O
+		};
+		
+		template TimeSeriesInstanceAnnc_optional mw_contentTimeSeriesInstanceAnncBase := {
+			resourceName := ?,//M
+			resourceType := ?,//M
+			resourceID := ?,//M
+			parentID := ?,//M
+			creationTime := ?,//M
+			lastModifiedTime := ?,//M
+			labels := *,//O
+			expirationTime := ?,//M
+			link := ?,//M
+			dataGenerationTime := *,//O
+			content := *,//O
+			sequenceNr := *,//O
+			contentSize  := *,//O
+			choice := *//O
+		};
+
+		template (value) Role_optional mw_contentRole_allOmit := {
+			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
+			roleID := omit, //M
+			issuer := omit, //M
+			holder := omit, //M
+			notBefore := omit,//M
+			notAfter := omit,//M
+			roleName := omit, //O
+			tokenLink := omit, //O
+			choice := omit//O
+		}
+		
+		template (value) Token_optional mw_contentToken_allOmit := {
+			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
+			tokenID := omit, //M
+			tokenObject := omit, //M
+			version := omit, //O
+			issuer := omit, //O
+			holder := omit, //O
+			notBefore := omit,//O
+			notAfter := omit,//O
+			tokenName := omit,//O
+			audience := omit,//O
+			permissions := omit,//O
+			extension_ := omit,//O
+			choice := omit//O
+		}
+		template (value) FlexContainerResource_optional m_contentFlexContainer_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit //O
+		}
+		
+		template (present) FlexContainerResource_optional mw_contentFlexContainer(
+																																							template (present) XSD.AnyURI p_ontologyRef := ?
+		) := {
+			resourceName := *,//O
+			resourceType := *,//NP
+			resourceID := *,//NP
+			parentID := *,//NP
+			creationTime := *,//NP
+			lastModifiedTime := *,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			dynamicAuthorizationConsultationIDs := *, //O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			stateTag := *,//NP
+			creator := *,//O
+			containerDefinition := *, //M
+			ontologyRef := *, //O
+			contentSize := *, //NP
+			nodeLink := * //O
+		}
+		
+		template DeviceAirConditioner_optional m_contentDeviceAirConditioner_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceClothesWasherDryer_optional m_contentDeviceClothesWasherDryer_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceElectricVehicleCharger_optional m_contentDeviceElectricVehicleCharger_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceLight_optional m_contentDeviceLight_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceMicrogeneration_optional m_contentDeviceMicrogeneration_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceOven_optional m_contentDeviceOven_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceRefrigerator_optional m_contentDeviceRefrigerator_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceRobotCleaner_optional m_contentDeviceRobotCleaner_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceSmartElectricMeter_optional m_contentDeviceSmartElectricMeter_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceStorageBattery_optional m_contentDeviceStorageBattery_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceTelevision_optional m_contentDeviceTelevision_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceThermostat_optional m_contentDeviceThermostat_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+		
+		template (value) DeviceWaterHeater_optional m_contentDeviceWaterHeater_allOmit := {
+			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
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := omit, //M
+			ontologyRef := omit, //O
+			contentSize := omit, //NP
+			nodeLink := omit, //O
+			choice := omit //NP
+		}
+
+
+	}//end group responseContent
+	
+	group SpecialContents {
+
+		/**
+		 * @desc Base primitiveContent for CREATE operation for GenericInterworkingService resource
+		 * @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, 
+																	in template (omit) AcpType p_accessControlPolicyIds := omit) := {
+			
+			resourceName := p_name,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := omit,//O
+			accessControlPolicyIDs := p_accessControlPolicyIds,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			containerDefinition := PX_CND_GENERIC_INTERWORKING_SERVICE,//M
+			ontologyRef := omit,//O
+			contentSize := omit, //NP
+			serviceName := "MyService",//M??
+			expirationCounter := 1,//Invalid attribute
+			inputDataPointLinks := omit,//O
+			outputDataPointLinks := omit,//O		
+			choice := omit//NP
+			
+		};
+
+		template (value) AE_invalid m_contentUpdateAe_invalid := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			expirationCounter := omit,//Invalid attribute
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			appName := omit,//O
+			app_ID := omit,//M
+			aE_ID := omit,//M
+			pointOfAccess := omit,//O
+			ontologyRef := omit,//O
+			nodeLink := omit,//O
+			requestReachability := omit,//M
+			contentSerialization := omit,//O
+			e2eSecInfo:= omit, //O
+			choice := omit//O
+		};
+    	
+		template (value) AccessControlPolicy_invalid m_contentUpdateAcp_invalid := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			expirationCounter := omit,//Invalid attribute
+			labels := omit,//O
+			expirationTime := omit,//M
+			announceTo := omit,//O
+			announcedAttribute := omit,//M
+			privileges := omit,//M
+			selfPrivileges := omit,//M
+			choice := omit//O
+		};
+    	
+		template (value) Group_invalid m_contentUpdateGroup_invalid := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			expirationCounter := omit,//Invalid attribute
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit,//O
+			announceTo := omit,//O
+			announcedAttribute := omit,//M
+			creator := omit,//O
+			memberType := omit,//M
+			currentNrOfMembers := omit,//M
+			maxNrOfMembers := omit,//M
+			memberIDs := omit,//M
+			membersAccessControlPolicyIDs := omit,//O
+			memberTypeValidated := omit,//M
+			consistencyStrategy := omit,//O
+			groupName := omit,//O
+			semanticSupportIndicator := omit,//O
+			choice := omit//O
+		};
+    	
+		template (value) PollingChannel_invalid m_contentUpdatePollingChannel_invalid := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			expirationCounter := omit,//Invalid attribute
+			labels := omit,//O
+			expirationTime := omit//M
+		};
+    	
+		template (value) Schedule_invalid m_contentUpdateSchedule_invalid := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			expirationCounter := omit,//Invalid attribute
+			labels := omit,//O
+			expirationTime := omit,//M
+			announceTo := omit,//O
+			announcedAttribute := omit,//M
+			scheduleElement := omit,//M
+			choice := omit//O
+		};
+    	
+		template (value) Subscription_invalid m_contentUpdateSubscription_invalid := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			maxNrOfInstances := omit,//Invalid attribute
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			creator := omit,//O
+			eventNotificationCriteria := omit,//O
+			expirationCounter := omit,//O
+			notificationURI := omit,//M
+			groupID := omit,//O
+			notificationForwardingURI := omit,//O
+			batchNotify := omit,//O
+			rateLimit := omit,//O
+			preSubscriptionNotify := omit,//O
+			pendingNotification := omit,//O
+			notificationStoragePriority := omit,//O
+			latestNotify := omit,//O
+			notificationContentType := omit,//M
+			notificationEventCat := omit,//O
+			subscriberURI := omit,//O
+			choice := omit//O
+		};
+		
+		template (value) Container_invalid m_contentUpdateContainer_invalid := {
+			resourceName := omit,//M
+			resourceType := omit,//M
+			resourceID := omit,//M
+			parentID := omit,//M
+			creationTime := omit,//M
+			lastModifiedTime := omit,//M
+			expirationCounter := omit,//Invalid attribute
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//M
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//M
+			stateTag := omit,//M
+			creator := omit,//M
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//M
+			currentByteSize := omit,//M
+			locationID := omit,//O
+			ontologyRef := omit,//O
+			disableRetrieval := omit, //O
+			choice := omit//O
+		};	
+		
+		template (value) TimeSeries_invalid m_contentUpdateTimeSeries_invalid := {
+			resourceName := omit,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			expirationCounter := omit,//Field not existing in container resource
+			labels := omit,//O
+			accessControlPolicyIDs := omit,//O
+			expirationTime := omit,//O
+			dynamicAuthorizationConsultationIDs := omit, //O
+			announceTo := omit,//O
+			announcedAttribute := omit,//O
+			stateTag := omit,//NP
+			creator := omit,//O
+			maxNrOfInstances := omit,//O
+			maxByteSize := omit,//O
+			maxInstanceAge := omit,//O
+			currentNrOfInstances := omit,//NP
+			currentByteSize := omit,//NP
+			periodicInterval := omit,//O
+			missingDataDetect := omit,//O
+			missingDataMaxNr := omit,//O
+			missingDataList := omit,//NP
+			missingDataCurrentNr := omit,//NP
+			missingDataDetectTimer := omit,//O
+			ontologyRef := omit,//O
+			contentInfo := omit,//O
+			choice := omit//NP
+		};	
+				
+	}//end group SpecialContents
+	
+	group ResponsePrimitives {
+		
+		/**
+		 * @desc  Base template for sending ResponsePrimitive
+		 * @param p_statusCode	Status code
+		 * @param p_requestId	Request ID of the corresponding request
+		 */
+		template (value) ResponsePrimitive m_responsePrimitive(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (omit) PrimitiveContent p_content := omit) := {
+			responseStatusCode := p_statusCode,
+			requestIdentifier := p_requestId,
+			primitiveContent := p_content,
+			to_ := omit,
+			from_ := omit,
+			originatingTimestamp := omit,
+			resultExpirationTimestamp := omit,
+			eventCategory := omit,
+			contentStatus := omit,
+			contentOffset := omit,
+			assignedTokenIdentifiers := omit,
+			tokenRequestInformation := omit,
+			authorSignReqInfo := omit,
+			releaseVersionIndicator := PX_RELEASE_VERSION,
+			vendorInformation := omit
+		};
+		
+		/**
+		 * @desc  Base template for sending ResponsePrimitive
+		 * @param p_statusCode	Status code
+		 * @param p_requestId	Request ID of the corresponding request
+		 */
+		template (value) ResponsePrimitive m_responsePrimitive_content(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
+			primitiveContent := p_content			
+		}
+		
+		template ResponsePrimitive mw_responsePrimitiveforInfoPort := ?;
+		
+		template RequestPrimitive mw_requestPrimitiveforInfoPort := ?;
+		
+		template ResponsePrimitive mw_responsePrimitive(in template  ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
+			responseStatusCode := p_statusCode,
+			requestIdentifier := ?,
+			primitiveContent := p_content,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+			
+    	};
+    	
+		/**
+		 * @desc Base Reception template for request primitive
+		 */
+		template RequestPrimitive mw_requestPrimitive(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
+			operation := ?,
+			to_ := p_to,
+			from_ := p_from,
+			requestIdentifier := ?,
+			resourceType := *,
+			primitiveContent := *,
+			roleIDs := *,
+			originatingTimestamp := *,
+			requestExpirationTimestamp := *,
+			resultExpirationTimestamp := *,
+			operationExecutionTime := *,
+			responseType := *,
+			resultPersistence := *,
+			resultContent := *,
+			eventCategory := *,
+			deliveryAggregation := *,
+			groupRequestIdentifier := *,
+			filterCriteria := *,
+			desiredIdentifierResultType := *,
+			tokens := *,
+			tokenIDs := *,
+			localTokenIDs := *,
+			tokenRequestIndicator := *,
+			groupRequestTargetMembers := *,
+			authorSignIndicator := *,
+			authorSigns := *,
+			authorRelIndicator := *,
+			semanticQueryIndicator := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+		}
+    	
+		template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := {
+			responseStatusCode := complement(p_statusCode),
+			requestIdentifier := ?,
+			primitiveContent := *,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+			
+		};
+    	
+    	template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
+			responseStatusCode := (int2000, int2001, int2002, int2004),
+			requestIdentifier := ?,
+			primitiveContent := p_content,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+    	};
+        		 
+    	template ResponsePrimitive mw_responsePrimitiveKO := {
+ 			responseStatusCode := complement(int2000, int2001, int2002, int2004),
+			requestIdentifier := ?,
+			primitiveContent := *,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+    	};
+    	
+    	template ResponsePrimitive mw_responsePollingResponse (template RequestPrimitive p_requestPrimitive := ?) := {
+			responseStatusCode := int2000,
+			requestIdentifier := ?,
+			primitiveContent := {requestPrimitive := p_requestPrimitive},
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+		};
+    	
+		template ResponsePrimitive mw_responseDiscovery (template URIList p_uriList := ?) := {
+			responseStatusCode := int2000,
+			requestIdentifier := ?,
+			primitiveContent := {uRIList := p_uriList},
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+		};
+    	
+		template (value) ResponsePrimitive m_responseNotification(ResponseStatusCode p_statusCode, in template(omit) PrimitiveContent p_notification := omit) := {
+			responseStatusCode := p_statusCode,
+			requestIdentifier := testcasename() & "-m_responseNotification",
+			primitiveContent := p_notification,
+			to_ := omit,
+			from_ := omit,
+			originatingTimestamp := omit,
+			resultExpirationTimestamp := omit,
+			eventCategory := omit,
+			contentStatus := omit,
+			contentOffset := omit,
+			assignedTokenIdentifiers := omit,
+			tokenRequestInformation := omit,
+			authorSignReqInfo := omit,
+			releaseVersionIndicator := PX_RELEASE_VERSION,
+			vendorInformation := omit
+		};
+		
+		template ResponsePrimitive mw_responseNotify(ResponseStatusCode p_statusCode) := {
+			responseStatusCode := p_statusCode,
+			requestIdentifier := ?,
+			primitiveContent := omit,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+		};
+		
+		/**
+		 * @desc Base primitiveContent for RETRIEVE operation for SemanticMashupResult resource
+		 */
+		template SemanticMashupResult_optional mw_retrievSemanticMashupResult :=
+		{
+			resourceName := ?,
+			resourceType := int42,
+			resourceID := ?,
+			parentID := ?,
+			creationTime := ?,
+			lastModifiedTime := ?,
+			labels := *,
+			accessControlPolicyIDs := *,
+			expirationTime := ?,
+			dynamicAuthorizationConsultationIDs := *,
+			announceTo := *,
+			announcedAttribute := *,
+			creator := *,
+			smjpInputParameter := *,
+			mashupResultFormat := ?,
+			mashupResult := ?
+		}
+			
+		/**
+		 * @desc Base primitiveContent for RETRIEVE operation for SemanticMashupInstance resource
+		 */
+		template SemanticMashupInstance_optional mw_retrievSemanticMashupInstance :=
+		{
+			resourceName := ?,
+			resourceType := int41,
+			resourceID := ?,
+			parentID := ?,
+			creationTime := ?,
+			lastModifiedTime := ?,
+			labels := *,
+			accessControlPolicyIDs := *,
+			expirationTime := ?,
+			dynamicAuthorizationConsultationIDs := *,
+			announceTo := *,
+			announcedAttribute := *,
+			creator := *,
+			smjpID := ?,
+			smjpInputParameter := *,
+			memberStoreType := ?,
+			mashupMember := *,
+			resultGenType := ?,
+			periodForResultGen := *
+		}
+
+		
+			/**
+		 * @desc Base primitiveContent for RETRIEVE operation for SemanticDescriptor resource
+		 */
+		template SemanticDescriptor_optional mw_retrieveSemanticDescriptor :=
+		{
+			resourceName := ?,
+			resourceType := int42,
+			resourceID := ?,
+			parentID := ?,
+			creationTime := ?,
+			lastModifiedTime := ?,
+			labels := *,
+			accessControlPolicyIDs := *,
+			expirationTime := ?,
+			dynamicAuthorizationConsultationIDs := *,
+			announceTo := *,
+			announcedAttribute := *,
+			creator := *,
+			descriptorRepresentation := ?,               
+			semanticOpExec := *,                         
+			descriptor := ?,       
+			ontologyRef := *,                            
+			relatedSemantics := *,                       
+			semanticValidated := *,                      
+			validationEnable := *,
+			choice := *                   
+		}
+
+			
+		/**
+		 * @desc Base primitiveContent for RETRIEVE operation for SemanticMashupJobProfile resource
+		 */
+		template SemanticMashupJobProfile_optional mw_retrievSemanticMashupJobProfile :=
+		{
+			resourceName := ?,
+			resourceType := int40,
+			resourceID := ?,
+			parentID := ?,
+			creationTime := ?,
+			lastModifiedTime := ?,
+			labels := *,
+			accessControlPolicyIDs := *,
+			expirationTime := ?,
+			dynamicAuthorizationConsultationIDs := *,
+			announceTo := *,
+			announcedAttribute := *,
+			creator := *,
+			memberFilter := ?,
+			smiID := *,
+			inputDescriptor := *,
+			outputDescriptor := ?,
+			functionDescriptor := ?
+		}
+    	
+		template ResponsePrimitive mw_responseNotifySecurityInfo(ResponseStatusCode p_statusCode, template SecurityInfo p_securityInfo) := {
+			responseStatusCode := p_statusCode,
+			requestIdentifier := ?,
+			primitiveContent := {securityInfo := p_securityInfo},
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,
+			vendorInformation := *
+		};
+    	
+		group InfoPortTemplates {
+		
+			template MyResource mw_resource := ?;	
+			template integer mw_resourceIndex := ?;	
+			template XSD.ID mw_resourceAddress := ?;
+		
+		}//end group InfoPortTemplates
+    	
+	}//end group ResponsePrimitives	
+	
+	group UpperTester {
+		template (value) UtTriggerPrimitive m_utCreate := {
+			utCommand := omit,
+			requestPrimitive := {
+				operation := int1,
+				to_ := "NotInitialized",
+				from_ := "UNINITIALIZED",
+				requestIdentifier := testcasename() & "-m_utCreate",
+				resourceType := omit,
+				primitiveContent := omit,
+				roleIDs := omit, 
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit, 
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			}, 
+			forcedFields := omit
+		};
+		
+		template (value) UtTriggerPrimitive m_utCreateAe modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateAe",
+				resourceType := int2,
+				primitiveContent := {aE := m_contentAe_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateContainer modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateContainer",
+				resourceType := int3,
+				primitiveContent := {container := valueof(mw_contentContainer_allOmit)}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateContentInstance modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateContentInstance",
+				resourceType := int4,
+				primitiveContent := {contentInstance := m_contentContentInstance_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateSubscription modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateSubscription",
+				resourceType := int23,
+				primitiveContent := {subscription := m_contentSubscription}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateRemoteCSE modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateRemoteCSE",
+				resourceType := int16,
+				primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
+			}
+		}
+ 		
+		template (value) UtTriggerPrimitive m_utCreatePollingChannel modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreatePollingChannel",
+				resourceType := int15,
+				primitiveContent := {pollingChannel := mw_contentPollingChannel_allOmit}
+			}
+		}
+ 		
+		template (value) UtTriggerPrimitive m_utRetrieve(XSD.ID p_targetResourceAddress) := {
+			utCommand := omit,
+			requestPrimitive := {
+				operation := int2,
+				to_ := p_targetResourceAddress,
+				from_ := "UNINITIALIZED",
+				requestIdentifier := "m_utRetrieveResource",
+				resourceType := omit,
+				primitiveContent := omit,
+				roleIDs := omit, 
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit, 
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			}, 
+			forcedFields := omit
+		};
+		
+		template (value) UtTriggerPrimitive m_utRetrievePollingChannelUri(XSD.ID p_targetResourceAddress) modifies m_utRetrieve := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utRetrievePollingChannelUri",
+				resourceType := int15,
+				primitiveContent := {pollingChannel := m_contentRetrievePollingChannel}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utRetrieveRemoteCSE(XSD.ID p_targetResourceAddress) modifies m_utRetrieve := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utRetrieveRemoteCSE",
+				resourceType := int16,
+				primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
+			}
+		}
+
+		template (value) UtTriggerPrimitive m_utUpdate := {
+			utCommand := omit,
+			requestPrimitive := {
+				operation := int3,
+				to_ := "NotInitialized",
+				from_ := "UNINITIALIZED",
+				requestIdentifier := testcasename() & "-m_utUpdate",
+				resourceType := omit,
+				primitiveContent := omit,
+				roleIDs := omit, 
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit, 
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			}, 
+			forcedFields := omit
+		};
+		
+		template (value) UtTriggerPrimitive m_utUpdateAe modifies m_utUpdate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utUpdateContainer",
+				resourceType := int2,
+				primitiveContent := {aE := m_contentUpdateAe}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utUpdateContainer modifies m_utUpdate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utUpdateContainer",
+				resourceType := int3,
+				primitiveContent := {container := m_contentUpdateContainer}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utDelete := {
+			utCommand := omit,
+			requestPrimitive := {
+				operation := int4,
+				to_ := "NotInitialized",
+				from_ := "UNINITIALIZED",
+				requestIdentifier := testcasename() & "-m_utDeleteRequest",
+				resourceType := omit,
+				primitiveContent := omit, 
+				roleIDs := omit, 
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit, 
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			}, 
+			forcedFields := omit
+		};
+		
+		template (value) UtTriggerPrimitive m_utDeleteResource(XSD.ID p_targetResourceAddress) modifies m_utDelete := {
+			requestPrimitive := {
+				to_ := p_targetResourceAddress
+			}
+		};
+		
+		
+		
+		template UtTriggerAckPrimitive mw_utResponseOK := {
+			responseStatusCode := int2000,
+			requestIdentifier := ?,
+			primitiveContent := *,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *, 
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,//FIXME
+			vendorInformation := *
+
+		}
+		
+		template UtTriggerAckPrimitive mw_utResponseKO := {
+			responseStatusCode := int4000,
+			requestIdentifier := ?,
+			primitiveContent := *,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,//FIXME
+			vendorInformation := *
+
+		}
+		
+		template UtTriggerAckPrimitive mw_utResponse(ResponseStatusCode p_statusCode) := {
+			responseStatusCode := p_statusCode,
+			requestIdentifier := ?,
+			primitiveContent := *,
+			to_ := *,
+			from_ := *,
+			originatingTimestamp := *,
+			resultExpirationTimestamp := *,
+			eventCategory := *,
+			contentStatus := *,
+			contentOffset := *,
+			assignedTokenIdentifiers := *,
+			tokenRequestInformation := *,
+			authorSignReqInfo := *,
+			releaseVersionIndicator := ?,//FIXME
+			vendorInformation := *
+
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateRole modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateRole",
+				resourceType := int31,
+				primitiveContent := {role := valueof(mw_contentRole_allOmit)}
+	 }	
+		}
+	
+		template (value) UtTriggerPrimitive m_utCreateToken modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateToken",
+				resourceType := int32,
+				primitiveContent := {token := valueof(mw_contentToken_allOmit)}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateFlexContainer modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateFlexContainer",
+				resourceType := int28,
+				primitiveContent := {flexContainer := m_contentFlexContainer_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceAirConditioner modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceAirConditioner",
+				resourceType := int28,
+				primitiveContent := {deviceAirConditioner := m_contentDeviceAirConditioner_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceClothesWasherDryer modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceClothesWasherDryer",
+				resourceType := int28,
+				primitiveContent := {deviceClothesWasherDryer := m_contentDeviceClothesWasherDryer_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceElectricVehicleCharger modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceElectricVehicleCharger",
+				resourceType := int28,
+				primitiveContent := {deviceElectricVehicleCharger := m_contentDeviceElectricVehicleCharger_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceLight modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceLightr",
+				resourceType := int28,
+				primitiveContent := {deviceLight := m_contentDeviceLight_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceMicrogeneration modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceMicrogeneration",
+				resourceType := int28,
+				primitiveContent := {deviceMicrogeneration := m_contentDeviceMicrogeneration_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceOven modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceOven",
+				resourceType := int28,
+				primitiveContent := {deviceOven := m_contentDeviceOven_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceRefrigerator modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceRefrigerator",
+				resourceType := int28,
+				primitiveContent := {deviceRefrigerator := m_contentDeviceRefrigerator_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceRobotCleaner modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceRobotCleaner",
+				resourceType := int28,
+				primitiveContent := {deviceRobotCleaner := m_contentDeviceRobotCleaner_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceSmartElectricMeter modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceSmartElectricMeter",
+				resourceType := int28,
+				primitiveContent := {deviceSmartElectricMeter := m_contentDeviceSmartElectricMeter_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceStorageBattery modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceStorageBattery",
+				resourceType := int28,
+				primitiveContent := {deviceStorageBattery := m_contentDeviceStorageBattery_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceTelevision modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceTelevision",
+				resourceType := int28,
+				primitiveContent := {deviceTelevision := m_contentDeviceTelevision_allOmit}
+			}
+		}
+		
+	 	template (value) UtTriggerPrimitive m_utCreateDeviceThermostat modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceThermostat",
+				resourceType := int28,
+				primitiveContent := {deviceThermostat := m_contentDeviceThermostat_allOmit}
+			}
+		}
+		
+		template (value) UtTriggerPrimitive m_utCreateDeviceWaterHeater modifies m_utCreate := {
+			requestPrimitive := {
+				requestIdentifier := testcasename() & "-m_utCreateDeviceWaterHeater",
+				resourceType := int28,
+				primitiveContent := {deviceWaterHeater := m_contentDeviceWaterHeater_allOmit}
+			}
+		}
+
+		template (value) UtTriggerPrimitive m_utNotify := {
+			utCommand := omit,
+			requestPrimitive := {
+				operation := int5,
+				to_ := "NotInitialized",
+				from_ := "UNINITIALIZED",
+				requestIdentifier := testcasename() & "-m_utNotify",
+				resourceType := omit,
+				primitiveContent := omit,
+				roleIDs := omit, 
+				originatingTimestamp := omit,
+				requestExpirationTimestamp := omit,
+				resultExpirationTimestamp := omit,
+				operationExecutionTime := omit,
+				responseType := omit,
+				resultPersistence := omit,
+				resultContent := omit,
+				eventCategory := omit,
+				deliveryAggregation := omit,
+				groupRequestIdentifier := omit,
+				filterCriteria := omit,
+				desiredIdentifierResultType := omit,
+				tokens := omit,
+				tokenIDs := omit,
+				localTokenIDs := omit, 
+				tokenRequestIndicator := omit,
+				groupRequestTargetMembers := omit,
+				authorSignIndicator := omit,
+				authorSigns := omit,
+				authorRelIndicator := omit,
+				semanticQueryIndicator := omit,
+				releaseVersionIndicator := PX_RELEASE_VERSION,
+				vendorInformation := omit
+			}, 
+			forcedFields := omit
+		};
+		
+		template (value) UtTriggerPrimitive m_utCommand_reset := {
+			utCommand := "Reset",
+			requestPrimitive := omit, 
+			forcedFields := omit
+		}
+	 }
+	 
+		group t8_primitives {
+			
+			template (value) T8Primitive m_t8Request(
+																							in template (value) T8Request p_t8Request
+																							) := {
+				t8Request := p_t8Request
+			} // End of template m_t8Request
+			
+			template (present) T8Primitive mw_t8Request(
+																									in template (present) T8Request p_t8Request := ?
+																									) := {
+				t8Request := p_t8Request
+			} // End of template mw_t8Request
+			
+			template (value) T8Primitive m_t8Response(
+																								in template (value) T8Response p_t8Response
+																								) := {
+				t8Response := p_t8Response
+			} // End of template m_t8Response
+			
+			template (present) T8Primitive mw_t8Response(
+																									in template (present) T8Response p_t8Response := ?
+																									) := {
+				t8Response := p_t8Response
+			} // End of template mw_t8Response
+			
+			template (omit) OneM2M_Types_3GPP_T8.URI m_uri_3gpp_nidd(
+																																in charstring p_apiRoot := "/",
+																																in template (omit) charstring p_apiSpecificSuffixes := omit,
+																																in template (omit) OneM2M_Types_3GPP_T8.URI.queryParameters p_queryParameters := omit
+			) := {
+				apiRoot             := p_apiRoot,
+				apiName             := "3gpp-nidd",
+				apiVersion          := "v1",
+				apiSpecificSuffixes := p_apiSpecificSuffixes,
+				queryParameters     := p_queryParameters
+			} // End of template m_uri_3gpp_nidd
+			
+			template (present) OneM2M_Types_3GPP_T8.URI mw_uri_3gpp_nidd(
+																																		template (present) charstring p_apiRoot := ?,
+																																		template charstring p_apiSpecificSuffixes := *,
+																																		template OneM2M_Types_3GPP_T8.URI.queryParameters p_queryParameters := *
+			) := {
+				apiRoot             := p_apiRoot,
+				apiName             := "3gpp-nidd",
+				apiVersion          := "v1",
+				apiSpecificSuffixes := p_apiSpecificSuffixes,
+				queryParameters     := p_queryParameters
+			} // End of template mw_uri_3gpp_nidd
+			
+			template (omit) OneM2M_Types_3GPP_T8.URI m_uri_3gpp_device_triggering(
+																																						in charstring p_apiRoot := "/",
+																																						in template (omit) charstring p_apiSpecificSuffixes := omit,
+																																						in template (omit) OneM2M_Types_3GPP_T8.URI.queryParameters p_queryParameters := omit
+			) modifies m_uri_3gpp_nidd := {
+				apiName             := "3gpp-device-triggering"
+			} // End of template m_uri_3gpp_device_triggering
+			
+			template (present) OneM2M_Types_3GPP_T8.URI mw_uri_3gpp_device_triggering(
+																																								template (present) charstring p_apiRoot := ?,
+																																								template charstring p_apiSpecificSuffixes := *,
+																																								template OneM2M_Types_3GPP_T8.URI.queryParameters p_queryParameters := *
+			) modifies mw_uri_3gpp_nidd := {
+				apiName             := "3gpp-device-triggering"
+			} // End of template mw_uri_3gpp_device_triggering
+			
+		} // End of group t8_primitives
+		
+		group t8_request {
+			
+			template (omit) T8Request m_t8_request_get(
+																								in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
+																								in template (value) RequestHeaders p_requestHeaders,
+																								in template (omit) RequestBodyT8 p_requestBody := omit
+																								) := {
+				resourceMethod := GET,
+				resourceUri    := p_resourceUri,
+				requestHeaders := p_requestHeaders,
+				requestBody    := p_requestBody
+			} // End of template m_t8_request_get
+			
+			template (omit) T8Request m_t8_request_post(
+																									in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
+																									in template (value) RequestHeaders p_requestHeaders,
+																									in template (omit) RequestBodyT8 p_requestBody := omit
+																									) modifies m_t8_request_get := {
+				resourceMethod := POST
+			} // End of template m_t8_request_post
+			
+			template (present) T8Request mw_t8_request_post(
+																											template (present) OneM2M_Types_3GPP_T8.URI p_resourceUri := ?,
+																											template (present) RequestHeaders p_requestHeaders := ?,
+																											template (present) RequestBodyT8 p_requestBody := ?
+																											) := {
+				resourceMethod := POST,
+				resourceUri    := p_resourceUri,
+				requestHeaders := p_requestHeaders,
+				requestBody    := p_requestBody
+			} // End of template mw_t8_request_post
+			
+			template (omit) T8Request m_t8_request_delete(
+																										in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
+																										in template (value) RequestHeaders p_requestHeaders,
+																										in template (omit) RequestBodyT8 p_requestBody := omit
+																										) modifies m_t8_request_get := {
+				resourceMethod := DELETE
+			} // End of template m_t8_request_delete
+			
+			template (present) T8Request mw_t8_request_delete(
+																												template (present) OneM2M_Types_3GPP_T8.URI p_resourceUri := ?,
+																												template (present) RequestHeaders p_requestHeaders := ?
+																												) := {
+				resourceMethod := DELETE,
+				resourceUri    := p_resourceUri,
+				requestHeaders := p_requestHeaders,
+				requestBody    := omit
+			} // End of template mw_t8_request_delete
+			
+			template (omit) T8Request m_t8_request_patch(
+																									in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
+																									in template (value) RequestHeaders p_requestHeaders,
+																									in template (omit) RequestBodyT8 p_requestBody := omit
+																									) modifies m_t8_request_get := {
+				resourceMethod := PATCH
+			} // End of template m_t8_request_patch
+			
+			template (present) T8Request mw_t8_request_patch(
+																												template (present) OneM2M_Types_3GPP_T8.URI p_resourceUri := ?,
+																												template (present) RequestHeaders p_requestHeaders := ?,
+																												template (present) RequestBodyT8 p_requestBody := ?
+																												) := {
+				resourceMethod := PATCH,
+				resourceUri    := p_resourceUri,
+				requestHeaders := p_requestHeaders,
+				requestBody    := p_requestBody
+			} // End of template mw_t8_request_patch
+			
+			template (omit) T8Request m_t8_request_put(
+																									in template (value) OneM2M_Types_3GPP_T8.URI p_resourceUri,
+																									in template (value) RequestHeaders p_requestHeaders,
+																									in template (omit) RequestBodyT8 p_requestBody := omit
+																									) modifies m_t8_request_get := {
+				resourceMethod := PUT
+			} // End of template m_t8_request_put
+			
+			template (present) T8Request mw_t8_request_put(
+																									template (present) OneM2M_Types_3GPP_T8.URI p_resourceUri := ?,
+																									template (present) RequestHeaders p_requestHeaders := ?,
+																									template (present) RequestBodyT8 p_requestBody := ?
+																									) := {
+				resourceMethod := PUT,
+				resourceUri    := p_resourceUri,
+				requestHeaders := p_requestHeaders,
+				requestBody    := p_requestBody
+			} // End of template mw_t8_request_put
+			
+		} // End of group t8_request
+		
+		group t8_response {
+			
+			template (omit) T8Response m_t8_response_200_ok(
+																											in template (value) ResponseHeaders p_responseHeaders,
+																											in template (omit) ResponseBody p_responseBody := omit
+																											) := {
+				responseCode    := 200,
+				responseHeaders := p_responseHeaders,
+				responseBody    := p_responseBody
+			} // End of template m_t8_response_200_ok
+			
+			template T8Response mw_t8_response_200_ok(
+																								template (present) ResponseHeaders p_responseHeaders := ?,
+																								template ResponseBody p_responseBody := *
+																								) := {
+				responseCode    := 200,
+				responseHeaders := p_responseHeaders,
+				responseBody    := p_responseBody
+			} // End of template mw_t8_response_200_ok
+			
+			template (omit) T8Response m_t8_response_201_created(
+																													in template (value) ResponseHeaders p_responseHeaders,
+																													in template (omit) ResponseBody p_responseBody := omit
+																													) modifies m_t8_response_200_ok := {
+				responseCode    := 201
+			} // End of template m_t8_response_201_ok
+			
+			template T8Response mw_t8_response_201_created(
+																											template (present) ResponseHeaders p_responseHeaders := ?,
+																											template ResponseBody p_responseBody := *
+																											) modifies mw_t8_response_200_ok := {
+				responseCode    := 201
+			} // End of template mw_t8_response_201_ok
+			
+			template T8Response mw_t8_response_204_no_content(
+																												template (present) ResponseHeaders p_responseHeaders := ?,
+																												template ResponseBody p_responseBody := *
+																												) modifies mw_t8_response_200_ok := {
+				responseCode    := 204,
+				responseBody    := omit
+			} // End of template mw_t8_response_204_no_content
+			
+			template (value) T8Response m_t8_response_ko(
+																										in template (value) ResponseHeaders p_responseHeaders,
+																										in template (value) ProblemDetails p_problemDetails
+																										) := {
+				responseCode    := 400,
+				responseHeaders := p_responseHeaders,
+				responseBody    := { problemDetails := p_problemDetails }
+			} // End of template m_t8_response_ko
+			
+			template (present) T8Response mw_t8_response_ko(
+																											template (present) ResponseHeaders p_responseHeaders := ?,
+																											template (present) ProblemDetails p_problemDetails := ?
+																											) := {
+				responseCode    := ?,
+				responseHeaders := p_responseHeaders,
+				responseBody    := { problemDetails := p_problemDetails }
+			} // End of template mw_t8_response_ko
+			
+			template (value) T8Response m_t8_response_400_bad_request(
+																																in template (value) ResponseHeaders p_responseHeaders,
+																																in template (value) ProblemDetails p_problemDetails
+																																) modifies m_t8_response_ko := {
+			} // End of template m_t8_response_400_bad_request
+			
+			template (present) T8Response mw_t8_response_400_bad_request(
+																																		template (present) ResponseHeaders p_responseHeaders := ?,
+																																		template (present) ProblemDetails p_problemDetails := ?
+																																		) modifies mw_t8_response_ko := {
+				responseCode    := 400
+			} // End of template mw_t8_response_400_bad_request
+			
+			template (value) T8Response m_t8_response_404_not_found(
+																															in template (value) ResponseHeaders p_responseHeaders,
+																															in template (value) ProblemDetails p_problemDetails
+																															) modifies m_t8_response_ko := {
+				responseCode    := 404
+			} // End of template m_t8_response_404_not_found
+			
+			template (present) T8Response mw_t8_response_404_not_found(
+																																template (present) ResponseHeaders p_responseHeaders := ?,
+																																template (present) ProblemDetails p_problemDetails := ?
+																																) modifies mw_t8_response_ko := {
+				responseCode    := 404
+			} // End of template mw_t8_response_404_not_found
+			
+		} // End of group t8_response
+		
+		group nidd {
+		
+			template (value) RequestBodyT8 m_request_body_niddConfiguration(in template (value) NiddConfiguration p_niddConfiguration) := {
+				individualNiddConfiguration := p_niddConfiguration
+			} // End of template m_request_body_niddConfiguration
+			
+			template (value) NiddConfiguration m_niddConfiguration := {
+				self_ := "self_value",
+				supportedFeatures := Notification_test_event,
+				mtcProviderId := "mtcProviderId_value",
+				externalId := "externalId_value",
+				msisdn := "msisdn_value",
+				externalGroupId := "externalGroupId_value",
+				duration_ := omit,
+				reliableDataService := omit,
+				rdsPorts := omit, 
+				pdnEstablishmentOptions := omit,
+				notificationDestination := "/", 
+				requestTestNotification := omit,
+				websockNotifConfig := omit,
+				maximumPacketSize := omit,
+				niddDownlinkDataTransfers := omit,
+				status := ACTIVE
+			} // End of template m_niddConfiguration
+			
+			template (present) NiddConfiguration mw_niddConfiguration(
+																																template (present) Link p_notificationDestination := ?
+																																) := {
+				self_ := *,
+				supportedFeatures := *,
+				mtcProviderId := *,
+				externalId := *,
+				msisdn := *,
+				externalGroupId := *,
+				duration_ := *,
+				reliableDataService := *,
+				rdsPorts := *, 
+				pdnEstablishmentOptions := *,
+				notificationDestination := p_notificationDestination, 
+				requestTestNotification := *,
+				websockNotifConfig := *,
+				maximumPacketSize := *,
+				niddDownlinkDataTransfers := *,
+				status := *
+			} // End of template mw_niddConfiguration
+			
+			template (present) ResponseBody mw_response_body_niddConfigurations(
+																																					template (present) NiddConfigurations p_niddConfigurations := ?
+																																					) := {
+				niddConfigurations := p_niddConfigurations
+			} // End of template mw_response_body_niddConfigurations
+			
+			template (present) ResponseBody mw_response_body_individualNiddConfiguration(
+																																									template (present) NiddConfiguration p_individualNiddConfiguration := ?
+																																									) := {
+				individualNiddConfiguration := p_individualNiddConfiguration
+			} // End of template mw_response_body_individualNiddConfiguration
+			
+		} // End of group nidd
+		
+		group deviceTriggering {
+		
+			template (value) RequestBodyT8 m_request_body_deviceTriggering(in template (value) DeviceTriggering p_deviceTriggeringTransaction) := {
+				individualDeviceTriggeringTransaction := p_deviceTriggeringTransaction
+			} // End of template m_request_body_deviceTriggering
+			
+			template (present) RequestBodyT8 mw_request_body_deviceTriggering(template (present) DeviceTriggering p_deviceTriggeringTransaction := ?) := {
+				individualDeviceTriggeringTransaction := p_deviceTriggeringTransaction
+			} // End of template mw_request_body_deviceTriggering
+			
+			template (present) RequestBodyT8 mw_request_body_deviceTriggeringDeliveryReportNotification(template (present) DeviceTriggeringDeliveryReportNotification p_deviceTriggeringDeliveryReportNotification := ?) := {
+				deviceTriggeringDeliveryReportNotification := p_deviceTriggeringDeliveryReportNotification
+			} // End of template mw_request_body_deviceTriggeringDeliveryReportNotification
+			
+			template (value) ResponseBody m_response_body_deviceTriggerings(
+																																			in template (value) DeviceTriggerings p_deviceTriggeringTransactions
+																																			) := {
+				deviceTriggeringTransactions := p_deviceTriggeringTransactions
+			} // End of template m_response_body_deviceTriggerings
+			
+			template (present) ResponseBody mw_response_body_deviceTriggerings(
+																																				template (present) DeviceTriggerings p_deviceTriggeringTransactions := ?
+																																				) := {
+				deviceTriggeringTransactions := p_deviceTriggeringTransactions
+			} // End of template mw_response_body_deviceTriggerings
+			
+			template (value) ResponseBody m_response_body_individualDeviceTriggering(
+																																								in template (value) DeviceTriggering p_deviceTriggeringTransaction
+																																								) := {
+				individualDeviceTriggeringTransaction := p_deviceTriggeringTransaction
+			} // End of template m_response_body_individualDeviceTriggering
+			
+			template (present) ResponseBody mw_response_body_individualDeviceTriggering(
+																																									template (present) DeviceTriggering p_deviceTriggeringTransaction := ?
+																																									) := {
+				individualDeviceTriggeringTransaction := p_deviceTriggeringTransaction
+			} // End of template mw_response_body_individualDeviceTriggering
+			template (value) DeviceTriggering m_deviceTriggering_response_delieveryResult(
+																																			in template (value) DeliveryResult p_deliveryResult,
+																																			in template (value) charstring p_self_
+																																			in template (value) ExternalId p_externalId,
+																																			in template (value) DurationSec p_validityPeriod := 0,
+																																			in template (value) Priority p_priority := NO_PRIORITY,
+																																			in template (value) Port p_applicationPortId,
+																																			in template (value) Bytes p_triggerPayload,
+																																			in template (value) Link p_notificationDestination
+																																			) := {
+				self_                   := p_self_,
+				externalId              := p_externalId,
+				msisdn                  := omit,
+				supportedFeatures       := omit,
+				validityPeriod          := p_validityPeriod,
+				priority                := p_priority,
+				applicationPortId       := p_applicationPortId,
+				appSrcPortId            := omit,
+				triggerPayload          := p_triggerPayload,
+				notificationDestination := p_notificationDestination, 
+				requestTestNotification := omit,
+				websockNotifConfig      := omit,
+				deliveryResult          := p_deliveryResult
+			} // End of template m_deviceTriggering_response_delieveryResult
+
+			template (value) DeviceTriggering m_deviceTriggering_externalId(
+																																			in template (value) ExternalId p_externalId,
+																																			in template (value) DurationSec p_validityPeriod := 0,
+																																			in template (value) Priority p_priority := NO_PRIORITY,
+																																			in template (value) Port p_applicationPortId,
+																																			in template (value) Bytes p_triggerPayload,
+																																			in template (value) Link p_notificationDestination
+																																			) := {
+				self_                   := omit,
+				externalId              := p_externalId,
+				msisdn                  := omit,
+				supportedFeatures       := omit,
+				validityPeriod          := p_validityPeriod,
+				priority                := p_priority,
+				applicationPortId       := p_applicationPortId,
+				appSrcPortId            := omit,
+				triggerPayload          := p_triggerPayload,
+				notificationDestination := p_notificationDestination, 
+				requestTestNotification := omit,
+				websockNotifConfig      := omit,
+				deliveryResult          := omit
+			} // End of template m_deviceTriggering_externalId
+			
+			template (present) DeviceTriggering mw_deviceTriggering_externalId(
+																																					template (present) ExternalId p_externalId := ?,
+																																					template (present) DurationSec p_validityPeriod := ?,
+																																					template (present) Priority p_priority := ?,
+																																					template (present) Port p_applicationPortId := ?,
+																																					template (present) Bytes p_triggerPayload := ?,
+																																					template (present) Link p_notificationDestination := ?
+																																					) := {
+				self_                   := *,
+				externalId              := p_externalId,
+				msisdn                  := omit,
+				supportedFeatures       := *,
+				validityPeriod          := p_validityPeriod,
+				priority                := p_priority,
+				applicationPortId       := p_applicationPortId,
+				appSrcPortId            := *,
+				triggerPayload          := p_triggerPayload,
+				notificationDestination := p_notificationDestination, 
+				requestTestNotification := *,
+				websockNotifConfig      := *,
+				deliveryResult          := *
+			} // End of template mw_deviceTriggeringTransaction
+			
+			template (value) DeviceTriggeringDeliveryReportNotification m_deviceTriggeringDeliveryReportNotification(
+																																																								in template (value) Link p_transaction, 
+																																																								in template (value) DeliveryResult p_result
+																																																								) := {
+				transaction := p_transaction, 
+				result      := p_result
+			} // End of template m_deviceTriggeringDeliveryReportNotification
+			
+			template (present) DeviceTriggeringDeliveryReportNotification mw_deviceTriggeringDeliveryReportNotification(
+																																																									template (present) Link p_transaction := ?, 
+																																																									template (present) DeliveryResult p_result := ?
+																																																									) := {
+				transaction := p_transaction, 
+				result      := p_result
+			} // End of template mw_deviceTriggeringDeliveryReportNotification
+			
+		} // End of group deviceTriggering
+		
+		group problemDetails {
+			
+			template (omit) ProblemDetails m_problemDetails(
+																											in charstring p_title,
+																											in integer p_status,
+																											in template (omit) charstring p_type := omit,
+																											in template (omit) charstring p_detail := omit,
+																											in template (omit) charstring p_instance := omit,
+																											in template (omit) charstring p_cause := omit,
+																											in template (omit) InvalidParams p_invalidParams := omit
+																											) := {
+				type_         := p_type,
+				title         := p_title,
+				status        := p_status,
+				detail        := p_detail,
+				instance      := p_instance,
+				cause         := p_cause,
+				invalidParams := p_invalidParams
+			} // End of template m_problemDetails
+			
+			template ProblemDetails mw_problemDetails(
+																								template charstring p_type := *,
+																								template charstring p_title := *,
+																								template integer p_status := *,
+																								template charstring p_detail := *,
+																								template charstring p_instance := *,
+																								template charstring p_cause := *,
+																								template InvalidParams p_invalidParams := *
+																								) := {
+				type_         := p_type,
+				title         := p_title,
+				status        := p_status,
+				detail        := p_detail,
+				instance      := p_instance,
+				cause         := p_cause,
+				invalidParams := p_invalidParams
+			} // End of template mw_problemDetails
+			
+		} // End of group problemDetails
+		
+}  // end of module