diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 96051bad7f33ea7308c2b1250a26eb61dda5dd16..ef130db09dbd0550c2cb41edbb223b3dbf0b2c8d 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 338 2017-08-03 08:36:12Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 339 2017-08-04 09:24:02Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
@@ -648,6 +648,7 @@ module OneM2M_Functions {
 						return false;
 					}
 			  	}	
+			  	return false;
 			}
 			
 			/**
@@ -684,6 +685,7 @@ module OneM2M_Functions {
 						return false;
 					}
 			  	}	
+			  	return false;
 			}
 			
 			/**
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 554ffc4e6b999c511bd3e658c4f014673dd5c7f6..aac6e03a849a9c46421362463f446ed72add99e8 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- *              $Id: OneM2M_Templates.ttcn 336 2017-07-31 09:46:16Z reinaortega $
+ *              $Id: OneM2M_Templates.ttcn 339 2017-08-04 09:24:02Z reinaortega $
  *  @desc       Module containing templates for oneM2M
  *
  */
@@ -3396,7 +3396,7 @@ module OneM2M_Templates {
 		 * @param p_statusCode	Status code
 		 * @param p_requestId	Request ID of the corresponding request
 		 */
-		template (value) ResponsePrimitive m_responsePrimitive(in template ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (omit) PrimitiveContent p_content := omit) := {
+		template (value) ResponsePrimitive m_responsePrimitive(in template (value) ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (omit) PrimitiveContent p_content := omit) := {
 			responseStatusCode := p_statusCode,
 			requestIdentifier := p_requestId,
 			primitiveContent := p_content,
@@ -3416,7 +3416,7 @@ module OneM2M_Templates {
 		 * @param p_statusCode	Status code
 		 * @param p_requestId	Request ID of the corresponding request
 		 */
-		template (value) ResponsePrimitive m_responsePrimitive_content(in template ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
+		template (value) ResponsePrimitive m_responsePrimitive_content(in template (value) ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
 			primitiveContent := p_content			
 		}
 		
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index c39b1aa8a96e6c821276c16680495dd1f710aa01..b9ea155cc5d6928a523bce416cb06fb5ff0fcae4 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 338 2017-08-03 08:36:12Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 339 2017-08-04 09:24:02Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -7436,7 +7436,7 @@ module OneM2M_Testcases {
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_001(int3, v_createRequest, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_001(int3, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7468,7 +7468,7 @@ module OneM2M_Testcases {
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
 
-						v_responsePrimitive := f_CSE_DMR_UPD_001(int9, v_createRequest, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_001(int9, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7500,7 +7500,7 @@ module OneM2M_Testcases {
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
 
-						v_responsePrimitive := f_CSE_DMR_UPD_001(int1, v_createRequest, v_updateRequest);//ACP
+						v_responsePrimitive := f_CSE_DMR_UPD_001(int1, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//ACP
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7533,7 +7533,7 @@ module OneM2M_Testcases {
 						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
 
-						v_responsePrimitive := f_CSE_DMR_UPD_001(int18, v_createRequest, v_updateRequest);//Schedule
+						v_responsePrimitive := f_CSE_DMR_UPD_001(int18, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//Schedule
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7566,7 +7566,7 @@ module OneM2M_Testcases {
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
 
-						v_responsePrimitive := f_CSE_DMR_UPD_001(int15, v_createRequest, v_updateRequest);//PollingChannel
+						v_responsePrimitive := f_CSE_DMR_UPD_001(int15, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//PollingChannel
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7698,7 +7698,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
                         
-						v_responsePrimitive := f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7728,7 +7728,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7758,7 +7758,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 							
-						v_responsePrimitive := f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest);//AccessControlPolicy
+						v_responsePrimitive := f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7788,7 +7788,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_002(int18, m_createScheduleBase,v_updateRequest);//Schedule
+						v_responsePrimitive := f_CSE_DMR_UPD_002(int18, m_createScheduleBase,v_updateRequest, v_primitiveContentRetrieveResource);//Schedule
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7818,7 +7818,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest);//PollingChannel
+						v_responsePrimitive := f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest, v_primitiveContentRetrieveResource);//PollingChannel
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7848,7 +7848,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7952,7 +7952,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
                         
-						v_responsePrimitive := f_CSE_DMR_UPD_003(int3, v_createRequest, v_updateRequest, v_nullFields);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_003(int3, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Container
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -7992,7 +7992,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_003(int9, v_createRequest, v_updateRequest, v_nullFields);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_003(int9, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Group
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -8030,7 +8030,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
 							
-						v_responsePrimitive := f_CSE_DMR_UPD_003(int1, v_createRequest, v_updateRequest, v_nullFields);//AccessControlPolicy
+						v_responsePrimitive := f_CSE_DMR_UPD_003(int1, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -8068,7 +8068,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_003(int18, v_createRequest, v_updateRequest, v_nullFields);//Schedule
+						v_responsePrimitive := f_CSE_DMR_UPD_003(int18, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Schedule
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -8106,7 +8106,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_003(int15, v_createRequest, v_updateRequest, v_nullFields);//PollingChannel
+						v_responsePrimitive := f_CSE_DMR_UPD_003(int15, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//PollingChannel
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -8144,7 +8144,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_003(int23, v_createRequest, v_updateRequest, v_nullFields);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_003(int23, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Subscription
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -8253,7 +8253,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_004(int3, v_createRequest, v_updateRequest, v_nullFields);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_004(int3, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Container
 						
 						if(getverdict == pass){
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -8310,7 +8310,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
                         
-						v_responsePrimitive := f_CSE_DMR_UPD_004(int9, v_createRequest, v_updateRequest, v_nullFields);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_004(int9, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Group
 						
 						if(getverdict == pass){
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -8376,7 +8376,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
       							
-						v_responsePrimitive := f_CSE_DMR_UPD_004(int1, v_createRequest, v_updateRequest, v_nullFields);//AccessControlPolicy
+						v_responsePrimitive := f_CSE_DMR_UPD_004(int1, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						
 						if(getverdict == pass){
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -8431,7 +8431,7 @@ module OneM2M_Testcases {
                 						
 						v_nullFields := {{"labels", omit}};
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_004(int18, v_createRequest, v_updateRequest, v_nullFields);//Schedule
+						v_responsePrimitive := f_CSE_DMR_UPD_004(int18, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Schedule
 						
 						if(getverdict == pass){
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -8487,7 +8487,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"labels", omit}};
       						
-						v_responsePrimitive := f_CSE_DMR_UPD_004(int15, v_createRequest, v_updateRequest, v_nullFields);//PollingChannel
+						v_responsePrimitive := f_CSE_DMR_UPD_004(int15, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//PollingChannel
 						
 						if(getverdict == pass){
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -8530,7 +8530,7 @@ module OneM2M_Testcases {
 						
 						v_nullFields := {{"expirationCounter", omit}};
       							
-						v_responsePrimitive := f_CSE_DMR_UPD_004(int23, v_createRequest, v_updateRequest, v_nullFields);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_004(int23, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Subscription
 						
 						if(getverdict == pass){
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -8773,7 +8773,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 						
-						f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest);//Container
+						f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -8792,7 +8792,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
-						f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest);//Group
+						f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -8814,7 +8814,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 								
-						f_CSE_DMR_UPD_006(int1, v_requestPrimitive, v_updateRequest);//AccessControlPolicy
+						f_CSE_DMR_UPD_006(int1, v_requestPrimitive, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -8833,7 +8833,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 										
-						f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest);//Schedule
+						f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest, v_primitiveContentRetrieveResource);//Schedule
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
@@ -8852,7 +8852,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 							
-						f_CSE_DMR_UPD_006(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel
+						f_CSE_DMR_UPD_006(int15, m_createPollingChannelBase, v_updateRequest, v_primitiveContentRetrieveResource);//PollingChannel
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
@@ -8871,7 +8871,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 								
-						f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -8964,7 +8964,7 @@ module OneM2M_Testcases {
 						v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
 						v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime;
 						
-						f_CSE_DMR_UPD_007(int3, m_createContainerBase, v_updateRequest);//Container
+						f_CSE_DMR_UPD_007(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.container_update_invalid)) {
@@ -8984,7 +8984,7 @@ module OneM2M_Testcases {
 						v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
 						v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime;
 						
-						f_CSE_DMR_UPD_007(int9, m_createGroupBase, v_updateRequest);//Group
+						f_CSE_DMR_UPD_007(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.group_update_invalid)) {
@@ -9004,7 +9004,7 @@ module OneM2M_Testcases {
 						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 						v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime;
 								
-						f_CSE_DMR_UPD_007(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy
+						f_CSE_DMR_UPD_007(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.aCP_update_invalid)) {
@@ -9024,7 +9024,7 @@ module OneM2M_Testcases {
 						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
 						v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
 										
-						f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest);//Schedule
+						f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest, v_primitiveContentRetrieveResource);//Schedule
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.schedule_update_invalid)) {
@@ -9044,7 +9044,7 @@ module OneM2M_Testcases {
 						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
 						v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
 							
-						f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel
+						f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest, v_primitiveContentRetrieveResource);//PollingChannel
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_update_invalid)) {
@@ -9064,7 +9064,7 @@ module OneM2M_Testcases {
 						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
 						v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime;
 								
-						f_CSE_DMR_UPD_007(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						f_CSE_DMR_UPD_007(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							//Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.subscription_update_invalid)) {
@@ -9151,7 +9151,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
 						
-						f_CSE_DMR_UPD_008(int3, m_createContainerBase, v_updateRequest, v_nullFields);//Container
+						f_CSE_DMR_UPD_008(int3, m_createContainerBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							  //Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -9173,7 +9173,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
 						
-						f_CSE_DMR_UPD_008(int9, m_createGroupBase, v_updateRequest, v_nullFields);//Group
+						f_CSE_DMR_UPD_008(int9, m_createGroupBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							  //Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -9195,7 +9195,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
 								
-						f_CSE_DMR_UPD_008(int1, m_createAcpBase, v_updateRequest, v_nullFields);//AccessControlPolicy
+						f_CSE_DMR_UPD_008(int1, m_createAcpBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						if(getverdict == pass){
 							  //Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -9217,7 +9217,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.schedule.expirationTime := v_expirationTime;
 										
-						f_CSE_DMR_UPD_008(int18, m_createScheduleBase, v_updateRequest, v_nullFields);//Schedule
+						f_CSE_DMR_UPD_008(int18, m_createScheduleBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Schedule
 						if(getverdict == pass){
 							  //Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
@@ -9239,7 +9239,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime;
 							
-						f_CSE_DMR_UPD_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields);//PollingChannel
+						f_CSE_DMR_UPD_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//PollingChannel
 						if(getverdict == pass){
 							  //Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
@@ -9261,7 +9261,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
 								
-						f_CSE_DMR_UPD_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields);//Subscription
+						f_CSE_DMR_UPD_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							  //Check that the resource has NOT been udpated
 							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -10368,7 +10368,7 @@ module OneM2M_Testcases {
 	
 					   v_updateRequest.primitiveContent.remoteCSE.labels := v_labels;
 	
-					   v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest);//Remote CSE
+					   v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource);//Remote CSE
 					   if(getverdict == pass){
 						   //Check attribute 1
 						   if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10396,7 +10396,7 @@ module OneM2M_Testcases {
 
 					   v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := v_poaList;
 
-					   v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest);//Remote CSE
+					   v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource);//Remote CSE
 					   if(getverdict == pass){
 						  //Check attribute 1
 						  if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10424,7 +10424,7 @@ module OneM2M_Testcases {
 
 					   v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink;
 
-					   v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest);//Remote CSE
+					   v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource);//Remote CSE
 					   if(getverdict == pass){
 						 //Check attribute 1
 						 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10452,7 +10452,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.node.labels := v_labels;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest);//Node
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest, v_primitiveContentRetrieveResource);//Node
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10480,7 +10480,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.node.accessControlPolicyIDs := v_acpType;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest);//Node
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest, v_primitiveContentRetrieveResource);//Node
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10513,7 +10513,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.aE.labels := v_labels;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest);//AE
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10541,7 +10541,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := v_acpType;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest);//AE
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10568,7 +10568,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.aE.appName := v_appName;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest);//AE
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10595,7 +10595,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest);//AE
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10622,7 +10622,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest);//AE
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10650,7 +10650,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.container.labels := v_labels;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10678,7 +10678,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_acpType;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10706,7 +10706,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10734,7 +10734,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10762,7 +10762,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10790,7 +10790,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10818,7 +10818,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.container.locationID := v_locationID;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10846,7 +10846,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10874,7 +10874,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_acpType;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10901,7 +10901,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.labels := v_labels;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10928,7 +10928,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10955,7 +10955,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -10982,7 +10982,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.groupID:=v_groupID;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11009,7 +11009,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11036,7 +11036,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11063,7 +11063,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11090,7 +11090,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11117,7 +11117,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11144,7 +11144,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11171,7 +11171,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11198,7 +11198,7 @@ module OneM2M_Testcases {
 					    var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.group_.labels := v_labels;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11225,7 +11225,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.group_.accessControlPolicyIDs := v_acpType;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11252,7 +11252,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11279,7 +11279,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.group_.groupName := v_groupName;
-						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							 //Check attribute 1
 							 if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11376,7 +11376,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest);//Remote CSE
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource);//Remote CSE
 						
 						if(getverdict == pass){
 							//Check attribute 1
@@ -11405,7 +11405,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest);//Remote CSE
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource);//Remote CSE
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11433,7 +11433,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.node.expirationTime := v_expirationTime;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest);//Node
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest, v_primitiveContentRetrieveResource);//Node
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11461,7 +11461,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.node.nodeID := v_targetId;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest);//Node
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest, v_primitiveContentRetrieveResource);//Node
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11489,7 +11489,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest);//AE
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11517,7 +11517,7 @@ module OneM2M_Testcases {
 
 						v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
 
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest);//AE
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11545,7 +11545,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int3, m_createContainerBase, v_updateRequest);//Container
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11573,7 +11573,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11610,7 +11610,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1;
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11647,7 +11647,7 @@ module OneM2M_Testcases {
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1;
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11675,7 +11675,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11703,7 +11703,7 @@ module OneM2M_Testcases {
 											
 						v_updateRequest.primitiveContent.subscription.notificationURI := v_notificationURI;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11731,7 +11731,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11759,7 +11759,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11787,7 +11787,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {
@@ -11815,7 +11815,7 @@ module OneM2M_Testcases {
 						
 						v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs;
 						
-						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest);//Group
+						v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
 						if(getverdict == pass){
 							//Check attribute 1
 							if(ispresent(v_responsePrimitive.primitiveContent)) {