diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index b3851c716692a71725ebcd08f4363879c245183a..bc36385c01ef8694910719997329022c864354e9 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1850,9 +1850,9 @@ module OneM2M_Templates {
 		template (value) AccessControlRule m_createAcr (in template (value) ListOfURIs p_acor, in template (value) AccessControlOperations p_allowedOperations) := {
 			accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
 			accessControlOperations := p_allowedOperations,
-			accessControlContexts_list := {},
+			accessControlContexts_list := omit,
 			accessControlAuthenticationFlag := omit, 
-			accessControlObjectDetails_list := {}
+			accessControlObjectDetails_list := omit
 		}
     	
 		/*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index b55ce90a964bd32e0dfd3f48f17f0d938814ecca..fc1c6347c67de0cdf6d2f3b7e26fe18a6494686c 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit b55ce90a964bd32e0dfd3f48f17f0d938814ecca
+Subproject commit fc1c6347c67de0cdf6d2f3b7e26fe18a6494686c
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index a53e93702f2ca2b3e2a71a0618ded0665c8889a0..525bba5aae46c2eceb2f097b9b722f7c85488505 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -8084,7 +8084,7 @@ module OneM2M_PermutationFunctions {
 	
 							// Preamble
 							v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
-							v_accessControlRule.accessControlContexts_list := {{{}, omit, { choice := { countryCode := {"ES"}}}}};
+							v_accessControlRule.accessControlContexts_list := {{omit, omit, { choice := { countryCode := {"ES"}}}}};
 							v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
 							v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
 							
@@ -8141,7 +8141,7 @@ module OneM2M_PermutationFunctions {
 	
 							// Preamble
 							v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
-							v_accessControlRule.accessControlContexts_list := {{{}, omit, { choice := { countryCode := {"ES"}}}}};
+							v_accessControlRule.accessControlContexts_list := {{omit, omit, { choice := { countryCode := {"ES"}}}}};
 							v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
 							v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
 							
@@ -8197,7 +8197,7 @@ module OneM2M_PermutationFunctions {
 	
 							// Preamble
 							v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
-							v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_AE1.mcaPortIn)}, omit}, omit}};
+							v_accessControlRule.accessControlContexts_list := {{omit, {{f_getIpv4Address(PX_TS_AE1.mcaPortIn)}, omit}, omit}};
 							v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
 							vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
 							
@@ -8257,7 +8257,7 @@ module OneM2M_PermutationFunctions {
 	
 							// Preamble
 							v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
-							v_accessControlRule.accessControlContexts_list := {{{}, {{"240.0.0.0"}, omit}, omit}};
+							v_accessControlRule.accessControlContexts_list := {{omit, {{"240.0.0.0"}, omit}, omit}};
 							v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
 							vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource