diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 825b464b48e63cbab6104b1c4db7c12cf38312a8..2511b0a6c38c580618fabf2b0f7f02beba49ce07 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2357,19 +2357,19 @@ 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
 		} accessControlIpAddresses optional,
 		LocationRegion accessControlLocationRegion optional
-	} accessControlContexts_list optional,//TODO It should be optional
+	} accessControlContexts_list optional,//TODO Make it optional
 	XSD.Boolean accessControlAuthenticationFlag optional,
 	record of record {
 		ResourceType resourceType optional,
 		SpecializationType specializationID optional,
 		record length(1 .. infinity) of ResourceType childResourceType
-	} accessControlObjectDetails_list optional //TODO It should be optional
+	} accessControlObjectDetails_list optional //TODO Make it optional
 }
 with {
   variant "name as uncapitalized";