diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 438782a0616836de1766637eeee1f2579636db73..cc7ca6f3a5cb2eaceec06a521d5971e8a81d9611 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2024,17 +2024,17 @@ type record AccessControlRule
 			record length(1 .. infinity) of Ipv6 ipv6Addresses optional
 		} accessControlIpAddresses optional,
 		LocationRegion accessControlLocationRegion optional
-	} accessControlContexts_list,
+	} accessControlContexts_list optional,//TODO It should be optional
 	XSD.Boolean accessControlAuthenticationFlag optional,
 	record of record {
 		ResourceType resourceType optional,
 		XSD.AnyURI specializationID optional,
 		record length(1 .. infinity) of ResourceType childResourceType
-	} accessControlObjectDetails_list
+	} accessControlObjectDetails_list optional//TODO It should be optional
 }
 with {
   variant "name as uncapitalized";
-  variant (accessControlContexts_list) "untagged";
+  //variant (accessControlContexts_list) "untagged";
   variant (accessControlContexts_list[-]) "name as 'accessControlContexts'";
   variant (accessControlContexts_list[-].accessControlWindow_list) "untagged";
   variant (accessControlContexts_list[-].accessControlWindow_list[-]) "name as 'accessControlWindow'";
@@ -2042,7 +2042,7 @@ with {
   variant (accessControlContexts_list[-].accessControlIpAddresses.ipv6Addresses) "list";
   //variant (accessControlAuthenticationFlag) "text 'true' as '1'";
   //variant (accessControlAuthenticationFlag) "text 'false' as '0'";
-  variant (accessControlObjectDetails_list) "untagged";
+  //variant (accessControlObjectDetails_list) "untagged";
   variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'";
   variant (accessControlObjectDetails_list[-].childResourceType) "list";
 };
@@ -6134,17 +6134,17 @@ type record EventNotificationCriteria
 	Timestamp expireAfter optional,
 	XSD.NonNegativeInteger sizeAbove optional,
 	XSD.PositiveInteger sizeBelow optional,
-	record length(0 .. 5) of Operation operationMonitor_list,
+	record length(0 .. 5) of Operation operationMonitor_list optional, //It should be optional
 	AttributeList_1 attribute optional,
-	record length(0 .. 5) of NotificationEventType notificationEventType_list,
+	record length(0 .. 5) of NotificationEventType notificationEventType_list optional, //It should be optional	
 	MissingData missingData optional,
 	FilterOperation filterOperation optional
 }
 with {
   variant "name as uncapitalized";
-  variant (operationMonitor_list) "untagged";
+//  variant (operationMonitor_list) "untagged";
   variant (operationMonitor_list[-]) "name as 'operationMonitor'";
-  variant (notificationEventType_list) "untagged";
+//  variant (notificationEventType_list) "untagged";
   variant (notificationEventType_list[-]) "name as 'notificationEventType'";
 };