diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 925bbe74cefce612f04f0c23b7ac07024e1f7347..77973404db6199e60174ada333173f7d62c0e434 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2075,9 +2075,9 @@ type record EventNotificationCriteria
 }
 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'";
   variant (childResourceType) "list";
 };
@@ -2359,7 +2359,7 @@ type record AccessControlRule
 	ListOfURIs accessControlOriginators,
 	AccessControlOperations accessControlOperations,
 	record of record {
-		record of ScheduleEntry accessControlWindow_list,
+		record of ScheduleEntry accessControlWindow_list optional,//TODO Make it optional
 		record {
 			record length(1 .. infinity) of Ipv4 ipv4Addresses optional,
 			record length(1 .. infinity) of Ipv6 ipv6Addresses optional
@@ -2375,7 +2375,7 @@ type record AccessControlRule
 }
 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'";
@@ -2383,7 +2383,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";
 };
@@ -4932,7 +4932,10 @@ type enumerated TriggerStatus
 	int3(3),
 	int4(4),
 	int5(5),
-	int6(6)
+	int6(6),
+	int7(7),
+	int8(8),
+	int9(9)
 }
 with {
   variant "useNumber";