diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 3e0e42857cc7309ba9a83eba096674e55a06c662..e23af83535f3ca2be1791358361ab82ae93e1ac7 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -9688,7 +9688,7 @@ module OneM2M_PermutationFunctions {
 
 					v_contentResponse.uRI := ?;
 
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+					v_aeIndex := f_cse_preamble_registerAe(-, {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING_AE1, PX_AE1_ADDRESS,-)});//c_CRUDNDi);
 
 					if(ispresent(p_parentRequestPrimitive)) {
 						v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);	
@@ -9697,13 +9697,12 @@ module OneM2M_PermutationFunctions {
 						p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
 					}
 					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
-					p_requestPrimitive.responseType.responseTypeValue := int2;		//nonBlockingRequestAsynch
-					p_requestPrimitive.responseType.notificationURI := omit;		//"...no notification target list is provided"
+					p_requestPrimitive.responseType := {int2, omit};		//nonBlockingRequestAsynch and no notification target list is provided"
 
 					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1000, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": URI attribute is set to <request> resource address");
 						}