diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 796f379b9ae44c37e5f80fb331bffb0bd959a597..761eefc04cdf4acea1f0db24a5dc78767e5a9163 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2626,7 +2626,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
@@ -2635,13 +2635,13 @@ type record AccessControlRule
 		ListOfM2MID accessControlUserIDs optional,
 		EvalCriteria accessControlEvalCriteria optional,
 		XSD.NonNegativeInteger accessControlLimit 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
 	AttributeList_1 accessControlAttributes optional
 }
 with {