diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index ef2dd9e88c62796d58cbdd6befed64150146aecd..261eefe5e6c62b0d47e956662e582c33ecc61084 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2346,7 +2346,7 @@ 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[-]) "name as 'notificationEventType'";
@@ -2374,13 +2374,13 @@ type record FilterCriteria
 	record length(1 .. infinity) of ResourceType parentResourceType optional,
 	XSD.NonNegativeInteger sizeAbove optional,
 	XSD.PositiveInteger sizeBelow optional,
-	record of TypeOfContent contentType_list,
-	record of Attribute attribute_list,
-	record of Attribute childAttribute_list,
-	record of Attribute parentAttribute_list,
+	record of TypeOfContent contentType_list optional,//TODO Make it optional
+	record of Attribute attribute_list optional,//TODO Make it optional
+	record of Attribute childAttribute_list optional,//TODO Make it optional
+	record of Attribute parentAttribute_list optional,//TODO Make it optional
 	FilterUsage filterUsage optional,
 	XSD.NonNegativeInteger limit optional,
-	record of Sparql semanticsFilter_list,
+	record of Sparql semanticsFilter_list optional,//TODO Make it optional
 	FilterOperation filterOperation optional,
 	ContentFilterSyntax contentFilterSyntax optional,
 	XSD.String contentFilterQuery optional,
@@ -2652,7 +2652,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'";
@@ -2660,7 +2660,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";
 };