diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 835858ad1cb65c1444de951d973cace4da3dbceb..12497b9e15d9e7871471dfadbaf2571dde542530 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -5,9 +5,7 @@
  *  © 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 $
+ *  @author     oneM2M/ETSI
  *  @desc       Module containing templates for oneM2M
  *
  */
@@ -119,7 +117,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit,
@@ -159,7 +157,7 @@ module OneM2M_Templates {
 					offset := omit
 				}
 			};
-			
+
 			/**
 			 * @desc Base Receive RETRIEVE request primitive
 			 * @param p_targetResourceAddress Target resource address
@@ -183,7 +181,7 @@ module OneM2M_Templates {
 				deliveryAggregation := *,
 				groupRequestIdentifier := *,
 				filterCriteria := *,
-				discoveryResultType := *,
+				desiredIdentifierResultType := *,
 				tokens := *,
 				tokenIDs := *,
 				localTokenIDs := *,
@@ -216,7 +214,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit,
@@ -250,7 +248,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit,
@@ -344,7 +342,7 @@ module OneM2M_Templates {
 			  * @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) DiscResType p_discResType, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
+			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" & f_rnd(1, 1000000),
 				filterCriteria := {
 					createdBefore := omit,
@@ -370,7 +368,7 @@ module OneM2M_Templates {
 					level := omit,
 					offset := omit
 				},
-				discoveryResultType := p_discResType
+				desiredIdentifierResultType := p_desIdResType
 			};
 			
 			/**
@@ -451,7 +449,6 @@ module OneM2M_Templates {
     	}//end group Retrieve
 
     	group Update {
-    		
     		template (value) RequestPrimitive m_update := {
 				operation := int3,
 				to_ := "NotInitialized",
@@ -471,7 +468,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit,
@@ -500,7 +497,7 @@ module OneM2M_Templates {
 				deliveryAggregation := *,
 				groupRequestIdentifier := *,
 				filterCriteria := *,
-				discoveryResultType := *, 
+				desiredIdentifierResultType := *, 
 				tokens := *,
 				tokenIDs := *,
 				localTokenIDs := *,
@@ -704,7 +701,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit,
@@ -736,7 +733,7 @@ module OneM2M_Templates {
 				deliveryAggregation := *,
 				groupRequestIdentifier := *,
 				filterCriteria := *,
-				discoveryResultType := *,
+				desiredIdentifierResultType := *,
 				tokens := *,
 				tokenIDs := *,
 				localTokenIDs := *,
@@ -767,7 +764,7 @@ module OneM2M_Templates {
 				deliveryAggregation := *,
 				groupRequestIdentifier := *,
 				filterCriteria := *,
-				discoveryResultType := *,
+				desiredIdentifierResultType := *,
 				tokens := *,
 				tokenIDs := *,
 				localTokenIDs := *,
@@ -1407,7 +1404,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit, 
@@ -1435,7 +1432,7 @@ module OneM2M_Templates {
 				deliveryAggregation := *,
 				groupRequestIdentifier := *,
 				filterCriteria := *,
-				discoveryResultType := *, 
+				desiredIdentifierResultType := *, 
 				tokens := *,
 				tokenIDs := *,
 				localTokenIDs := *,
@@ -1478,7 +1475,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit,
@@ -1525,7 +1522,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit,
@@ -1556,7 +1553,7 @@ module OneM2M_Templates {
 				deliveryAggregation := *,
 				groupRequestIdentifier := *,
 				filterCriteria := *,
-				discoveryResultType := *,
+				desiredIdentifierResultType := *,
 				tokens := *,
 				tokenIDs := *,
 				localTokenIDs := *,
@@ -1898,7 +1895,6 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := p_accessControlPolicyIds,//O
 			expirationTime := omit,//O
 			dynamicAuthorizationConsultationIDs := omit,//O
-			stateTag := omit,//NP
 			source := p_source,//M
 			target := p_target,//M
 			lifespan := p_lifespan,//M
@@ -2366,7 +2362,8 @@ module OneM2M_Templates {
 			operationMonitor_list := {},
 			attribute := p_attribute_list, 
 			notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
-			missingData := omit
+			missingData := omit,
+			filterOperation := omit
 		};
         
 		template (value) BatchNotify m_batchNotify (in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration := "PT20S") := {
@@ -2945,7 +2942,6 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := omit, //O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			stateTag := omit,//NP
 			creator := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
@@ -2979,7 +2975,6 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := *, //O
 			announceTo := *,//O
 			announcedAttribute := *,//O
-			stateTag := omit,//NP
 			creator := *,//O
 			maxNrOfInstances := *,//O
 			maxByteSize := *,//O
@@ -3012,7 +3007,6 @@ module OneM2M_Templates {
 			expirationTime := omit,//O
 			link := omit,//M TODO Put the right value
 			dynamicAuthorizationConsultationIDs := omit, //O
-			stateTag := omit,//NP
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
 			maxInstanceAge := omit,//O
@@ -3043,7 +3037,6 @@ module OneM2M_Templates {
 			expirationTime := ?,//MA M
 			link := omit, //O NA
 			dynamicAuthorizationConsultationIDs := *, //OA			
-			stateTag := *,//OA
 			maxNrOfInstances := *,//O OA		
 			maxByteSize := *,//O OA	
 			maxInstanceAge := *,//O OA	
@@ -3112,7 +3105,6 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := omit, //O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			stateTag := omit,//NP
 			creator := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
@@ -3567,7 +3559,6 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := omit, //O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			stateTag := omit,//NP
 			creator := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
@@ -4224,7 +4215,6 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := *,//O
 			expirationTime := ?,//M
 			dynamicAuthorizationConsultationIDs := *,//O
-			stateTag := ?,//M
 			operation := ?,//M
 			target := ?,//M
 			originator := ?,//M	
@@ -4643,7 +4633,6 @@ module OneM2M_Templates {
 			accessControlPolicyIDs := omit,//O
 			expirationTime := omit,//M
 			dynamicAuthorizationConsultationIDs := omit,//O
-			stateTag := omit,//M
 			source := omit,//M
 			target := omit,//M
 			lifespan := omit,//M
@@ -4824,7 +4813,6 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			stateTag := omit,//M
 			creator := omit,//M
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
@@ -4854,7 +4842,6 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := *,//O
 			announceTo := *,//O
 			announcedAttribute := *,//O
-			stateTag := ?,//M
 			creator := ?,//M
 			maxNrOfInstances := *,//O
 			maxByteSize := *,//O
@@ -4908,7 +4895,6 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := omit,//O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			stateTag := omit,//M
 			creator := omit,//M
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
@@ -5009,6 +4995,7 @@ module OneM2M_Templates {
 			requestReachability := omit,//M
 			contentSerialization := omit,//O
 			e2eSecInfo:= omit, //O
+			supportedReleaseVersions := omit,//O
 			choice := omit//O
 		};
     	
@@ -5053,6 +5040,7 @@ module OneM2M_Templates {
 			consistencyStrategy := omit,//O
 			groupName := omit,//O
 			semanticSupportIndicator := omit,//O
+			notifyAggregation := omit,//O
 			choice := omit//O
 		};
     	
@@ -5155,7 +5143,6 @@ module OneM2M_Templates {
 			dynamicAuthorizationConsultationIDs := omit, //O
 			announceTo := omit,//O
 			announcedAttribute := omit,//O
-			stateTag := omit,//NP
 			creator := omit,//O
 			maxNrOfInstances := omit,//O
 			maxByteSize := omit,//O
@@ -5380,7 +5367,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit, 
@@ -5459,7 +5446,7 @@ module OneM2M_Templates {
 				filterCriteria := omit,
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit, 
@@ -5498,7 +5485,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit, 
@@ -5545,7 +5532,7 @@ module OneM2M_Templates {
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
 				filterCriteria := omit,
-				discoveryResultType := omit,
+				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,
 				localTokenIDs := omit, 
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index a75cdc70f9adf73e38ad5cfc04fc54f437b4c6bc..8e8492740d7a503bdc7a961d3a10b343b2fef8ca 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -5,9 +5,7 @@
  *  © 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_Types.ttcn $
- *              $Id: OneM2M_Types.ttcn 356 2017-08-21 12:25:14Z reinaortega $
+ *  @author     oneM2M/ETSI
  *  @desc       OneM2M data types module 
  *
  */
@@ -16,24 +14,25 @@ module OneM2M_Types {
 
 import from XSD all;
 
+
 type record AccessControlPolicy
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    SetOfAcrs privileges,
-    SetOfAcrs selfPrivileges,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	SetOfAcrs privileges,
+	SetOfAcrs selfPrivileges,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -50,21 +49,21 @@ with {
 
 type record AccessControlPolicyAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    SetOfAcrs privileges,
-    SetOfAcrs selfPrivileges,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	SetOfAcrs privileges,
+	SetOfAcrs selfPrivileges,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -86,23 +85,23 @@ with {
 
 type record ActiveCmdhPolicy
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.ID activeCmdhPolicyLink
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.ID activeCmdhPolicyLink
 }
 with {
   variant "name as uncapitalized";
@@ -114,43 +113,43 @@ with {
 
 type record AE
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    XSD.String appName optional,
-    XSD.String app_ID,
-    XSD.ID aE_ID,
-    PoaList pointOfAccess optional,
-    XSD.AnyURI ontologyRef optional,
-    XSD.AnyURI nodeLink optional,
-    XSD.Boolean requestReachability,
-    Serializations contentSerialization optional,
-    E2eSecInfo e2eSecInfo optional,
-    SupportedReleaseVersions supportedReleaseVersions,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Container container,
-            Group group_,
-            AccessControlPolicy accessControlPolicy,
-            Subscription subscription,
-            PollingChannel pollingChannel,
-            Schedule schedule,
-            SemanticDescriptor semanticDescriptor,
-            TimeSeries timeSeries,
-            TrafficPattern trafficPattern,
-            Sg_flexContainerResource_group sg_flexContainerResource
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	XSD.String appName optional,
+	XSD.String app_ID,
+	XSD.ID aE_ID,
+	PoaList pointOfAccess optional,
+	XSD.AnyURI ontologyRef optional,
+	XSD.AnyURI nodeLink optional,
+	XSD.Boolean requestReachability,
+	Serializations contentSerialization optional,
+	E2eSecInfo e2eSecInfo optional,
+	SupportedReleaseVersions supportedReleaseVersions,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Container container,
+			Group group_,
+			AccessControlPolicy accessControlPolicy,
+			Subscription subscription,
+			PollingChannel pollingChannel,
+			Schedule schedule,
+			SemanticDescriptor semanticDescriptor,
+			TimeSeries timeSeries,
+			TrafficPattern trafficPattern,
+			Sg_flexContainerResource_group sg_flexContainerResource
+		} choice_list
+	} choice optional
 }
 with {
   variant "element";
@@ -171,46 +170,46 @@ with {
 
 type record AEAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.String appName optional,
-    XSD.String app_ID optional,
-    XSD.ID aE_ID optional,
-    PoaList pointOfAccess optional,
-    XSD.AnyURI ontologyRef optional,
-    XSD.AnyURI nodeLink optional,
-    XSD.Boolean requestReachability optional,
-    Serializations contentSerialization optional,
-    E2eSecInfo e2eSecInfo optional,
-    SupportedReleaseVersions supportedReleaseVersions,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Container container,
-            ContainerAnnc containerAnnc,
-            Group group_,
-            GroupAnnc groupAnnc,
-            AccessControlPolicy accessControlPolicy,
-            AccessControlPolicyAnnc accessControlPolicyAnnc,
-            Subscription subscription,
-            ScheduleAnnc scheduleAnnc,
-            SemanticDescriptor semanticDescriptor,
-            TimeSeries timeSeries,
-            TimeSeriesAnnc timeSeriesAnnc,
-            TrafficPatternAnnc trafficPatternAnnc,
-            Sg_flexContainerResource_group sg_flexContainerResource,
-            Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.String appName optional,
+	XSD.String app_ID optional,
+	XSD.ID aE_ID optional,
+	PoaList pointOfAccess optional,
+	XSD.AnyURI ontologyRef optional,
+	XSD.AnyURI nodeLink optional,
+	XSD.Boolean requestReachability optional,
+	Serializations contentSerialization optional,
+	E2eSecInfo e2eSecInfo optional,
+	SupportedReleaseVersions supportedReleaseVersions,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Container container,
+			ContainerAnnc containerAnnc,
+			Group group_,
+			GroupAnnc groupAnnc,
+			AccessControlPolicy accessControlPolicy,
+			AccessControlPolicyAnnc accessControlPolicyAnnc,
+			Subscription subscription,
+			ScheduleAnnc scheduleAnnc,
+			SemanticDescriptor semanticDescriptor,
+			TimeSeries timeSeries,
+			TimeSeriesAnnc timeSeriesAnnc,
+			TrafficPatternAnnc trafficPatternAnnc,
+			Sg_flexContainerResource_group sg_flexContainerResource,
+			Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+		} choice_list
+	} choice optional
 }
 with {
   variant "element";
@@ -230,32 +229,32 @@ with {
 
 type record AllJoynApp
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    AllJoynDirection direction,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription,
-            AllJoynSvcObject allJoynSvcObject
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	AllJoynDirection direction,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription,
+			AllJoynSvcObject allJoynSvcObject
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -271,32 +270,32 @@ with {
 
 type record AllJoynAppAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    AllJoynDirection direction,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription,
-            AllJoynSvcObject allJoynSvcObject,
-            AllJoynSvcObjectAnnc allJoynSvcObjectAnnc
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	AllJoynDirection direction,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription,
+			AllJoynSvcObject allJoynSvcObject,
+			AllJoynSvcObjectAnnc allJoynSvcObjectAnnc
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -312,34 +311,34 @@ with {
 
 type record AllJoynInterface
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.AnyURI interfaceIntrospectXmlRef,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription,
-            AllJoynMethod allJoynMethod,
-            AllJoynProperty allJoynProperty,
-            Container container
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.AnyURI interfaceIntrospectXmlRef,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription,
+			AllJoynMethod allJoynMethod,
+			AllJoynProperty allJoynProperty,
+			Container container
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -355,36 +354,36 @@ with {
 
 type record AllJoynInterfaceAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.AnyURI interfaceIntrospectXmlRef optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription,
-            AllJoynMethod allJoynMethod,
-            AllJoynMethodAnnc allJoynMethodAnnc,
-            AllJoynProperty allJoynProperty,
-            AllJoynPropertyAnnc allJoynPropertyAnnc,
-            Container container,
-            ContainerAnnc containerAnnc
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.AnyURI interfaceIntrospectXmlRef optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription,
+			AllJoynMethod allJoynMethod,
+			AllJoynMethodAnnc allJoynMethodAnnc,
+			AllJoynProperty allJoynProperty,
+			AllJoynPropertyAnnc allJoynPropertyAnnc,
+			Container container,
+			ContainerAnnc containerAnnc
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -400,33 +399,33 @@ with {
 
 type record AllJoynMethodCall
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.String input optional,
-    XSD.String callStatus optional,
-    XSD.String output optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.String input optional,
+	XSD.String callStatus optional,
+	XSD.String output optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -442,29 +441,29 @@ with {
 
 type record AllJoynMethodCallAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -480,31 +479,31 @@ with {
 
 type record AllJoynMethod
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription,
-            AllJoynMethodCall allJoynMethodCall
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription,
+			AllJoynMethodCall allJoynMethodCall
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -520,31 +519,31 @@ with {
 
 type record AllJoynMethodAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription,
-            AllJoynMethodCall allJoynMethodCall,
-            AllJoynMethodCallAnnc allJoynMethodCallAnnc
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription,
+			AllJoynMethodCall allJoynMethodCall,
+			AllJoynMethodCallAnnc allJoynMethodCallAnnc
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -560,32 +559,32 @@ with {
 
 type record AllJoynProperty
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.String currentValue,
-    XSD.String requestedValue optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.String currentValue,
+	XSD.String requestedValue optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -601,29 +600,29 @@ with {
 
 type record AllJoynPropertyAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -639,33 +638,33 @@ with {
 
 type record AllJoynSvcObject
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.String objectPath,
-    XSD.Boolean enable,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription,
-            AllJoynInterface allJoynInterface
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.String objectPath,
+	XSD.Boolean enable,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription,
+			AllJoynInterface allJoynInterface
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -683,33 +682,33 @@ with {
 
 type record AllJoynSvcObjectAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.String objectPath,
-    XSD.Boolean enable optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription,
-            AllJoynInterface allJoynInterface,
-            AllJoynInterfaceAnnc allJoynInterfaceAnnc
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.String objectPath,
+	XSD.Boolean enable optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription,
+			AllJoynInterface allJoynInterface,
+			AllJoynInterfaceAnnc allJoynInterfaceAnnc
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -727,33 +726,33 @@ with {
 
 type record AreaNwkDeviceInfo
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String devID,
-    XSD.String devType,
-    XSD.AnyURI areaNwkId,
-    XSD.NonNegativeInteger sleepInterval optional,
-    XSD.NonNegativeInteger sleepDuration optional,
-    XSD.String devStatus optional,
-    ListOfURIs listOfNeighbors,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String devID,
+	XSD.String devType,
+	XSD.AnyURI areaNwkId,
+	XSD.NonNegativeInteger sleepInterval optional,
+	XSD.NonNegativeInteger sleepDuration optional,
+	XSD.String devStatus optional,
+	ListOfURIs listOfNeighbors,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -770,32 +769,32 @@ with {
 
 type record AreaNwkDeviceInfoAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String devID optional,
-    XSD.String devType optional,
-    XSD.AnyURI areaNwkId optional,
-    XSD.NonNegativeInteger sleepInterval optional,
-    XSD.NonNegativeInteger sleepDuration optional,
-    XSD.String devStatus optional,
-    ListOfURIs listOfNeighbors optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String devID optional,
+	XSD.String devType optional,
+	XSD.AnyURI areaNwkId optional,
+	XSD.NonNegativeInteger sleepInterval optional,
+	XSD.NonNegativeInteger sleepDuration optional,
+	XSD.String devStatus optional,
+	ListOfURIs listOfNeighbors optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -811,28 +810,28 @@ with {
 
 type record AreaNwkInfo
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String areaNwkType,
-    ListOfURIs listOfDevices,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String areaNwkType,
+	ListOfURIs listOfDevices,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -849,27 +848,27 @@ with {
 
 type record AreaNwkInfoAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String areaNwkType optional,
-    ListOfURIs listOfDevices optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String areaNwkType optional,
+	ListOfURIs listOfDevices optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -885,28 +884,28 @@ with {
 
 type record Battery
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.UnsignedInt batteryLevel,
-    BatteryStatus batteryStatus,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.UnsignedInt batteryLevel,
+	BatteryStatus batteryStatus,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -923,27 +922,27 @@ with {
 
 type record BatteryAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.UnsignedInt batteryLevel optional,
-    BatteryStatus batteryStatus optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.UnsignedInt batteryLevel optional,
+	BatteryStatus batteryStatus optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -959,25 +958,25 @@ with {
 
 type record CmdhBuffer
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    ListOfEventCatWithDef applicableEventCategory,
-    XSD.NonNegativeInteger maxBufferSize,
-    XSD.PositiveInteger storagePriority (1 .. !11)
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	ListOfEventCatWithDef applicableEventCategory,
+	XSD.NonNegativeInteger maxBufferSize,
+	XSD.PositiveInteger storagePriority (1 .. !11)
 }
 with {
   variant "name as uncapitalized";
@@ -989,23 +988,23 @@ with {
 
 type record CmdhDefaults
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    record length(2 .. infinity) of MgmtLinkRef mgmtLink_list
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	record length(2 .. infinity) of MgmtLinkRef mgmtLink_list
 }
 with {
   variant "name as uncapitalized";
@@ -1019,28 +1018,28 @@ with {
 
 type record CmdhDefEcValue
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.PositiveInteger order,
-    EventCat defEcValue,
-    ListOfM2MID requestOrigin,
-    XSD.AnySimpleType requestContext optional,//FIXME Use AnySimpleType instead
-    XSD.Boolean requestContextNotification optional,
-    XSD.AnySimpleType requestCharacteristics optional//FIXME Use AnySimpleType instead
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.PositiveInteger order,
+	EventCat defEcValue,
+	ListOfM2MID requestOrigin,
+	XSD.AnySimpleType requestContext optional,//FIXME Use AnySimpleType instead
+	XSD.Boolean requestContextNotification optional,
+	XSD.AnySimpleType requestCharacteristics optional//FIXME Use AnySimpleType instead
 }
 with {
   variant "name as uncapitalized";
@@ -1054,28 +1053,28 @@ with {
 
 type record CmdhEcDefParamValues
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    ListOfEventCatWithDef applicableEventCategory,
-    XSD.Long defaultRequestExpTime,
-    XSD.Long defaultResultExpTime,
-    XSD.Long defaultOpExecTime,
-    XSD.Long defaultRespPersistence,
-    XSD.Boolean defaultDelAggregation
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	ListOfEventCatWithDef applicableEventCategory,
+	XSD.Long defaultRequestExpTime,
+	XSD.Long defaultResultExpTime,
+	XSD.Long defaultOpExecTime,
+	XSD.Long defaultRespPersistence,
+	XSD.Boolean defaultDelAggregation
 }
 with {
   variant "name as uncapitalized";
@@ -1089,37 +1088,37 @@ with {
 
 type record CmdhLimits
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.PositiveInteger order,
-    ListOfM2MID requestOrigin,
-    XSD.AnySimpleType requestContext,//FIXME Use AnySimpleType instead
-    XSD.Boolean requestContextNotification optional,
-    XSD.AnySimpleType requestCharacteristics,//FIXME Use AnySimpleType instead
-    ListOfEventCat limitsEventCategory,
-    ListOfMinMax limitsRequestExpTime,
-    ListOfMinMax limitsResultExpTime,
-    ListOfMinMax limitsOpExecTime,
-    ListOfMinMax limitsRespPersistence,
-    enumerated {
-        x0,
-        x1,
-        x0_1
-    } limitsDelAggregation
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.PositiveInteger order,
+	ListOfM2MID requestOrigin,
+	XSD.AnySimpleType requestContext,//FIXME Use AnySimpleType instead
+	XSD.Boolean requestContextNotification optional,
+	XSD.AnySimpleType requestCharacteristics,//FIXME Use AnySimpleType instead
+	ListOfEventCat limitsEventCategory,
+	ListOfMinMax limitsRequestExpTime,
+	ListOfMinMax limitsResultExpTime,
+	ListOfMinMax limitsOpExecTime,
+	ListOfMinMax limitsRespPersistence,
+	enumerated {
+		x0,
+		x1,
+		x0_1
+	} limitsDelAggregation
 }
 with {
   variant "name as uncapitalized";
@@ -1136,24 +1135,24 @@ with {
 
 type record CmdhNetworkAccessRules
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    ListOfEventCatWithDef applicableEventCategories,
-    record of MgmtLinkRef mgmtLink_list
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	ListOfEventCatWithDef applicableEventCategories,
+	record of MgmtLinkRef mgmtLink_list
 }
 with {
   variant "name as uncapitalized";
@@ -1167,28 +1166,28 @@ with {
 
 type record CmdhNwAccessRule
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    ListOfM2MID targetNetwork,
-    XSD.NonNegativeInteger minReqVolume,
-    XSD.NonNegativeInteger spreadingWaitTime,
-    BackOffParameters backOffParameters,
-    XSD.AnySimpleType otherConditions,//FIXME Use AnySimpleType instead
-    MgmtLinkRef mgmtLink
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	ListOfM2MID targetNetwork,
+	XSD.NonNegativeInteger minReqVolume,
+	XSD.NonNegativeInteger spreadingWaitTime,
+	BackOffParameters backOffParameters,
+	XSD.AnySimpleType otherConditions,//FIXME Use AnySimpleType instead
+	MgmtLinkRef mgmtLink
 }
 with {
   variant "name as uncapitalized";
@@ -1200,24 +1199,24 @@ with {
 
 type record CmdhPolicy
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String cmdhPolicyName,
-    record length(4 .. infinity) of MgmtLinkRef mgmtLink_list
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String cmdhPolicyName,
+	record length(4 .. infinity) of MgmtLinkRef mgmtLink_list
 }
 with {
   variant "name as uncapitalized";
@@ -1381,8 +1380,8 @@ with {
 
 type union AbsRelTimestamp
 {
-    Timestamp alt_,
-    XSD.Long alt_1
+	Timestamp alt_,
+	XSD.Long alt_1
 }
 with {
   variant "name as uncapitalized";
@@ -1394,8 +1393,8 @@ with {
 
 type union MissingDataList
 {
-    ListOfTimeStamp alt_,
-    ListOfRelTimeStamp alt_1
+	ListOfTimeStamp alt_,
+	ListOfRelTimeStamp alt_1
 }
 with {
   variant "name as uncapitalized";
@@ -1433,9 +1432,9 @@ with {
 
 type enumerated PermittedMediaTypes
 {
-    applicationcbor,
-    applicationjson,
-    applicationxml
+	applicationcbor,
+	applicationjson,
+	applicationxml
 }
 with {
   variant "text 'applicationcbor' as 'application/cbor'";
@@ -1464,8 +1463,8 @@ with {
 
 type union EventCat
 {
-    StdEventCats alt_,
-    XSD.Integer alt_1 (100 .. 999)
+	StdEventCats alt_,
+	XSD.Integer alt_1 (100 .. 999)
 }
 with {
   variant "name as uncapitalized";
@@ -1477,11 +1476,11 @@ with {
 
 type union EventCatWithDef
 {
-    enumerated {
-        int0(0)
-    } alt_,
-    StdEventCats alt_1,
-    XSD.Integer alt_2 (100 .. 999)
+	enumerated {
+		int0(0)
+	} alt_,
+	StdEventCats alt_1,
+	XSD.Integer alt_2 (100 .. 999)
 }
 with {
   variant "name as uncapitalized";
@@ -1570,8 +1569,8 @@ with {
 
 type union DynAuthJWT
 {
-    E2eCompactJWS alt_,
-    E2eCompactJWE alt_1
+	E2eCompactJWS alt_,
+	E2eCompactJWE alt_1
 }
 with {
   variant "name as uncapitalized";
@@ -1589,9 +1588,9 @@ with {
 
 type union LocationTargetID
 {
-    NodeID alt_,
-    ExternalID alt_1,
-    XSD.String alt_2 (pattern "([0-9]*)")
+	NodeID alt_,
+	ExternalID alt_1,
+	XSD.String alt_2 (pattern "([0-9]*)")
 }
 with {
   variant "name as uncapitalized";
@@ -1623,8 +1622,8 @@ with {
 
 type record DeliveryMetaData
 {
-    XSD.Boolean tracingOption,
-    ListOfM2MID tracingInfo optional
+	XSD.Boolean tracingOption,
+	ListOfM2MID tracingInfo optional
 }
 with {
   variant "name as uncapitalized";
@@ -1635,14 +1634,14 @@ with {
 
 type record AggregatedRequest
 {
-    record length(1 .. infinity) of record {
-        Operation operation,
-        XSD.AnyURI to_,
-        XSD.ID from_,
-        RequestID requestIdentifier,
-        PrimitiveContent primitiveContent optional,
-        MetaInformation metaInformation optional
-    } request_list
+	record length(1 .. infinity) of record {
+		Operation operation,
+		XSD.AnyURI to_,
+		XSD.ID from_,
+		RequestID requestIdentifier,
+		PrimitiveContent primitiveContent optional,
+		MetaInformation metaInformation optional
+	} request_list
 }
 with {
   variant "name as uncapitalized";
@@ -1655,26 +1654,26 @@ with {
 
 type record MetaInformation
 {
-    ResourceType resourceType optional,
-    Timestamp originatingTimestamp optional,
-    AbsRelTimestamp requestExpirationTimestamp optional,
-    AbsRelTimestamp resultExpirationTimestamp optional,
-    AbsRelTimestamp operationExecutionTime optional,
-    ResponseTypeInfo responseType optional,
-    AbsRelTimestamp resultPersistence optional,
-    ResultContent resultContent optional,
-    EventCat eventCategory optional,
-    XSD.Boolean deliveryAggregation optional,
-    XSD.String groupRequestIdentifier optional,
-    FilterCriteria filterCriteria optional,
-    DiscResType discoveryResultType optional,
-    record length(1 .. infinity) of RoleID roleIDs optional,
-    XSD.Boolean tokenRequestIndicator optional,
-    record length(1 .. infinity) of DynAuthJWT tokens optional,
-    record length(1 .. infinity) of TokenID tokenIDs optional,
-    record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
-    ReleaseVersion releaseVersionIndicator,
-    XSD.String vendorInformation optional
+	ResourceType resourceType optional,
+	Timestamp originatingTimestamp optional,
+	AbsRelTimestamp requestExpirationTimestamp optional,
+	AbsRelTimestamp resultExpirationTimestamp optional,
+	AbsRelTimestamp operationExecutionTime optional,
+	ResponseTypeInfo responseType optional,
+	AbsRelTimestamp resultPersistence optional,
+	ResultContent resultContent optional,
+	EventCat eventCategory optional,
+	XSD.Boolean deliveryAggregation optional,
+	XSD.String groupRequestIdentifier optional,
+	FilterCriteria filterCriteria optional,
+	DesIdResType desiredIdentifierResultType optional,
+	record length(1 .. infinity) of RoleID roleIDs optional,
+	XSD.Boolean tokenRequestIndicator optional,
+	record length(1 .. infinity) of DynAuthJWT tokens optional,
+	record length(1 .. infinity) of TokenID tokenIDs optional,
+	record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
+	ReleaseVersion releaseVersionIndicator,
+	XSD.String vendorInformation optional
 }
 with {
   variant "name as uncapitalized";
@@ -1693,70 +1692,70 @@ with {
 
 //FIXME Use this type instead type record PrimitiveContent
 type union PrimitiveContent {
-    //TS-0004 - 7.5.2-1 & 7.5.2-2 Common elements to request/response content
-    //ResourceTypes
-    AEAnnc_optional aEAnnc,
-    AE_optional aE,
-    AccessControlPolicy_optional accessControlPolicy,
-    AccessControlPolicyAnnc_optional accessControlPolicyAnnc,
-    ContentInstance_optional contentInstance,
-    ContentInstanceAnnc_optional contentInstanceAnnc,
-    Container_optional container,
-    ContainerAnnc_optional containerAnnc,
-    Delivery_optional delivery,
-    FlexContainerResource_optional flexContainer,
-    CSEBase_optional cSEBase,
-    Group_optional group_,
-    GroupAnnc_optional groupAnnc,
-    LocationPolicy_optional locationPolicy,
-    LocationPolicyAnnc_optional locationPolicyAnnc,
-    MgmtResource_optional mgmtResource,//MgmtResource
-    MgmtCmd_optional mgmtCmd,
-    AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource
-    Node_optional node,
-    NodeAnnc_optional nodeAnnc,
-    PollingChannel_optional pollingChannel,
-    Request_optional request, 
-    RemoteCSE_optional remoteCSE,
-    RemoteCSEAnnc_optional remoteCSEAnnc,
-    Schedule_optional schedule,
-    ScheduleAnnc_optional scheduleAnnc,
-    StatsConfig_optional statsConfig,
-    StatsCollect_optional statsCollect,
-    M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
-    ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
-    Subscription_optional subscription,
-    SemanticDescriptor_optional semanticDescriptor,
-    TimeSeries_optional timeSeries,
-    TimeSeriesInstance_optional timeSeriesInstance,
-    TimeSeriesAnnc_optional timeSeriesAnnc,
-    TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc,
-    GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
-    //SecurityInfo
-    SecurityInfo securityInfo,
-    //TS-0004 - 7.5.2-1 Elements used for request content
-    Notification notification,
-    AggregatedNotification aggregatedNotification,
-    AttributeList attributeList,
-    ResponsePrimitive responsePrimitive,
-    //TS-0004 - 7.5.2-2 Elements used for response content
-    Resource resource,
-    URIList uRIList,
-    ResourceRefList resourceRefList,
-    AggregatedResponse aggregatedResponse,
-    URI uRI,
-    RequestPrimitive requestPrimitive,
-    DebugInfo debugInfo,
-    //Invalid types
-    AE_update_invalid aE_update_invalid,
-    ACP_update_invalid aCP_update_invalid,
-    Container_update_invalid container_update_invalid,
-    Group_update_invalid group_update_invalid,
-    PollingChannel_update_invalid pollingChannel_update_invalid,
-    Schedule_update_invalid schedule_update_invalid,
-    Subscription_update_invalid subscription_update_invalid,
-    LocationPolicy_update_invalid locationPolicy_update_invalid,
-    TimeSeries_update_invalid timeSeries_update_invalid
+	//TS-0004 - 7.5.2-1 & 7.5.2-2 Common elements to request/response content
+	//ResourceTypes
+	AEAnnc_optional aEAnnc,
+	AE_optional aE,
+	AccessControlPolicy_optional accessControlPolicy,
+	AccessControlPolicyAnnc_optional accessControlPolicyAnnc,
+	ContentInstance_optional contentInstance,
+	ContentInstanceAnnc_optional contentInstanceAnnc,
+	Container_optional container,
+	ContainerAnnc_optional containerAnnc,
+	Delivery_optional delivery,
+	FlexContainerResource_optional flexContainer,
+	CSEBase_optional cSEBase,
+	Group_optional group_,
+	GroupAnnc_optional groupAnnc,
+	LocationPolicy_optional locationPolicy,
+	LocationPolicyAnnc_optional locationPolicyAnnc,
+	MgmtResource_optional mgmtResource,//MgmtResource
+	MgmtCmd_optional mgmtCmd,
+	AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource
+	Node_optional node,
+	NodeAnnc_optional nodeAnnc,
+	PollingChannel_optional pollingChannel,
+	Request_optional request, 
+	RemoteCSE_optional remoteCSE,
+	RemoteCSEAnnc_optional remoteCSEAnnc,
+	Schedule_optional schedule,
+	ScheduleAnnc_optional scheduleAnnc,
+	StatsConfig_optional statsConfig,
+	StatsCollect_optional statsCollect,
+	M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
+	ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
+	Subscription_optional subscription,
+	SemanticDescriptor_optional semanticDescriptor,
+	TimeSeries_optional timeSeries,
+	TimeSeriesInstance_optional timeSeriesInstance,
+	TimeSeriesAnnc_optional timeSeriesAnnc,
+	TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc,
+	GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
+	//SecurityInfo
+	SecurityInfo securityInfo,
+	//TS-0004 - 7.5.2-1 Elements used for request content
+	Notification notification,
+	AggregatedNotification aggregatedNotification,
+	AttributeList attributeList,
+	ResponsePrimitive responsePrimitive,
+	//TS-0004 - 7.5.2-2 Elements used for response content
+	Resource resource,
+	URIList uRIList,
+	ResourceRefList resourceRefList,
+	AggregatedResponse aggregatedResponse,
+	URI uRI,
+	RequestPrimitive requestPrimitive,
+	DebugInfo debugInfo,
+	//Invalid types
+	AE_update_invalid aE_update_invalid,
+	ACP_update_invalid aCP_update_invalid,
+	Container_update_invalid container_update_invalid,
+	Group_update_invalid group_update_invalid,
+	PollingChannel_update_invalid pollingChannel_update_invalid,
+	Schedule_update_invalid schedule_update_invalid,
+	Subscription_update_invalid subscription_update_invalid,
+	LocationPolicy_update_invalid locationPolicy_update_invalid,
+	TimeSeries_update_invalid timeSeries_update_invalid
 }
 
 
@@ -1765,28 +1764,28 @@ type union PrimitiveContent {
 
 type record FilterCriteria
 {
-    Timestamp createdBefore optional,
-    Timestamp createdAfter optional,
-    Timestamp modifiedSince optional,
-    Timestamp unmodifiedSince optional,
-    XSD.PositiveInteger stateTagSmaller optional,
-    XSD.NonNegativeInteger stateTagBigger optional,
-    Timestamp expireBefore optional,
-    Timestamp expireAfter optional,
-    Labels labels optional,
-    ResourceTypeList resourceType optional,
-    XSD.NonNegativeInteger sizeAbove optional,
-    XSD.PositiveInteger sizeBelow optional,
-    record of TypeOfContent contentType_list,
-    record of Attribute attribute_list,
-    FilterUsage filterUsage optional,
-    XSD.NonNegativeInteger limit optional,
-    record of Sparql semanticsFilter_list,
-    XSD.Boolean filterOperation optional,
-    ContentFilterSyntax contentFilterSyntax optional,
-    XSD.String contentFilterQuery optional,
-    XSD.PositiveInteger level optional,
-    XSD.PositiveInteger offset optional
+	Timestamp createdBefore optional,
+	Timestamp createdAfter optional,
+	Timestamp modifiedSince optional,
+	Timestamp unmodifiedSince optional,
+	XSD.PositiveInteger stateTagSmaller optional,
+	XSD.NonNegativeInteger stateTagBigger optional,
+	Timestamp expireBefore optional,
+	Timestamp expireAfter optional,
+	Labels labels optional,
+	ResourceTypeList resourceType optional,
+	XSD.NonNegativeInteger sizeAbove optional,
+	XSD.PositiveInteger sizeBelow optional,
+	record of TypeOfContent contentType_list,
+	record of Attribute attribute_list,
+	FilterUsage filterUsage optional,
+	XSD.NonNegativeInteger limit optional,
+	record of Sparql semanticsFilter_list,
+	XSD.Boolean filterOperation optional,
+	ContentFilterSyntax contentFilterSyntax optional,
+	XSD.String contentFilterQuery optional,
+	XSD.PositiveInteger level optional,
+	XSD.PositiveInteger offset optional
 }
 with {
   variant "name as uncapitalized";
@@ -1803,8 +1802,8 @@ with {
 
 type record Attribute
 {
-    XSD.NCName name,
-    XSD.AnySimpleType value_//FIXME Use AnySimpleType instead
+	XSD.NCName name,
+	XSD.AnySimpleType value_//FIXME Use AnySimpleType instead
 }
 with {
   variant "name as uncapitalized";
@@ -1814,7 +1813,7 @@ with {
 
 type record ScheduleEntries
 {
-    record length(1 .. infinity) of ScheduleEntry scheduleEntry_list
+	record length(1 .. infinity) of ScheduleEntry scheduleEntry_list
 }
 with {
   variant "name as uncapitalized";
@@ -1829,8 +1828,8 @@ with {
 
 type record ActionStatus
 {
-    XSD.AnyURI action_ optional,
-    Status status optional
+	XSD.AnyURI action_ optional,
+	Status status optional
 }
 with {
   variant "name as uncapitalized";
@@ -1840,8 +1839,8 @@ with {
 
 type record AnyArgType
 {
-    XSD.NCName name,
-    XSD.AnySimpleType value_//FIXME Use AnySimpleType instead
+	XSD.NCName name,
+	XSD.AnySimpleType value_//FIXME Use AnySimpleType instead
 }
 with {
   variant "name as uncapitalized";
@@ -1851,7 +1850,7 @@ with {
 
 type record ResetArgsType
 {
-    record of AnyArgType anyArg_list
+	record of AnyArgType anyArg_list
 }
 with {
   variant "name as uncapitalized";
@@ -1862,7 +1861,7 @@ with {
 
 type record RebootArgsType
 {
-    record of AnyArgType anyArg_list
+	record of AnyArgType anyArg_list
 }
 with {
   variant "name as uncapitalized";
@@ -1873,11 +1872,11 @@ with {
 
 type record UploadArgsType
 {
-    XSD.String fileType,
-    XSD.AnyURI uRL,
-    XSD.String username,
-    XSD.String password,
-    record of AnyArgType anyArg_list
+	XSD.String fileType,
+	XSD.AnyURI uRL,
+	XSD.String username,
+	XSD.String password,
+	record of AnyArgType anyArg_list
 }
 with {
   variant "name as uncapitalized";
@@ -1889,17 +1888,17 @@ with {
 
 type record DownloadArgsType
 {
-    XSD.String fileType,
-    XSD.AnyURI uRL,
-    XSD.String username,
-    XSD.String password,
-    XSD.PositiveInteger filesize,
-    XSD.String targetFile,
-    XSD.PositiveInteger delaySeconds,
-    XSD.AnyURI successURL,
-    Timestamp startTime,
-    Timestamp completeTime,
-    record of AnyArgType anyArg_list
+	XSD.String fileType,
+	XSD.AnyURI uRL,
+	XSD.String username,
+	XSD.String password,
+	XSD.PositiveInteger filesize,
+	XSD.String targetFile,
+	XSD.PositiveInteger delaySeconds,
+	XSD.AnyURI successURL,
+	Timestamp startTime,
+	Timestamp completeTime,
+	record of AnyArgType anyArg_list
 }
 with {
   variant "name as uncapitalized";
@@ -1911,12 +1910,12 @@ with {
 
 type record SoftwareInstallArgsType
 {
-    XSD.AnyURI uRL,
-    XSD.String uUID,
-    XSD.String username,
-    XSD.String password,
-    XSD.String executionEnvRef,
-    record of AnyArgType anyArg_list
+	XSD.AnyURI uRL,
+	XSD.String uUID,
+	XSD.String username,
+	XSD.String password,
+	XSD.String executionEnvRef,
+	record of AnyArgType anyArg_list
 }
 with {
   variant "name as uncapitalized";
@@ -1929,13 +1928,13 @@ with {
 
 type record SoftwareUpdateArgsType
 {
-    XSD.String uUID,
-    XSD.String version,
-    XSD.AnyURI uRL,
-    XSD.String username,
-    XSD.String password,
-    XSD.String executionEnvRef,
-    record of AnyArgType anyArg_list
+	XSD.String uUID,
+	XSD.String version,
+	XSD.AnyURI uRL,
+	XSD.String username,
+	XSD.String password,
+	XSD.String executionEnvRef,
+	record of AnyArgType anyArg_list
 }
 with {
   variant "name as uncapitalized";
@@ -1948,10 +1947,10 @@ with {
 
 type record SoftwareUninstallArgsType
 {
-    XSD.String uUID,
-    XSD.String version,
-    XSD.String executionEnvRef,
-    record of AnyArgType anyArg_list
+	XSD.String uUID,
+	XSD.String version,
+	XSD.String executionEnvRef,
+	record of AnyArgType anyArg_list
 }
 with {
   variant "name as uncapitalized";
@@ -1963,15 +1962,15 @@ with {
 
 type record ExecReqArgsListType
 {
-    union {
-        record of ResetArgsType reset_list,
-        record length(1 .. infinity) of RebootArgsType reboot_list,
-        record length(1 .. infinity) of UploadArgsType upload_list,
-        record length(1 .. infinity) of DownloadArgsType download_list,
-        record length(1 .. infinity) of SoftwareInstallArgsType softwareInstall_list,
-        record length(1 .. infinity) of SoftwareUpdateArgsType softwareUpdate_list,
-        record length(1 .. infinity) of SoftwareUninstallArgsType softwareUninstall_list
-    } choice
+	union {
+		record of ResetArgsType reset_list,
+		record length(1 .. infinity) of RebootArgsType reboot_list,
+		record length(1 .. infinity) of UploadArgsType upload_list,
+		record length(1 .. infinity) of DownloadArgsType download_list,
+		record length(1 .. infinity) of SoftwareInstallArgsType softwareInstall_list,
+		record length(1 .. infinity) of SoftwareUpdateArgsType softwareUpdate_list,
+		record length(1 .. infinity) of SoftwareUninstallArgsType softwareUninstall_list
+	} choice
 }
 with {
   variant "name as uncapitalized";
@@ -1995,9 +1994,9 @@ with {
 
 type record MgmtLinkRef
 {
-    ResourceName name,
-    MgmtDefinition type_,
-    XSD.AnyURI base
+	ResourceName name,
+	MgmtDefinition type_,
+	XSD.AnyURI base
 }
 with {
   variant "name as uncapitalized";
@@ -2012,7 +2011,7 @@ with {
 
 type record SetOfAcrs
 {
-    record of AccessControlRule accessControlRule_list
+	record of AccessControlRule accessControlRule_list
 }
 with {
   variant "name as uncapitalized";
@@ -2023,22 +2022,22 @@ with {
 
 type record AccessControlRule
 {
-    ListOfURIs accessControlOriginators,
-    AccessControlOperations accessControlOperations,
-    record of record {
-        record of ScheduleEntry accessControlWindow_list,
-        record {
-            record length(1 .. infinity) of Ipv4 ipv4Addresses optional,
-            record length(1 .. infinity) of Ipv6 ipv6Addresses optional
-        } accessControlIpAddresses optional,
-        LocationRegion accessControlLocationRegion optional
-    } accessControlContexts_list,
-    XSD.Boolean accessControlAuthenticationFlag optional,
-    record of record {
-        ResourceType resourceType optional,
-        XSD.AnyURI specializationID optional,
-        record length(1 .. infinity) of ResourceType childResourceType
-    } accessControlObjectDetails_list
+	ListOfURIs accessControlOriginators,
+	AccessControlOperations accessControlOperations,
+	record of record {
+		record of ScheduleEntry accessControlWindow_list,
+		record {
+			record length(1 .. infinity) of Ipv4 ipv4Addresses optional,
+			record length(1 .. infinity) of Ipv6 ipv6Addresses optional
+		} accessControlIpAddresses optional,
+		LocationRegion accessControlLocationRegion optional
+	} accessControlContexts_list,
+	XSD.Boolean accessControlAuthenticationFlag optional,
+	record of record {
+		ResourceType resourceType optional,
+		XSD.AnyURI specializationID optional,
+		record length(1 .. infinity) of ResourceType childResourceType
+	} accessControlObjectDetails_list
 }
 with {
   variant "name as uncapitalized";
@@ -2058,10 +2057,10 @@ with {
 
 type record ChildResourceRef
 {
-    ResourceName name,
-    XSD.AnyURI specializationID optional,
-    ResourceType type_,
-    XSD.AnyURI base
+	ResourceName name,
+	XSD.AnyURI specializationID optional,
+	ResourceType type_,
+	XSD.AnyURI base
 }
 with {
   //variant "name as uncapitalized";
@@ -2075,8 +2074,8 @@ with {
 
 type record ResponseTypeInfo
 {
-    ResponseType responseTypeValue,
-    record of XSD.AnyURI notificationURI optional
+	ResponseType responseTypeValue,
+	record of XSD.AnyURI notificationURI optional
 }
 with {
   variant "name as uncapitalized";
@@ -2088,16 +2087,16 @@ with {
 
 type record OperationResult
 {
-    ResponseStatusCode responseStatusCode,
-    RequestID requestIdentifier,
-    PrimitiveContent primitiveContent optional,
-    XSD.AnyURI to_ optional,
-    XSD.ID from_ optional,
-    Timestamp originatingTimestamp optional,
-    AbsRelTimestamp resultExpirationTimestamp optional,
-    EventCat eventCategory optional,
-    ContentStatus contentStatus optional,
-    XSD.PositiveInteger contentOffset optional
+	ResponseStatusCode responseStatusCode,
+	RequestID requestIdentifier,
+	PrimitiveContent primitiveContent optional,
+	XSD.AnyURI to_ optional,
+	XSD.ID from_ optional,
+	Timestamp originatingTimestamp optional,
+	AbsRelTimestamp resultExpirationTimestamp optional,
+	EventCat eventCategory optional,
+	ContentStatus contentStatus optional,
+	XSD.PositiveInteger contentOffset optional
 }
 with {
   variant "name as uncapitalized";
@@ -2110,10 +2109,10 @@ with {
 
 type record ContentRef
 {
-    record length(1 .. infinity) of record {
-        XSD.NCName name,
-        XSD.AnyURI uRI
-    } uRIReference_list
+	record length(1 .. infinity) of record {
+		XSD.NCName name,
+		XSD.AnyURI uRI
+	} uRIReference_list
 }
 with {
   variant "name as uncapitalized";
@@ -2125,8 +2124,8 @@ with {
 
 type record DeletionContexts
 {
-    record of ScheduleEntry timeOfDay_list,
-    record of LocationRegion locationRegions_list
+	record of ScheduleEntry timeOfDay_list,
+	record of LocationRegion locationRegions_list
 }
 with {
   variant "name as uncapitalized";
@@ -2139,10 +2138,10 @@ with {
 
 type record LocationRegion
 {
-    union {
-        record length(1 .. infinity) of CountryCode countryCode,
-        record length(3) of XSD.Float circRegion
-    } choice
+	union {
+		record length(1 .. infinity) of CountryCode countryCode,
+		record length(3) of XSD.Float circRegion
+	} choice
 }
 with {
   variant "name as uncapitalized";
@@ -2160,8 +2159,8 @@ with {
 
 type record MissingData
 {
-    XSD.NonNegativeInteger number,
-    XSD.Duration duration
+	XSD.PositiveInteger number,
+	XSD.Duration duration
 }
 with {
   variant "name as uncapitalized";
@@ -2174,11 +2173,11 @@ with {
 
 type record ReceiverESPrimRandObject
 {
-    XSD.NCName esprimRandID,
-    XSD.NCName esprimRandValue,
-    AbsRelTimestamp esprimRandExpiry,
-    record length(1 .. infinity) of EsprimKeyGenAlgID esprimKeyGenAlgIDs,
-    record length(1 .. infinity) of EsprimProtocolAndAlgID esprimProtocolAndAlgIDs
+	XSD.NCName esprimRandID,
+	XSD.NCName esprimRandValue,
+	AbsRelTimestamp esprimRandExpiry,
+	record length(1 .. infinity) of EsprimKeyGenAlgID esprimKeyGenAlgIDs,
+	record length(1 .. infinity) of EsprimProtocolAndAlgID esprimProtocolAndAlgIDs
 }
 with {
   variant "name as uncapitalized";
@@ -2191,11 +2190,11 @@ with {
 
 type record OriginatorESPrimRandObject
 {
-    XSD.NCName esprimRandID,
-    XSD.NCName esprimRandValue,
-    AbsRelTimestamp esprimRandExpiry,
-    EsprimKeyGenAlgID esprimKeyGenAlgIDs,
-    record length(1 .. infinity) of EsprimProtocolAndAlgID esprimProtocolAndAlgIDs
+	XSD.NCName esprimRandID,
+	XSD.NCName esprimRandValue,
+	AbsRelTimestamp esprimRandExpiry,
+	EsprimKeyGenAlgID esprimKeyGenAlgIDs,
+	record length(1 .. infinity) of EsprimProtocolAndAlgID esprimProtocolAndAlgIDs
 }
 with {
   variant "name as uncapitalized";
@@ -2205,9 +2204,9 @@ with {
 
 type record E2eSecInfo
 {
-    record length(1 .. infinity) of Suid supportedE2ESecFeatures,
-    record length(1 .. infinity) of XSD.Base64Binary certificates optional,
-    ReceiverESPrimRandObject sharedReceiverESPrimRandObject optional
+	record length(1 .. infinity) of Suid supportedE2ESecFeatures,
+	record length(1 .. infinity) of XSD.Base64Binary certificates optional,
+	ReceiverESPrimRandObject sharedReceiverESPrimRandObject optional
 }
 with {
   variant "name as uncapitalized";
@@ -2218,9 +2217,9 @@ with {
 
 type record TokenPermission
 {
-    ListOfM2MID resourceIDs optional,
-    SetOfAcrs privileges optional,
-    record length(1 .. infinity) of RoleID roleIDs optional
+	ListOfM2MID resourceIDs optional,
+	SetOfAcrs privileges optional,
+	record length(1 .. infinity) of RoleID roleIDs optional
 }
 with {
   variant "name as uncapitalized";
@@ -2230,7 +2229,7 @@ with {
 
 type record TokenPermissions
 {
-    record of TokenPermission permission_list
+	record of TokenPermission permission_list
 }
 with {
   variant "name as uncapitalized";
@@ -2241,16 +2240,16 @@ with {
 
 type record TokenClaimSet
 {
-    XSD.String version,
-    TokenID tokenID,
-    XSD.ID holder,
-    XSD.ID issuer,
-    Timestamp notBefore,
-    Timestamp notAfter,
-    XSD.String tokenName optional,
-    ListOfM2MID audience optional,
-    TokenPermissions permissions optional,
-    XSD.String extension_ optional
+	XSD.String version,
+	TokenID tokenID,
+	XSD.ID holder,
+	XSD.ID issuer,
+	Timestamp notBefore,
+	Timestamp notAfter,
+	XSD.String tokenName optional,
+	ListOfM2MID audience optional,
+	TokenPermissions permissions optional,
+	XSD.String extension_ optional
 }
 with {
   variant "name as uncapitalized";
@@ -2260,10 +2259,10 @@ with {
 
 type record DynAuthLocalTokenIdAssignments
 {
-    record length(1 .. infinity) of record {
-        XSD.NCName localTokenID,
-        TokenID tokenID
-    } localTokenIdAssignment_list
+	record length(1 .. infinity) of record {
+		XSD.NCName localTokenID,
+		TokenID tokenID
+	} localTokenIdAssignment_list
 }
 with {
   variant "name as uncapitalized";
@@ -2274,11 +2273,11 @@ with {
 
 type record DynAuthTokenSummary
 {
-    TokenID tokenID,
-    Timestamp notBefore,
-    Timestamp notAfter,
-    XSD.String tokenName optional,
-    ListOfM2MID audience optional
+	TokenID tokenID,
+	Timestamp notBefore,
+	Timestamp notAfter,
+	XSD.String tokenName optional,
+	ListOfM2MID audience optional
 }
 with {
   variant "name as uncapitalized";
@@ -2287,11 +2286,11 @@ with {
 
 type record DynAuthTokenReqInfo
 {
-    record length(1 .. infinity) of record {
-        XSD.AnyURI uRI,
-        DynAuthDasRequest dasRequest optional,
-        DynAuthJWT securedDasRequest optional
-    } dasInfo_list
+	record length(1 .. infinity) of record {
+		XSD.AnyURI uRI,
+		DynAuthDasRequest dasRequest optional,
+		DynAuthJWT securedDasRequest optional
+	} dasInfo_list
 }
 with {
   variant "name as uncapitalized";
@@ -2303,20 +2302,20 @@ with {
 
 type record DynAuthDasRequest
 {
-    XSD.ID originator,
-    ResourceType targetedResourceType,
-    Operation operation,
-    record {
-        Ipv4 ipv4Address optional,
-        Ipv6 ipv6Address optional
-    } originatorIP optional,
-    LocationRegion originatorLocation optional,
-    record length(1 .. infinity) of RoleID originatorRoleIDs optional,
-    AbsRelTimestamp requestTimestamp optional,
-    XSD.AnyURI targetedResourceID optional,
-    AbsRelTimestamp proposedPrivilegesLifetime optional,
-    record length(1 .. infinity) of RoleID roleIDsFromACPs optional,
-    record length(1 .. infinity) of TokenID tokenIDs optional
+	XSD.ID originator,
+	ResourceType targetedResourceType,
+	Operation operation,
+	record {
+		Ipv4 ipv4Address optional,
+		Ipv6 ipv6Address optional
+	} originatorIP optional,
+	LocationRegion originatorLocation optional,
+	record length(1 .. infinity) of RoleID originatorRoleIDs optional,
+	AbsRelTimestamp requestTimestamp optional,
+	XSD.AnyURI targetedResourceID optional,
+	AbsRelTimestamp proposedPrivilegesLifetime optional,
+	record length(1 .. infinity) of RoleID roleIDsFromACPs optional,
+	record length(1 .. infinity) of TokenID tokenIDs optional
 }
 with {
   variant "name as uncapitalized";
@@ -2330,13 +2329,13 @@ with {
 
 type record BackOffParameters
 {
-    record length(1 .. infinity) of record {
-        NetworkAction networkAction optional,
-        XSD.NonNegativeInteger initialBackoffTime,
-        XSD.NonNegativeInteger additionalBackoffTime,
-        XSD.NonNegativeInteger maximumBackoffTime,
-        XSD.NonNegativeInteger optionalRandomBackoffTime optional
-    } backOffParametersSet_list
+	record length(1 .. infinity) of record {
+		NetworkAction networkAction optional,
+		XSD.NonNegativeInteger initialBackoffTime,
+		XSD.NonNegativeInteger additionalBackoffTime,
+		XSD.NonNegativeInteger maximumBackoffTime,
+		XSD.NonNegativeInteger optionalRandomBackoffTime optional
+	} backOffParametersSet_list
 }
 with {
   variant "name as uncapitalized";
@@ -2351,7 +2350,7 @@ with {
 
 type record ListOfDataLinks
 {
-    record length(1 .. infinity) of DataLink dataLinkEntry_list
+	record length(1 .. infinity) of DataLink dataLinkEntry_list
 }
 with {
   variant "name as uncapitalized";
@@ -2364,9 +2363,9 @@ with {
 
 type record DataLink
 {
-    XSD.AnyURI name,
-    XSD.ID dataContainerID,
-    XSD.NCName attributeName optional
+	XSD.AnyURI name,
+	XSD.ID dataContainerID,
+	XSD.NCName attributeName optional
 }
 with {
   variant "name as uncapitalized";
@@ -2377,13 +2376,13 @@ with {
 
 type record Resource_1
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional
 }
 with {
   variant "name as 'resource'";
@@ -2393,16 +2392,16 @@ with {
 
 type record RegularResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional
 }
 with {
   variant "name as uncapitalized";
@@ -2412,18 +2411,18 @@ with {
 
 type record AnnounceableResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional
 }
 with {
   variant "name as uncapitalized";
@@ -2434,17 +2433,17 @@ with {
 
 type record AnnouncedResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional
 }
 with {
   variant "name as uncapitalized";
@@ -2454,16 +2453,16 @@ with {
 
 type record AnnounceableSubordinateResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional
 }
 with {
   variant "name as uncapitalized";
@@ -2474,14 +2473,14 @@ with {
 
 type record SubordinateResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime
 }
 with {
   variant "name as uncapitalized";
@@ -2491,15 +2490,15 @@ with {
 
 type record AnnouncedSubordinateResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    XSD.AnyURI link
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	XSD.AnyURI link
 }
 with {
   variant "name as uncapitalized";
@@ -2509,22 +2508,22 @@ with {
 
 type record MgmtResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional
 }
 with {
   variant "name as uncapitalized";
@@ -2535,21 +2534,21 @@ with {
 
 type record AnnouncedMgmtResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional
 }
 with {
   variant "name as uncapitalized";
@@ -2568,23 +2567,23 @@ with {
 
 type record FlexContainerResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize
 }
 with {
   variant "name as uncapitalized";
@@ -2594,21 +2593,21 @@ with {
 
 type record AnnouncedFlexContainerResource
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize
 }
 with {
   variant "name as uncapitalized";
@@ -2620,11 +2619,11 @@ with {
 
 type union Sg_announceableSubordinateResource_group
 {
-    AnnounceableSubordinateResource sg_announceableSubordinateResource,
-    AccessControlPolicy accessControlPolicy,
-    ContentInstance contentInstance,
-    Schedule schedule,
-    TimeSeriesInstance timeSeriesInstance
+	AnnounceableSubordinateResource sg_announceableSubordinateResource,
+	AccessControlPolicy accessControlPolicy,
+	ContentInstance contentInstance,
+	Schedule schedule,
+	TimeSeriesInstance timeSeriesInstance
 }
 with {
   variant "untagged";
@@ -2635,11 +2634,11 @@ with {
 
 type union Sg_announcedSubordinateResource_group
 {
-    AnnouncedSubordinateResource sg_announcedSubordinateResource,
-    AccessControlPolicyAnnc accessControlPolicyAnnc,
-    ContentInstanceAnnc contentInstanceAnnc,
-    ScheduleAnnc scheduleAnnc,
-    TimeSeriesInstanceAnnc timeSeriesInstanceAnnc
+	AnnouncedSubordinateResource sg_announcedSubordinateResource,
+	AccessControlPolicyAnnc accessControlPolicyAnnc,
+	ContentInstanceAnnc contentInstanceAnnc,
+	ScheduleAnnc scheduleAnnc,
+	TimeSeriesInstanceAnnc timeSeriesInstanceAnnc
 }
 with {
   variant "untagged";
@@ -2650,26 +2649,26 @@ with {
 
 type union Sg_mgmtResource_group
 {
-    MgmtResource sg_mgmtResource,
-    ActiveCmdhPolicy activeCmdhPolicy,
-    AreaNwkDeviceInfo areaNwkDeviceInfo,
-    AreaNwkInfo areaNwkInfo,
-    Battery battery,
-    CmdhBuffer cmdhBuffer,
-    CmdhDefEcValue cmdhDefEcValue,
-    CmdhDefaults cmdhDefaults,
-    CmdhEcDefParamValues cmdhEcDefParamValues,
-    CmdhLimits cmdhLimits,
-    CmdhNetworkAccessRules cmdhNetworkAccessRules,
-    CmdhNwAccessRule cmdhNwAccessRule,
-    CmdhPolicy cmdhPolicy,
-    DeviceCapability deviceCapability,
-    DeviceInfo deviceInfo,
-    EventLog eventLog,
-    Firmware firmware,
-    Memory memory,
-    Reboot reboot,
-    Software software
+	MgmtResource sg_mgmtResource,
+	ActiveCmdhPolicy activeCmdhPolicy,
+	AreaNwkDeviceInfo areaNwkDeviceInfo,
+	AreaNwkInfo areaNwkInfo,
+	Battery battery,
+	CmdhBuffer cmdhBuffer,
+	CmdhDefEcValue cmdhDefEcValue,
+	CmdhDefaults cmdhDefaults,
+	CmdhEcDefParamValues cmdhEcDefParamValues,
+	CmdhLimits cmdhLimits,
+	CmdhNetworkAccessRules cmdhNetworkAccessRules,
+	CmdhNwAccessRule cmdhNwAccessRule,
+	CmdhPolicy cmdhPolicy,
+	DeviceCapability deviceCapability,
+	DeviceInfo deviceInfo,
+	EventLog eventLog,
+	Firmware firmware,
+	Memory memory,
+	Reboot reboot,
+	Software software
 }
 with {
   variant "untagged";
@@ -2680,16 +2679,16 @@ with {
 
 type union Sg_announceableResource_group
 {
-    AnnounceableResource sg_announceableResource,
-    AE aE,
-    Container container,
-    Group group_,
-    LocationPolicy locationPolicy,
-    Node node,
-    RemoteCSE remoteCSE,
-    SemanticDescriptor semanticDescriptor,
-    TimeSeries timeSeries,
-    TrafficPattern trafficPattern
+	AnnounceableResource sg_announceableResource,
+	AE aE,
+	Container container,
+	Group group_,
+	LocationPolicy locationPolicy,
+	Node node,
+	RemoteCSE remoteCSE,
+	SemanticDescriptor semanticDescriptor,
+	TimeSeries timeSeries,
+	TrafficPattern trafficPattern
 }
 with {
   variant "untagged";
@@ -2702,16 +2701,16 @@ with {
 
 type union Sg_announcedResource_group
 {
-    AnnouncedResource sg_announcedResource,
-    AEAnnc aEAnnc,
-    ContainerAnnc containerAnnc,
-    GroupAnnc groupAnnc,
-    LocationPolicyAnnc locationPolicyAnnc,
-    NodeAnnc nodeAnnc,
-    RemoteCSEAnnc remoteCSEAnnc,
-    SemanticDescriptorAnnc semanticDescriptorAnnc,
-    TimeSeriesAnnc timeSeriesAnnc,
-    TrafficPatternAnnc trafficPatternAnnc
+	AnnouncedResource sg_announcedResource,
+	AEAnnc aEAnnc,
+	ContainerAnnc containerAnnc,
+	GroupAnnc groupAnnc,
+	LocationPolicyAnnc locationPolicyAnnc,
+	NodeAnnc nodeAnnc,
+	RemoteCSEAnnc remoteCSEAnnc,
+	SemanticDescriptorAnnc semanticDescriptorAnnc,
+	TimeSeriesAnnc timeSeriesAnnc,
+	TrafficPatternAnnc trafficPatternAnnc
 }
 with {
   variant "untagged";
@@ -2723,17 +2722,17 @@ with {
 
 type union Sg_flexContainerResource_group
 {
-    FlexContainerResource sg_flexContainerResource,
-    AllJoynApp allJoynApp,
-    AllJoynInterface allJoynInterface,
-    AllJoynMethod allJoynMethod,
-    AllJoynMethodCall allJoynMethodCall,
-    AllJoynProperty allJoynProperty,
-    AllJoynSvcObject allJoynSvcObject,
-    GenericInterworkingOperationInstance genericInterworkingOperationInstance,
-    GenericInterworkingService genericInterworkingService,
-    SvcFwWrapper svcFwWrapper,
-    SvcObjWrapper svcObjWrapper
+	FlexContainerResource sg_flexContainerResource,
+	AllJoynApp allJoynApp,
+	AllJoynInterface allJoynInterface,
+	AllJoynMethod allJoynMethod,
+	AllJoynMethodCall allJoynMethodCall,
+	AllJoynProperty allJoynProperty,
+	AllJoynSvcObject allJoynSvcObject,
+	GenericInterworkingOperationInstance genericInterworkingOperationInstance,
+	GenericInterworkingService genericInterworkingService,
+	SvcFwWrapper svcFwWrapper,
+	SvcObjWrapper svcObjWrapper
 }
 with {
   variant "untagged";
@@ -2744,17 +2743,17 @@ with {
 
 type union Sg_announcedFlexContainerResource_group
 {
-    AnnouncedFlexContainerResource sg_announcedFlexContainerResource,
-    AllJoynAppAnnc allJoynAppAnnc,
-    AllJoynInterfaceAnnc allJoynInterfaceAnnc,
-    AllJoynMethodAnnc allJoynMethodAnnc,
-    AllJoynMethodCallAnnc allJoynMethodCallAnnc,
-    AllJoynPropertyAnnc allJoynPropertyAnnc,
-    AllJoynSvcObjectAnnc allJoynSvcObjectAnnc,
-    GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc,
-    GenericInterworkingServiceAnnc genericInterworkingServiceAnnc,
-    SvcFwWrapperAnnc svcFwWrapperAnnc,
-    SvcObjWrapperAnnc svcObjWrapperAnnc
+	AnnouncedFlexContainerResource sg_announcedFlexContainerResource,
+	AllJoynAppAnnc allJoynAppAnnc,
+	AllJoynInterfaceAnnc allJoynInterfaceAnnc,
+	AllJoynMethodAnnc allJoynMethodAnnc,
+	AllJoynMethodCallAnnc allJoynMethodCallAnnc,
+	AllJoynPropertyAnnc allJoynPropertyAnnc,
+	AllJoynSvcObjectAnnc allJoynSvcObjectAnnc,
+	GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc,
+	GenericInterworkingServiceAnnc genericInterworkingServiceAnnc,
+	SvcFwWrapperAnnc svcFwWrapperAnnc,
+	SvcObjWrapperAnnc svcObjWrapperAnnc
 }
 with {
   variant "untagged";
@@ -2765,17 +2764,17 @@ with {
 
 type union Sg_announcedMgmtResource_group
 {
-    AnnouncedMgmtResource sg_announcedMgmtResource,
-    AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc,
-    AreaNwkInfoAnnc areaNwkInfoAnnc,
-    BatteryAnnc batteryAnnc,
-    DeviceCapabilityAnnc deviceCapabilityAnnc,
-    DeviceInfoAnnc deviceInfoAnnc,
-    EventLogAnnc eventLogAnnc,
-    FirmwareAnnc firmwareAnnc,
-    MemoryAnnc memoryAnnc,
-    RebootAnnc rebootAnnc,
-    SoftwareAnnc softwareAnnc
+	AnnouncedMgmtResource sg_announcedMgmtResource,
+	AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc,
+	AreaNwkInfoAnnc areaNwkInfoAnnc,
+	BatteryAnnc batteryAnnc,
+	DeviceCapabilityAnnc deviceCapabilityAnnc,
+	DeviceInfoAnnc deviceInfoAnnc,
+	EventLogAnnc eventLogAnnc,
+	FirmwareAnnc firmwareAnnc,
+	MemoryAnnc memoryAnnc,
+	RebootAnnc rebootAnnc,
+	SoftwareAnnc softwareAnnc
 }
 with {
   variant "untagged";
@@ -2786,8 +2785,8 @@ with {
 
 type union Sg_resource_group
 {
-    Resource sg_resource,
-    CSEBase cSEBase
+	Resource sg_resource,
+	CSEBase cSEBase
 }
 with {
   variant "untagged";
@@ -2799,24 +2798,24 @@ with {
 
 type union Sg_regularResource_group
 {
-    RegularResource sg_regularResource,
-    Delivery delivery,
-    DynamicAuthorizationConsultation dynamicAuthorizationConsultation,
-    EventConfig eventConfig,
-    ExecInstance execInstance,
-    M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
-    MgmtCmd mgmtCmd,
-    NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
-    NotificationTargetPolicy notificationTargetPolicy,
-    PolicyDeletionRules policyDeletionRules,
-    Request request,
-    Role role,
-    ServiceSubscribedAppRule serviceSubscribedAppRule,
-    ServiceSubscribedNode serviceSubscribedNode,
-    StatsCollect statsCollect,
-    StatsConfig statsConfig,
-    Subscription subscription,
-    Token token
+	RegularResource sg_regularResource,
+	Delivery delivery,
+	DynamicAuthorizationConsultation dynamicAuthorizationConsultation,
+	EventConfig eventConfig,
+	ExecInstance execInstance,
+	M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
+	MgmtCmd mgmtCmd,
+	NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
+	NotificationTargetPolicy notificationTargetPolicy,
+	PolicyDeletionRules policyDeletionRules,
+	Request request,
+	Role role,
+	ServiceSubscribedAppRule serviceSubscribedAppRule,
+	ServiceSubscribedNode serviceSubscribedNode,
+	StatsCollect statsCollect,
+	StatsConfig statsConfig,
+	Subscription subscription,
+	Token token
 }
 with {
   variant "untagged";
@@ -2827,8 +2826,8 @@ with {
 
 type union Sg_subordinateResource_group
 {
-    SubordinateResource sg_subordinateResource,
-    PollingChannel pollingChannel
+	SubordinateResource sg_subordinateResource,
+	PollingChannel pollingChannel
 }
 with {
   variant "untagged";
@@ -2839,38 +2838,38 @@ with {
 
 type record Container
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.NonNegativeInteger maxNrOfInstances optional,
-    XSD.NonNegativeInteger maxByteSize optional,
-    XSD.NonNegativeInteger maxInstanceAge optional,
-    XSD.NonNegativeInteger currentNrOfInstances,
-    XSD.NonNegativeInteger currentByteSize,
-    XSD.AnyURI locationID optional,
-    XSD.AnyURI ontologyRef optional,
-    XSD.Boolean disableRetrieval optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            ContentInstance contentInstance,
-            Container container,
-            Subscription subscription,
-            SemanticDescriptor semanticDescriptor,
-            Sg_flexContainerResource_group sg_flexContainerResource
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.NonNegativeInteger maxNrOfInstances optional,
+	XSD.NonNegativeInteger maxByteSize optional,
+	XSD.NonNegativeInteger maxInstanceAge optional,
+	XSD.NonNegativeInteger currentNrOfInstances,
+	XSD.NonNegativeInteger currentByteSize,
+	XSD.AnyURI locationID optional,
+	XSD.AnyURI ontologyRef optional,
+	XSD.Boolean disableRetrieval optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			ContentInstance contentInstance,
+			Container container,
+			Subscription subscription,
+			SemanticDescriptor semanticDescriptor,
+			Sg_flexContainerResource_group sg_flexContainerResource
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -2889,40 +2888,40 @@ with {
 
 type record ContainerAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.NonNegativeInteger maxNrOfInstances optional,
-    XSD.NonNegativeInteger maxByteSize optional,
-    XSD.NonNegativeInteger maxInstanceAge optional,
-    XSD.NonNegativeInteger currentNrOfInstances optional,
-    XSD.NonNegativeInteger currentByteSize optional,
-    XSD.AnyURI locationID optional,
-    XSD.AnyURI ontologyRef optional,
-    XSD.Boolean disableRetrieval optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            ContentInstance contentInstance,
-            ContentInstanceAnnc contentInstanceAnnc,
-            Container container,
-            ContainerAnnc containerAnnc,
-            Subscription subscription,
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Sg_flexContainerResource_group sg_flexContainerResource,
-            Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.NonNegativeInteger maxNrOfInstances optional,
+	XSD.NonNegativeInteger maxByteSize optional,
+	XSD.NonNegativeInteger maxInstanceAge optional,
+	XSD.NonNegativeInteger currentNrOfInstances optional,
+	XSD.NonNegativeInteger currentByteSize optional,
+	XSD.AnyURI locationID optional,
+	XSD.AnyURI ontologyRef optional,
+	XSD.Boolean disableRetrieval optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			ContentInstance contentInstance,
+			ContentInstanceAnnc contentInstanceAnnc,
+			Container container,
+			ContainerAnnc containerAnnc,
+			Subscription subscription,
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Sg_flexContainerResource_group sg_flexContainerResource,
+			Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -2940,27 +2939,27 @@ with {
 
 type record ContentInstance
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    ContentInfo contentInfo optional,
-    XSD.NonNegativeInteger contentSize,
-    ContentRef contentRef optional,
-    XSD.AnyURI ontologyRef optional,
-    XSD.AnySimpleType content,//FIXME Use AnySimpleType instead
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	ContentInfo contentInfo optional,
+	XSD.NonNegativeInteger contentSize,
+	ContentRef contentRef optional,
+	XSD.AnyURI ontologyRef optional,
+	XSD.AnySimpleType content,//FIXME Use AnySimpleType instead
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -2977,24 +2976,24 @@ with {
 
 type record ContentInstanceAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    XSD.NonNegativeInteger stateTag,
-    ContentInfo contentInfo optional,
-    XSD.NonNegativeInteger contentSize optional,
-    XSD.AnyURI ontologyRef optional,
-    XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	XSD.NonNegativeInteger stateTag,
+	ContentInfo contentInfo optional,
+	XSD.NonNegativeInteger contentSize optional,
+	XSD.AnyURI ontologyRef optional,
+	XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -3010,47 +3009,47 @@ with {
 
 type record CSEBase
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    CseTypeID cseType optional,
-    XSD.ID cSE_ID,
-    ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	CseTypeID cseType optional,
+	XSD.ID cSE_ID,
+	ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
     PoaList pointOfAccess,
-    XSD.AnyURI nodeLink optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    E2eSecInfo e2eSecInfo optional,
-    SupportedReleaseVersions supportedReleaseVersions,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            RemoteCSE remoteCSE,
-            RemoteCSEAnnc remoteCSEAnnc,
-            Node node,
-            AE aE,
-            Container container,
-            Group group_,
-            AccessControlPolicy accessControlPolicy,
-            Subscription subscription,
-            MgmtCmd mgmtCmd,
-            LocationPolicy locationPolicy,
-            StatsConfig statsConfig,
-            StatsCollect statsCollect,
-            Request request,
-            Delivery delivery,
-            Schedule schedule,
-            M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
-            ServiceSubscribedAppRule serviceSubscribedAppRule,
-            Role role,
-            Token token,
-            Sg_flexContainerResource_group sg_flexContainerResource
-        } choice_list
-    } choice optional
+	XSD.AnyURI nodeLink optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	E2eSecInfo e2eSecInfo optional,
+	SupportedReleaseVersions supportedReleaseVersions,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			RemoteCSE remoteCSE,
+			RemoteCSEAnnc remoteCSEAnnc,
+			Node node,
+			AE aE,
+			Container container,
+			Group group_,
+			AccessControlPolicy accessControlPolicy,
+			Subscription subscription,
+			MgmtCmd mgmtCmd,
+			LocationPolicy locationPolicy,
+			StatsConfig statsConfig,
+			StatsCollect statsCollect,
+			Request request,
+			Delivery delivery,
+			Schedule schedule,
+			M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
+			ServiceSubscribedAppRule serviceSubscribedAppRule,
+			Role role,
+			Token token,
+			Sg_flexContainerResource_group sg_flexContainerResource
+		} choice_list
+	} choice optional
 }
 with {
   variant "element";
@@ -3069,29 +3068,28 @@ with {
 
 type record Delivery
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID source,
-    XSD.ID target,
-    Timestamp lifespan,
-    EventCat eventCat,
-    DeliveryMetaData deliveryMetaData,
-    AggregatedRequest aggregatedRequest,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.ID source,
+	XSD.ID target,
+	Timestamp lifespan,
+	EventCat eventCat,
+	DeliveryMetaData deliveryMetaData,
+	AggregatedRequest aggregatedRequest,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -3107,32 +3105,32 @@ with {
 
 type record DeviceCapability
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String capabilityName,
-    XSD.Boolean attached,
-    ActionStatus capabilityActionStatus,
-    XSD.Boolean currentState,
-    XSD.Boolean enable optional,
-    XSD.Boolean disable optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String capabilityName,
+	XSD.Boolean attached,
+	ActionStatus capabilityActionStatus,
+	XSD.Boolean currentState,
+	XSD.Boolean enable optional,
+	XSD.Boolean disable optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -3157,31 +3155,31 @@ with {
 
 type record DeviceCapabilityAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String capabilityName optional,
-    XSD.Boolean attached optional,
-    ActionStatus capabilityActionStatus optional,
-    XSD.Boolean currentState optional,
-    XSD.Boolean enable optional,
-    XSD.Boolean disable optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String capabilityName optional,
+	XSD.Boolean attached optional,
+	ActionStatus capabilityActionStatus optional,
+	XSD.Boolean currentState optional,
+	XSD.Boolean enable optional,
+	XSD.Boolean disable optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -3205,33 +3203,33 @@ with {
 
 type record DeviceInfo
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String deviceLabel,
-    XSD.String manufacturer,
-    XSD.String model,
-    XSD.String deviceType,
-    XSD.String fwVersion,
-    XSD.String swVersion,
-    XSD.String hwVersion,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String deviceLabel,
+	XSD.String manufacturer,
+	XSD.String model,
+	XSD.String deviceType,
+	XSD.String fwVersion,
+	XSD.String swVersion,
+	XSD.String hwVersion,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -3248,32 +3246,32 @@ with {
 
 type record DeviceInfoAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String deviceLabel optional,
-    XSD.String manufacturer optional,
-    XSD.String model optional,
-    XSD.String deviceType optional,
-    XSD.String fwVersion optional,
-    XSD.String swVersion optional,
-    XSD.String hwVersion optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String deviceLabel optional,
+	XSD.String manufacturer optional,
+	XSD.String model optional,
+	XSD.String deviceType optional,
+	XSD.String fwVersion optional,
+	XSD.String swVersion optional,
+	XSD.String hwVersion optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -3289,19 +3287,19 @@ with {
 
 type record DynamicAuthorizationConsultation
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.Boolean dynamicAuthorizationEnabled,
-    ListOfURIs dynamicAuthorizationPoA,
-    Timestamp dynamicAuthorizationLifetime optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.Boolean dynamicAuthorizationEnabled,
+	PoaList dynamicAuthorizationPoA,
+	Timestamp dynamicAuthorizationLifetime optional
 }
 with {
   variant "name as uncapitalized";
@@ -3314,56 +3312,56 @@ with {
 
 type enumerated ResourceType
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6),
-    int7(7),
-    int8(8),
-    int9(9),
-    int10(10),
-    int11(11),
-    int12(12),
-    int13(13),
-    int14(14),
-    int15(15),
-    int16(16),
-    int17(17),
-    int18(18),
-    int19(19),
-    int20(20),
-    int21(21),
-    int22(22),
-    int23(23),
-    int24(24),
-    int25(25),
-    int26(26),
-    int27(27),
-    int28(28),
-    int29(29),
-    int30(30),
-    int31(31),
-    int32(32),
-    int33(33),
-    int34(34),
-    int10001(10001),
-    int10002(10002),
-    int10003(10003),
-    int10004(10004),
-    int10009(10009),
-    int10010(10010),
-    int10013(10013),
-    int10014(10014),
-    int10016(10016),
-    int10018(10018),
-    int10024(10024),
-    int10028(10028),
-    int10029(10029),
-    int10030(10030),
-    int10033(10033),
-    int10034(10034)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6),
+	int7(7),
+	int8(8),
+	int9(9),
+	int10(10),
+	int11(11),
+	int12(12),
+	int13(13),
+	int14(14),
+	int15(15),
+	int16(16),
+	int17(17),
+	int18(18),
+	int19(19),
+	int20(20),
+	int21(21),
+	int22(22),
+	int23(23),
+	int24(24),
+	int25(25),
+	int26(26),
+	int27(27),
+	int28(28),
+	int29(29),
+	int30(30),
+	int31(31),
+	int32(32),
+	int33(33),
+	int34(34),
+	int10001(10001),
+	int10002(10002),
+	int10003(10003),
+	int10004(10004),
+	int10009(10009),
+	int10010(10010),
+	int10013(10013),
+	int10014(10014),
+	int10016(10016),
+	int10018(10018),
+	int10024(10024),
+	int10028(10028),
+	int10029(10029),
+	int10030(10030),
+	int10033(10033),
+	int10034(10034)
 }
 with {
   variant "useNumber";
@@ -3373,9 +3371,9 @@ with {
 
 type enumerated CseTypeID
 {
-    int1(1),
-    int2(2),
-    int3(3)
+	int1(1),
+	int2(2),
+	int3(3)
 }
 with {
   variant "useNumber";
@@ -3385,9 +3383,9 @@ with {
 
 type enumerated LocationSource
 {
-    int1(1),
-    int2(2),
-    int3(3)
+	int1(1),
+	int2(2),
+	int3(3)
 }
 with {
   variant "useNumber";
@@ -3397,9 +3395,9 @@ with {
 
 type enumerated StdEventCats
 {
-    int2(2),
-    int3(3),
-    int4(4)
+	int2(2),
+	int3(3),
+	int4(4)
 }
 with {
   variant "useNumber";
@@ -3409,11 +3407,11 @@ with {
 
 type enumerated Operation
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5)
 }
 with {
   variant "useNumber";
@@ -3423,10 +3421,10 @@ with {
 
 type enumerated ResponseType
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4)
 }
 with {
   variant "useNumber";
@@ -3436,16 +3434,16 @@ with {
 
 type enumerated ResultContent
 {
-    int0(0),
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6),
-    int7(7),
-    int8(8),
-    int9(9)
+	int0(0),
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6),
+	int7(7),
+	int8(8),
+	int9(9)
 }
 with {
   variant "useNumber";
@@ -3453,10 +3451,10 @@ with {
 };
 
 
-type enumerated DiscResType
+type enumerated DesIdResType
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -3466,63 +3464,66 @@ with {
 
 type enumerated ResponseStatusCode
 {
-    int1000(1000),
-    int1001(1001),
-    int1002(1002),
-    int2000(2000),
-    int2001(2001),
-    int2002(2002),
-    int2004(2004),
-    int4000(4000),
-    int4001(4001),
-    int4004(4004),
-    int4005(4005),
-    int4008(4008),
-    int4015(4015),
-    int4101(4101),
-    int4102(4102),
-    int4103(4103),
-    int4104(4104),
-    int4105(4105),
-    int4106(4106),
-    int4107(4107),
-    int4108(4108),
-    int4109(4109),
-    int4110(4110),
-    int4111(4111),
-    int4112(4112),
-    int4113(4113),
-    int4114(4114),
-    int4115(4115),
-    int4116(4116),
-    int4117(4117),
-    int5000(5000),
-    int5001(5001),
-    int5103(5103),
-    int5105(5105),
-    int5106(5106),
-    int5203(5203),
-    int5204(5204),
-    int5205(5205),
-    int5206(5206),
-    int5207(5207),
-    int5208(5208),
-    int5209(5209),
-    int5210(5210),
-    int5211(5211),
-    int5212(5212),
-    int6003(6003),
-    int6005(6005),
-    int6010(6010),
-    int6020(6020),
-    int6021(6021),
-    int6022(6022),
-    int6023(6023),
-    int6024(6024),
-    int6025(6025),
-    int6026(6026),
-    int6028(6028),
-    int6029(6029)
+	int1000(1000),
+	int1001(1001),
+	int1002(1002),
+	int2000(2000),
+	int2001(2001),
+	int2002(2002),
+	int2004(2004),
+	int4000(4000),
+	int4001(4001),
+	int4004(4004),
+	int4005(4005),
+	int4008(4008),
+	int4015(4015),
+	int4101(4101),
+	int4102(4102),
+	int4103(4103),
+	int4104(4104),
+	int4105(4105),
+	int4106(4106),
+	int4107(4107),
+	int4108(4108),
+	int4109(4109),
+	int4110(4110),
+	int4111(4111),
+	int4112(4112),
+	int4113(4113),
+	int4114(4114),
+	int4115(4115),
+	int4116(4116),
+	int4117(4117),
+	int4124(4124),
+	int5000(5000),
+	int5001(5001),
+	int5103(5103),
+	int5105(5105),
+	int5106(5106),
+	int5203(5203),
+	int5204(5204),
+	int5205(5205),
+	int5206(5206),
+	int5207(5207),
+	int5208(5208),
+	int5209(5209),
+	int5210(5210),
+	int5211(5211),
+	int5212(5212),
+	int5219(5219),
+	int5220(5220),
+	int6003(6003),
+	int6005(6005),
+	int6010(6010),
+	int6020(6020),
+	int6021(6021),
+	int6022(6022),
+	int6023(6023),
+	int6024(6024),
+	int6025(6025),
+	int6026(6026),
+	int6028(6028),
+	int6029(6029)
 }
 with {
   variant "useNumber";
@@ -3532,11 +3533,11 @@ with {
 
 type enumerated RequestStatus
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5)
 }
 with {
   variant "useNumber";
@@ -3546,59 +3547,59 @@ with {
 
 type enumerated MemberType
 {
-    int0(0),
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6),
-    int7(7),
-    int8(8),
-    int9(9),
-    int10(10),
-    int11(11),
-    int12(12),
-    int13(13),
-    int14(14),
-    int15(15),
-    int16(16),
-    int17(17),
-    int18(18),
-    int19(19),
-    int20(20),
-    int21(21),
-    int22(22),
-    int23(23),
-    int24(24),
-    int25(25),
-    int26(26),
-    int27(27),
-    int28(28),
-    int29(29),
-    int30(30),
-    int31(31),
-    int32(32),
-    int33(33),
-    int34(34),
-    int10001(10001),
-    int10002(10002),
-    int10003(10003),
-    int10004(10004),
-    int10009(10009),
-    int10010(10010),
-    int10013(10013),
-    int10014(10014),
-    int10016(10016),
-    int10018(10018),
-    int10024(10024),
-    int10028(10028),
-    int10029(10029),
-    int10030(10030),
-    int10033(10033),
-    int10034(10034),
-    int20001(20001),
-    int20002(20002)
+	int0(0),
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6),
+	int7(7),
+	int8(8),
+	int9(9),
+	int10(10),
+	int11(11),
+	int12(12),
+	int13(13),
+	int14(14),
+	int15(15),
+	int16(16),
+	int17(17),
+	int18(18),
+	int19(19),
+	int20(20),
+	int21(21),
+	int22(22),
+	int23(23),
+	int24(24),
+	int25(25),
+	int26(26),
+	int27(27),
+	int28(28),
+	int29(29),
+	int30(30),
+	int31(31),
+	int32(32),
+	int33(33),
+	int34(34),
+	int10001(10001),
+	int10002(10002),
+	int10003(10003),
+	int10004(10004),
+	int10009(10009),
+	int10010(10010),
+	int10013(10013),
+	int10014(10014),
+	int10016(10016),
+	int10018(10018),
+	int10024(10024),
+	int10028(10028),
+	int10029(10029),
+	int10030(10030),
+	int10033(10033),
+	int10034(10034),
+	int20001(20001),
+	int20002(20002)
 }
 with {
   variant "useNumber";
@@ -3608,9 +3609,9 @@ with {
 
 type enumerated ConsistencyStrategy
 {
-    int1(1),
-    int2(2),
-    int3(3)
+	int1(1),
+	int2(2),
+	int3(3)
 }
 with {
   variant "useNumber";
@@ -3620,13 +3621,13 @@ with {
 
 type enumerated CmdType
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6),
-    int7(7)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6),
+	int7(7)
 }
 with {
   variant "useNumber";
@@ -3636,10 +3637,10 @@ with {
 
 type enumerated ExecModeType
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4)
 }
 with {
   variant "useNumber";
@@ -3649,12 +3650,12 @@ with {
 
 type enumerated ExecStatusType
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6)
 }
 with {
   variant "useNumber";
@@ -3664,36 +3665,36 @@ with {
 
 type enumerated ExecResultType
 {
-    int0(0),
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6),
-    int7(7),
-    int8(8),
-    int9(9),
-    int10(10),
-    int11(11),
-    int12(12),
-    int13(13),
-    int14(14),
-    int15(15),
-    int16(16),
-    int19(19),
-    int20(20),
-    int21(21),
-    int22(22),
-    int23(23),
-    int24(24),
-    int25(25),
-    int26(26),
-    int27(27),
-    int28(28),
-    int29(29),
-    int30(30),
-    int31(31)
+	int0(0),
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6),
+	int7(7),
+	int8(8),
+	int9(9),
+	int10(10),
+	int11(11),
+	int12(12),
+	int13(13),
+	int14(14),
+	int15(15),
+	int16(16),
+	int19(19),
+	int20(20),
+	int21(21),
+	int22(22),
+	int23(23),
+	int24(24),
+	int25(25),
+	int26(26),
+	int27(27),
+	int28(28),
+	int29(29),
+	int30(30),
+	int31(31)
 }
 with {
   variant "useNumber";
@@ -3703,8 +3704,8 @@ with {
 
 type enumerated PendingNotification
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -3714,9 +3715,9 @@ with {
 
 type enumerated NotificationContentType
 {
-    int1(1),
-    int2(2),
-    int3(3)
+	int1(1),
+	int2(2),
+	int3(3)
 }
 with {
   variant "useNumber";
@@ -3726,11 +3727,11 @@ with {
 
 type enumerated NotificationEventType
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5)
 }
 with {
   variant "useNumber";
@@ -3740,10 +3741,10 @@ with {
 
 type enumerated Status
 {
-    int0(0),
-    int1(1),
-    int2(2),
-    int3(3)
+	int0(0),
+	int1(1),
+	int2(2),
+	int3(3)
 }
 with {
   variant "useNumber";
@@ -3753,13 +3754,13 @@ with {
 
 type enumerated BatteryStatus
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6),
-    int7(7)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6),
+	int7(7)
 }
 with {
   variant "useNumber";
@@ -3769,33 +3770,33 @@ with {
 
 type enumerated MgmtDefinition
 {
-    int0(0),
-    int1001(1001),
-    int1002(1002),
-    int1003(1003),
-    int1004(1004),
-    int1005(1005),
-    int1006(1006),
-    int1007(1007),
-    int1008(1008),
-    int1009(1009),
-    int1010(1010),
-    int1011(1011),
-    int1012(1012),
-    int1013(1013),
-    int1014(1014),
-    int1015(1015),
-    int1016(1016),
-    int1017(1017),
-    int1018(1018),
-    int1019(1019),
-    int1020(1020),
-    int1021(1021),
-    int1022(1022),
-    int1023(1023),
-    int1024(1024),
-    int1025(1025),
-    int1026(1026)
+	int0(0),
+	int1001(1001),
+	int1002(1002),
+	int1003(1003),
+	int1004(1004),
+	int1005(1005),
+	int1006(1006),
+	int1007(1007),
+	int1008(1008),
+	int1009(1009),
+	int1010(1010),
+	int1011(1011),
+	int1012(1012),
+	int1013(1013),
+	int1014(1014),
+	int1015(1015),
+	int1016(1016),
+	int1017(1017),
+	int1018(1018),
+	int1019(1019),
+	int1020(1020),
+	int1021(1021),
+	int1022(1022),
+	int1023(1023),
+	int1024(1024),
+	int1025(1025),
+	int1026(1026)
 }
 with {
   variant "useNumber";
@@ -3805,11 +3806,11 @@ with {
 
 type enumerated LogTypeId
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5)
 }
 with {
   variant "useNumber";
@@ -3819,11 +3820,11 @@ with {
 
 type enumerated LogStatus
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5)
 }
 with {
   variant "useNumber";
@@ -3833,9 +3834,9 @@ with {
 
 type enumerated EventType
 {
-    int1(1),
-    int2(2),
-    int3(3)
+	int1(1),
+	int2(2),
+	int3(3)
 }
 with {
   variant "useNumber";
@@ -3845,8 +3846,8 @@ with {
 
 type enumerated StatsRuleStatusType
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -3856,7 +3857,7 @@ with {
 
 type enumerated StatModelType
 {
-    int1(1)
+	int1(1)
 }
 with {
   variant "useNumber";
@@ -3866,9 +3867,9 @@ with {
 
 type enumerated EncodingType
 {
-    int0(0),
-    int1(1),
-    int2(2)
+	int0(0),
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -3880,69 +3881,69 @@ with {
 
 type enumerated AccessControlOperations
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6),
-    int7(7),
-    int8(8),
-    int9(9),
-    int10(10),
-    int11(11),
-    int12(12),
-    int13(13),
-    int14(14),
-    int15(15),
-    int16(16),
-    int17(17),
-    int18(18),
-    int19(19),
-    int20(20),
-    int21(21),
-    int22(22),
-    int23(23),
-    int24(24),
-    int25(25),
-    int26(26),
-    int27(27),
-    int28(28),
-    int29(29),
-    int30(30),
-    int31(31),
-    int32(32),
-    int33(33),
-    int34(34),
-    int35(35),
-    int36(36),
-    int37(37),
-    int38(38),
-    int39(39),
-    int40(40),
-    int41(41),
-    int42(42),
-    int43(43),
-    int44(44),
-    int45(45),
-    int46(46),
-    int47(47),
-    int48(48),
-    int49(49),
-    int50(50),
-    int51(51),
-    int52(52),
-    int53(53),
-    int54(54),
-    int55(55),
-    int56(56),
-    int57(57),
-    int58(58),
-    int59(59),
-    int60(60),
-    int61(61),
-    int62(62),
-    int63(63)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6),
+	int7(7),
+	int8(8),
+	int9(9),
+	int10(10),
+	int11(11),
+	int12(12),
+	int13(13),
+	int14(14),
+	int15(15),
+	int16(16),
+	int17(17),
+	int18(18),
+	int19(19),
+	int20(20),
+	int21(21),
+	int22(22),
+	int23(23),
+	int24(24),
+	int25(25),
+	int26(26),
+	int27(27),
+	int28(28),
+	int29(29),
+	int30(30),
+	int31(31),
+	int32(32),
+	int33(33),
+	int34(34),
+	int35(35),
+	int36(36),
+	int37(37),
+	int38(38),
+	int39(39),
+	int40(40),
+	int41(41),
+	int42(42),
+	int43(43),
+	int44(44),
+	int45(45),
+	int46(46),
+	int47(47),
+	int48(48),
+	int49(49),
+	int50(50),
+	int51(51),
+	int52(52),
+	int53(53),
+	int54(54),
+	int55(55),
+	int56(56),
+	int57(57),
+	int58(58),
+	int59(59),
+	int60(60),
+	int61(61),
+	int62(62),
+	int63(63)
 }
 with {
   variant "useNumber";
@@ -3952,9 +3953,9 @@ with {
 
 type enumerated FilterUsage
 {
-    int1(1),
-    int2(2),
-    int3(3)
+	int1(1),
+	int2(2),
+	int3(3)
 }
 with {
   variant "useNumber";
@@ -3964,10 +3965,10 @@ with {
 
 type enumerated NotificationTargetPolicyAction
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4)
 }
 with {
   variant "useNumber";
@@ -3977,8 +3978,8 @@ with {
 
 type enumerated LogicalOperator
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -3986,12 +3987,21 @@ with {
 };
 
 
+type enumerated FilterOperation
+{
+	int1(1),
+	int2(2)
+}
+with {
+  variant "useNumber";
+  variant "name as uncapitalized";
+};
 
 
 type enumerated AllJoynDirection
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -4001,7 +4011,7 @@ with {
 
 type enumerated ContentFilterSyntax
 {
-    int1(1)
+	int1(1)
 }
 with {
   variant "useNumber";
@@ -4011,12 +4021,12 @@ with {
 
 type enumerated ContentSecurity
 {
-    int0(0),
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5)
+	int0(0),
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5)
 }
 with {
   variant "useNumber";
@@ -4026,27 +4036,27 @@ with {
 
 type enumerated Suid
 {
-    int10(10),
-    int11(11),
-    int12(12),
-    int13(13),
-    int14(14),
-    int15(15),
-    int21(21),
-    int22(22),
-    int23(23),
-    int24(24),
-    int25(25),
-    int32(32),
-    int33(33),
-    int34(34),
-    int35(35),
-    int40(40),
-    int41(41),
-    int42(42),
-    int43(43),
-    int44(44),
-    int45(45)
+	int10(10),
+	int11(11),
+	int12(12),
+	int13(13),
+	int14(14),
+	int15(15),
+	int21(21),
+	int22(22),
+	int23(23),
+	int24(24),
+	int25(25),
+	int32(32),
+	int33(33),
+	int34(34),
+	int35(35),
+	int40(40),
+	int41(41),
+	int42(42),
+	int43(43),
+	int44(44),
+	int45(45)
 }
 with {
   variant "useNumber";
@@ -4056,7 +4066,7 @@ with {
 
 type enumerated EsprimKeyGenAlgID
 {
-    int1(1)
+	int1(1)
 }
 with {
   variant "useNumber";
@@ -4066,9 +4076,9 @@ with {
 
 type enumerated EsprimProtocolAndAlgID
 {
-    int10(10),
-    int11(11),
-    int12(12)
+	int10(10),
+	int11(11),
+	int12(12)
 }
 with {
   variant "useNumber";
@@ -4078,8 +4088,8 @@ with {
 
 type enumerated PeriodicIndicator
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -4089,8 +4099,8 @@ with {
 
 type enumerated StationaryIndication
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -4100,8 +4110,8 @@ with {
 
 type enumerated ContentStatus
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -4111,11 +4121,11 @@ with {
 
 type enumerated NetworkAction
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5)
 }
 with {
   variant "useNumber";
@@ -4125,8 +4135,8 @@ with {
 
 type enumerated LocationInformationType
 {
-    int1(1),
-    int2(2)
+	int1(1),
+	int2(2)
 }
 with {
   variant "useNumber";
@@ -4136,10 +4146,10 @@ with {
 
 type enumerated GeofenceEventCriteria
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4)
 }
 with {
   variant "useNumber";
@@ -4149,27 +4159,27 @@ with {
 
 type record EventConfig
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.ID creator optional,
-    XSD.String eventID,
-    EventType eventType,
-    Timestamp eventStart optional,
-    Timestamp eventEnd optional,
-    record of Operation operationType optional,
-    XSD.NonNegativeInteger dataSize optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.ID creator optional,
+	XSD.String eventID,
+	EventType eventType,
+	Timestamp eventStart optional,
+	Timestamp eventEnd optional,
+	record of Operation operationType optional,
+	XSD.NonNegativeInteger dataSize optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4186,31 +4196,31 @@ with {
 
 type record EventLog
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    LogTypeId logTypeId,
-    XSD.String logData,
-    LogStatus logStatus,
-    XSD.Boolean logStart,
-    XSD.Boolean logStop,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	LogTypeId logTypeId,
+	XSD.String logData,
+	LogStatus logStatus,
+	XSD.Boolean logStart,
+	XSD.Boolean logStop,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4231,30 +4241,30 @@ with {
 
 type record EventLogAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    LogTypeId logTypeId optional,
-    XSD.String logData optional,
-    LogStatus logStatus optional,
-    XSD.Boolean logStart optional,
-    XSD.Boolean logStop optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	LogTypeId logTypeId optional,
+	XSD.String logData optional,
+	LogStatus logStatus optional,
+	XSD.Boolean logStart optional,
+	XSD.Boolean logStop optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4274,29 +4284,29 @@ with {
 
 type record ExecInstance
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ExecStatusType execStatus,
-    ExecResultType execResult,
-    XSD.Boolean execDisable optional,
-    NodeID execTarget,
-    ExecModeType execMode optional,
-    XSD.Duration execFrequency optional,
-    XSD.Duration execDelay optional,
-    XSD.NonNegativeInteger execNumber optional,
-    ExecReqArgsListType execReqArgs optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ExecStatusType execStatus,
+	ExecResultType execResult,
+	XSD.Boolean execDisable optional,
+	NodeID execTarget,
+	ExecModeType execMode optional,
+	XSD.Duration execFrequency optional,
+	XSD.Duration execDelay optional,
+	XSD.NonNegativeInteger execNumber optional,
+	ExecReqArgsListType execReqArgs optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4314,31 +4324,31 @@ with {
 
 type record Firmware
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String version,
-    XSD.String firmwareName,
-    XSD.AnyURI uRL,
-    XSD.Boolean update,
-    ActionStatus updateStatus,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String version,
+	XSD.String firmwareName,
+	XSD.AnyURI uRL,
+	XSD.Boolean update,
+	ActionStatus updateStatus,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4358,30 +4368,30 @@ with {
 
 type record FirmwareAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String version optional,
-    XSD.String firmwareName optional,
-    XSD.AnyURI uRL optional,
-    XSD.Boolean update optional,
-    ActionStatus updateStatus optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String version optional,
+	XSD.String firmwareName optional,
+	XSD.AnyURI uRL optional,
+	XSD.Boolean update optional,
+	ActionStatus updateStatus optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4400,36 +4410,36 @@ with {
 
 type record GenericInterworkingOperationInstance
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.String operationName,
-    XSD.String operationState,
-    ListOfDataLinks inputDataPointLinks optional,
-    ListOfDataLinks outputDataPointLinks optional,
-    ListOfDataLinks inputLinks optional,
-    ListOfDataLinks outputLinks optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.String operationName,
+	XSD.String operationState,
+	ListOfDataLinks inputDataPointLinks optional,
+	ListOfDataLinks outputDataPointLinks optional,
+	ListOfDataLinks inputLinks optional,
+	ListOfDataLinks outputLinks optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4445,35 +4455,35 @@ with {
 
 type record GenericInterworkingOperationInstanceAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.String operationName optional,
-    XSD.String operationState optional,
-    ListOfDataLinks inputDataPointLinks optional,
-    ListOfDataLinks outputDataPointLinks optional,
-    ListOfDataLinks inputLinks optional,
-    ListOfDataLinks outputLinks optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.String operationName optional,
+	XSD.String operationState optional,
+	ListOfDataLinks inputDataPointLinks optional,
+	ListOfDataLinks outputDataPointLinks optional,
+	ListOfDataLinks inputLinks optional,
+	ListOfDataLinks outputLinks optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4489,35 +4499,35 @@ with {
 
 type record GenericInterworkingService
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.String serviceName,
-    ListOfDataLinks inputDataPointLinks optional,
-    ListOfDataLinks outputDataPointLinks optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            GenericInterworkingService genericInterworkingService,
-            GenericInterworkingOperationInstance genericInterworkingOperationInstance,
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.String serviceName,
+	ListOfDataLinks inputDataPointLinks optional,
+	ListOfDataLinks outputDataPointLinks optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			GenericInterworkingService genericInterworkingService,
+			GenericInterworkingOperationInstance genericInterworkingOperationInstance,
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4533,34 +4543,34 @@ with {
 
 type record GenericInterworkingServiceAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    XSD.String serviceName,
-    ListOfDataLinks inputDataPointLinks optional,
-    ListOfDataLinks outputDataPointLinks optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            GenericInterworkingServiceAnnc genericInterworkingServiceAnnc,
-            GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc,
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	XSD.String serviceName,
+	ListOfDataLinks inputDataPointLinks optional,
+	ListOfDataLinks outputDataPointLinks optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			GenericInterworkingServiceAnnc genericInterworkingServiceAnnc,
+			GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc,
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4576,36 +4586,36 @@ with {
 
 type record Group
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    XSD.ID creator optional,
-    MemberType memberType,
-    XSD.NonNegativeInteger currentNrOfMembers,
-    XSD.PositiveInteger maxNrOfMembers,
-    record length(0 .. infinity) of XSD.AnyURI memberIDs,//TODO A list that can be empty
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	XSD.ID creator optional,
+	MemberType memberType,
+	XSD.NonNegativeInteger currentNrOfMembers,
+	XSD.PositiveInteger maxNrOfMembers,
+	record length(0 .. infinity) of XSD.AnyURI memberIDs,//TODO A list that can be empty
     ListOfURIs membersAccessControlPolicyIDs optional,
-    XSD.Boolean memberTypeValidated optional,
-    ConsistencyStrategy consistencyStrategy optional,
-    XSD.String groupName optional,
-    XSD.Boolean semanticSupportIndicator optional,
-    BatchNotify notifyAggregation optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Subscription subscription,
-            SemanticDescriptor semanticDescriptor
-        } choice_list
-    } choice optional
+	XSD.Boolean memberTypeValidated optional,
+	ConsistencyStrategy consistencyStrategy optional,
+	XSD.String groupName optional,
+	XSD.Boolean semanticSupportIndicator optional,
+	BatchNotify notifyAggregation optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Subscription subscription,
+			SemanticDescriptor semanticDescriptor
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4627,35 +4637,35 @@ with {
 
 type record GroupAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MemberType memberType optional,
-    XSD.NonNegativeInteger currentNrOfMembers optional,
-    XSD.PositiveInteger maxNrOfMembers optional,
-    record of XSD.AnyURI memberIDs optional,
-    ListOfURIs membersAccessControlPolicyIDs optional,
-    XSD.Boolean memberTypeValidated optional,
-    ConsistencyStrategy consistencyStrategy optional,
-    XSD.String groupName optional,
-    XSD.Boolean semanticSupportIndicator optional,
-    BatchNotify notifyAggregation optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Subscription subscription,
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MemberType memberType optional,
+	XSD.NonNegativeInteger currentNrOfMembers optional,
+	XSD.PositiveInteger maxNrOfMembers optional,
+	record of XSD.AnyURI memberIDs optional,
+	ListOfURIs membersAccessControlPolicyIDs optional,
+	XSD.Boolean memberTypeValidated optional,
+	ConsistencyStrategy consistencyStrategy optional,
+	XSD.String groupName optional,
+	XSD.Boolean semanticSupportIndicator optional,
+	BatchNotify notifyAggregation optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Subscription subscription,
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4676,34 +4686,34 @@ with {
 
 type record LocationPolicy
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    LocationSource locationSource,
-    LocationInformationType locationInformationType,
-    ListOfDuration locationUpdatePeriod optional,
-    LocationTargetID locationTargetID optional,
-    XSD.AnyURI locationServer optional,
-    XSD.AnyURI locationContainerID,
-    XSD.String locationContainerName optional,
-    XSD.String locationStatus,
-    XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
-    GeofenceEventCriteria geofenceEventCriteria optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	LocationSource locationSource,
+	LocationInformationType locationInformationType,
+	ListOfDuration locationUpdatePeriod optional,
+	LocationTargetID locationTargetID optional,
+	XSD.AnyURI locationServer optional,
+	XSD.AnyURI locationContainerID,
+	XSD.String locationContainerName optional,
+	XSD.String locationStatus,
+	XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
+	GeofenceEventCriteria geofenceEventCriteria optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4720,27 +4730,27 @@ with {
 
 type record LocationPolicyAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    LocationSource locationSource optional,
-    LocationInformationType locationInformationType optional,
-    ListOfDuration locationUpdatePeriod optional,
-    LocationTargetID locationTargetID optional,
-    XSD.AnyURI locationServer optional,
-    XSD.AnyURI locationContainerID optional,
-    XSD.String locationContainerName optional,
-    XSD.String locationStatus optional,
-    XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
-    GeofenceEventCriteria geofenceEventCriteria optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	LocationSource locationSource optional,
+	LocationInformationType locationInformationType optional,
+	ListOfDuration locationUpdatePeriod optional,
+	LocationTargetID locationTargetID optional,
+	XSD.AnyURI locationServer optional,
+	XSD.AnyURI locationContainerID optional,
+	XSD.String locationContainerName optional,
+	XSD.String locationStatus optional,
+	XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
+	GeofenceEventCriteria geofenceEventCriteria optional
 }
 with {
   variant "name as uncapitalized";
@@ -4751,23 +4761,23 @@ with {
 
 type record M2mServiceSubscriptionProfile
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            ServiceSubscribedNode serviceSubscribedNode,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			ServiceSubscribedNode serviceSubscribedNode,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4783,28 +4793,28 @@ with {
 
 type record Memory
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.UnsignedLong memAvailable,
-    XSD.UnsignedLong memTotal,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.UnsignedLong memAvailable,
+	XSD.UnsignedLong memTotal,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4821,27 +4831,27 @@ with {
 
 type record MemoryAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.UnsignedLong memAvailable optional,
-    XSD.UnsignedLong memTotal optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.UnsignedLong memAvailable optional,
+	XSD.UnsignedLong memTotal optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4857,32 +4867,32 @@ with {
 
 type record MgmtCmd
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.String description optional,
-    CmdType cmdType,
-    ExecReqArgsListType execReqArgs optional,
-    XSD.Boolean execEnable,
-    NodeID execTarget,
-    ExecModeType execMode optional,
-    XSD.Duration execFrequency optional,
-    XSD.Duration execDelay optional,
-    XSD.NonNegativeInteger execNumber optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            ExecInstance execInstance,
-            Subscription subscription
-        } choice_list
-    } choice
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.String description optional,
+	CmdType cmdType,
+	ExecReqArgsListType execReqArgs optional,
+	XSD.Boolean execEnable,
+	NodeID execTarget,
+	ExecModeType execMode optional,
+	XSD.Duration execFrequency optional,
+	XSD.Duration execDelay optional,
+	XSD.NonNegativeInteger execNumber optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			ExecInstance execInstance,
+			Subscription subscription
+		} choice_list
+	} choice
 }
 with {
   variant "name as uncapitalized";
@@ -4900,41 +4910,41 @@ with {
 
 type record Node
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    NodeID nodeID,
-    XSD.ID hostedCSELink optional,
-    XSD.String mgmtClientAddress optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Memory memory,
-            Battery battery,
-            AreaNwkInfo areaNwkInfo,
-            AreaNwkDeviceInfo areaNwkDeviceInfo,
-            Firmware firmware,
-            Software software,
-            DeviceInfo deviceInfo,
-            DeviceCapability deviceCapability,
-            Reboot reboot,
-            EventLog eventLog,
-            CmdhPolicy cmdhPolicy,
-            ActiveCmdhPolicy activeCmdhPolicy,
-            Subscription subscription,
-            SemanticDescriptor semanticDescriptor,
-            TrafficPattern trafficPattern
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	NodeID nodeID,
+	XSD.ID hostedCSELink optional,
+	XSD.String mgmtClientAddress optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Memory memory,
+			Battery battery,
+			AreaNwkInfo areaNwkInfo,
+			AreaNwkDeviceInfo areaNwkDeviceInfo,
+			Firmware firmware,
+			Software software,
+			DeviceInfo deviceInfo,
+			DeviceCapability deviceCapability,
+			Reboot reboot,
+			EventLog eventLog,
+			CmdhPolicy cmdhPolicy,
+			ActiveCmdhPolicy activeCmdhPolicy,
+			Subscription subscription,
+			SemanticDescriptor semanticDescriptor,
+			TrafficPattern trafficPattern
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4951,39 +4961,39 @@ with {
 
 type record NodeAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    NodeID nodeID,
-    XSD.ID hostedCSELink optional,
-    XSD.String mgmtClientAddress optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            MemoryAnnc memoryAnnc,
-            BatteryAnnc batteryAnnc,
-            AreaNwkInfoAnnc areaNwkInfoAnnc,
-            AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc,
-            FirmwareAnnc firmwareAnnc,
-            SoftwareAnnc softwareAnnc,
-            DeviceInfoAnnc deviceInfoAnnc,
-            DeviceCapabilityAnnc deviceCapabilityAnnc,
-            RebootAnnc rebootAnnc,
-            EventLogAnnc eventLogAnnc,
-            Subscription subscription,
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            TrafficPatternAnnc trafficPatternAnnc
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	NodeID nodeID,
+	XSD.ID hostedCSELink optional,
+	XSD.String mgmtClientAddress optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			MemoryAnnc memoryAnnc,
+			BatteryAnnc batteryAnnc,
+			AreaNwkInfoAnnc areaNwkInfoAnnc,
+			AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc,
+			FirmwareAnnc firmwareAnnc,
+			SoftwareAnnc softwareAnnc,
+			DeviceInfoAnnc deviceInfoAnnc,
+			DeviceCapabilityAnnc deviceCapabilityAnnc,
+			RebootAnnc rebootAnnc,
+			EventLogAnnc eventLogAnnc,
+			Subscription subscription,
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			TrafficPatternAnnc trafficPatternAnnc
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -4999,22 +5009,22 @@ with {
 
 type record NotificationTargetMgmtPolicyRef
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs notificationTargetURI optional,
-    XSD.AnyURI notificationlPolicyID optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs notificationTargetURI optional,
+	XSD.AnyURI notificationlPolicyID optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5030,27 +5040,27 @@ with {
 
 type record NotificationTargetPolicy
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.ID creator optional,
-    NotificationTargetPolicyAction action_,
-    XSD.Token policyLabel,
-    LogicalOperator rulesRelationship optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            PolicyDeletionRules policyDeletionRules,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.ID creator optional,
+	NotificationTargetPolicyAction action_,
+	XSD.Token policyLabel,
+	LogicalOperator rulesRelationship optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			PolicyDeletionRules policyDeletionRules,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5081,7 +5091,7 @@ with {
 
 type record AggregatedNotification_1
 {
-    record of Notification notification_list
+	record of Notification notification_list
 }
 with {
   variant "name as 'aggregatedNotification'";
@@ -5091,26 +5101,26 @@ with {
 
 type record Notification_1
 {
-    record {
-        Representation representation optional,
-        record {
-            Operation operation optional,
-            XSD.ID originator optional
-        } operationMonitor optional,
-        NotificationEventType notificationEventType optional
-    } notificationEvent optional,
-    XSD.Boolean verificationRequest optional,
-    XSD.Boolean subscriptionDeletion optional,
-    XSD.AnyURI subscriptionReference optional,
-    XSD.ID creator optional,
-    XSD.AnyURI notificationForwardingURI optional,
-    XSD.ID notificationTarget optional,
-    XSD.Boolean targetRemovalRequest optional,
-    XSD.Boolean targetRemovalAllowance optional,
-    record {
-        XSD.ID originator,
-        FilterCriteria filterCriteria
-    } iPEDiscoveryRequest optional
+	record {
+		Representation representation optional,
+		record {
+			Operation operation optional,
+			XSD.ID originator optional
+		} operationMonitor optional,
+		NotificationEventType notificationEventType optional
+	} notificationEvent optional,
+	XSD.Boolean verificationRequest optional,
+	XSD.Boolean subscriptionDeletion optional,
+	XSD.AnyURI subscriptionReference optional,
+	XSD.ID creator optional,
+	XSD.AnyURI notificationForwardingURI optional,
+	XSD.ID notificationTarget optional,
+	XSD.Boolean targetRemovalRequest optional,
+	XSD.Boolean targetRemovalAllowance optional,
+	record {
+		XSD.ID originator,
+		FilterCriteria filterCriteria
+	} iPEDiscoveryRequest optional
 }
 with {
   variant "name as 'notification'";
@@ -5135,12 +5145,12 @@ with {
 
 type record SecurityInfo_1
 {
-    SecurityInfoType securityInfoType optional,
-    DynAuthDasRequest dasRequest optional,
-    DynAuthDasResponse dasResponse optional,
-    ReceiverESPrimRandObject esprimRandObject optional,
-    E2eCompactJWE esprimObject optional,
-    XSD.Base64Binary escertkeMessage optional
+	SecurityInfoType securityInfoType optional,
+	DynAuthDasRequest dasRequest optional,
+	DynAuthDasResponse dasResponse optional,
+	ReceiverESPrimRandObject esprimRandObject optional,
+	E2eCompactJWE esprimObject optional,
+	XSD.Base64Binary escertkeMessage optional
 }
 with {
   variant "name as 'securityInfo'";
@@ -5149,12 +5159,12 @@ with {
 
 type enumerated SecurityInfoType
 {
-    int1(1),
-    int2(2),
-    int3(3),
-    int4(4),
-    int5(5),
-    int6(6)
+	int1(1),
+	int2(2),
+	int3(3),
+	int4(4),
+	int5(5),
+	int6(6)
 }
 with {
   variant "useNumber";
@@ -5164,11 +5174,11 @@ with {
 
 type record DynAuthDasResponse
 {
-    record {
-        SetOfAcrs grantedPrivileges optional,
-        AbsRelTimestamp privilegesLifetime optional
-    } dynamicACPInfo optional,
-    record length(1 .. infinity) of DynAuthJWT tokens optional
+	record {
+		SetOfAcrs grantedPrivileges optional,
+		AbsRelTimestamp privilegesLifetime optional
+	} dynamicACPInfo optional,
+	record length(1 .. infinity) of DynAuthJWT tokens optional
 }
 with {
   variant "name as uncapitalized";
@@ -5178,48 +5188,32 @@ with {
 
 //FIXME To replace Representation type by this
 type union Representation {
-    Resource_2 resource, 
-    XSD.AnyURI uRI
+	Resource_2 resource, 
+	XSD.AnyURI uRI
 }
 with {
-    variant "name as 'representation'";
-    variant (uRI) "name as capitalized";
+	variant "name as 'representation'";
+	variant (uRI) "name as capitalized";
  };
-  
-//type record Representation
-//{
-//    union {
-//        XSD.String elem,
-//        XSD.String elem_1
-//    } choice optional
-//}
-//with {
-//  variant "name as uncapitalized";
-//  variant (choice) "untagged";
-//  variant (choice.elem) "anyElement from 'http://www.onem2m.org/xml/protocols'";
-//  variant (choice.elem_1) "name as 'elem'";
-//  variant (choice.elem_1) "anyElement except unqualified, 'http://www.onem2m.org/xml/protocols'";
-//};
-
 
 type record PolicyDeletionRules
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    DeletionContexts deletionRules optional,
-    LogicalOperator deletionRulesRelation optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	DeletionContexts deletionRules optional,
+	LogicalOperator deletionRulesRelation optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5242,28 +5236,28 @@ with {
 
 type record Reboot
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.Boolean reboot,
-    XSD.Boolean factoryReset,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.Boolean reboot,
+	XSD.Boolean factoryReset,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5284,27 +5278,27 @@ with {
 
 type record RebootAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.Boolean reboot optional,
-    XSD.Boolean factoryReset optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.Boolean reboot optional,
+	XSD.Boolean factoryReset optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5324,50 +5318,50 @@ with {
 
 type record RemoteCSE
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    CseTypeID cseType optional,
-    PoaList pointOfAccess optional,
-    XSD.AnyURI cSEBase,
-    XSD.ID cSE_ID,
-    ExternalID m2M_Ext_ID optional,
-    TriggerRecipientID trigger_Recipient_ID optional,
-    XSD.Boolean requestReachability,
-    XSD.AnyURI nodeLink optional,
-    XSD.UnsignedInt triggerReferenceNumber optional,
-    E2eSecInfo e2eSecInfo optional,
-    SupportedReleaseVersions supportedReleaseVersions,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            NodeAnnc nodeAnnc,
-            Container container,
-            ContainerAnnc containerAnnc,
-            Group group_,
-            GroupAnnc groupAnnc,
-            AccessControlPolicy accessControlPolicy,
-            AccessControlPolicyAnnc accessControlPolicyAnnc,
-            Subscription subscription,
-            PollingChannel pollingChannel,
-            Schedule schedule,
-            TimeSeries timeSeries,
-            TimeSeriesAnnc timeSeriesAnnc,
-            LocationPolicyAnnc locationPolicyAnnc,
-            AEAnnc aEAnnc,
-            Sg_flexContainerResource_group sg_flexContainerResource,
-            Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	CseTypeID cseType optional,
+	PoaList pointOfAccess optional,
+	XSD.AnyURI cSEBase,
+	XSD.ID cSE_ID,
+	ExternalID m2M_Ext_ID optional,
+	TriggerRecipientID trigger_Recipient_ID optional,
+	XSD.Boolean requestReachability,
+	XSD.AnyURI nodeLink optional,
+	XSD.UnsignedInt triggerReferenceNumber optional,
+	E2eSecInfo e2eSecInfo optional,
+	SupportedReleaseVersions supportedReleaseVersions,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			NodeAnnc nodeAnnc,
+			Container container,
+			ContainerAnnc containerAnnc,
+			Group group_,
+			GroupAnnc groupAnnc,
+			AccessControlPolicy accessControlPolicy,
+			AccessControlPolicyAnnc accessControlPolicyAnnc,
+			Subscription subscription,
+			PollingChannel pollingChannel,
+			Schedule schedule,
+			TimeSeries timeSeries,
+			TimeSeriesAnnc timeSeriesAnnc,
+			LocationPolicyAnnc locationPolicyAnnc,
+			AEAnnc aEAnnc,
+			Sg_flexContainerResource_group sg_flexContainerResource,
+			Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5392,46 +5386,46 @@ with {
 
 type record RemoteCSEAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    CseTypeID cseType optional,
-    PoaList pointOfAccess optional,
-    XSD.AnyURI cSEBase optional,
-    XSD.ID cSE_ID optional,
-    XSD.Boolean requestReachability optional,
-    XSD.AnyURI nodeLink optional,
-    E2eSecInfo e2eSecInfo optional,
-    SupportedReleaseVersions supportedReleaseVersions,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            NodeAnnc nodeAnnc,
-            Container container,
-            ContainerAnnc containerAnnc,
-            Group group_,
-            GroupAnnc groupAnnc,
-            AccessControlPolicy accessControlPolicy,
-            AccessControlPolicyAnnc accessControlPolicyAnnc,
-            Subscription subscription,
-            PollingChannel pollingChannel,
-            ScheduleAnnc scheduleAnnc,
-            LocationPolicyAnnc locationPolicyAnnc,
-            TimeSeries timeSeries,
-            TimeSeriesAnnc timeSeriesAnnc,
-            AEAnnc aEAnnc,
-            Sg_flexContainerResource_group sg_flexContainerResource,
-            Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	CseTypeID cseType optional,
+	PoaList pointOfAccess optional,
+	XSD.AnyURI cSEBase optional,
+	XSD.ID cSE_ID optional,
+	XSD.Boolean requestReachability optional,
+	XSD.AnyURI nodeLink optional,
+	E2eSecInfo e2eSecInfo optional,
+	SupportedReleaseVersions supportedReleaseVersions,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			NodeAnnc nodeAnnc,
+			Container container,
+			ContainerAnnc containerAnnc,
+			Group group_,
+			GroupAnnc groupAnnc,
+			AccessControlPolicy accessControlPolicy,
+			AccessControlPolicyAnnc accessControlPolicyAnnc,
+			Subscription subscription,
+			PollingChannel pollingChannel,
+			ScheduleAnnc scheduleAnnc,
+			LocationPolicyAnnc locationPolicyAnnc,
+			TimeSeries timeSeries,
+			TimeSeriesAnnc timeSeriesAnnc,
+			AEAnnc aEAnnc,
+			Sg_flexContainerResource_group sg_flexContainerResource,
+			Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5453,31 +5447,31 @@ with {
 
 type record RequestPrimitive
 {
-    Operation operation,
-    XSD.AnyURI to_,
-    XSD.ID from_ optional,
-    RequestID requestIdentifier,
-    ResourceType resourceType optional,
-    PrimitiveContent primitiveContent optional,
-    record length(1 .. infinity) of RoleID roleIDs optional,
-    Timestamp originatingTimestamp optional,
-    AbsRelTimestamp requestExpirationTimestamp optional,
-    AbsRelTimestamp resultExpirationTimestamp optional,
-    AbsRelTimestamp operationExecutionTime optional,
-    ResponseTypeInfo responseType optional,
-    AbsRelTimestamp resultPersistence optional,
-    ResultContent resultContent optional,
-    EventCat eventCategory optional,
-    XSD.Boolean deliveryAggregation optional,
-    XSD.String groupRequestIdentifier optional,
-    FilterCriteria filterCriteria optional,
-    DiscResType discoveryResultType optional,
-    record length(1 .. infinity) of DynAuthJWT tokens optional,
-    record length(1 .. infinity) of TokenID tokenIDs optional,
-    record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
-    XSD.Boolean tokenRequestIndicator optional,
-    ReleaseVersion releaseVersionIndicator,
-    XSD.String vendorInformation optional
+	Operation operation,
+	XSD.AnyURI to_,
+	XSD.ID from_ optional,
+	RequestID requestIdentifier,
+	ResourceType resourceType optional,
+	PrimitiveContent primitiveContent optional,
+	record length(1 .. infinity) of RoleID roleIDs optional,
+	Timestamp originatingTimestamp optional,
+	AbsRelTimestamp requestExpirationTimestamp optional,
+	AbsRelTimestamp resultExpirationTimestamp optional,
+	AbsRelTimestamp operationExecutionTime optional,
+	ResponseTypeInfo responseType optional,
+	AbsRelTimestamp resultPersistence optional,
+	ResultContent resultContent optional,
+	EventCat eventCategory optional,
+	XSD.Boolean deliveryAggregation optional,
+	XSD.String groupRequestIdentifier optional,
+	FilterCriteria filterCriteria optional,
+	DesIdResType desiredIdentifierResultType optional,
+	record length(1 .. infinity) of DynAuthJWT tokens optional,
+	record length(1 .. infinity) of TokenID tokenIDs optional,
+	record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
+	XSD.Boolean tokenRequestIndicator optional,
+	ReleaseVersion releaseVersionIndicator,
+	XSD.String vendorInformation optional
 }
 with {
   variant "name as uncapitalized";
@@ -5504,31 +5498,30 @@ with {
 
 type record Request
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag,
-    Operation operation,
-    XSD.AnyURI target,
-    XSD.ID originator,
-    RequestID requestID,
-    MetaInformation metaInformation,
-    PrimitiveContent primitiveContent optional,
-    RequestStatus requestStatus,
-    OperationResult operationResult,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	Operation operation,
+	XSD.AnyURI target,
+	XSD.ID originator,
+	RequestID requestID,
+	MetaInformation metaInformation,
+	PrimitiveContent primitiveContent optional,
+	RequestStatus requestStatus,
+	OperationResult operationResult,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5544,20 +5537,20 @@ with {
 
 type record ResponsePrimitive
 {
-    ResponseStatusCode responseStatusCode,
-    RequestID requestIdentifier,
-    PrimitiveContent primitiveContent optional,
-    XSD.ID to_ optional,
-    XSD.ID from_ optional,
-    Timestamp originatingTimestamp optional,
-    AbsRelTimestamp resultExpirationTimestamp optional,
-    EventCat eventCategory optional,
-    ContentStatus contentStatus optional,
-    XSD.PositiveInteger contentOffset optional,
-    DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional,
-    DynAuthTokenReqInfo tokenRequestInformation optional,
-    ReleaseVersion releaseVersionIndicator,
-    XSD.String vendorInformation optional
+	ResponseStatusCode responseStatusCode,
+	RequestID requestIdentifier,
+	PrimitiveContent primitiveContent optional,
+	XSD.ID to_ optional,
+	XSD.ID from_ optional,
+	Timestamp originatingTimestamp optional,
+	AbsRelTimestamp resultExpirationTimestamp optional,
+	EventCat eventCategory optional,
+	ContentStatus contentStatus optional,
+	XSD.PositiveInteger contentOffset optional,
+	DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional,
+	DynAuthTokenReqInfo tokenRequestInformation optional,
+	ReleaseVersion releaseVersionIndicator,
+	XSD.String vendorInformation optional
 }
 with {
   variant "name as uncapitalized";
@@ -5610,21 +5603,21 @@ with {
 
 type record ResourceWrapper
 {
-//    union {
-//        Sg_resource_group sg_resource,
-//        Sg_regularResource_group sg_regularResource,
-//        Sg_announcedResource_group sg_announcedResource,
-//        Sg_announceableResource_group sg_announceableResource,
-//        Sg_subordinateResource_group sg_subordinateResource,
-//        Sg_announcedSubordinateResource_group sg_announcedSubordinateResource,
-//        Sg_announceableSubordinateResource_group sg_announceableSubordinateResource,
-//        Sg_mgmtResource_group sg_mgmtResource,
-//        Sg_announcedMgmtResource_group sg_announcedMgmtResource,
-//        Sg_flexContainerResource_group sg_flexContainerResource,
-//        Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-//    } 
-    Resource_2 choice,//TODO Use Resource_2 type instead 
-    XSD.AnyURI uRI
+//	  union {
+//		  Sg_resource_group sg_resource,
+//		  Sg_regularResource_group sg_regularResource,
+//		  Sg_announcedResource_group sg_announcedResource,
+//		  Sg_announceableResource_group sg_announceableResource,
+//		  Sg_subordinateResource_group sg_subordinateResource,
+//		  Sg_announcedSubordinateResource_group sg_announcedSubordinateResource,
+//		  Sg_announceableSubordinateResource_group sg_announceableSubordinateResource,
+//		  Sg_mgmtResource_group sg_mgmtResource,
+//		  Sg_announcedMgmtResource_group sg_announcedMgmtResource,
+//		  Sg_flexContainerResource_group sg_flexContainerResource,
+//		  Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+//	  } 
+	Resource_2 choice,//TODO Use Resource_2 type instead 
+	XSD.AnyURI uRI
 }
 with {
   variant "name as uncapitalized";
@@ -5635,8 +5628,8 @@ with {
 
 type record AggregatedResponse_1
 {
-    XSD.AnyURI resourceID optional,
-    record of ResponsePrimitive responsePrimitive_list
+	XSD.AnyURI resourceID optional,
+	record of ResponsePrimitive responsePrimitive_list
 }
 with {
   variant "name as 'aggregatedResponse'";
@@ -5647,7 +5640,7 @@ with {
 
 type record ListOfChildResourceRef
 {
-    record length(1 .. infinity) of ChildResourceRef resourceRef_list
+	record length(1 .. infinity) of ChildResourceRef resourceRef_list
 }
 with {
   variant "name as uncapitalized";
@@ -5658,29 +5651,29 @@ with {
 
 type record Role
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    RoleID roleID,
-    XSD.ID issuer,
-    XSD.ID holder,
-    Timestamp notBefore,
-    Timestamp notAfter,
-    XSD.String roleName optional,
-    XSD.AnyURI tokenLink optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	RoleID roleID,
+	XSD.ID issuer,
+	XSD.ID holder,
+	Timestamp notBefore,
+	Timestamp notAfter,
+	XSD.String roleName optional,
+	XSD.AnyURI tokenLink optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5696,23 +5689,23 @@ with {
 
 type record Schedule
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    ScheduleEntries scheduleElement,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	ScheduleEntries scheduleElement,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5729,16 +5722,16 @@ with {
 
 type record ScheduleAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ScheduleEntries scheduleElement optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ScheduleEntries scheduleElement optional
 }
 with {
   variant "name as uncapitalized";
@@ -5749,28 +5742,28 @@ with {
 
 type record SemanticDescriptor
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    XSD.ID creator optional,
-    DescriptorRepresentation descriptorRepresentation optional,
-    Sparql semanticOpExec optional,
-    XSD.Base64Binary descriptor,
-    XSD.AnyURI ontologyRef optional,
-    ListOfURIs relatedSemantics optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	XSD.ID creator optional,
+	DescriptorRepresentation descriptorRepresentation optional,
+	Sparql semanticOpExec optional,
+	XSD.Base64Binary descriptor,
+	XSD.AnyURI ontologyRef optional,
+	ListOfURIs relatedSemantics optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5787,26 +5780,26 @@ with {
 
 type record SemanticDescriptorAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    DescriptorRepresentation descriptorRepresentation optional,
-    Sparql semanticOpExec optional,
-    XSD.Base64Binary descriptor optional,
-    XSD.AnyURI ontologyRef optional,
-    ListOfURIs relatedSemantics optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	DescriptorRepresentation descriptorRepresentation optional,
+	Sparql semanticOpExec optional,
+	XSD.Base64Binary descriptor optional,
+	XSD.AnyURI ontologyRef optional,
+	ListOfURIs relatedSemantics optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5822,24 +5815,24 @@ with {
 
 type record ServiceSubscribedAppRule
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfM2MID applicableCredIDs optional,
-    ListOfM2MID allowedApp_IDs optional,
-    ListOfM2MID allowedAEs optional,
-    record length(1 .. infinity) of RoleID allowedRole_IDs optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfM2MID applicableCredIDs optional,
+	ListOfM2MID allowedApp_IDs optional,
+	ListOfM2MID allowedAEs optional,
+	record length(1 .. infinity) of RoleID allowedRole_IDs optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5858,24 +5851,24 @@ with {
 
 type record ServiceSubscribedNode
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    NodeID nodeID,
-    XSD.ID cSE_ID optional,
-    record of DeviceID deviceIdentifier optional,
-    ListOfURIs ruleLinks optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	NodeID nodeID,
+	XSD.ID cSE_ID optional,
+	record of DeviceID deviceIdentifier optional,
+	ListOfURIs ruleLinks optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5893,35 +5886,35 @@ with {
 
 type record Software
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String version,
-    XSD.String softwareName,
-    XSD.AnyURI uRL,
-    XSD.Boolean install,
-    XSD.Boolean uninstall,
-    ActionStatus installStatus,
-    XSD.Boolean activate_ optional,
-    XSD.Boolean deactivate_ optional,
-    ActionStatus activeStatus optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String version,
+	XSD.String softwareName,
+	XSD.AnyURI uRL,
+	XSD.Boolean install,
+	XSD.Boolean uninstall,
+	ActionStatus installStatus,
+	XSD.Boolean activate_ optional,
+	XSD.Boolean deactivate_ optional,
+	ActionStatus activeStatus optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -5949,34 +5942,34 @@ with {
 
 type record SoftwareAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    MgmtDefinition mgmtDefinition,
-    ListOfURIs objectIDs optional,
-    ListOfURIs objectPaths optional,
-    XSD.String description optional,
-    XSD.String version optional,
-    XSD.String softwareName optional,
-    XSD.AnyURI uRL optional,
-    XSD.Boolean install optional,
-    XSD.Boolean uninstall optional,
-    ActionStatus installStatus optional,
-    XSD.Boolean activate_ optional,
-    XSD.Boolean deactivate_ optional,
-    ActionStatus activeStatus optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	MgmtDefinition mgmtDefinition,
+	ListOfURIs objectIDs optional,
+	ListOfURIs objectPaths optional,
+	XSD.String description optional,
+	XSD.String version optional,
+	XSD.String softwareName optional,
+	XSD.AnyURI uRL optional,
+	XSD.Boolean install optional,
+	XSD.Boolean uninstall optional,
+	ActionStatus installStatus optional,
+	XSD.Boolean activate_ optional,
+	XSD.Boolean deactivate_ optional,
+	ActionStatus activeStatus optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6003,28 +5996,28 @@ with {
 
 type record StatsCollect
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.ID creator optional,
-    XSD.String statsCollectID,
-    XSD.ID collectingEntityID,
-    ListOfM2MID collectedEntityID,
-    StatsRuleStatusType statsRuleStatus,
-    StatModelType statModel,
-    ScheduleEntries collectPeriod optional,
-    XSD.String eventID optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of Subscription subscription_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.ID creator optional,
+	XSD.String statsCollectID,
+	XSD.ID collectingEntityID,
+	ListOfM2MID collectedEntityID,
+	StatsRuleStatusType statsRuleStatus,
+	StatModelType statModel,
+	ScheduleEntries collectPeriod optional,
+	XSD.String eventID optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of Subscription subscription_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6040,24 +6033,24 @@ with {
 
 type record StatsConfig
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.ID creator optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            EventConfig eventConfig,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.ID creator optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			EventConfig eventConfig,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6073,38 +6066,38 @@ with {
 
 type record Subscription
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.ID creator optional,
-    EventNotificationCriteria eventNotificationCriteria optional,
-    XSD.PositiveInteger expirationCounter optional,
-    ListOfURIs notificationURI,
-    XSD.AnyURI groupID optional,
-    XSD.AnyURI notificationForwardingURI optional,
-    BatchNotify batchNotify optional,
-    RateLimit rateLimit optional,
-    XSD.PositiveInteger preSubscriptionNotify optional,
-    PendingNotification pendingNotification optional,
-    XSD.PositiveInteger notificationStoragePriority optional,
-    XSD.Boolean latestNotify optional,
-    NotificationContentType notificationContentType,
-    EventCat notificationEventCat optional,
-    XSD.AnyURI subscriberURI optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Schedule schedule,
-            NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.ID creator optional,
+	EventNotificationCriteria eventNotificationCriteria optional,
+	XSD.PositiveInteger expirationCounter optional,
+	ListOfURIs notificationURI,
+	XSD.AnyURI groupID optional,
+	XSD.AnyURI notificationForwardingURI optional,
+	BatchNotify batchNotify optional,
+	RateLimit rateLimit optional,
+	XSD.PositiveInteger preSubscriptionNotify optional,
+	PendingNotification pendingNotification optional,
+	XSD.PositiveInteger notificationStoragePriority optional,
+	XSD.Boolean latestNotify optional,
+	NotificationContentType notificationContentType,
+	EventCat notificationEventCat optional,
+	XSD.AnyURI subscriberURI optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Schedule schedule,
+			NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6122,20 +6115,21 @@ with {
 
 type record EventNotificationCriteria
 {
-    Timestamp createdBefore optional,
-    Timestamp createdAfter optional,
-    Timestamp modifiedSince optional,
-    Timestamp unmodifiedSince optional,
-    XSD.PositiveInteger stateTagSmaller optional,
-    XSD.NonNegativeInteger stateTagBigger optional,
-    Timestamp expireBefore optional,
-    Timestamp expireAfter optional,
-    XSD.NonNegativeInteger sizeAbove optional,
-    XSD.PositiveInteger sizeBelow optional,
-    record length(0 .. 5) of Operation operationMonitor_list,
-    AttributeList_1 attribute optional,
-    record length(0 .. 5) of NotificationEventType notificationEventType_list,
-    MissingData missingData optional
+	Timestamp createdBefore optional,
+	Timestamp createdAfter optional,
+	Timestamp modifiedSince optional,
+	Timestamp unmodifiedSince optional,
+	XSD.PositiveInteger stateTagSmaller optional,
+	XSD.NonNegativeInteger stateTagBigger optional,
+	Timestamp expireBefore optional,
+	Timestamp expireAfter optional,
+	XSD.NonNegativeInteger sizeAbove optional,
+	XSD.PositiveInteger sizeBelow optional,
+	record length(0 .. 5) of Operation operationMonitor_list,
+	AttributeList_1 attribute optional,
+	record length(0 .. 5) of NotificationEventType notificationEventType_list,
+	MissingData missingData optional,
+	FilterOperation filterOperation optional
 }
 with {
   variant "name as uncapitalized";
@@ -6148,8 +6142,8 @@ with {
 
 type record BatchNotify
 {
-    XSD.NonNegativeInteger number optional,
-    XSD.Duration duration optional
+	XSD.NonNegativeInteger number optional,
+	XSD.Duration duration optional
 }
 with {
   variant "name as uncapitalized";
@@ -6158,8 +6152,8 @@ with {
 
 type record RateLimit
 {
-    XSD.NonNegativeInteger maxNrOfNotify optional,
-    XSD.Duration timeWindow optional
+	XSD.NonNegativeInteger maxNrOfNotify optional,
+	XSD.Duration timeWindow optional
 }
 with {
   variant "name as uncapitalized";
@@ -6168,30 +6162,30 @@ with {
 
 type record SvcFwWrapper
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6207,29 +6201,29 @@ with {
 
 type record SvcFwWrapperAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6245,31 +6239,31 @@ with {
 
 type record SvcObjWrapper
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime optional,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    ListOfNCNames announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            Subscription subscription,
-            AllJoynApp allJoynApp
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime optional,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	ListOfNCNames announcedAttribute optional,
+	XSD.NonNegativeInteger stateTag,
+	XSD.ID creator optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			Subscription subscription,
+			AllJoynApp allJoynApp
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6285,30 +6279,30 @@ with {
 
 type record SvcObjWrapperAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime optional,
-    Timestamp lastModifiedTime optional,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime optional,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.AnyURI containerDefinition,
-    XSD.AnyURI ontologyRef optional,
-    XSD.NonNegativeInteger contentSize,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record of union {
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc,
-            Subscription subscription,
-            AllJoynAppAnnc allJoynAppAnnc
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime optional,
+	Timestamp lastModifiedTime optional,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime optional,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger stateTag optional,
+	XSD.AnyURI containerDefinition,
+	XSD.AnyURI ontologyRef optional,
+	XSD.NonNegativeInteger contentSize,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record of union {
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc,
+			Subscription subscription,
+			AllJoynAppAnnc allJoynAppAnnc
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6324,20 +6318,20 @@ with {
 
 type record TimeSeriesInstance
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    AbsRelTimestamp dataGenerationTime,
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	AbsRelTimestamp dataGenerationTime,
     XSD.AnySimpleType content,//FIXME Use AnySimpleType instead
-    XSD.NonNegativeInteger sequenceNr optional,
-    XSD.NonNegativeInteger contentSize
+	XSD.NonNegativeInteger sequenceNr optional,
+	XSD.NonNegativeInteger contentSize
 }
 with {
   variant "name as uncapitalized";
@@ -6349,19 +6343,19 @@ with {
 
 type record TimeSeriesInstanceAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    AbsRelTimestamp dataGenerationTime optional,
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	AbsRelTimestamp dataGenerationTime optional,
     XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
-    XSD.NonNegativeInteger sequenceNr optional,
-    XSD.NonNegativeInteger contentSize optional
+	XSD.NonNegativeInteger sequenceNr optional,
+	XSD.NonNegativeInteger contentSize optional
 }
 with {
   variant "name as uncapitalized";
@@ -6372,40 +6366,39 @@ with {
 
 type record TimeSeries
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    XSD.NonNegativeInteger stateTag,
-    XSD.ID creator,
-    XSD.NonNegativeInteger maxNrOfInstances optional,
-    XSD.NonNegativeInteger maxByteSize optional,
-    XSD.NonNegativeInteger maxInstanceAge optional,
-    XSD.NonNegativeInteger currentNrOfInstances,
-    XSD.NonNegativeInteger currentByteSize,
-    XSD.NonNegativeInteger periodicInterval optional,
-    XSD.Boolean missingDataDetect optional,
-    XSD.NonNegativeInteger missingDataMaxNr optional,
-    MissingDataList missingDataList optional,
-    XSD.NonNegativeInteger missingDataCurrentNr optional,
-    XSD.NonNegativeInteger missingDataDetectTimer optional,
-    XSD.AnyURI ontologyRef optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            TimeSeriesInstance timeSeriesInstance,
-            Subscription subscription,
-            SemanticDescriptor semanticDescriptor
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	XSD.ID creator,
+	XSD.NonNegativeInteger maxNrOfInstances optional,
+	XSD.NonNegativeInteger maxByteSize optional,
+	XSD.NonNegativeInteger maxInstanceAge optional,
+	XSD.NonNegativeInteger currentNrOfInstances,
+	XSD.NonNegativeInteger currentByteSize,
+	XSD.PositiveInteger periodicInterval optional,
+	XSD.Boolean missingDataDetect optional,
+	XSD.PositiveInteger missingDataMaxNr optional,
+	MissingDataList missingDataList optional,
+	XSD.NonNegativeInteger missingDataCurrentNr optional,
+	XSD.PositiveInteger missingDataDetectTimer optional,
+	XSD.AnyURI ontologyRef optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			TimeSeriesInstance timeSeriesInstance,
+			Subscription subscription,
+			SemanticDescriptor semanticDescriptor
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6424,39 +6417,38 @@ with {
 
 type record TimeSeriesAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.NonNegativeInteger stateTag optional,
-    XSD.NonNegativeInteger maxNrOfInstances optional,
-    XSD.NonNegativeInteger maxByteSize optional,
-    XSD.NonNegativeInteger maxInstanceAge optional,
-    XSD.NonNegativeInteger currentNrOfInstances,
-    XSD.NonNegativeInteger currentByteSize,
-    XSD.NonNegativeInteger periodicInterval optional,
-    XSD.NonNegativeInteger missingDataMaxNr optional,
-    MissingDataList missingDataList optional,
-    XSD.NonNegativeInteger missingDataCurrentNr optional,
-    XSD.NonNegativeInteger missingDataDetectTimer optional,
-    XSD.AnyURI ontologyRef optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            TimeSeriesInstance timeSeriesInstance,
-            TimeSeriesInstanceAnnc timeSeriesInstanceAnnc,
-            Subscription subscription,
-            SemanticDescriptor semanticDescriptor,
-            SemanticDescriptorAnnc semanticDescriptorAnnc
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.NonNegativeInteger maxNrOfInstances optional,
+	XSD.NonNegativeInteger maxByteSize optional,
+	XSD.NonNegativeInteger maxInstanceAge optional,
+	XSD.NonNegativeInteger currentNrOfInstances,
+	XSD.NonNegativeInteger currentByteSize,
+	XSD.PositiveInteger periodicInterval optional,
+	XSD.PositiveInteger missingDataMaxNr optional,
+	MissingDataList missingDataList optional,
+	XSD.NonNegativeInteger missingDataCurrentNr optional,
+	XSD.PositiveInteger missingDataDetectTimer optional,
+	XSD.AnyURI ontologyRef optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			TimeSeriesInstance timeSeriesInstance,
+			TimeSeriesInstanceAnnc timeSeriesInstanceAnnc,
+			Subscription subscription,
+			SemanticDescriptor semanticDescriptor,
+			SemanticDescriptorAnnc semanticDescriptorAnnc
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6472,33 +6464,33 @@ with {
 
 type record Token
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    TokenID tokenID,
-    DynAuthJWT tokenObject,
-    XSD.String version optional,
-    XSD.ID issuer optional,
-    XSD.ID holder optional,
-    Timestamp notBefore,
-    Timestamp notAfter optional,
-    XSD.String tokenName optional,
-    ListOfM2MID audience optional,
-    TokenPermissions permissions optional,
-    XSD.String extension_ optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            Subscription subscription
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	TokenID tokenID,
+	DynAuthJWT tokenObject,
+	XSD.String version optional,
+	XSD.ID issuer optional,
+	XSD.ID holder optional,
+	Timestamp notBefore,
+	Timestamp notAfter optional,
+	XSD.String tokenName optional,
+	ListOfM2MID audience optional,
+	TokenPermissions permissions optional,
+	XSD.String extension_ optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			Subscription subscription
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6515,33 +6507,33 @@ with {
 
 type record TrafficPattern
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs optional,
-    Timestamp expirationTime,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    ListOfURIs announceTo optional,
-    record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-    XSD.Boolean provideToNSE optional,
-    PeriodicIndicator periodicIndicator optional,
-    XSD.UnsignedInt periodicDurationTime optional,
-    XSD.UnsignedInt periodicIntervalTime optional,
-    StationaryIndication stationaryIndication optional,
-    XSD.PositiveInteger dataSizeIndicator optional,
-    Timestamp validityTime optional,
-    ListOfM2MID targetNetwork,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            record of Subscription subscription_list,
-            record length(1) of Schedule schedule_list
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs optional,
+	Timestamp expirationTime,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	ListOfURIs announceTo optional,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+	XSD.Boolean provideToNSE optional,
+	PeriodicIndicator periodicIndicator optional,
+	XSD.UnsignedInt periodicDurationTime optional,
+	XSD.UnsignedInt periodicIntervalTime optional,
+	StationaryIndication stationaryIndication optional,
+	XSD.PositiveInteger dataSizeIndicator optional,
+	Timestamp validityTime optional,
+	ListOfM2MID targetNetwork,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			record of Subscription subscription_list,
+			record length(1) of Schedule schedule_list
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6564,32 +6556,32 @@ with {
 
 type record TrafficPatternAnnc
 {
-    ResourceName resourceName,
-    ResourceType resourceType,
-    XSD.ID resourceID,
-    NhURI parentID,
-    Timestamp creationTime,
-    Timestamp lastModifiedTime,
-    Labels labels optional,
-    AcpType accessControlPolicyIDs,
-    Timestamp expirationTime,
-    XSD.AnyURI link,
-    ListOfURIs dynamicAuthorizationConsultationIDs optional,
-    XSD.Boolean provideToNSE optional,
-    PeriodicIndicator periodicIndicator optional,
-    XSD.UnsignedInt periodicDurationTime optional,
-    XSD.UnsignedInt periodicIntervalTime optional,
-    StationaryIndication stationaryIndication optional,
-    XSD.PositiveInteger dataSizeIndicator optional,
-    Timestamp validityTime optional,
-    ListOfM2MID targetNetwork optional,
-    union {
-        record length(1 .. infinity) of ChildResourceRef childResource_list,
-        record length(1 .. infinity) of union {
-            record of Subscription subscription_list,
-            record length(1) of ScheduleAnnc scheduleAnnc_list
-        } choice_list
-    } choice optional
+	ResourceName resourceName,
+	ResourceType resourceType,
+	XSD.ID resourceID,
+	NhURI parentID,
+	Timestamp creationTime,
+	Timestamp lastModifiedTime,
+	Labels labels optional,
+	AcpType accessControlPolicyIDs,
+	Timestamp expirationTime,
+	XSD.AnyURI link,
+	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.Boolean provideToNSE optional,
+	PeriodicIndicator periodicIndicator optional,
+	XSD.UnsignedInt periodicDurationTime optional,
+	XSD.UnsignedInt periodicIntervalTime optional,
+	StationaryIndication stationaryIndication optional,
+	XSD.PositiveInteger dataSizeIndicator optional,
+	Timestamp validityTime optional,
+	ListOfM2MID targetNetwork optional,
+	union {
+		record length(1 .. infinity) of ChildResourceRef childResource_list,
+		record length(1 .. infinity) of union {
+			record of Subscription subscription_list,
+			record length(1) of ScheduleAnnc scheduleAnnc_list
+		} choice_list
+	} choice optional
 }
 with {
   variant "name as uncapitalized";
@@ -6613,82 +6605,82 @@ with {
  *         oneM2M Abstract Service Primitives 
  * ******************************************
 */
-    /**
-     * @desc Type for the oneM2M primitives exchange
-     * @member primitive oneM2M primitive
-     * @member host IP Address of the destination
-     * @member xmlNamespace XML Namespace to be used
-     * @member protocolBinding Protocol binding to be used
-     * @member serialization Serialization to be used
-     * @member forcedFields Attributes that need to be processed differently by the test adapter:
-     *             - empty fields (for instance, for attribute deletion), i.e. <labels></labels> -> value_ to be omitted
-     *             - invalid values, i.e. <maxNrOfInstances>-1</maxNrOfInstances>
-     */
-    type record MsgOut {
-        union {
-            RequestPrimitive requestPrimitive,
-            ResponsePrimitive responsePrimitive
-        } primitive, 
-        charstring host optional,
-        charstring xmlNamespace optional, 
-        charstring protocolBinding optional,
-        charstring serialization optional,
-        AttributeAux_list forcedFields optional
-    }
-    with {
-        encode ""
-    }
+	/**
+	 * @desc Type for the oneM2M primitives exchange
+	 * @member primitive oneM2M primitive
+	 * @member host IP Address of the destination
+	 * @member xmlNamespace XML Namespace to be used
+	 * @member protocolBinding Protocol binding to be used
+	 * @member serialization Serialization to be used
+	 * @member forcedFields Attributes that need to be processed differently by the test adapter:
+	 *             - empty fields (for instance, for attribute deletion), i.e. <labels></labels> -> value_ to be omitted
+	 *             - invalid values, i.e. <maxNrOfInstances>-1</maxNrOfInstances>
+	 */
+	type record MsgOut {
+		union {
+			RequestPrimitive requestPrimitive,
+			ResponsePrimitive responsePrimitive
+		} primitive, 
+		charstring host optional,
+		charstring xmlNamespace optional, 
+		charstring protocolBinding optional,
+		charstring serialization optional,
+		AttributeAux_list forcedFields optional
+	}
+	with {
+		encode ""
+	}
     
-    /**
-     * @desc Type for the oneM2M primitives exchange
-     * @member primitive oneM2M primitive
-     */
-    type record MsgIn {
-        union {
-            RequestPrimitive requestPrimitive,
-            ResponsePrimitive responsePrimitive
-        } primitive, 
-        AttributeList_1 nullFields optional
-    }
-    with {
-        encode ""
-    }
+	/**
+	 * @desc Type for the oneM2M primitives exchange
+	 * @member primitive oneM2M primitive
+	 */
+	type record MsgIn {
+		union {
+			RequestPrimitive requestPrimitive,
+			ResponsePrimitive responsePrimitive
+		} primitive, 
+		AttributeList_1 nullFields optional
+	}
+	with {
+		encode ""
+	}
     
-    type record AcRequestPrimitive {
-        charstring event,
-        anytype data
-    }
-    with {
-        encode "adapter";
-    }
+	type record AcRequestPrimitive {
+		charstring event,
+		anytype data
+	}
+	with {
+		encode "adapter";
+	}
     
-    type record AcResponsePrimitive {
-        charstring event,
-        anytype data
-    }
-    with {
-        encode "adapter";
-    }
+	type record AcResponsePrimitive {
+		charstring event,
+		anytype data
+	}
+	with {
+		encode "adapter";
+	}
     
-    type record UtTriggerPrimitive {
-        RequestPrimitive requestPrimitive, 
-        AttributeAux_list forcedFields optional
-    }
-    with {
-        encode "UpperTester"
-    }
+	type record UtTriggerPrimitive {
+		RequestPrimitive requestPrimitive, 
+		AttributeAux_list forcedFields optional
+	}
+	with {
+		encode "UpperTester"
+	}
         
-    type ResponsePrimitive UtTriggerAckPrimitive
-    with {            
-        encode "UpperTester"
-    }
+	type ResponsePrimitive UtTriggerAckPrimitive
+	with {            
+		encode "UpperTester"
+	}
     
-    type record AttributeAux {
-        XSD.NCName name,
-        charstring value_ optional
-    };
+	type record AttributeAux {
+		XSD.NCName name,
+		charstring value_ optional
+	};
     
-    type record of AttributeAux AttributeAux_list;
+	type record of AttributeAux AttributeAux_list;
 
 /* **********************************
 *         oneM2M Resource primitives
@@ -6701,1574 +6693,1570 @@ with {
 
 group OptionalResourceTypes {
     
-    type record AccessControlPolicy_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        SetOfAcrs privileges optional,
-        SetOfAcrs selfPrivileges optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-    type record AccessControlPolicyAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        SetOfAcrs privileges optional,
-        SetOfAcrs selfPrivileges optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record AE_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.String appName optional,
-        XSD.String app_ID optional,
-        XSD.ID aE_ID optional,
-        PoaList pointOfAccess optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.AnyURI nodeLink optional,
-        XSD.Boolean requestReachability optional,
-        Serializations contentSerialization optional,
-        E2eSecInfo e2eSecInfo optional,
-        SupportedReleaseVersions supportedReleaseVersions optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Container container,
-                Group group_,
-                AccessControlPolicy accessControlPolicy,
-                Subscription subscription,
-                PollingChannel pollingChannel,
-                Schedule schedule,
-                SemanticDescriptor semanticDescriptor,
-                TimeSeries timeSeries,
-                TrafficPattern trafficPattern,
-                Sg_flexContainerResource_group sg_flexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (app_ID) "name as 'App-ID'";
-      variant (aE_ID) "name as 'AE-ID'";
-      //variant (requestReachability) "text 'true' as '1'";
-      //variant (requestReachability) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-      variant (choice.choice_list[-].group_) "name as 'group'";
-    };
-
-    type record AEAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.String appName optional,
-        XSD.String app_ID optional,
-        XSD.ID aE_ID optional,
-        PoaList pointOfAccess optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.AnyURI nodeLink optional,
-        XSD.Boolean requestReachability optional,
-        Serializations contentSerialization optional,
-        E2eSecInfo e2eSecInfo optional,
-        SupportedReleaseVersions supportedReleaseVersions optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Container container,
-                ContainerAnnc containerAnnc,
-                Group group_,
-                GroupAnnc groupAnnc,
-                AccessControlPolicy accessControlPolicy,
-                AccessControlPolicyAnnc accessControlPolicyAnnc,
-                Subscription subscription,
-                ScheduleAnnc scheduleAnnc,
-                SemanticDescriptor semanticDescriptor,
-                TimeSeries timeSeries,
-                TimeSeriesAnnc timeSeriesAnnc,
-                TrafficPatternAnnc trafficPatternAnnc,
-                Sg_flexContainerResource_group sg_flexContainerResource,
-                Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (app_ID) "name as 'App-ID'";
-      variant (aE_ID) "name as 'AE-ID'";
-      //variant (requestReachability) "text 'true' as '1'";
-      //variant (requestReachability) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-      variant (choice.choice_list[-].group_) "name as 'group'";
-    };
+	type record AccessControlPolicy_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		SetOfAcrs privileges optional,
+		SetOfAcrs selfPrivileges optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+	type record AccessControlPolicyAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		SetOfAcrs privileges optional,
+		SetOfAcrs selfPrivileges optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record AE_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.String appName optional,
+		XSD.String app_ID optional,
+		XSD.ID aE_ID optional,
+		PoaList pointOfAccess optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.AnyURI nodeLink optional,
+		XSD.Boolean requestReachability optional,
+		Serializations contentSerialization optional,
+		E2eSecInfo e2eSecInfo optional,
+		SupportedReleaseVersions supportedReleaseVersions optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Container container,
+				Group group_,
+				AccessControlPolicy accessControlPolicy,
+				Subscription subscription,
+				PollingChannel pollingChannel,
+				Schedule schedule,
+				SemanticDescriptor semanticDescriptor,
+				TimeSeries timeSeries,
+				TrafficPattern trafficPattern,
+				Sg_flexContainerResource_group sg_flexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (app_ID) "name as 'App-ID'";
+	  variant (aE_ID) "name as 'AE-ID'";
+	  //variant (requestReachability) "text 'true' as '1'";
+	  //variant (requestReachability) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	  variant (choice.choice_list[-].group_) "name as 'group'";
+	};
+
+	type record AEAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.String appName optional,
+		XSD.String app_ID optional,
+		XSD.ID aE_ID optional,
+		PoaList pointOfAccess optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.AnyURI nodeLink optional,
+		XSD.Boolean requestReachability optional,
+		Serializations contentSerialization optional,
+		E2eSecInfo e2eSecInfo optional,
+		SupportedReleaseVersions supportedReleaseVersions optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Container container,
+				ContainerAnnc containerAnnc,
+				Group group_,
+				GroupAnnc groupAnnc,
+				AccessControlPolicy accessControlPolicy,
+				AccessControlPolicyAnnc accessControlPolicyAnnc,
+				Subscription subscription,
+				ScheduleAnnc scheduleAnnc,
+				SemanticDescriptor semanticDescriptor,
+				TimeSeries timeSeries,
+				TimeSeriesAnnc timeSeriesAnnc,
+				TrafficPatternAnnc trafficPatternAnnc,
+				Sg_flexContainerResource_group sg_flexContainerResource,
+				Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (app_ID) "name as 'App-ID'";
+	  variant (aE_ID) "name as 'AE-ID'";
+	  //variant (requestReachability) "text 'true' as '1'";
+	  //variant (requestReachability) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	  variant (choice.choice_list[-].group_) "name as 'group'";
+	};
     
-    type record MgmtCmd_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.String description optional,
-        CmdType cmdType optional,
-        ExecReqArgsListType execReqArgs optional,
-        XSD.Boolean execEnable optional,
-        NodeID execTarget optional,
-        ExecModeType execMode optional,
-        XSD.Duration execFrequency optional,
-        XSD.Duration execDelay optional,
-        XSD.NonNegativeInteger execNumber optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                ExecInstance execInstance,
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      //variant (execEnable) "text 'true' as '1'";
-      //variant (execEnable) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record MgmtCmd_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.String description optional,
+		CmdType cmdType optional,
+		ExecReqArgsListType execReqArgs optional,
+		XSD.Boolean execEnable optional,
+		NodeID execTarget optional,
+		ExecModeType execMode optional,
+		XSD.Duration execFrequency optional,
+		XSD.Duration execDelay optional,
+		XSD.NonNegativeInteger execNumber optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				ExecInstance execInstance,
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  //variant (execEnable) "text 'true' as '1'";
+	  //variant (execEnable) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
     
 
-    type record MgmtResource_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        MgmtDefinition mgmtDefinition optional,
-        ListOfURIs objectIDs optional,
-        ListOfURIs objectPaths optional,
-        XSD.String description optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-    };
-
-    type record AnnouncedMgmtResource_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        MgmtDefinition mgmtDefinition optional,
-        ListOfURIs objectIDs optional,
-        ListOfURIs objectPaths optional,
-        XSD.String description optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant (resourceName) "attribute";
-    };
-
-    type record FlexContainerResource_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        ListOfNCNames announcedAttribute optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.ID creator optional,
-        XSD.AnyURI containerDefinition optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.NonNegativeInteger contentSize optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant (resourceName) "attribute";
-    };
-
-    type record AnnouncedFlexContainerResource_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.AnyURI containerDefinition optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.NonNegativeInteger contentSize optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant (resourceName) "attribute";
-    };
-
-    type record Container_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.ID creator optional,
-        XSD.NonNegativeInteger maxNrOfInstances optional,
-        XSD.NonNegativeInteger maxByteSize optional,
-        XSD.NonNegativeInteger maxInstanceAge optional,
-        XSD.NonNegativeInteger currentNrOfInstances optional,
-        XSD.NonNegativeInteger currentByteSize optional,
-        XSD.AnyURI locationID optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.Boolean disableRetrieval optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                ContentInstance contentInstance,
-                Container container,
-                Subscription subscription,
-                SemanticDescriptor semanticDescriptor,
-                Sg_flexContainerResource_group sg_flexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      //variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      //variant (disableRetrieval) "text 'true' as '1'";
-      //variant (disableRetrieval) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record ContainerAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.NonNegativeInteger maxNrOfInstances optional,
-        XSD.NonNegativeInteger maxByteSize optional,
-        XSD.NonNegativeInteger maxInstanceAge optional,
-        XSD.NonNegativeInteger currentNrOfInstances optional,
-        XSD.NonNegativeInteger currentByteSize optional,
-        XSD.AnyURI locationID optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.Boolean disableRetrieval optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                ContentInstance contentInstance,
-                ContentInstanceAnnc contentInstanceAnnc,
-                Container container,
-                ContainerAnnc containerAnnc,
-                Subscription subscription,
-                SemanticDescriptor semanticDescriptor,
-                SemanticDescriptorAnnc semanticDescriptorAnnc,
-                Sg_flexContainerResource_group sg_flexContainerResource,
-                Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      //variant (disableRetrieval) "text 'true' as '1'";
-      //variant (disableRetrieval) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record ContentInstance_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.ID creator optional,
-        ContentInfo contentInfo optional,
-        XSD.NonNegativeInteger contentSize optional,
-        ContentRef contentRef optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.AnySimpleType content optional, 
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.semanticDescriptor_list) "untagged";
-      variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'";
-    };
-
-    type record ContentInstanceAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        XSD.NonNegativeInteger stateTag optional,
-        ContentInfo contentInfo optional,
-        XSD.NonNegativeInteger contentSize optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.AnySimpleType content optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.semanticDescriptor_list) "untagged";
-      variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'";
-    };
-
-    type record CSEBase_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        CseTypeID cseType optional,
-        XSD.ID cSE_ID optional,
-        ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
-        PoaList pointOfAccess optional,
-        XSD.AnyURI nodeLink optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        E2eSecInfo e2eSecInfo optional,
-        SupportedReleaseVersions supportedReleaseVersions optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                RemoteCSE remoteCSE,
-                RemoteCSEAnnc remoteCSEAnnc,
-                Node node,
-                AE aE,
-                Container container,
-                Group group_,
-                AccessControlPolicy accessControlPolicy,
-                Subscription subscription,
-                MgmtCmd mgmtCmd,
-                LocationPolicy locationPolicy,
-                StatsConfig statsConfig,
-                StatsCollect statsCollect,
-                Request request,
-                Delivery delivery,
-                Schedule schedule,
-                M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
-                ServiceSubscribedAppRule serviceSubscribedAppRule,
-                Role role,
-                XSD.Token token,
-                Sg_flexContainerResource_group sg_flexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (cSE_ID) "name as 'CSE-ID'";
-      variant (supportedResourceType) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-      variant (choice.choice_list[-].aE) "name as capitalized";
-      variant (choice.choice_list[-].group_) "name as 'group'";
-    };
-
-    type record Delivery_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.ID source optional,
-        XSD.ID target optional,
-        Timestamp lifespan optional,
-        EventCat eventCat optional,
-        DeliveryMetaData deliveryMetaData optional,
-        AggregatedRequest aggregatedRequest optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record GenericInterworkingOperationInstance_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        ListOfNCNames announcedAttribute optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.ID creator optional,
-        XSD.AnyURI containerDefinition optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.NonNegativeInteger contentSize optional,
-        XSD.String operationName optional,
-        XSD.String operationState optional,
-        ListOfDataLinks inputDataPointLinks optional,
-        ListOfDataLinks outputDataPointLinks optional,
-        ListOfDataLinks inputLinks optional,
-        ListOfDataLinks outputLinks optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                SemanticDescriptor semanticDescriptor,
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record Group_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.ID creator optional,
-        MemberType memberType optional,
-        XSD.NonNegativeInteger currentNrOfMembers optional,
-        XSD.PositiveInteger maxNrOfMembers optional,
-        record length(0 .. infinity) of XSD.AnyURI memberIDs optional,//TODO A list that can be empty
-        ListOfURIs membersAccessControlPolicyIDs optional,
-        XSD.Boolean memberTypeValidated optional,
-        ConsistencyStrategy consistencyStrategy optional,
-        XSD.String groupName optional,
-        XSD.Boolean semanticSupportIndicator optional,
-        BatchNotify notifyAggregation optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription,
-                SemanticDescriptor semanticDescriptor
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (memberIDs) "list";
-      //variant (memberTypeValidated) "text 'true' as '1'";
-      //variant (memberTypeValidated) "text 'false' as '0'";
-      //variant (semanticSupportIndicator) "text 'true' as '1'";
-      //variant (semanticSupportIndicator) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record GroupAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        MemberType memberType optional,
-        XSD.NonNegativeInteger currentNrOfMembers optional,
-        XSD.PositiveInteger maxNrOfMembers optional,
-        record of XSD.AnyURI memberIDs optional,
-        ListOfURIs membersAccessControlPolicyIDs optional,
-        XSD.Boolean memberTypeValidated optional,
-        ConsistencyStrategy consistencyStrategy optional,
-        XSD.String groupName optional,
-        XSD.Boolean semanticSupportIndicator optional,
-        BatchNotify notifyAggregation optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription,
-                SemanticDescriptor semanticDescriptor,
-                SemanticDescriptorAnnc semanticDescriptorAnnc
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (memberIDs) "list";
-      //variant (memberTypeValidated) "text 'true' as '1'";
-      //variant (memberTypeValidated) "text 'false' as '0'";
-      //variant (semanticSupportIndicator) "text 'true' as '1'";
-      //variant (semanticSupportIndicator) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record LocationPolicy_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        LocationSource locationSource optional,
-        LocationInformationType locationInformationType optional,
-        ListOfDuration locationUpdatePeriod optional,
-        LocationTargetID locationTargetID optional,
-        XSD.AnyURI locationServer optional,
-        XSD.AnyURI locationContainerID optional,
-        XSD.String locationContainerName optional,
-        XSD.String locationStatus optional,
-        XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
-        GeofenceEventCriteria geofenceEventCriteria optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record LocationPolicyAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        LocationSource locationSource optional,
-        LocationInformationType locationInformationType optional,
-        ListOfDuration locationUpdatePeriod optional,
-        LocationTargetID locationTargetID optional,
-        XSD.AnyURI locationServer optional,
-        XSD.AnyURI locationContainerID optional,
-        XSD.String locationContainerName optional,
-        XSD.String locationStatus optional,
-        XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
-        GeofenceEventCriteria geofenceEventCriteria optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-    };
-
-    type record M2mServiceSubscriptionProfile_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                ServiceSubscribedNode serviceSubscribedNode,
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record Node_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        NodeID nodeID optional,
-        XSD.ID hostedCSELink optional,
-        XSD.String mgmtClientAddress optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Memory memory,
-                Battery battery,
-                AreaNwkInfo areaNwkInfo,
-                AreaNwkDeviceInfo areaNwkDeviceInfo,
-                Firmware firmware,
-                Software software,
-                DeviceInfo deviceInfo,
-                DeviceCapability deviceCapability,
-                Reboot reboot,
-                EventLog eventLog,
-                CmdhPolicy cmdhPolicy,
-                ActiveCmdhPolicy activeCmdhPolicy,
-                Subscription subscription,
-                SemanticDescriptor semanticDescriptor,
-                TrafficPattern trafficPattern
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record NodeAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        NodeID nodeID optional,
-        XSD.ID hostedCSELink optional,
-        XSD.String mgmtClientAddress optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                MemoryAnnc memoryAnnc,
-                BatteryAnnc batteryAnnc,
-                AreaNwkInfoAnnc areaNwkInfoAnnc,
-                AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc,
-                FirmwareAnnc firmwareAnnc,
-                SoftwareAnnc softwareAnnc,
-                DeviceInfoAnnc deviceInfoAnnc,
-                DeviceCapabilityAnnc deviceCapabilityAnnc,
-                RebootAnnc rebootAnnc,
-                EventLogAnnc eventLogAnnc,
-                Subscription subscription,
-                SemanticDescriptor semanticDescriptor,
-                SemanticDescriptorAnnc semanticDescriptorAnnc,
-                TrafficPatternAnnc trafficPatternAnnc
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record PollingChannel_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-    };
-
-    type record RemoteCSE_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        CseTypeID cseType optional,
-        PoaList pointOfAccess optional,
-        XSD.AnyURI cSEBase optional,
-        XSD.ID cSE_ID optional,
-        ExternalID m2M_Ext_ID optional,
-        TriggerRecipientID trigger_Recipient_ID optional,
-        XSD.Boolean requestReachability optional,
-        XSD.AnyURI nodeLink optional,
-        XSD.UnsignedInt triggerReferenceNumber optional,
-        E2eSecInfo e2eSecInfo optional,
-        SupportedReleaseVersions supportedReleaseVersions optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                NodeAnnc nodeAnnc,
-                Container container,
-                ContainerAnnc containerAnnc,
-                Group group_,
-                GroupAnnc groupAnnc,
-                AccessControlPolicy accessControlPolicy,
-                AccessControlPolicyAnnc accessControlPolicyAnnc,
-                Subscription subscription,
-                PollingChannel pollingChannel,
-                Schedule schedule,
-                TimeSeries timeSeries,
-                TimeSeriesAnnc timeSeriesAnnc,
-                LocationPolicyAnnc locationPolicyAnnc,
-                AEAnnc aEAnnc,
-                Sg_flexContainerResource_group sg_flexContainerResource,
-                Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (cSEBase) "name as capitalized";
-      variant (cSE_ID) "name as 'CSE-ID'";
-      variant (m2M_Ext_ID) "name as 'M2M-Ext-ID'";
-      variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'";
-      //variant (requestReachability) "text 'true' as '1'";
-      //variant (requestReachability) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-      variant (choice.choice_list[-].group_) "name as 'group'";
-      variant (choice.choice_list[-].aEAnnc) "name as capitalized";
-    };
-
-    type record RemoteCSEAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        CseTypeID cseType optional,
-        PoaList pointOfAccess optional,
-        XSD.AnyURI cSEBase optional,
-        XSD.ID cSE_ID optional,
-        XSD.Boolean requestReachability optional,
-        XSD.AnyURI nodeLink optional,
-        E2eSecInfo e2eSecInfo optional,
-        SupportedReleaseVersions supportedReleaseVersions optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                NodeAnnc nodeAnnc,
-                Container container,
-                ContainerAnnc containerAnnc,
-                Group group_,
-                GroupAnnc groupAnnc,
-                AccessControlPolicy accessControlPolicy,
-                AccessControlPolicyAnnc accessControlPolicyAnnc,
-                Subscription subscription,
-                PollingChannel pollingChannel,
-                ScheduleAnnc scheduleAnnc,
-                LocationPolicyAnnc locationPolicyAnnc,
-                TimeSeries timeSeries,
-                TimeSeriesAnnc timeSeriesAnnc,
-                AEAnnc aEAnnc,
-                Sg_flexContainerResource_group sg_flexContainerResource,
-                Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (cSEBase) "name as capitalized";
-      variant (cSE_ID) "name as 'CSE-ID'";
-      //variant (requestReachability) "text 'true' as '1'";
-      //variant (requestReachability) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-      variant (choice.choice_list[-].group_) "name as 'group'";
-      variant (choice.choice_list[-].aEAnnc) "name as capitalized";
-    };
+	type record MgmtResource_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		MgmtDefinition mgmtDefinition optional,
+		ListOfURIs objectIDs optional,
+		ListOfURIs objectPaths optional,
+		XSD.String description optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	};
+
+	type record AnnouncedMgmtResource_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		MgmtDefinition mgmtDefinition optional,
+		ListOfURIs objectIDs optional,
+		ListOfURIs objectPaths optional,
+		XSD.String description optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant (resourceName) "attribute";
+	};
+
+	type record FlexContainerResource_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		ListOfNCNames announcedAttribute optional,
+		XSD.NonNegativeInteger stateTag optional,
+		XSD.ID creator optional,
+		XSD.AnyURI containerDefinition optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.NonNegativeInteger contentSize optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant (resourceName) "attribute";
+	};
+
+	type record AnnouncedFlexContainerResource_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.NonNegativeInteger stateTag optional,
+		XSD.AnyURI containerDefinition optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.NonNegativeInteger contentSize optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant (resourceName) "attribute";
+	};
+
+	type record Container_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.NonNegativeInteger stateTag optional,
+		XSD.ID creator optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional,
+		XSD.AnyURI locationID optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.Boolean disableRetrieval optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				ContentInstance contentInstance,
+				Container container,
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor,
+				Sg_flexContainerResource_group sg_flexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  //variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  //variant (disableRetrieval) "text 'true' as '1'";
+	  //variant (disableRetrieval) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record ContainerAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.NonNegativeInteger stateTag optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional,
+		XSD.AnyURI locationID optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.Boolean disableRetrieval optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				ContentInstance contentInstance,
+				ContentInstanceAnnc contentInstanceAnnc,
+				Container container,
+				ContainerAnnc containerAnnc,
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor,
+				SemanticDescriptorAnnc semanticDescriptorAnnc,
+				Sg_flexContainerResource_group sg_flexContainerResource,
+				Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  //variant (disableRetrieval) "text 'true' as '1'";
+	  //variant (disableRetrieval) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record ContentInstance_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.NonNegativeInteger stateTag optional,
+		XSD.ID creator optional,
+		ContentInfo contentInfo optional,
+		XSD.NonNegativeInteger contentSize optional,
+		ContentRef contentRef optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.AnySimpleType content optional, 
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.semanticDescriptor_list) "untagged";
+	  variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'";
+	};
+
+	type record ContentInstanceAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		XSD.NonNegativeInteger stateTag optional,
+		ContentInfo contentInfo optional,
+		XSD.NonNegativeInteger contentSize optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.AnySimpleType content optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.semanticDescriptor_list) "untagged";
+	  variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'";
+	};
+
+	type record CSEBase_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		CseTypeID cseType optional,
+		XSD.ID cSE_ID optional,
+		ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
+		PoaList pointOfAccess optional,
+		XSD.AnyURI nodeLink optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		E2eSecInfo e2eSecInfo optional,
+		SupportedReleaseVersions supportedReleaseVersions optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				RemoteCSE remoteCSE,
+				RemoteCSEAnnc remoteCSEAnnc,
+				Node node,
+				AE aE,
+				Container container,
+				Group group_,
+				AccessControlPolicy accessControlPolicy,
+				Subscription subscription,
+				MgmtCmd mgmtCmd,
+				LocationPolicy locationPolicy,
+				StatsConfig statsConfig,
+				StatsCollect statsCollect,
+				Request request,
+				Delivery delivery,
+				Schedule schedule,
+				M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
+				ServiceSubscribedAppRule serviceSubscribedAppRule,
+				Role role,
+				XSD.Token token,
+				Sg_flexContainerResource_group sg_flexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (cSE_ID) "name as 'CSE-ID'";
+	  variant (supportedResourceType) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	  variant (choice.choice_list[-].aE) "name as capitalized";
+	  variant (choice.choice_list[-].group_) "name as 'group'";
+	};
+
+	type record Delivery_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID source optional,
+		XSD.ID target optional,
+		Timestamp lifespan optional,
+		EventCat eventCat optional,
+		DeliveryMetaData deliveryMetaData optional,
+		AggregatedRequest aggregatedRequest optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record GenericInterworkingOperationInstance_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		ListOfNCNames announcedAttribute optional,
+		XSD.NonNegativeInteger stateTag optional,
+		XSD.ID creator optional,
+		XSD.AnyURI containerDefinition optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.NonNegativeInteger contentSize optional,
+		XSD.String operationName optional,
+		XSD.String operationState optional,
+		ListOfDataLinks inputDataPointLinks optional,
+		ListOfDataLinks outputDataPointLinks optional,
+		ListOfDataLinks inputLinks optional,
+		ListOfDataLinks outputLinks optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				SemanticDescriptor semanticDescriptor,
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record Group_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.ID creator optional,
+		MemberType memberType optional,
+		XSD.NonNegativeInteger currentNrOfMembers optional,
+		XSD.PositiveInteger maxNrOfMembers optional,
+		record length(0 .. infinity) of XSD.AnyURI memberIDs optional,//TODO A list that can be empty
+		ListOfURIs membersAccessControlPolicyIDs optional,
+		XSD.Boolean memberTypeValidated optional,
+		ConsistencyStrategy consistencyStrategy optional,
+		XSD.String groupName optional,
+		XSD.Boolean semanticSupportIndicator optional,
+		BatchNotify notifyAggregation optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (memberIDs) "list";
+	  //variant (memberTypeValidated) "text 'true' as '1'";
+	  //variant (memberTypeValidated) "text 'false' as '0'";
+	  //variant (semanticSupportIndicator) "text 'true' as '1'";
+	  //variant (semanticSupportIndicator) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record GroupAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		MemberType memberType optional,
+		XSD.NonNegativeInteger currentNrOfMembers optional,
+		XSD.PositiveInteger maxNrOfMembers optional,
+		record of XSD.AnyURI memberIDs optional,
+		ListOfURIs membersAccessControlPolicyIDs optional,
+		XSD.Boolean memberTypeValidated optional,
+		ConsistencyStrategy consistencyStrategy optional,
+		XSD.String groupName optional,
+		XSD.Boolean semanticSupportIndicator optional,
+		BatchNotify notifyAggregation optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor,
+				SemanticDescriptorAnnc semanticDescriptorAnnc
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (memberIDs) "list";
+	  //variant (memberTypeValidated) "text 'true' as '1'";
+	  //variant (memberTypeValidated) "text 'false' as '0'";
+	  //variant (semanticSupportIndicator) "text 'true' as '1'";
+	  //variant (semanticSupportIndicator) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record LocationPolicy_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		LocationSource locationSource optional,
+		LocationInformationType locationInformationType optional,
+		ListOfDuration locationUpdatePeriod optional,
+		LocationTargetID locationTargetID optional,
+		XSD.AnyURI locationServer optional,
+		XSD.AnyURI locationContainerID optional,
+		XSD.String locationContainerName optional,
+		XSD.String locationStatus optional,
+		XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
+		GeofenceEventCriteria geofenceEventCriteria optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record LocationPolicyAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		LocationSource locationSource optional,
+		LocationInformationType locationInformationType optional,
+		ListOfDuration locationUpdatePeriod optional,
+		LocationTargetID locationTargetID optional,
+		XSD.AnyURI locationServer optional,
+		XSD.AnyURI locationContainerID optional,
+		XSD.String locationContainerName optional,
+		XSD.String locationStatus optional,
+		XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
+		GeofenceEventCriteria geofenceEventCriteria optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	};
+
+	type record M2mServiceSubscriptionProfile_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				ServiceSubscribedNode serviceSubscribedNode,
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record Node_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		NodeID nodeID optional,
+		XSD.ID hostedCSELink optional,
+		XSD.String mgmtClientAddress optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Memory memory,
+				Battery battery,
+				AreaNwkInfo areaNwkInfo,
+				AreaNwkDeviceInfo areaNwkDeviceInfo,
+				Firmware firmware,
+				Software software,
+				DeviceInfo deviceInfo,
+				DeviceCapability deviceCapability,
+				Reboot reboot,
+				EventLog eventLog,
+				CmdhPolicy cmdhPolicy,
+				ActiveCmdhPolicy activeCmdhPolicy,
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor,
+				TrafficPattern trafficPattern
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record NodeAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		NodeID nodeID optional,
+		XSD.ID hostedCSELink optional,
+		XSD.String mgmtClientAddress optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				MemoryAnnc memoryAnnc,
+				BatteryAnnc batteryAnnc,
+				AreaNwkInfoAnnc areaNwkInfoAnnc,
+				AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc,
+				FirmwareAnnc firmwareAnnc,
+				SoftwareAnnc softwareAnnc,
+				DeviceInfoAnnc deviceInfoAnnc,
+				DeviceCapabilityAnnc deviceCapabilityAnnc,
+				RebootAnnc rebootAnnc,
+				EventLogAnnc eventLogAnnc,
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor,
+				SemanticDescriptorAnnc semanticDescriptorAnnc,
+				TrafficPatternAnnc trafficPatternAnnc
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record PollingChannel_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	};
+
+	type record RemoteCSE_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		CseTypeID cseType optional,
+		PoaList pointOfAccess optional,
+		XSD.AnyURI cSEBase optional,
+		XSD.ID cSE_ID optional,
+		ExternalID m2M_Ext_ID optional,
+		TriggerRecipientID trigger_Recipient_ID optional,
+		XSD.Boolean requestReachability optional,
+		XSD.AnyURI nodeLink optional,
+		XSD.UnsignedInt triggerReferenceNumber optional,
+		E2eSecInfo e2eSecInfo optional,
+		SupportedReleaseVersions supportedReleaseVersions optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				NodeAnnc nodeAnnc,
+				Container container,
+				ContainerAnnc containerAnnc,
+				Group group_,
+				GroupAnnc groupAnnc,
+				AccessControlPolicy accessControlPolicy,
+				AccessControlPolicyAnnc accessControlPolicyAnnc,
+				Subscription subscription,
+				PollingChannel pollingChannel,
+				Schedule schedule,
+				TimeSeries timeSeries,
+				TimeSeriesAnnc timeSeriesAnnc,
+				LocationPolicyAnnc locationPolicyAnnc,
+				AEAnnc aEAnnc,
+				Sg_flexContainerResource_group sg_flexContainerResource,
+				Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (cSEBase) "name as capitalized";
+	  variant (cSE_ID) "name as 'CSE-ID'";
+	  variant (m2M_Ext_ID) "name as 'M2M-Ext-ID'";
+	  variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'";
+	  //variant (requestReachability) "text 'true' as '1'";
+	  //variant (requestReachability) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	  variant (choice.choice_list[-].group_) "name as 'group'";
+	  variant (choice.choice_list[-].aEAnnc) "name as capitalized";
+	};
+
+	type record RemoteCSEAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		CseTypeID cseType optional,
+		PoaList pointOfAccess optional,
+		XSD.AnyURI cSEBase optional,
+		XSD.ID cSE_ID optional,
+		XSD.Boolean requestReachability optional,
+		XSD.AnyURI nodeLink optional,
+		E2eSecInfo e2eSecInfo optional,
+		SupportedReleaseVersions supportedReleaseVersions optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				NodeAnnc nodeAnnc,
+				Container container,
+				ContainerAnnc containerAnnc,
+				Group group_,
+				GroupAnnc groupAnnc,
+				AccessControlPolicy accessControlPolicy,
+				AccessControlPolicyAnnc accessControlPolicyAnnc,
+				Subscription subscription,
+				PollingChannel pollingChannel,
+				ScheduleAnnc scheduleAnnc,
+				LocationPolicyAnnc locationPolicyAnnc,
+				TimeSeries timeSeries,
+				TimeSeriesAnnc timeSeriesAnnc,
+				AEAnnc aEAnnc,
+				Sg_flexContainerResource_group sg_flexContainerResource,
+				Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (cSEBase) "name as capitalized";
+	  variant (cSE_ID) "name as 'CSE-ID'";
+	  //variant (requestReachability) "text 'true' as '1'";
+	  //variant (requestReachability) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	  variant (choice.choice_list[-].group_) "name as 'group'";
+	  variant (choice.choice_list[-].aEAnnc) "name as capitalized";
+	};
     
-    type record Request_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.NonNegativeInteger stateTag optional,
-        Operation operation optional,
-        XSD.AnyURI target optional,
-        XSD.ID originator optional,
-        RequestID requestID optional,
-        MetaInformation metaInformation optional,
-        PrimitiveContent primitiveContent optional,
-        RequestStatus requestStatus optional,
-        OperationResult operationResult optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record Schedule_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        ScheduleEntries scheduleElement optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record ScheduleAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ScheduleEntries scheduleElement optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-    };
-
-    type record SemanticDescriptor_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.ID creator optional,
-        DescriptorRepresentation descriptorRepresentation optional,
-        Sparql semanticOpExec optional,
-        XSD.Base64Binary descriptor optional,
-        XSD.AnyURI ontologyRef optional,
-        ListOfURIs relatedSemantics optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription_optional subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record Request_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		Operation operation optional,
+		XSD.AnyURI target optional,
+		XSD.ID originator optional,
+		RequestID requestID optional,
+		MetaInformation metaInformation optional,
+		PrimitiveContent primitiveContent optional,
+		RequestStatus requestStatus optional,
+		OperationResult operationResult optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record Schedule_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		ScheduleEntries scheduleElement optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record ScheduleAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ScheduleEntries scheduleElement optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	};
+
+	type record SemanticDescriptor_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.ID creator optional,
+		DescriptorRepresentation descriptorRepresentation optional,
+		Sparql semanticOpExec optional,
+		XSD.Base64Binary descriptor optional,
+		XSD.AnyURI ontologyRef optional,
+		ListOfURIs relatedSemantics optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription_optional subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
     
-    type record SemanticDescriptorAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        DescriptorRepresentation descriptorRepresentation optional,
-        Sparql semanticOpExec optional,
-        XSD.Base64Binary descriptor optional,
-        XSD.AnyURI ontologyRef optional,
-        ListOfURIs relatedSemantics optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription_optional subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record ServiceSubscribedAppRule_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfM2MID applicableCredIDs optional,
-        ListOfM2MID allowedApp_IDs optional,
-        ListOfM2MID allowedAEs optional,
-        record length(1 .. infinity) of RoleID allowedRole_IDs optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription_optional subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (allowedApp_IDs) "name as 'allowedApp-IDs'";
-      variant (allowedRole_IDs) "name as 'allowedRole-IDs'";
-      variant (allowedRole_IDs) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record ServiceSubscribedNode_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        NodeID nodeID optional,
-        XSD.ID cSE_ID optional,
-        record of DeviceID deviceIdentifier optional,
-        ListOfURIs ruleLinks optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription_optional subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (cSE_ID) "name as 'CSE-ID'";
-      variant (deviceIdentifier) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record StatsCollect_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.ID creator optional,
-        XSD.String statsCollectID optional,
-        XSD.ID collectingEntityID optional,
-        ListOfM2MID collectedEntityID optional,
-        StatsRuleStatusType statsRuleStatus optional,
-        StatModelType statModel optional,
-        ScheduleEntries collectPeriod optional,
-        XSD.String eventID optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription_optional subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record StatsConfig_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.ID creator optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                EventConfig eventConfig,
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-    type record Subscription_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.ID creator optional,
-        EventNotificationCriteria eventNotificationCriteria optional,
-        XSD.PositiveInteger expirationCounter optional,
-        ListOfURIs notificationURI optional,
-        XSD.AnyURI groupID optional,
-        XSD.AnyURI notificationForwardingURI optional,
-        BatchNotify batchNotify optional,
-        RateLimit rateLimit optional,
-        XSD.PositiveInteger preSubscriptionNotify optional,
-        PendingNotification pendingNotification optional,
-        XSD.PositiveInteger notificationStoragePriority optional,
-        XSD.Boolean latestNotify optional,
-        NotificationContentType notificationContentType optional,
-        EventCat notificationEventCat optional,
-        XSD.AnyURI subscriberURI optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Schedule schedule,
-                NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      //variant (latestNotify) "text 'true' as '1'";
-      //variant (latestNotify) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record SemanticDescriptorAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		DescriptorRepresentation descriptorRepresentation optional,
+		Sparql semanticOpExec optional,
+		XSD.Base64Binary descriptor optional,
+		XSD.AnyURI ontologyRef optional,
+		ListOfURIs relatedSemantics optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription_optional subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record ServiceSubscribedAppRule_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfM2MID applicableCredIDs optional,
+		ListOfM2MID allowedApp_IDs optional,
+		ListOfM2MID allowedAEs optional,
+		record length(1 .. infinity) of RoleID allowedRole_IDs optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription_optional subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (allowedApp_IDs) "name as 'allowedApp-IDs'";
+	  variant (allowedRole_IDs) "name as 'allowedRole-IDs'";
+	  variant (allowedRole_IDs) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record ServiceSubscribedNode_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		NodeID nodeID optional,
+		XSD.ID cSE_ID optional,
+		record of DeviceID deviceIdentifier optional,
+		ListOfURIs ruleLinks optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription_optional subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (cSE_ID) "name as 'CSE-ID'";
+	  variant (deviceIdentifier) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record StatsCollect_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID creator optional,
+		XSD.String statsCollectID optional,
+		XSD.ID collectingEntityID optional,
+		ListOfM2MID collectedEntityID optional,
+		StatsRuleStatusType statsRuleStatus optional,
+		StatModelType statModel optional,
+		ScheduleEntries collectPeriod optional,
+		XSD.String eventID optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription_optional subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record StatsConfig_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID creator optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				EventConfig eventConfig,
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+	type record Subscription_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID creator optional,
+		EventNotificationCriteria eventNotificationCriteria optional,
+		XSD.PositiveInteger expirationCounter optional,
+		ListOfURIs notificationURI optional,
+		XSD.AnyURI groupID optional,
+		XSD.AnyURI notificationForwardingURI optional,
+		BatchNotify batchNotify optional,
+		RateLimit rateLimit optional,
+		XSD.PositiveInteger preSubscriptionNotify optional,
+		PendingNotification pendingNotification optional,
+		XSD.PositiveInteger notificationStoragePriority optional,
+		XSD.Boolean latestNotify optional,
+		NotificationContentType notificationContentType optional,
+		EventCat notificationEventCat optional,
+		XSD.AnyURI subscriberURI optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Schedule schedule,
+				NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  //variant (latestNotify) "text 'true' as '1'";
+	  //variant (latestNotify) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
     
-    type record TimeSeries_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.ID creator optional,
-        XSD.NonNegativeInteger maxNrOfInstances optional,
-        XSD.NonNegativeInteger maxByteSize optional,
-        XSD.NonNegativeInteger maxInstanceAge optional,
-        XSD.NonNegativeInteger currentNrOfInstances optional,
-        XSD.NonNegativeInteger currentByteSize optional,
-        XSD.NonNegativeInteger periodicInterval optional,
-        XSD.Boolean missingDataDetect optional,
-        XSD.NonNegativeInteger missingDataMaxNr optional,
-        MissingDataList missingDataList optional,
-        XSD.NonNegativeInteger missingDataCurrentNr optional,
-        XSD.NonNegativeInteger missingDataDetectTimer optional,
-        XSD.AnyURI ontologyRef optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                TimeSeriesInstance_optional timeSeriesInstance,
-                Subscription_optional subscription,
-                SemanticDescriptor_optional semanticDescriptor
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      //variant (missingDataDetect) "text 'true' as '1'";
-      //variant (missingDataDetect) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
-
-
-    type record TimeSeriesAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.NonNegativeInteger maxNrOfInstances optional,
-        XSD.NonNegativeInteger maxByteSize optional,
-        XSD.NonNegativeInteger maxInstanceAge optional,
-        XSD.NonNegativeInteger currentNrOfInstances optional,
-        XSD.NonNegativeInteger currentByteSize optional,
-        XSD.NonNegativeInteger periodicInterval optional,
-        XSD.NonNegativeInteger missingDataMaxNr optional,
-        MissingDataList missingDataList optional,
-        XSD.NonNegativeInteger missingDataCurrentNr optional,
-        XSD.NonNegativeInteger missingDataDetectTimer optional,
-        XSD.AnyURI ontologyRef optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                TimeSeriesInstance_optional timeSeriesInstance,
-                TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc,
-                Subscription_optional subscription,
-                SemanticDescriptor_optional semanticDescriptor,
-                SemanticDescriptorAnnc_optional semanticDescriptorAnnc
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      //variant (missingDataDetect) "text 'true' as '1'";
-      //variant (missingDataDetect) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record TimeSeries_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.ID creator optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional,
+		XSD.NonNegativeInteger periodicInterval optional,
+		XSD.Boolean missingDataDetect optional,
+		XSD.NonNegativeInteger missingDataMaxNr optional,
+		MissingDataList missingDataList optional,
+		XSD.NonNegativeInteger missingDataCurrentNr optional,
+		XSD.NonNegativeInteger missingDataDetectTimer optional,
+		XSD.AnyURI ontologyRef optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				TimeSeriesInstance_optional timeSeriesInstance,
+				Subscription_optional subscription,
+				SemanticDescriptor_optional semanticDescriptor
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  //variant (missingDataDetect) "text 'true' as '1'";
+	  //variant (missingDataDetect) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
+
+
+	type record TimeSeriesAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional,
+		XSD.NonNegativeInteger periodicInterval optional,
+		XSD.NonNegativeInteger missingDataMaxNr optional,
+		MissingDataList missingDataList optional,
+		XSD.NonNegativeInteger missingDataCurrentNr optional,
+		XSD.NonNegativeInteger missingDataDetectTimer optional,
+		XSD.AnyURI ontologyRef optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				TimeSeriesInstance_optional timeSeriesInstance,
+				TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc,
+				Subscription_optional subscription,
+				SemanticDescriptor_optional semanticDescriptor,
+				SemanticDescriptorAnnc_optional semanticDescriptorAnnc
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  //variant (missingDataDetect) "text 'true' as '1'";
+	  //variant (missingDataDetect) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
     
-    type record TimeSeriesInstance_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        AbsRelTimestamp dataGenerationTime optional,
-        XSD.AnySimpleType content optional,
-        XSD.NonNegativeInteger sequenceNr optional,
-        XSD.NonNegativeInteger contentSize  optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-    };
-
-
-    type record TimeSeriesInstanceAnnc_optional
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        XSD.AnyURI link optional,
-        AbsRelTimestamp dataGenerationTime optional,
-        XSD.AnySimpleType content optional,
-        XSD.NonNegativeInteger sequenceNr optional,
-        XSD.NonNegativeInteger contentSize optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-    };
+	type record TimeSeriesInstance_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		AbsRelTimestamp dataGenerationTime optional,
+		XSD.AnySimpleType content optional,
+		XSD.NonNegativeInteger sequenceNr optional,
+		XSD.NonNegativeInteger contentSize  optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	};
+
+
+	type record TimeSeriesInstanceAnnc_optional
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		XSD.AnyURI link optional,
+		AbsRelTimestamp dataGenerationTime optional,
+		XSD.AnySimpleType content optional,
+		XSD.NonNegativeInteger sequenceNr optional,
+		XSD.NonNegativeInteger contentSize optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	};
         
 
 
@@ -8277,461 +8265,464 @@ group OptionalResourceTypes {
     
 group InvalidTypes {
         
-    type record AE_update_invalid {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for AE
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.String appName optional,
-        XSD.String app_ID optional,
-        XSD.ID aE_ID optional,
-        PoaList pointOfAccess optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.AnyURI nodeLink optional,
-        XSD.Boolean requestReachability optional,
-        Serializations contentSerialization optional,
-        E2eSecInfo e2eSecInfo optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Container container,
-                Group group_,
-                AccessControlPolicy accessControlPolicy,
-                Subscription subscription,
-                PollingChannel pollingChannel,
-                Schedule schedule,
-                SemanticDescriptor semanticDescriptor,
-                TimeSeries timeSeries,
-                TrafficPattern trafficPattern,
-                Sg_flexContainerResource_group sg_flexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (app_ID) "name as 'App-ID'";
-      variant (aE_ID) "name as 'AE-ID'";
-      //variant (requestReachability) "text 'true' as '1'";
-      //variant (requestReachability) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-      variant (choice.choice_list[-].group_) "name as 'group'";
-    };
+	type record AE_update_invalid {
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for AE
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.String appName optional,
+		XSD.String app_ID optional,
+		XSD.ID aE_ID optional,
+		PoaList pointOfAccess optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.AnyURI nodeLink optional,
+		XSD.Boolean requestReachability optional,
+		Serializations contentSerialization optional,
+		E2eSecInfo e2eSecInfo optional,
+		SupportedReleaseVersions supportedReleaseVersions optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Container container,
+				Group group_,
+				AccessControlPolicy accessControlPolicy,
+				Subscription subscription,
+				PollingChannel pollingChannel,
+				Schedule schedule,
+				SemanticDescriptor semanticDescriptor,
+				TimeSeries timeSeries,
+				TrafficPattern trafficPattern,
+				Sg_flexContainerResource_group sg_flexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (app_ID) "name as 'App-ID'";
+	  variant (aE_ID) "name as 'AE-ID'";
+	  //variant (requestReachability) "text 'true' as '1'";
+	  //variant (requestReachability) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	  variant (choice.choice_list[-].group_) "name as 'group'";
+	};
        
-    type record ACP_update_invalid {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for ACP
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        SetOfAcrs privileges optional,
-        SetOfAcrs selfPrivileges optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of Subscription subscription_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.subscription_list) "untagged";
-      variant (choice.subscription_list[-]) "name as 'subscription'";
-    };
+	type record ACP_update_invalid {
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for ACP
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		SetOfAcrs privileges optional,
+		SetOfAcrs selfPrivileges optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.subscription_list) "untagged";
+	  variant (choice.subscription_list[-]) "name as 'subscription'";
+	};
         
-    type record Container_update_invalid {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.Integer stateTag optional,
-        XSD.ID creator optional,
-        XSD.Integer maxNrOfInstances optional,
-        XSD.Integer maxByteSize optional,
-        XSD.Integer maxInstanceAge optional,
-        XSD.Integer currentNrOfInstances optional,
-        XSD.Integer currentByteSize optional,
-        XSD.AnyURI locationID optional,
-        XSD.AnyURI ontologyRef optional,
-        XSD.Boolean disableRetrieval optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                ContentInstance contentInstance,
-                Container container,
-                Subscription subscription,
-                SemanticDescriptor semanticDescriptor,
-                Sg_flexContainerResource_group sg_flexContainerResource
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      //variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      //variant (disableRetrieval) "text 'true' as '1'";
-      //variant (disableRetrieval) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record Container_update_invalid {
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.Integer stateTag optional,
+		XSD.ID creator optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional,
+		XSD.AnyURI locationID optional,
+		XSD.AnyURI ontologyRef optional,
+		XSD.Boolean disableRetrieval optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				ContentInstance contentInstance,
+				Container container,
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor,
+				Sg_flexContainerResource_group sg_flexContainerResource
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  //variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  //variant (disableRetrieval) "text 'true' as '1'";
+	  //variant (disableRetrieval) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
               
-    type record Group_update_invalid {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Group
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.ID creator optional,
-        MemberType memberType optional,
-        XSD.NonNegativeInteger currentNrOfMembers optional,
-        XSD.PositiveInteger maxNrOfMembers optional,
-        ListOfURIs memberIDs optional,
-        ListOfURIs membersAccessControlPolicyIDs optional,
-        XSD.Boolean memberTypeValidated optional,
-        ConsistencyStrategy consistencyStrategy optional,
-        XSD.String groupName optional,
-        XSD.Boolean semanticSupportIndicator optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription,
-                SemanticDescriptor semanticDescriptor
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      //variant (memberTypeValidated) "text 'true' as '1'";
-      //variant (memberTypeValidated) "text 'false' as '0'";
-      //variant (semanticSupportIndicator) "text 'true' as '1'";
-      //variant (semanticSupportIndicator) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record Group_update_invalid {
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Group
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.ID creator optional,
+		MemberType memberType optional,
+		XSD.NonNegativeInteger currentNrOfMembers optional,
+		XSD.PositiveInteger maxNrOfMembers optional,
+		record length(0 .. infinity) of XSD.AnyURI memberIDs optional,//TODO A list that can be empty
+		ListOfURIs membersAccessControlPolicyIDs optional,
+		XSD.Boolean memberTypeValidated optional,
+		ConsistencyStrategy consistencyStrategy optional,
+		XSD.String groupName optional,
+		XSD.Boolean semanticSupportIndicator optional,
+		BatchNotify notifyAggregation optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription,
+				SemanticDescriptor semanticDescriptor
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  //variant (memberTypeValidated) "text 'true' as '1'";
+	  //variant (memberTypeValidated) "text 'false' as '0'";
+	  //variant (semanticSupportIndicator) "text 'true' as '1'";
+	  //variant (semanticSupportIndicator) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
 
        
-    type record PollingChannel_update_invalid {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel
-        Labels labels optional,
-        Timestamp expirationTime optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-    };
+	type record PollingChannel_update_invalid {
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel
+		Labels labels optional,
+		Timestamp expirationTime optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	};
        
-    type record Schedule_update_invalid {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Schedule
-        Labels labels optional,
-        Timestamp expirationTime optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        ScheduleEntries scheduleElement optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record Schedule_update_invalid {
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Schedule
+		Labels labels optional,
+		Timestamp expirationTime optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		ScheduleEntries scheduleElement optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
        
-    type record Subscription_update_invalid {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        XSD.ID creator optional,
-        EventNotificationCriteria eventNotificationCriteria optional,
-        XSD.PositiveInteger expirationCounter optional,
-        ListOfURIs notificationURI optional,
-        XSD.AnyURI groupID optional,
-        XSD.AnyURI notificationForwardingURI optional,
-        BatchNotify batchNotify optional,
-        RateLimit rateLimit optional,
-        XSD.PositiveInteger preSubscriptionNotify optional,
-        PendingNotification pendingNotification optional,
-        XSD.PositiveInteger notificationStoragePriority optional,
-        XSD.Boolean latestNotify optional,
-        NotificationContentType notificationContentType optional,
-        EventCat notificationEventCat optional,
-        XSD.AnyURI subscriberURI optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Schedule schedule,
-                NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      //variant (latestNotify) "text 'true' as '1'";
-      //variant (latestNotify) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record Subscription_update_invalid {
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.ID creator optional,
+		EventNotificationCriteria eventNotificationCriteria optional,
+		XSD.PositiveInteger expirationCounter optional,
+		ListOfURIs notificationURI optional,
+		XSD.AnyURI groupID optional,
+		XSD.AnyURI notificationForwardingURI optional,
+		BatchNotify batchNotify optional,
+		RateLimit rateLimit optional,
+		XSD.PositiveInteger preSubscriptionNotify optional,
+		PendingNotification pendingNotification optional,
+		XSD.PositiveInteger notificationStoragePriority optional,
+		XSD.Boolean latestNotify optional,
+		NotificationContentType notificationContentType optional,
+		EventCat notificationEventCat optional,
+		XSD.AnyURI subscriberURI optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Schedule schedule,
+				NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  //variant (latestNotify) "text 'true' as '1'";
+	  //variant (latestNotify) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
     
-    type record TimeSeries_update_invalid
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for TimeSeries
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        XSD.NonNegativeInteger stateTag optional,
-        XSD.ID creator optional,
-        XSD.NonNegativeInteger maxNrOfInstances optional,
-        XSD.NonNegativeInteger maxByteSize optional,
-        XSD.NonNegativeInteger maxInstanceAge optional,
-        XSD.NonNegativeInteger currentNrOfInstances optional,
-        XSD.NonNegativeInteger currentByteSize optional,
-        XSD.NonNegativeInteger periodicInterval optional,
-        XSD.Boolean missingDataDetect optional,
-        XSD.NonNegativeInteger missingDataMaxNr optional,
-        MissingDataList missingDataList optional,
-        XSD.NonNegativeInteger missingDataCurrentNr optional,
-        XSD.NonNegativeInteger missingDataDetectTimer optional,
-        XSD.AnyURI ontologyRef optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                TimeSeriesInstance_optional timeSeriesInstance,
-                Subscription_optional subscription,
-                SemanticDescriptor_optional semanticDescriptor
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      //variant (missingDataDetect) "text 'true' as '1'";
-      //variant (missingDataDetect) "text 'false' as '0'";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	type record TimeSeries_update_invalid
+	{
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for TimeSeries
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		XSD.ID creator optional,
+		XSD.NonNegativeInteger maxNrOfInstances optional,
+		XSD.NonNegativeInteger maxByteSize optional,
+		XSD.NonNegativeInteger maxInstanceAge optional,
+		XSD.NonNegativeInteger currentNrOfInstances optional,
+		XSD.NonNegativeInteger currentByteSize optional,
+		XSD.NonNegativeInteger periodicInterval optional,
+		XSD.Boolean missingDataDetect optional,
+		XSD.NonNegativeInteger missingDataMaxNr optional,
+		MissingDataList missingDataList optional,
+		XSD.NonNegativeInteger missingDataCurrentNr optional,
+		XSD.NonNegativeInteger missingDataDetectTimer optional,
+		XSD.AnyURI ontologyRef optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				TimeSeriesInstance_optional timeSeriesInstance,
+				Subscription_optional subscription,
+				SemanticDescriptor_optional semanticDescriptor
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  //variant (missingDataDetect) "text 'true' as '1'";
+	  //variant (missingDataDetect) "text 'false' as '0'";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
 
 
        
-     type record LocationPolicy_update_invalid {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for LocationPolicy
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional,
-        ListOfURIs announceTo optional,
-        record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
-        LocationSource locationSource optional,
-        ListOfDuration locationUpdatePeriod optional,
-        LocationTargetID locationTargetID optional,
-        XSD.AnyURI locationServer optional,
-        XSD.AnyURI locationContainerID optional,
-        XSD.String locationContainerName optional,
-        XSD.String locationStatus optional,
-        union {
-            record length(1 .. infinity) of ChildResourceRef childResource_list,
-            record length(1 .. infinity) of union {
-                Subscription subscription
-            } choice_list
-        } choice optional
-    }
-    with {
-      variant "name as uncapitalized";
-      variant "element";
-      variant (resourceName) "attribute";
-      variant (announcedAttribute) "list";
-      variant (choice) "untagged";
-      variant (choice.childResource_list) "untagged";
-      variant (choice.childResource_list[-]) "name as 'childResource'";
-      variant (choice.choice_list) "untagged";
-      variant (choice.choice_list[-]) "untagged";
-    };
+	 type record LocationPolicy_update_invalid {
+		ResourceName resourceName optional,
+		ResourceType resourceType optional,
+		XSD.ID resourceID optional,
+		NhURI parentID optional,
+		Timestamp creationTime optional,
+		Timestamp lastModifiedTime optional,
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for LocationPolicy
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+		LocationSource locationSource optional,
+		ListOfDuration locationUpdatePeriod optional,
+		LocationTargetID locationTargetID optional,
+		XSD.AnyURI locationServer optional,
+		XSD.AnyURI locationContainerID optional,
+		XSD.String locationContainerName optional,
+		XSD.String locationStatus optional,
+		union {
+			record length(1 .. infinity) of ChildResourceRef childResource_list,
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
+		} choice optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (resourceName) "attribute";
+	  variant (announcedAttribute) "list";
+	  variant (choice) "untagged";
+	  variant (choice.childResource_list) "untagged";
+	  variant (choice.childResource_list[-]) "name as 'childResource'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
+	};
        
 }//end group invalidTypes
 
 group OtherTypes {
         
-    type enumerated Configurations {
-        e_cf01,
-        e_cf02,
-        e_cf02CseSimuMaster,
-        e_cf03,
-        e_cf04
-    };
+	type enumerated Configurations {
+		e_cf01,
+		e_cf02,
+		e_cf02CseSimuMaster,
+		e_cf03,
+		e_cf04
+	};
     
-    type enumerated TestSystemRole {
-        e_cse,
-        e_ae
-    };
+	type enumerated TestSystemRole {
+		e_cse,
+		e_ae
+	};
         
-    type NhURI ParentID;
+	type NhURI ParentID;
         
-    type record MyResource {
-        integer parentIndex,
-        ResourceType resourceType,
-        PrimitiveContent resource
-    };
+	type record MyResource {
+		integer parentIndex,
+		ResourceType resourceType,
+		PrimitiveContent resource
+	};
         
-    type record of MyResource MyResourcesList;
+	type record of MyResource MyResourcesList;
         
-    type record of integer IntegerList;
+	type record of integer IntegerList;
         
-    type enumerated PrimitiveScope {
-        e_cseRelative,
-        e_spRelative, 
-        e_absolute
-    }
+	type enumerated PrimitiveScope {
+		e_cseRelative,
+		e_spRelative, 
+		e_absolute
+	}
         
-    type enumerated AddressingMethod {
-        e_nonHierarchical,
-        e_hierarchical, 
-        e_hybrid
-    }
+	type enumerated AddressingMethod {
+		e_nonHierarchical,
+		e_hierarchical, 
+		e_hybrid
+	}
         
-    type union Resource_2 {
-        //ResourceTypes
-        AEAnnc_optional aEAnnc,
-        AE_optional aE,
-        AccessControlPolicy_optional accessControlPolicy,
-        AccessControlPolicyAnnc_optional accessControlPolicyAnnc,
-        ContentInstance_optional contentInstance,
-        ContentInstanceAnnc_optional contentInstanceAnnc,
-        Container_optional container,
-        ContainerAnnc_optional containerAnnc,
-        CSEBase_optional cSEBase,
-        Group_optional group_,
-        GroupAnnc_optional groupAnnc,
-        LocationPolicy_optional locationPolicy,
-        LocationPolicyAnnc_optional locationPolicyAnnc,
-        MgmtResource_optional mgmtResource,//MgmtResource
-        AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource
-        Node_optional node,
-        NodeAnnc_optional nodeAnnc,
-        PollingChannel_optional pollingChannel,
-        RemoteCSE_optional remoteCSE,
-        Schedule_optional schedule,
-        ScheduleAnnc_optional scheduleAnnc,
-        StatsConfig_optional statsConfig,
-        StatsCollect_optional statsCollect,
-        M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
-        ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
-        Subscription_optional subscription,
-        TimeSeries_optional timeSeries
-    }
-    with {
-        variant "untagged";
-    }        
+	type union Resource_2 {
+		//ResourceTypes
+		AEAnnc_optional aEAnnc,
+		AE_optional aE,
+		AccessControlPolicy_optional accessControlPolicy,
+		AccessControlPolicyAnnc_optional accessControlPolicyAnnc,
+		ContentInstance_optional contentInstance,
+		ContentInstanceAnnc_optional contentInstanceAnnc,
+		Container_optional container,
+		ContainerAnnc_optional containerAnnc,
+		CSEBase_optional cSEBase,
+		Group_optional group_,
+		GroupAnnc_optional groupAnnc,
+		LocationPolicy_optional locationPolicy,
+		LocationPolicyAnnc_optional locationPolicyAnnc,
+		MgmtResource_optional mgmtResource,//MgmtResource
+		AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource
+		Node_optional node,
+		NodeAnnc_optional nodeAnnc,
+		PollingChannel_optional pollingChannel,
+		RemoteCSE_optional remoteCSE,
+		Schedule_optional schedule,
+		ScheduleAnnc_optional scheduleAnnc,
+		StatsConfig_optional statsConfig,
+		StatsCollect_optional statsCollect,
+		M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
+		ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
+		Subscription_optional subscription,
+		TimeSeries_optional timeSeries
+	}
+	with {
+		variant "untagged";
+	}        
         
-    type record of ResourceType ResourceTypeList_1
-    with {
-        variant "name as uncapitalized";
-        variant "list";
-    };
+	type record of ResourceType ResourceTypeList_1
+	with {
+		variant "name as uncapitalized";
+		variant "list";
+	};
 }
 
 group tsSettings {
@@ -8744,10 +8735,10 @@ group tsSettings {
  * @member e_ws   WebSocket protocol binding
  */
 type enumerated ProtocolBindings {
-    e_http (0),
-    e_coap (1),
-    e_mqtt (2),
-    e_wsck (3)
+	e_http (0),
+	e_coap (1),
+	e_mqtt (2),
+	e_wsck (3)
 }
 
 /**
@@ -8759,9 +8750,9 @@ type enumerated ProtocolBindings {
  * @member e_raw  Data serialization using binary formay
  */
 type enumerated SerializationProtocols {
-    e_xml  (0),
-    e_json (1),
-    e_cbor (2)
+	e_xml  (0),
+	e_json (1),
+	e_cbor (2)
 }
 
 type record of charstring SerializationProtocolsLabels;
@@ -8777,26 +8768,26 @@ const SerializationProtocolsLabels c_serializationLabel := { "xml", "json", "cbo
  *                    If omitted, the SUT IP address defined in SutDesc data structure will be used by the Test Adapter
  */
 type record BindingDesc {
-    charstring       tsAddress,
-    integer          remotePort optional,
-    integer          localPort optional,
-    charstring       sutAddress
+	charstring       tsAddress,
+	integer          remotePort optional,
+	integer          localPort optional,
+	charstring       sutAddress
 }
 
 /**
  * @desc HTTP binding protocol settings
  */
 type record HttpBindingDesc {
-    ProtocolBindings bindingProtocol (e_http),
-    BindingDesc      bindingDesc
+	ProtocolBindings bindingProtocol (e_http),
+	BindingDesc      bindingDesc
 }
 
 /**
  * @desc COAP binding protocol settings
  */
 type record CoapBindingDesc {
-    ProtocolBindings bindingProtocol (e_coap),
-    BindingDesc      bindingDesc
+	ProtocolBindings bindingProtocol (e_coap),
+	BindingDesc      bindingDesc
 }
 
 /**
@@ -8807,28 +8798,28 @@ type record CoapBindingDesc {
  * @member bindingDesc     
  */
 type record MqttBindingDesc {
-    ProtocolBindings bindingProtocol (e_mqtt),
-    BindingDesc      bindingDesc,
-    charstring       hostingCSE_ID,
-    charstring       credentialId
-    // TODO To be completed
+	ProtocolBindings bindingProtocol (e_mqtt),
+	BindingDesc      bindingDesc,
+	charstring       hostingCSE_ID,
+	charstring       credentialId
+	// TODO To be completed
 }
 
 /**
  * @desc WebSocket binding protocol settings 
  */
 type record WSBindingDesc {
-    ProtocolBindings bindingProtocol (e_wsck),
-    BindingDesc      bindingDesc,
-    charstring       requestUri 
-    // TODO To be completed
+	ProtocolBindings bindingProtocol (e_wsck),
+	BindingDesc      bindingDesc,
+	charstring       requestUri 
+	// TODO To be completed
 }
 
 type union BindingProtocolsSelect {
-    HttpBindingDesc httpBindingDesc,
-    CoapBindingDesc coapBindingDesc,
-    MqttBindingDesc mqttBindingDesc,
-    WSBindingDesc   wsBindingDesc
+	HttpBindingDesc httpBindingDesc,
+	CoapBindingDesc coapBindingDesc,
+	MqttBindingDesc mqttBindingDesc,
+	WSBindingDesc   wsBindingDesc
 }
 
 /**
@@ -8837,12 +8828,12 @@ type union BindingProtocolsSelect {
  * @member serialization
  */
 type record PortDesc {
-    BindingProtocolsSelect binding,
-    SerializationProtocols serialization
+	BindingProtocolsSelect binding,
+	SerializationProtocols serialization
 }
 
 type record SutDesc {
-    charstring sutAddress
+	charstring sutAddress
 }
 
 /**
@@ -8888,6 +8879,4 @@ with {
   encode "XML";
   //variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
   //variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
-    extension "anytype Resource, URI, Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, AccessControlPolicyAnnc_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, ContainerAnnc_optional, ContentInstanceAnnc_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid,  GroupAnnc_optional, LocationPolicyAnnc_optional, MgmtResource_optional, AnnouncedMgmtResource_optional, Node_optional, NodeAnnc_optional, Schedule_optional, ScheduleAnnc_optional,  Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid, SemanticDescriptor_optional, FlexContainerResource_optional, GenericInterworkingOperationInstance_optional"
 }
-
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 00ec5b73fe4dd488498c58f247f120b96ff28128..319c7903d482a598fee215a0fb8803f6df47ddda 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -5,9 +5,7 @@
  *  © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
  *  All rights reserved.
  *  
- *  @author     ETSI
- *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ *  @author     oneM2M/ETSI
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -4033,7 +4031,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
-						v_createRequest.primitiveContent.container_update_invalid.maxNrOfInstances := -1;
+						v_createRequest.primitiveContent.container_update_invalid.maxNrOfInstances := 0;
 						v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));			
@@ -4046,7 +4044,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
-						v_createRequest.primitiveContent.container_update_invalid.maxByteSize := -1;
+						v_createRequest.primitiveContent.container_update_invalid.maxByteSize := 0;
 						v_invalidAttribute := {name := "maxByteSize", value_ := "-1"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
@@ -4060,7 +4058,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var AttributeAux v_invalidAttribute;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						
-						v_createRequest.primitiveContent.container_update_invalid.maxInstanceAge := -1;
+						v_createRequest.primitiveContent.container_update_invalid.maxInstanceAge := 0;
 						v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
@@ -4624,7 +4622,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						  
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_CIN_CR() runs on Tester system CseSystem {//TODO
+					testcase TC_CSE_DMR_CRE_012_CIN_CR() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
@@ -4636,7 +4634,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					}
 					
-					testcase TC_CSE_DMR_CRE_012_CIN_CNF() runs on Tester system CseSystem {//TODO
+					testcase TC_CSE_DMR_CRE_012_CIN_CNF() runs on Tester system CseSystem {
 						// Local variables
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;