diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 6871c87f2af7921cc99bbfe32ef218ea81ce47d1..5ada7f4a4b98cf1790b10c0ac5537dbc19e97ba8 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2024,13 +2024,13 @@ 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 //TODO It should be optional
 }
 with {
   variant "name as uncapitalized";
@@ -5648,7 +5648,7 @@ with {
 
 type record ListOfChildResourceRef
 {
-	record length(1 .. infinity) of ChildResourceRef resourceRef_list
+	record length(0 .. infinity) of ChildResourceRef resourceRef_list//TODO It should allow empty list
 }
 with {
   variant "name as uncapitalized";