diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 825b464b48e63cbab6104b1c4db7c12cf38312a8..6d4aa2eaafdec96a48b4ac850424dfe6d196188a 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2363,13 +2363,13 @@ type record AccessControlRule
 			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";
@@ -7574,8 +7574,8 @@ with {
 
 type record RateLimit
 {
-	XSD.NonNegativeInteger maxNrOfNotify optional,
-	XSD.Duration timeWindow optional
+	XSD.NonNegativeInteger maxNrOfNotify,
+	XSD.Duration timeWindow
 }
 with {
   variant "name as uncapitalized";