diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 46dc3c4aa1e0a64a0b711f7e657ac1556ec25d5c..8b83ce1cc91220505da93b035638aa8864b50bb6 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -973,7 +973,7 @@ module OneM2M_Functions {
 						}
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := vc_request.primitive.requestPrimitive.from_;
-						mccPortIn.send(m_response(v_response));					
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));					
 					}
     					
 					[] tc_ac.timeout {
@@ -1104,7 +1104,7 @@ module OneM2M_Functions {
 				
 				v_request := f_getUpdateRequestPrimitive(p_resourceType, p_resourceIndex, p_request);
 					
-				mcaPort.send(m_request(v_request, p_nullFields));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, p_nullFields)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1441,7 +1441,7 @@ module OneM2M_Functions {
 			
 				v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
 		
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 			}
 			
@@ -1460,7 +1460,7 @@ module OneM2M_Functions {
 				
 				v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
 
-				mcaPort.send(m_request(v_request));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 		
 			}
 			
@@ -1643,14 +1643,14 @@ module OneM2M_Functions {
 							setverdict(pass, __SCOPE__ & ":INFO: Notification received with the expected content");
 							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] mcaPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value vc_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
 							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
@@ -1790,7 +1790,7 @@ module OneM2M_Functions {
 				
 					v_request.from_ := PX_CSE1_ID;
 					
-					mccPort.send(m_request(v_request));
+					mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, mw_primitiveContentNotification(mw_contentNotification_any)))) -> value vc_response {
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 895a147a19caffe011a1910bf58937da986361fb..847fe7c1825440f6407ffa5f742385220f2c021a 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -60,12 +60,12 @@ module OneM2M_PermutationFunctions {
 								v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(v_responsePrimitive))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 							}
 							[] mcaPortIn.receive(mw_request(?)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__, " : Error while creating container");
-								mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))));
+								mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -3252,8 +3252,8 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
-																						{"pi", "ct"}, f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+																						{"pi", "ct"}, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -3309,8 +3309,8 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl"}, f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+																						{"lbl"}, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -3361,8 +3361,8 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl", "at"}, f_getOriginator(v_resourceIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+																						{"lbl", "at"}, f_getOriginator(v_resourceIndex)))));
 
 						tc_ac.start;
 						alt {
@@ -3777,8 +3777,8 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
-																						{"pi", "ct"}, f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+																						{"pi", "ct"}, f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -3859,8 +3859,8 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl"}, f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+																						{"lbl"}, f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -3937,8 +3937,8 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
-																						{"lbl", "at"}, f_getOriginator(v_aeIndex))));//from AE ID
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+																						{"lbl", "at"}, f_getOriginator(v_aeIndex)))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -7193,6 +7193,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_remoteCSEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					//TODO var template RequestPrimitive v_remoteCSEAnnc := mw_createAccessControlPolicyAnnc;
    
 					// Test control
@@ -7254,7 +7255,7 @@ module OneM2M_PermutationFunctions {
 					v_CntAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
 					v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_parentIndex);
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_CntAnncResourceIndex));	
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 
 					tc_ac.start;
 					alt {
@@ -7294,6 +7295,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
 					// Test control
@@ -7352,6 +7354,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7410,6 +7413,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7467,6 +7471,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7530,6 +7535,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7586,6 +7592,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
    
 					// Test control
@@ -7676,7 +7683,7 @@ module OneM2M_PermutationFunctions {
 					v_resourceAnncIndex := f_cse_createResource(p_resourceType,p_createRequestAnnc);
 
 					// Test Body
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex))));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex)))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -7762,6 +7769,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -7828,6 +7836,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -7908,7 +7917,7 @@ module OneM2M_PermutationFunctions {
 	
 					vc_cse1.start(f_cse_announcementProcedure_deleteHandler());	
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					mcaPort.send(m_request(v_updateRequest, p_nullFields));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields)));
 	
 					tc_ac.start;
 					alt {
@@ -7954,6 +7963,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -7996,6 +8006,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 		
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
 	   
@@ -8033,7 +8044,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8061,6 +8072,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8120,6 +8132,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8196,7 +8209,7 @@ module OneM2M_PermutationFunctions {
 
 					vc_cse1.start(f_cse_announcementProcedure_updateHandler());
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					mcaPort.send(m_request(v_updateRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 
 					tc_ac.start;
 					alt {
@@ -8242,6 +8255,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8279,7 +8293,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8307,6 +8321,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8344,7 +8359,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8372,6 +8387,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8409,7 +8425,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8436,6 +8452,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_latestResourceIndex;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -8473,7 +8490,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_CSE1_ID;
 							v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
-							mccPortIn.send(m_response(v_responsePrimitive));			
+							mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8518,7 +8535,7 @@ module OneM2M_PermutationFunctions {
 
 					vc_cse1.start(f_cse_announcementProcedure_updateHandler());
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					mcaPort.send(m_request(v_updateRequest, p_nullFields));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields)));
 
 					tc_ac.start;
 					alt {
@@ -8582,7 +8599,7 @@ module OneM2M_PermutationFunctions {
 					v_AEAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_AEAnncResourceIndex));
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					mcaPort.send(m_request(v_updateRequest));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
 
 					tc_ac.start;
 					alt {
@@ -8648,7 +8665,7 @@ module OneM2M_PermutationFunctions {
 				  	
 					vc_cse1.start(f_cse_announcementProcedure_deleteHandler());	
 					v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					mcaPort.send(m_request(v_request));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					tc_ac.start;
 					alt {
@@ -8695,6 +8712,7 @@ module OneM2M_PermutationFunctions {
 					var integer v_aEAnncIndex := -1;
 					var ResponsePrimitive v_responsePrimitive;
 					var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					
 					v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
    
@@ -9142,7 +9160,7 @@ module OneM2M_PermutationFunctions {
 					
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5206))) -> value v_response {
@@ -9210,7 +9228,7 @@ module OneM2M_PermutationFunctions {
 	
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					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 {
@@ -9238,7 +9256,7 @@ module OneM2M_PermutationFunctions {
 
 					//Check to see if the resource is present or not
 					if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
-						mcaPort.send(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex)))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -9310,7 +9328,7 @@ module OneM2M_PermutationFunctions {
 
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponseUri))) -> value v_response {
@@ -9353,7 +9371,7 @@ module OneM2M_PermutationFunctions {
 							v_statusCode := int2002;
 							v_primitiveContent := omit;
 						}
-						mcaPort.send(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponseRequestResource))) -> value v_response{
@@ -9371,7 +9389,7 @@ module OneM2M_PermutationFunctions {
 									setverdict(fail, testcasename() & ": RequestStatus: FAIL");
 								}else{								//PENDING, FORWARDING or PARTIALLY_COMPLETED
 									f_sleep(PX_TAC/5.0);
-									mcaPort.send(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
+									mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
 									repeat;								
 								}
 							}
@@ -9435,7 +9453,7 @@ module OneM2M_PermutationFunctions {
 	
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, omit))) -> value v_response {
@@ -9514,7 +9532,7 @@ module OneM2M_PermutationFunctions {
 	
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					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 {
@@ -9542,7 +9560,7 @@ module OneM2M_PermutationFunctions {
 
 					//Check to see if the resource is present or not
 					if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
-						mcaPort.send(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))));
+						mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex)))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -9608,7 +9626,7 @@ module OneM2M_PermutationFunctions {
 					p_requestPrimitive.responseType.responseTypeValue := int2;		//nonBlockingRequestAsynch
 					p_requestPrimitive.responseType.notificationURI := omit;		//"...no notification target list is provided"
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					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 {
@@ -9686,7 +9704,7 @@ module OneM2M_PermutationFunctions {
 
 					// Test Body
 
-					mcaPort.send(m_request(valueof(p_requestPrimitive)));
+					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 {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index bcb692a9582a0025d35053c5d03269167ec8a247..427f40c40946ba867ec73f03cf71afbd5562effb 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -43,7 +43,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 					v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
 					    
-					mcaPort.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_request(v_request))));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
 					
 					t_ac.start;
 					alt {
@@ -6425,13 +6425,13 @@ module OneM2M_Testcases_CSE_Release_2 {
 					}
 					
 					testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem {
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-						
+						var AeSimu v_ae1 := AeSimu.create("AE1") alive;						
 						var EventCat v_eventCat:= {alt_1:= 300};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
 						v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
 						v_ae1.done;						 
@@ -9786,7 +9786,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-												
+											
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);	
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_ae1.start(f_CSE_ANNC_CRE_001(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9803,6 +9804,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
   
 						v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -9815,6 +9817,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
   
 						v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequestAnnc, v_updateRequest));//Container
@@ -9827,6 +9830,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
   
 						v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequestAnnc, v_updateRequest));//Group
@@ -9854,6 +9858,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
 							
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 	
 						v_ae1.start(f_CSE_ANNC_CRE_003(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9871,6 +9876,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -9883,6 +9889,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9895,6 +9902,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9907,6 +9915,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -9935,6 +9944,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 	  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -9947,6 +9957,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -9959,6 +9970,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -9972,6 +9984,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -10012,6 +10025,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -10024,6 +10038,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -10036,6 +10051,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -10049,6 +10065,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -10089,6 +10106,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -10101,6 +10119,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -10113,6 +10132,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -10126,6 +10146,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -10138,7 +10159,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
-						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
+						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+						 v_createRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"mbs"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_cse1.done;
@@ -10166,6 +10189,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
   
@@ -10179,6 +10203,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cnf"};
   
@@ -10192,6 +10217,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
   
@@ -10236,6 +10262,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						 v_createRequest.primitiveContent.container.labels := {"MyLabel"};
 	  
@@ -10255,6 +10282,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
 						 v_ae1.done;
 					}
@@ -10265,6 +10293,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_001(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_ae1.done;
 					}
@@ -10275,6 +10304,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_001(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_ae1.done;
 					}
@@ -10285,6 +10315,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_001(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_ae1.done;
 					}
@@ -10319,6 +10350,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createAcpBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
 						 v_ae1.done;
 					}
@@ -10329,6 +10361,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContainerBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 	  
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_002(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_ae1.done;
 					}
@@ -10339,6 +10372,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_002(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_ae1.done;
 					}
@@ -10349,6 +10383,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequest := m_createGroupBase;
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						 v_ae1.start(f_CSE_ANNC_RET_002(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_ae1.done;
 					}
@@ -10388,6 +10423,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
 			
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};					
 			
 						v_cse1.start(f_CSE_ANNC_UPD_001(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10401,6 +10437,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 			
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10414,6 +10451,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 			
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_UPD_001(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -10446,6 +10484,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};		
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
@@ -10464,6 +10503,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
@@ -10482,6 +10522,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfURIs v_announceTo := {"To be deleted"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
@@ -10524,6 +10565,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
@@ -10565,6 +10607,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
@@ -10606,6 +10649,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var ListOfURIs v_announceTo := {"To be deleted"};
 						var PrimitiveContent v_primitiveContentRetrieveResource;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						
 						v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
@@ -10686,6 +10730,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;	
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.accessControlPolicy.parentID := PX_CSE1_ID;			
@@ -10701,6 +10746,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.container.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.container.parentID := PX_CSE1_ID;
@@ -10716,6 +10762,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;	
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_updateRequest.primitiveContent.group_.announcedAttribute := {"ToBeDeleted"};
 						v_updateRequest.primitiveContent.group_.parentID := PX_CSE1_ID;
@@ -10754,6 +10801,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var Labels v_labels_2 := {"To be deleted"};	
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						
@@ -10787,6 +10835,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						
 						v_cse1.start(f_CSE_ANNC_UPD_006(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10800,6 +10849,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 	
 						v_cse1.start(f_CSE_ANNC_UPD_006(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10813,6 +10863,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_006(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -10842,6 +10893,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 	
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 	
 						v_cse1.start(f_CSE_ANNC_UPD_007(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -10855,6 +10907,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -10868,6 +10921,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 
 						v_cse1.start(f_CSE_ANNC_UPD_007(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -10902,6 +10956,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
@@ -10948,6 +11003,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var MemberType v_memberType := int3;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						v_createRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
@@ -11040,6 +11096,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;	
 						
@@ -11062,6 +11119,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
 						var MemberType v_memberType := int3;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						
@@ -11111,6 +11169,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;	
 
@@ -11134,6 +11193,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;	
 		
@@ -11157,6 +11217,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var Timestamp v_expirationTime_1 := "21001231T012345";
 						var Timestamp v_expirationTime_2 := "21101231T012345";
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.expirationTime := v_expirationTime_1;
 		
@@ -11207,6 +11268,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
 						var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
@@ -11231,6 +11293,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var MemberType v_memberType_1 := int3;
 						var MemberType v_memberType_2 := int4;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType_1;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
@@ -11285,6 +11348,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
@@ -11323,6 +11387,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AttributeAux_list v_nullFields;
 						var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
@@ -11402,6 +11467,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var XSD.NonNegativeInteger v_maxByteSize := 512;
 	  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
@@ -11446,6 +11512,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						var MemberType v_memberType := int3;
 	  
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
@@ -11533,6 +11600,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;	
 						var ResponsePrimitive v_responsePrimitive;	
 						 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_UPD_014(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
@@ -11562,6 +11630,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -11574,6 +11643,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -11586,6 +11656,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -11614,6 +11685,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -11626,6 +11698,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -11638,6 +11711,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
   
 						v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -11671,10 +11745,73 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 										
-				v_ae1.start(f_CSE_PCH_001());	  	  	
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				v_ae1.start(f_CSE_PCH_001());
+							  	  	
 				v_ae1.done;
 							  	  		
 			}
+									
+			function f_CSE_PCH_001() runs on AeSimu {
+				// Local variables
+				var integer v_aeIndex := -1;
+				var integer v_resourceIndex := -1;
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+				var RequestPrimitive v_requestNotify;
+				
+				// Test control
+	
+				// Test component configuration
+				f_cf02Up();
+	
+				// Test adapter configuration
+	
+				// Preamble
+				vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+				vc_cse1.done;
+				
+				v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+				
+				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
+				
+				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				
+				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+				
+				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
+				
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Polling response received");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePollingResponse)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+					}
+				 }	
+								
+				// Postamble
+				f_cse_postamble_deleteResources();
+				
+				// Tear down
+				f_cf01Down();
+			} // end TC_CSE_PCH_001
+			
 			/**
 			 * @desc Check that the IUT which hosts <pollingChannel> resource forwards a Notify request successfully to a target AE, once the IUT receives a polling request from AE
 			 * 
@@ -11683,10 +11820,72 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 										
-				v_ae1.start(f_CSE_PCH_002());	  	  	
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
+				v_ae1.start(f_CSE_PCH_002());
+							  	  	
 				v_ae1.done;
 							  	  		
 			}
+									
+			function f_CSE_PCH_002() runs on AeSimu {
+				// Local variables
+				var integer v_aeIndex := -1;
+				var integer v_resourceIndex := -1;
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+				var RequestPrimitive v_requestNotify;
+				
+				// Test control
+	
+				// Test component configuration
+				f_cf02Up();
+	
+				// Test adapter configuration
+	
+				// Preamble
+				vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+				vc_cse1.done;
+				
+				v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+				
+				v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
+				
+				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+				
+				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
+				
+				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+								
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Polling response received");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePollingResponse)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+					}
+				 }	
+								
+				// Postamble
+				f_cse_postamble_deleteResources();
+				
+				// Tear down
+				f_cf01Down();
+			} // end TC_CSE_PCH_002
 			
 			/**
 			 * @desc Check that the IUT which hosts <pollingChannel> resource forwards the polling response message to the CSE when receiving a Notify request to the <pollingChannelURI> resource from the AE
@@ -11696,19 +11895,79 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 				v_ae1.start(f_CSE_PCH_003());
 				v_ae1.done;
 				  	  		
 			}
 			
-			/**
-			 * @desc Check that the IUT which performs polling sends the Notify request to <pollingChannelURI> Hosting CSE after receiving response using polling channel
-			 * 
-		     */
+			function f_CSE_PCH_003() runs on AeSimu {
+				//Local variables
+				 var integer v_aeIndex := -1;
+				 var integer v_resourceIndex := -1;
+				 var RequestPrimitive v_request;
+				 var MsgIn v_response;
+				 var RequestPrimitive v_requestNotify;
+	
+				 // Test control
+
+
+				 // Test component configuration
+				 f_cf02Up();
+
+				 // Test adapter configuration
+
+				 // Preamble
+				 vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+				 vc_cse1.done;
+	
+				 v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
+	
+				 v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
+				 
+				v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+				
+				v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
+				vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
+				
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePollingResponse(v_requestNotify))) -> value v_response {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__ & ": Polling response received");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePollingResponse)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Content not carrying request targeting AE1");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Wrong status code");
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
+						tc_ac.stop;
+						setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+					}
+					[] tc_ac.timeout {
+						setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+					}
+				 }
+				 
+				mcaPort.send(f_getMsgOutPrimitive(m_request(v_requestNotify)));
+				
+				//Postamble
+ 			    f_cse_postamble_deleteResources();
+				
+				// Tear down
+				f_cf02Down();
+			}
+			
 			testcase TC_CSE_PCH_004() runs on Tester system CseSystem {
 		
 				var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 				
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 				v_cse1.start(f_CSE_PCH_004());
 				v_cse1.done;
 			}
@@ -11759,7 +12018,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
 						v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
 						v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
-						mccPortIn.send(m_response(v_response_rsp1));
+						mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response_rsp1)));
 				   }
 				   [] tc_ac.timeout {
 					   setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
@@ -11799,7 +12058,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				var integer v_aeIndex2 := -1;
 				var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 				
-				
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 				v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
 				v_request.to_ := f_getResourceAddress(v_aeIndex2);
 				
@@ -11816,7 +12075,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				 var integer v_aeIndex2 := -1;
 				 var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 	
-				 
+				 f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 				 v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
 				 
 				 v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_aeIndex1), f_getOriginator(v_aeIndex1)));
@@ -11828,14 +12087,13 @@ module OneM2M_Testcases_CSE_Release_2 {
 			  
 			  testcase TC_CSE_PCH_005_UPD() runs on Tester system CseSystem {
 					
-				  var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-	
+				  var AeSimu v_ae1 := AeSimu.create("AE1") alive;	
 				  var RequestPrimitive v_request;
 				  var integer v_aeIndex1 := -1;
 				  var integer v_aeIndex2 := -1;
 				  var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 
-				  
+				  f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 				  v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
 				  
  
@@ -11856,7 +12114,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				var integer v_aeIndex2 := -1;
 				var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 
-				
+				f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 				v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
 				
  
@@ -11868,7 +12126,47 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 			}
 			
-		} //end group g_CSE_PCH_005
+			function f_CSE_PCH_005(inout integer p_aeIndex1, inout integer p_aeIndex2, RequestPrimitive p_requestprimitive) runs on AeSimu {
+				
+				//Local variables
+				var integer v_aeIndex1 := -1;
+				var integer v_aeIndex2 := -1;
+				var integer v_resourceIndex := -1;
+				var integer v_acpAuxIndex := -1;
+				var RequestPrimitive v_request;
+				var MsgIn v_response;
+				var RequestPrimitive v_requestNotify;
+	
+				// Test control
+	
+				// Test component configuration
+				f_cf01Up(true);
+	
+				// Test adapter configuration
+	
+				// Preamble
+ 			    v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);//c_CUDNDi)
+ 			    
+				p_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+				
+				p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+				
+				//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
+				mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestprimitive)));
+				tc_ac.start;
+				alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
+						tc_ac.stop;
+						setverdict(pass, __SCOPE__&":INFO: Polling Resource type not created as originator has no privilege");
+					}
+					[] tc_ac.timeout {
+						setverdict(inconc, __SCOPE__&":INFO: No answer while creating polling resource type");
+					}
+				}	
+				
+				
+			}
+		 } //end group g_CSE_PCH_005
 		 
 		 /**
 		  * @desc Check that the IUT sends the response with a status to the CSE1 when the request expires according to its Request Expiration Timestamp
@@ -11878,12 +12176,64 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 			 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
 				
+			 f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
 			 v_cse1.start(f_CSE_PCH_006());
 			 v_cse1.done;
 		 }
-		} //end group PollingChannel
+				
+		 function f_CSE_PCH_006() runs on CseSimu {
+			 // Local variables
+			 var integer v_aeIndex := -1;
+			 var integer v_resourceIndex := -1;
+			 var RequestPrimitive v_request;
+			 var MsgIn v_response;
+			 var RequestPrimitive v_requestNotify;
+
+			 // Test control
+
+			 // Test component configuration
+			 f_cf02UpCseSimuMaster();
 
+			 // Test adapter configuration
+
+			 // Preamble
+			 vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+
+			 vc_ae1.start(f_cse_preamble_registerAe());//AE1 is registred;
+			 vc_ae1.done;
+			 f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
+			 v_aeIndex := f_getResource(vc_ae1);
+	
+			 vc_ae1.start(f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex));//PollingChannel is created;
+			 vc_ae1.done;
+
+			 v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));	
+			 v_request.from_ := PX_CSE1_ID;
+		
+			 mccPort.send(m_request(v_request));
+			 tc_ac.start;
+			 alt {
+				 [] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
+					 tc_ac.stop;
+					 setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
+				 }
+				 [] mccPort.receive(mw_response()) {
+					 tc_ac.stop;
+					 setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+				 }
+				 [] tc_ac.timeout {
+					 setverdict(inconc, __SCOPE__&":INFO: No answer while performing notification");
+				 }
+			 }	
 		
+			 // Postamble
+			 f_cse_postamble_deleteResourcesCSE();
+
+			 // Tear down
+			 f_cf02DownCseSimuMaster();
+		 } // end f_CSE_PCH_006
+			
+		}//end group PollingChannel
 		group Non_Blocking_Requests{
 
 			group Synchronous{
@@ -11899,6 +12249,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_001(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 				
@@ -11911,6 +12262,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 				
 						v_ae1.start(f_CSE_NBR_SYN_001(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -11923,6 +12275,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 		
@@ -11933,6 +12286,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 				
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -11951,6 +12305,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_002(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -11963,6 +12318,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_SYN_002(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -11975,6 +12331,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -11985,6 +12342,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12003,6 +12361,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_003(m_createContainerBase, -, int1)); //Create Container
 						v_ae1.done;
 
@@ -12015,6 +12374,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_SYN_003(m_updateContainerBase, m_createContainerBase, int3)); //Update Container
@@ -12027,6 +12387,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2)); //Retrieve Container
 						v_ae1.done;
 
@@ -12037,6 +12398,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_SYN_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int4)); //Delete Container
 						v_ae1.done;
 
@@ -12058,6 +12420,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_001(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12070,6 +12433,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_001(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12082,6 +12446,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12092,6 +12457,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12110,6 +12476,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_002(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12122,6 +12489,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 				
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_002(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12134,6 +12502,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12144,6 +12513,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12162,6 +12532,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_003(m_createContainerBase, -, int2001)); //Create Container
 						v_ae1.done;
 
@@ -12174,6 +12545,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_003(m_updateContainerBase, m_createContainerBase, int2004)); //Update Container
@@ -12186,6 +12558,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container
 						v_ae1.done;
 
@@ -12196,6 +12569,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container
 						v_ae1.done;
 
@@ -12214,6 +12588,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_004(m_createContainerBase, -)); //Create Container
 						v_ae1.done;
 
@@ -12226,6 +12601,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var Labels v_labels_1 := {"VALUE_1"};
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 
 						v_ae1.start(f_CSE_NBR_ASY_004(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -12238,6 +12614,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_004(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
 						v_ae1.done;
 
@@ -12248,6 +12625,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 
+						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 						v_ae1.start(f_CSE_NBR_ASY_004(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
 						v_ae1.done;
 
@@ -12270,6 +12648,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_ae1.start(f_CSE_TS_001());
 		  	  	
 					v_ae1.done;
@@ -12300,7 +12679,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					//Create data points and force a missingDataPoint
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					// Test Body
-    				mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+    				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -12348,6 +12727,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 					
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_ae1.start(f_CSE_TS_002());
 		  	  	
 					v_ae1.done;
@@ -12381,7 +12761,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					
 					//Retrieve first missing data point
-    				mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+    				mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 
 					tc_ac.start;
 					alt {
@@ -12425,7 +12805,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					
 					//Retrieve second missing data point
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
 	
 					tc_ac.start;
 					alt {
@@ -12487,6 +12867,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 											
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_ae1.start(f_CSE_TS_003());
 								  	  	
 					v_ae1.done;
@@ -12553,6 +12934,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 							
+					f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
 					v_ae1.start(f_CSE_TS_004());
 				  	  	
 					v_ae1.done;
@@ -12609,7 +12991,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							mcaPortIn.send(m_response(v_responsePrimitive));
+							mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
 						}
 						[] tc_ac.timeout {
 							setverdict(pass, __SCOPE__ & ": Notification not received");
@@ -12617,7 +12999,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					}	
 					
 					//Check if the IUT restarts missing data point counter and timer
-					mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex))));
+					mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex)))));
 					
 					v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 					v_contentResponse.timeSeries.missingDataCurrentNr := 0;