diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 820696e85693d9d1272f6b23f81fe5db98d1ed58..57552f5eb459e9e7cb72acb1deee6d42abab1a24 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- *              $Id: OneM2M_Types.ttcn 113 2016-09-09 07:11:54Z reinaortega $
+ *              $Id: OneM2M_Types.ttcn 115 2016-09-14 07:08:40Z reinaortega $
  *  @desc       Test System module for oneM2M
  *
  */
@@ -1895,7 +1895,7 @@ type record AccessControlRule
 			record length(1 .. infinity) of Ipv6 ipv6Addresses
 		} accessControlIpAddresses optional,
 		LocationRegion accessControlLocationRegion optional
-	} accessControlContexts_list optional, //TODO
+	} accessControlContexts_list optional,
 	XSD.Boolean accessControlAuthenticationFlag optional
 }
 with {
@@ -6933,12 +6933,16 @@ group invalidTypes {
 		AcpType accessControlPolicyIDs optional,
 		Timestamp creationTime optional,//Invalid field to be used for BI tests
 		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
 		ListOfURIs announceTo optional,
 		record of XSD.Token announcedAttribute optional,
 		XSD.String appName optional,
 		PoaList pointOfAccess optional,
 		XSD.AnyURI ontologyRef optional,
-		XSD.Boolean requestReachability optional
+		XSD.AnyURI nodeLink optional,
+		XSD.Boolean requestReachability optional,
+		Serializations contentSerialization optional,
+		E2eSecInfo e2eSecInfo optional
 	};
        
 	type record ACP_update_invalid {
@@ -6959,6 +6963,7 @@ group invalidTypes {
 		Timestamp creationTime optional,//Invalid field to be used for BI tests (RO attributes)
 		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container
 		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
 		ListOfURIs announceTo optional,
 		record of XSD.Token announcedAttribute optional,
 		XSD.NonNegativeInteger maxNrOfInstances optional,
@@ -6967,69 +6972,59 @@ group invalidTypes {
 		XSD.AnyURI locationID optional,
 		XSD.AnyURI ontologyRef optional
 	}
-	   
-	//TODO To double check
-	type record ContentInstance_update_invalid {
+	          
+	type record Group_update_invalid {
 		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
 		Timestamp creationTime optional,//Invalid field to be used for BI tests
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Group
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
 		ListOfURIs announceTo optional,
-		ContentInfo contentInfo optional,
-		XSD.NonNegativeInteger contentSize optional,
-		XSD.AnyURI ontologyRef optional,
-		XSD.AnyType content_ optional
-	}
-       
-	type record Group_update_invalid {
-		 Labels labels optional,
-		 AcpType accessControlPolicyIDs optional,
-		 Timestamp creationTime optional,//Invalid field to be used for BI tests
-		 XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Group
-		 Timestamp expirationTime optional,
-		 ListOfURIs announceTo optional,
-		 record of XSD.Token announcedAttribute optional,
-		 XSD.NonNegativeInteger maxNrOfMembers optional,
-		 ListOfURIs memberIDs optional,
-		 ListOfURIs membersAccessControlPolicyIDs optional,
-		 XSD.String groupName optional
+		record of XSD.Token announcedAttribute optional,
+		XSD.NonNegativeInteger maxNrOfMembers optional,
+		ListOfURIs memberIDs optional,
+		ListOfURIs membersAccessControlPolicyIDs optional,
+		XSD.String groupName optional
 	}
        
 	type record PollingChannel_update_invalid {
-		 Labels labels optional,
-		 AcpType accessControlPolicyIDs optional,
-		 Timestamp creationTime optional,//Invalid field to be used for BI tests
-		 XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel
-		 Timestamp expirationTime optional,
-		 XSD.AnyURI pollingChannelURI optional //TODO: To be double checked
+		Labels labels optional,
+		Timestamp creationTime optional,//Invalid field to be used for BI tests
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel
+		Timestamp expirationTime optional
 	}
        
 	type record Schedule_update_invalid {
-		 Labels labels optional,
-		 Timestamp creationTime optional,//Invalid field to be used for BI tests
-		 XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Schedule
-		 Timestamp expirationTime optional,
-		 ListOfURIs announceTo optional,
-		 record of XSD.Token announcedAttribute optional,
-		 ScheduleEntries scheduleElement optional
+		Labels labels optional,
+		Timestamp creationTime optional,//Invalid field to be used for BI tests
+		XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Schedule
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record of XSD.Token announcedAttribute optional,
+		ScheduleEntries scheduleElement optional
 	}
        
 	type record Subscription_update_invalid {
-		 Labels labels optional,
-		 AcpType accessControlPolicyIDs optional,
-		 Timestamp creationTime optional,//Invalid field to be used for BI tests
-		 XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription
-		 Timestamp expirationTime 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,
-		 PendingNotification pendingNotification optional,
-		 XSD.PositiveInteger notificationStoragePriority optional,
-		 XSD.Boolean latestNotify optional,
-		 NotificationContentType notificationContentType optional,
-		 EventCat notificationEventCat optional
+		Labels labels optional,
+		AcpType accessControlPolicyIDs optional,
+		Timestamp creationTime optional,//Invalid field to be used for BI tests
+		XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription
+		Timestamp expirationTime optional,
+		ListOfURIs dynamicAuthorizationConsultationIDs 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,
+		PendingNotification pendingNotification optional,
+		XSD.PositiveInteger notificationStoragePriority optional,
+		XSD.Boolean latestNotify optional,
+		NotificationContentType notificationContentType optional,
+		EventCat notificationEventCat optional
 	 }
        
 	 //@Martin
@@ -7039,6 +7034,9 @@ group invalidTypes {
 		Labels labels optional,
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,		
+		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		ListOfURIs announceTo optional,
+		record of XSD.Token announcedAttribute optional,
 		LocationSource locationSource optional,//invalid field to be used for BI tests
 		XSD.Duration locationUpdatePeriod optional,
 		NodeID locationTargetID optional,//invalid field to be used for BI tests