diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 8788fbb49b5ff032926f357b919bb2c3f4db31a1..c5c1028daf6ed7d3fd141dea17e9ab1b34ff92a4 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7565,7 +7565,7 @@ module OneM2M_PermutationFunctions {
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
 					v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 					v_ae1.done;
-					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+					v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
    
 					// Test control
 
@@ -7574,34 +7574,16 @@ module OneM2M_PermutationFunctions {
 	
 					//Test adapter configuration
 					// Register the CSE
-					f_cse_registerRemoteCse(mw_createRemoteCSE);		
+					f_cse_registerRemoteCse(m_createRemoteCSEBase);		
 
 					v_ae1.start(f_cse_createResource(int2,v_create));
-					f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+					v_aeIndex := f_getLatestResourceIndex(v_ae1);
+					v_aEAnncIndex := f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
 					v_ae1.done;
 
 					// Test Body
-					v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
-
-					tc_ac.start;
-					alt {
-						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
-
-							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or 
-							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
-								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
-							} else {
-								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
-							}
-
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
-						}
-					}
-					
+					v_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_aEAnncIndex);
 					v_ae1.done;
 
 					// Postamble
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index dee81dea898ab8d33bacea55833acc8f9f8500b9..744c4526cf7cded419194f6af6bf59ee794e3c5f 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -10859,11 +10859,12 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-	  
-						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
+	    				 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+						 v_cse1.done;
+						 
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.container.labels := {"MyLabel"};
+						 v_createRequestAnnc.primitiveContent.container.labels := ?;
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_009_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_cse1.done;