diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 08b3dfd35ad8e7c16f566c66cd03902671a5ab0e..ac6675208930486bfc97bce826c510e7fe875e09 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2891,7 +2891,7 @@ module OneM2M_Functions {
 					v_myResource.cSEBase.resourceName := PX_TS_CSE1.cseName;
 					v_myResource.cSEBase.resourceType := p_resourceType;
 					v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_TS_CSE1.cseResourceId);
-					v_myResource.cSEBase.parentID := "";//Following TS-0001, it must be NULL. Set to a value for Codec to set it to null
+					v_myResource.cSEBase.parentID := "";//Following TS-0001, it must be an empty string
 					v_myResource.cSEBase.creationTime := fx_generateTimestamp();
 					v_myResource.cSEBase.creationTime := "20171231T012345";
 					v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;		
@@ -3495,7 +3495,7 @@ module OneM2M_Functions {
 					
 					f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
 					if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.cSEBase)) {
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}})); 
+						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive)); 
 					} else {
 						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
 					}
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index e3f4d4c31d6e2cfa2c7615c5df3cc687a245588d..4c2f611bf0825439eed768aaa59c69a4a0c68274 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -4947,7 +4947,7 @@ module OneM2M_Templates {
 			resourceName := ?,//M
 			resourceType := ?,//M
 			resourceID := ?,//M
-			parentID := omit,//M
+			parentID := "",//M
 			creationTime := ?,//M
 			lastModifiedTime := ?,//M
 			labels := *,//O
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 0d31e5c7619566ffe0cd36d382b37140639b2b66..6e0779db8dae56c25b449b3b960a7c9a57af79dc 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -2350,7 +2350,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse), {"parentID"})) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
 						}
@@ -2575,11 +2575,11 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					tc_ac.start;
 					alt {
-						[PX_IN_CSE] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse_IN), {"parentID"})) -> value v_response {
+						[PX_IN_CSE] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse_IN))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": cseType attribute is set to 1 (IN_CSE)");
 						}
-						[PX_MN_CSE] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse_MN), {"parentID"})) -> value v_response {
+						[PX_MN_CSE] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse_MN))) -> value v_response {
 							tc_ac.stop;
 							if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType)) {
 								if(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType == int2) {
@@ -2796,7 +2796,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					tc_ac.start;
 					alt {
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse), {"parentID"})) -> value v_response {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
 							tc_ac.stop;
 							
 							if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.supportedResourceType == PX_SRT) {