diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 9c158b863dfa7779b8e21d1c6c955fbcf4f64d77..b8fc6b844cbfbb81ae15b6b1e5bd1e27ecc4bba7 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- *              $Id: OneM2M_Types.ttcn 308 2017-06-21 09:44:17Z reinaortega $
+ *              $Id: OneM2M_Types.ttcn 309 2017-06-21 13:08:02Z reinaortega $
  *  @desc       OneM2M data types module 
  *
  */
@@ -27,7 +27,7 @@ type record AccessControlPolicy
 	Labels labels optional,
 	Timestamp expirationTime,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	SetOfAcrs privileges,
 	SetOfAcrs selfPrivileges,
 	union {
@@ -97,7 +97,7 @@ type record ActiveCmdhPolicy
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -125,7 +125,7 @@ type record AE
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	XSD.String appName optional,
 	XSD.String app_ID,
 	XSD.ID aE_ID,
@@ -724,7 +724,7 @@ type record AreaNwkDeviceInfo
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -808,7 +808,7 @@ type record AreaNwkInfo
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -882,7 +882,7 @@ type record Battery
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -956,7 +956,7 @@ type record CmdhBuffer
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -986,7 +986,7 @@ type record CmdhDefaults
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -1016,7 +1016,7 @@ type record CmdhDefEcValue
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -1051,7 +1051,7 @@ type record CmdhEcDefParamValues
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -1086,7 +1086,7 @@ type record CmdhLimits
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -1133,7 +1133,7 @@ type record CmdhNetworkAccessRules
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -1164,7 +1164,7 @@ type record CmdhNwAccessRule
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -1197,7 +1197,7 @@ type record CmdhPolicy
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -2434,7 +2434,7 @@ type record MgmtResource
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -2762,7 +2762,7 @@ type record Container
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	XSD.NonNegativeInteger stateTag,
 	XSD.ID creator optional,
 	XSD.NonNegativeInteger maxNrOfInstances optional,
@@ -2861,7 +2861,7 @@ type record ContentInstance
 	Labels labels optional,
 	Timestamp expirationTime,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	XSD.NonNegativeInteger stateTag,
 	XSD.ID creator optional,
 	ContentInfo contentInfo optional,
@@ -3028,7 +3028,7 @@ type record DeviceCapability
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -3126,7 +3126,7 @@ type record DeviceInfo
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -4070,7 +4070,7 @@ type record EventLog
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -4198,7 +4198,7 @@ type record Firmware
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -4456,7 +4456,7 @@ type record Group
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	XSD.ID creator optional,
 	MemberType memberType,
 	XSD.NonNegativeInteger currentNrOfMembers,
@@ -4553,7 +4553,7 @@ type record LocationPolicy
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	LocationSource locationSource,
 	ListOfDuration locationUpdatePeriod optional,
 	NodeID locationTargetID optional,
@@ -4654,7 +4654,7 @@ type record Memory
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -4771,7 +4771,7 @@ type record Node
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	NodeID nodeID,
 	XSD.ID hostedCSELink optional,
 	XSD.String mgmtClientAddress optional,
@@ -5098,7 +5098,7 @@ type record Reboot
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -5180,7 +5180,7 @@ type record RemoteCSE
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	CseTypeID cseType optional,
 	PoaList pointOfAccess optional,
 	XSD.AnyURI cSEBase,
@@ -5542,7 +5542,7 @@ type record Schedule
 	Labels labels optional,
 	Timestamp expirationTime,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	ScheduleEntries scheduleElement,
 	union {
 		record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -5597,7 +5597,7 @@ type record SemanticDescriptor
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	XSD.ID creator optional,
 	DescriptorRepresentation descriptorRepresentation optional,
 	Sparql semanticOpExec optional,
@@ -5741,7 +5741,7 @@ type record Software
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	MgmtDefinition mgmtDefinition,
 	ListOfURIs objectIDs optional,
 	ListOfURIs objectPaths optional,
@@ -6166,7 +6166,7 @@ type record TimeSeriesInstance
 	Labels labels optional,
 	Timestamp expirationTime,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	AbsRelTimestamp dataGenerationTime,
 	XSD.AnySimpleType content,
 	XSD.NonNegativeInteger sequenceNr optional
@@ -6214,7 +6214,7 @@ type record TimeSeries
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	XSD.NonNegativeInteger stateTag,
 	XSD.ID creator,
 	XSD.NonNegativeInteger maxNrOfInstances optional,
@@ -6361,7 +6361,7 @@ type record TrafficPattern
 	Timestamp expirationTime,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
 	ListOfURIs announceTo optional,
-	record length(1 .. infinity) of XSD.NCName announcedAttribute,
+	record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
 	XSD.Boolean provideToNSE optional,
 	PeriodicIndicator periodicIndicator optional,
 	XSD.UnsignedInt periodicDurationTime optional,