diff --git a/OneM2M_TestControl_ADN_profile_3.ttcn b/OneM2M_TestControl_ADN_profile_3.ttcn
index f68f2ccf79ee3467d2a87d2cab0c8fc1b1cf703b..eaec8dd84fda3d53d2cb2a770c5d77d05b1e2d2a 100644
--- a/OneM2M_TestControl_ADN_profile_3.ttcn
+++ b/OneM2M_TestControl_ADN_profile_3.ttcn
@@ -47,11 +47,18 @@ module OneM2M_TestControl_ADN_profile_3 {
 		//AE_REG_00002
 		if(true) {execute (TC_AE_REG_CRE_001());}
 		if(true) {execute (TC_AE_REG_CRE_002_RR());}
+		if(true) {execute (TC_AE_REG_CRE_002_API());}
+		if(true) {execute (TC_AE_REG_CRE_002_SRV());}
+		
 		//AE_DMR_00001 
 		if(true) {execute (TC_AE_DMR_CRE_001());}
 		//AE_DMR_00002
 		if(true) {execute (TC_AE_DMR_CRE_002());}
 		
+		//AE_SUB_00004
+		if(true) {execute (TC_AE_SUB_NTF_001());}
+		if(true) {execute (TC_AE_SUB_NTF_002());}
+		
 	}		
 
 }  // end of module OneM2M_TestControl_ADN_profile_3
diff --git a/OneM2M_TestControl_ADN_profile_4.ttcn b/OneM2M_TestControl_ADN_profile_4.ttcn
index 3c67d4d035610c4c988167aa48560a4c8cf1bc1b..62f3981506a067bafb409650875fa874b35eabe9 100644
--- a/OneM2M_TestControl_ADN_profile_4.ttcn
+++ b/OneM2M_TestControl_ADN_profile_4.ttcn
@@ -53,6 +53,8 @@ module OneM2M_TestControl_ADN_profile_4 {
 		//AE_REG_00002
 		if(true) {execute (TC_AE_REG_CRE_001());}
 		if(true) {execute (TC_AE_REG_CRE_002_RR());}
+		if(true) {execute (TC_AE_REG_CRE_002_API());}
+		if(true) {execute (TC_AE_REG_CRE_002_SRV());}
 		if(true) {execute (TC_AE_REG_CRE_002_RN());}
 		if(true) {execute (TC_AE_REG_CRE_002_ET());}
 		if(true) {execute (TC_AE_REG_CRE_002_LBL());}
@@ -98,28 +100,7 @@ module OneM2M_TestControl_ADN_profile_4 {
 		if(true) {execute (TC_AE_DMR_DEL_004());}
 		if(true) {execute (TC_AE_DMR_DEL_001());}
 		if(true) {execute (TC_AE_DMR_DEL_002());}
-
-		//Extendable features
-		//AE/REG/00002
-		if(true) {execute (TC_AE_REG_CRE_002_API());}
-		if(true) {execute (TC_AE_REG_CRE_002_OR());}
-		if(true) {execute (TC_AE_DMR_UPD_001_OR());}
-		// AE/DMR/00001
-		if(PICS_CNT_ACPI) {execute (TC_AE_DMR_CRE_004_ACPI());}
-		if(PICS_CNT_OR) {execute (TC_AE_DMR_CRE_004_OR());}
-		//if(true) {execute (TC_AE_DMR_CRE_004_LI());}//TODO To be implemented
-		//AE/SUB/00001
-		//if(true) {execute (TC_AE_SUB_CRE_002_LBL());}//TODO To be implemented. TP As well
-		if(PICS_SUB_SU) {execute (TC_AE_SUB_CRE_002_SU());}
-		if(PICS_SUB_ACPI) {execute (TC_AE_SUB_CRE_002_ACPI());}
-		if(PICS_SUB_ENC) {execute (TC_AE_SUB_CRE_002_ENC());}
-		if(PICS_SUB_EXC) {execute (TC_AE_SUB_CRE_002_EXC());}
-		if(PICS_SUB_NFU) {execute (TC_AE_SUB_CRE_002_NFU());}
-		if(PICS_SUB_NCT) {execute (TC_AE_SUB_CRE_002_NCT());}
-		if(PICS_SUB_NEC) {execute (TC_AE_SUB_CRE_002_NEC());}
-		if(true) {execute (TC_AE_SUB_NTF_001());}
-		if(true) {execute (TC_AE_SUB_NTF_002());}
-
+		
 	}
 
 }  // end of module OneM2M_TestControl_ADN_profile_4
diff --git a/OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel.ttcn b/OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..98432e26f4e77595096bcc0f19d56f3b4ece2d6c
--- /dev/null
+++ b/OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel.ttcn
@@ -0,0 +1,63 @@
+/**
+ *  Copyright Notification
+ *  No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
+ *  The copyright and the foregoing restriction extend to reproduction in all media.
+ *  © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
+ *  All rights reserved.
+ *  
+ *  @author     oneM2M/ETSI
+ *  @desc       Test control module for oneM2M
+ *
+ */
+module OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel {
+
+
+	import from OneM2M_Testcases_AE_Release_1 all;	
+	import from OneM2M_Pics all;
+			
+	control {
+		
+		//AE_GEN_00001
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
+		//AE_GEN_00002
+		if(true) {execute (TC_AE_DMR_CRE_001());}
+		//AE_REG_00002
+		if(true) {execute (TC_AE_REG_CRE_001());}
+		if(true) {execute (TC_AE_REG_CRE_002_RR());}
+		if(true) {execute (TC_AE_REG_CRE_002_POA());}
+		//AE_SUB_00001
+		if(true) {execute (TC_AE_SUB_CRE_001());}
+		
+		//AE_PCH_00001
+		//TODO Missing
+		
+		//AE_PCH_00002
+		if(true) {execute (TC_AE_PCH_001());}
+	}
+
+
+}  // end of module OneM2M_TestControl_Constrained_actuator_as_ADN
+
diff --git a/OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable.ttcn b/OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..7f51c9356da30c7369bc9e48ab23a0b3375b7d1c
--- /dev/null
+++ b/OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable.ttcn
@@ -0,0 +1,61 @@
+/**
+ *  Copyright Notification
+ *  No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
+ *  The copyright and the foregoing restriction extend to reproduction in all media.
+ *  © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
+ *  All rights reserved.
+ *  
+ *  @author     oneM2M/ETSI
+ *  @desc       Test control module for oneM2M
+ *
+ */
+module OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable {
+
+
+	import from OneM2M_Testcases_AE_Release_1 all;	
+	import from OneM2M_Pics all;
+			
+	control {
+		
+		//AE_GEN_00001
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
+		//AE_GEN_00002
+		if(true) {execute (TC_AE_DMR_CRE_001());}
+		//AE_REG_00002
+		if(true) {execute (TC_AE_REG_CRE_001());}
+		if(true) {execute (TC_AE_REG_CRE_002_RR());}
+		if(true) {execute (TC_AE_REG_CRE_002_POA());}
+		//AE_SUB_00001
+		if(true) {execute (TC_AE_SUB_CRE_001());}
+		
+		//AE_SUB_00004
+		if(true) {execute (TC_AE_SUB_NTF_001());}
+		if(true) {execute (TC_AE_SUB_NTF_002());}
+	}
+
+
+}  // end of module OneM2M_TestControl_Constrained_actuator_as_ADN
+
diff --git a/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn b/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
index 8ea6b5b233c019c73c202a5f842c72ccdab5b681..58e3d2b07132cecc65ceed6ea1d9d309142bcc2b 100644
--- a/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
+++ b/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
@@ -49,31 +49,6 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
 		//AE_DMR_00002 
 		if(true) {execute (TC_AE_DMR_CRE_002());}
 		
-		
-		//Extendable feature set
-		//AE/REG/00002
-		if(true) {execute (TC_AE_REG_CRE_001());}
-		if(true) {execute (TC_AE_REG_CRE_002_RR());}
-		if(true) {execute (TC_AE_REG_CRE_002_RN());}
-		if(true) {execute (TC_AE_REG_CRE_002_ET());}
-		if(true) {execute (TC_AE_REG_CRE_002_LBL());}
-		if(true) {execute (TC_AE_REG_CRE_002_APN());}
-		//AE/DMR/00001
-		if(true) {execute (TC_AE_DMR_CRE_001());}
-		if(PICS_CNT_RN) {execute (TC_AE_DMR_CRE_004_RN());}
-		if(PICS_CNT_ET) {execute (TC_AE_DMR_CRE_004_ET());}
-		if(PICS_CNT_LBL) {execute (TC_AE_DMR_CRE_004_LBL());}
-		if(PICS_CNT_CR) {execute (TC_AE_DMR_CRE_004_CR());}
-		if(PICS_CNT_MNI) {execute (TC_AE_DMR_CRE_004_MNI());}
-		if(PICS_CNT_MBS) {execute (TC_AE_DMR_CRE_004_MBS());}
-		if(PICS_CNT_MIA) {execute (TC_AE_DMR_CRE_004_MIA());}
-		//AE/DMR/00002
-		if(PICS_CIN_RN) {execute (TC_AE_DMR_CRE_003_RN());}
-		if(PICS_CIN_ET) {execute (TC_AE_DMR_CRE_003_ET());}
-		if(PICS_CIN_LBL) {execute (TC_AE_DMR_CRE_003_LBL());}
-		if(PICS_CIN_CR) {execute (TC_AE_DMR_CRE_003_CR());}
-		if(PICS_CIN_CNF) {execute (TC_AE_DMR_CRE_003_CNF());}
-		
 	}
 			
 }  // end of module OneM2M_TestControl_Constrained_sensor_as_ADN
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index f611c26d6a64de2f79a8da11a51aa6b2740b47c3..eac5d94c3439e9cd9c460c75db095f03fae95beb 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -43,9 +43,134 @@ module OneM2M_TestControl_IN_profile {
 		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_CSR());}
 		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_SPR());}
 		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_003_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_003_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_003_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_003_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_003_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_003_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_003_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_003_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_003_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_003_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_003_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_003_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_004_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_004_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_004_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_004_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_004_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_004_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_004_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_004_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_004_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_004_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_004_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_004_ABS());}
 		
 		//CE_GEN_00002 
+		if(true) {execute (TC_CSE_RT_BR_001_CRE());}
+		if(true) {execute (TC_CSE_RT_BR_001_RET());}
+		if(true) {execute (TC_CSE_RT_BR_001_UPD());}
+		if(true) {execute (TC_CSE_RT_BR_001_DEL());}
 		
+		if(true) {execute (TC_CSE_DMR_CRE_015_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_015_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_015_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_015_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_015_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_PCH());}
+		if(true) {execute (TC_CSE_DMR_RET_020_RCN_0());}
+		if(true) {execute (TC_CSE_DMR_RET_020_RCN_2());}
+		if(true) {execute (TC_CSE_DMR_RET_020_RCN_3());}
+		if(true) {execute (TC_CSE_DMR_RET_020_RCN_9());}
+		if(true) {execute (TC_CSE_DMR_RET_021_CNT());}
+		if(true) {execute (TC_CSE_DMR_RET_021_GRP());}
+		if(true) {execute (TC_CSE_DMR_RET_021_ACP());}
+		if(true) {execute (TC_CSE_DMR_RET_021_SUB());}
+		if(true) {execute (TC_CSE_DMR_RET_021_PCH());}
+		if(true) {execute (TC_CSE_DMR_UPD_019_RCN_2());}
+		if(true) {execute (TC_CSE_DMR_UPD_019_RCN_3());}
+		if(true) {execute (TC_CSE_DMR_UPD_020_CNT());}
+		if(true) {execute (TC_CSE_DMR_UPD_020_GRP());}
+		if(true) {execute (TC_CSE_DMR_UPD_020_ACP());}
+		if(true) {execute (TC_CSE_DMR_UPD_021_CNT());}
+		if(true) {execute (TC_CSE_DMR_UPD_021_GRP());}
+		if(true) {execute (TC_CSE_DMR_UPD_021_ACP());}
+		if(true) {execute (TC_CSE_DMR_UPD_022_CNT());}
+		if(true) {execute (TC_CSE_DMR_UPD_022_GRP());}
+		if(true) {execute (TC_CSE_DMR_UPD_022_ACP());}
+		if(true) {execute (TC_CSE_DMR_DEL_011_RCN_2());}
+		if(true) {execute (TC_CSE_DMR_DEL_011_RCN_3());}
+		if(true) {execute (TC_CSE_DMR_DEL_011_RCN_9());}
+		if(true) {execute (TC_CSE_DMR_DEL_012_CNT());}
+		if(true) {execute (TC_CSE_DMR_DEL_012_GRP());}
+		if(true) {execute (TC_CSE_DMR_DEL_012_ACP());}
+		if(true) {execute (TC_CSE_DMR_DEL_013_CNT());}
+		if(true) {execute (TC_CSE_DMR_DEL_013_GRP());}
+		if(true) {execute (TC_CSE_DMR_DEL_013_ACP());}
+				
+		if(true) {execute (TC_CSE_RT_NBS_001_CRE());}
+		if(true) {execute (TC_CSE_RT_NBS_001_UPD());}
+		if(true) {execute (TC_CSE_RT_NBS_001_RET());}
+		if(true) {execute (TC_CSE_RT_NBS_001_DEL());}
+		if(true) {execute (TC_CSE_RT_NBS_002_CRE());}
+		if(true) {execute (TC_CSE_RT_NBS_002_UPD());}
+		if(true) {execute (TC_CSE_RT_NBS_002_RET());}
+		if(true) {execute (TC_CSE_RT_NBS_002_DEL());}
+		if(true) {execute (TC_CSE_RT_NBS_003_CRE());}
+		if(true) {execute (TC_CSE_RT_NBS_003_UPD());}
+		if(true) {execute (TC_CSE_RT_NBS_003_RET());}
+		if(true) {execute (TC_CSE_RT_NBS_003_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_001_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_001_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_001_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_001_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_002_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_002_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_002_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_002_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_003_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_003_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_003_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_003_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_004_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_004_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_004_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_004_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_005_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_005_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_005_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_005_DEL());}
+		
+		if(true) {execute (TC_CSE_DMR_001_CRE());}
+		if(true) {execute (TC_CSE_DMR_001_UPD());}
+		if(true) {execute (TC_CSE_DMR_001_RET());}
+		if(true) {execute (TC_CSE_DMR_001_DEL());}
+		if(true) {execute (TC_CSE_DMR_002_CRE());}
+		if(true) {execute (TC_CSE_DMR_002_UPD());}
+		if(true) {execute (TC_CSE_DMR_002_RET());}
+		if(true) {execute (TC_CSE_DMR_002_DEL());}
+
 		//CE_REG_00001
 		if(true) {execute (TC_CSE_REG_CRE_021());}
 		if(true) {execute (TC_CSE_REG_RET_001());}
@@ -57,22 +182,35 @@ module OneM2M_TestControl_IN_profile {
 		if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
 
 		//CE_REG_00002
+		if(true) {execute (TC_CSE_REG_CRE_016());}
+		if(true) {execute (TC_CSE_REG_CRE_017_API());}
+		if(true) {execute (TC_CSE_REG_CRE_017_RR());}
 		if(true) {execute (TC_CSE_REG_RET_003());}
 		if(true) {execute (TC_CSE_REG_DEL_003());}
 		if(true) {execute (TC_CSE_DMR_RET_013_AE());} 
 		if(true) {execute (TC_CSE_DMR_UPD_016_AE_ET());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_AE_RR());}
+		
 		if(true) {execute (TC_CSE_REG_CRE_004());}
-		if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_009());}
 		if(true) {execute (TC_CSE_REG_CRE_011());}
-		if(true) {execute (TC_CSE_REG_CRE_016());}
-		if(true) {execute (TC_CSE_REG_CRE_017_API());}
-		if(true) {execute (TC_CSE_REG_CRE_017_RR());}
 		if(true) {execute (TC_CSE_REG_CRE_022());}
 		if(true) {execute (TC_CSE_REG_CRE_023());}
-		if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
-		if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
-		if(PICS_AE_LBL) {execute (TC_CSE_DMR_UPD_015_AE_LBL());}
+
+		if(true) {execute (TC_CSE_REG_CRE_020());}
+		
+		if(true) {execute (TC_CSE_REG_CRE_032());}
+		
+		if(true) {execute (TC_CSE_REG_CRE_005());}
+		if(true) {execute (TC_CSE_REG_CRE_006());}
+		if(true) {execute (TC_CSE_REG_CRE_007());}
+		if(true) {execute (TC_CSE_REG_CRE_031());}
+		if(true) {execute (TC_CSE_REG_DEL_005());}
+		if(true) {execute (TC_CSE_REG_DEL_006());}
+		if(true) {execute (TC_CSE_REG_DEL_007());}
+				
+		//if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
+		//if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
+		//if(PICS_AE_LBL) {execute (TC_CSE_DMR_UPD_015_AE_LBL());}
 		if(PICS_AE_APN) {execute (TC_CSE_REG_CRE_012_AE_APN());}
 		if(PICS_AE_APN) {execute (TC_CSE_REG_RET_004_APN());}
 		if(PICS_AE_APN) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
@@ -83,7 +221,9 @@ module OneM2M_TestControl_IN_profile {
 		if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001_SAE());}
 		if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_002_CAE());}
 		if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_002_SAE());}
-		
+		if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_009());}
+		if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_029());}
+				
 		//CE_REG_00004
 		if(true) {execute (TC_CSE_REG_CRE_018());}
 		if(true) {execute (TC_CSE_REG_CRE_019());}
@@ -93,10 +233,10 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_REG_DEL_002());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_CSR_ET());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_CSR_RR());}
-		if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
-		if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
-		if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
-		if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
+		//if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
+		//if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
+		//if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
+		//if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
 		if(PICS_CSR_CST) {execute (TC_CSE_REG_CRE_013_CST());}
 		if(PICS_CSR_CST) {execute (TC_CSE_REG_RET_007_CST());}
 		if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_013_POA());}
@@ -116,13 +256,14 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_CRE_002_CNT());}
 		if(true) {execute (TC_CSE_DMR_CRE_003_CNT());}
 		if(true) {execute (TC_CSE_DMR_CRE_007_CNT_CIN ());}
-		if(true) {execute (TC_CSE_DMR_CRE_008 ());}
+		if(true) {execute (TC_CSE_DMR_CRE_008_CNT_CIN ());}
 		if(true) {execute (TC_CSE_DMR_CRE_009 ());}
 		if(true) {execute (TC_CSE_DMR_CRE_010 ());}
 		if(true) {execute (TC_CSE_DMR_CRE_011 ());}
+		if(true) {execute (TC_CSE_DMR_CRE_013_CNT_CIN());}
+		if(true) {execute (TC_CSE_DMR_CRE_014_CNT_CIN ());}
 		if(true) {execute (TC_CSE_DMR_RET_001_CNT());}
 		if(true) {execute (TC_CSE_DMR_RET_013_CNT());}
-		if(true) {execute (TC_CSE_DMR_CRE_014_CNT_CIN ());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_CNT_LBL());}
 		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_002_CNT_LBL());}
 		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_003_CNT_LBL());}
@@ -133,12 +274,11 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_010_CNT ());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
-		if(true) {execute (TC_CSE_DMR_DEL_005 ());}
-		if(true) {execute (TC_CSE_DMR_DEL_006());}
-		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
-		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
-		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
+		if(true) {execute (TC_CSE_DMR_DEL_005_CNT ());}
+		if(true) {execute (TC_CSE_DMR_DEL_006_CNT_CIN());}
+		
 		if(PICS_CNT_CR) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
+		
 		if(true) {execute (TC_CSE_DMR_CRE_005_MNI());}
 		if(true) {execute (TC_CSE_DMR_CRE_006_MNI());}
 		if(PICS_CNT_MNI) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
@@ -156,20 +296,30 @@ module OneM2M_TestControl_IN_profile {
 		if(PICS_CNT_MIA) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
 		if(PICS_CNT_MIA) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
 
+		//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
+		//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
+		//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
+
 		//CE_DMR_00002
 		if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
 		if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
 		if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
-		if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
+		
+		//if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
 		if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
+		
 		if(PICS_CIN_CNF) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
+		
 		if(true) {execute (TC_CSE_DMR_RET_012());}
 		if(true) {execute (TC_CSE_DMR_UPD_012());}
 		if(true) {execute (TC_CSE_DMR_DEL_007());}
+		
 		if(true) {execute (TC_CSE_DMR_RET_010());}
 		if(true) {execute (TC_CSE_DMR_UPD_013());}
 		if(true) {execute (TC_CSE_DMR_DEL_009());}
+		
+		if(true) {execute (TC_CSE_DMR_CRE_002_FLXC());}
 
 		//CE_SUB_00001
 		if(true) {execute (TC_CSE_DMR_CRE_001_SUB_CB());}
@@ -192,18 +342,36 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NCT());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_SUB());}
-		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
-		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
-		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
+		
+		//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
+		//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
+		//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
 		if(PICS_SUB_CR) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
-
+		
+		if(true) {execute (TC_CSE_DMR_CRE_012_SUB_SU());}
+		
 		//CE_SUB_00004
 		if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
 		if(true) {execute (TC_CSE_SUB_CRE_001_CIN());}
 		if(true) {execute (TC_CSE_SUB_CRE_003());}
 		if(true) {execute (TC_CSE_SUB_CRE_005());}
+		
 		if(true) {execute (TC_CSE_SUB_UPD_001());}
+		if(true) {execute (TC_CSE_SUB_UPD_002());}
+		if(true) {execute (TC_CSE_SUB_UPD_003());}
+		if(true) {execute (TC_CSE_SUB_UPD_004());}
+		if(true) {execute (TC_CSE_SUB_UPD_005());}
+		if(true) {execute (TC_CSE_SUB_UPD_006());}
+		if(true) {execute (TC_CSE_SUB_UPD_007());}
+		if(true) {execute (TC_CSE_SUB_UPD_008());}
+		if(true) {execute (TC_CSE_SUB_UPD_009());}
 		if(true) {execute (TC_CSE_SUB_DEL_001());}
+		if(true) {execute (TC_CSE_SUB_DEL_002());}
+		if(true) {execute (TC_CSE_SUB_DEL_003());}
+		if(true) {execute (TC_CSE_SUB_NTF_001());}
+		if(true) {execute (TC_CSE_SUB_NTF_002());}
+		if(true) {execute (TC_CSE_SUB_NTF_003());}
+
 		if(true) {execute (TC_CSE_SUB_CRE_004());}
 
 		//CE_SEC_00001
@@ -242,14 +410,18 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_SEC_ACP_UPD_001());}
 		if(true) {execute (TC_CSE_SEC_ACP_UPD_002());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_CNT());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_GRP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_ACP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_SUB());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_PCH());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_ACP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_CNT());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_GRP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_SUB());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_ACP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_AE());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_CNT());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_GRP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_CSR());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_SUB());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
@@ -308,28 +480,13 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_SEC_ACP_012_RET());}
 		if(true) {execute (TC_CSE_SEC_ACP_012_DEL());}		
 		
-		//Extendable Feature set
-		if(true) {execute (TC_CSE_DIS_001());}
-		if(true) {execute (TC_CSE_DIS_002());}
-		if(true) {execute (TC_CSE_DIS_003());}
-		if(true) {execute (TC_CSE_DIS_004());}
-		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DIS_005());}
-		if(true) {execute (TC_CSE_DIS_006());}
-		if(true) {execute (TC_CSE_DIS_007());}
-		if(true) {execute (TC_CSE_DIS_008_CRB_CRA());}
-		if(true) {execute (TC_CSE_DIS_008_MS_US());}
-		if(true) {execute (TC_CSE_DIS_008_STS_STB());}
-		if(true) {execute (TC_CSE_DIS_008_EXB_EXA());}
-		if(true) {execute (TC_CSE_DIS_009());}
+		//CE_GMG_00001
 		if(true) {execute (TC_CSE_DMR_CRE_001_GRP_CB());}
 		if(true) {execute (TC_CSE_DMR_CRE_001_GRP_AE());}
 		if(true) {execute (TC_CSE_DMR_CRE_002_GRP());}
 		if(true) {execute (TC_CSE_DMR_CRE_003_GRP());}
-		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_GRP());}
 		if(true) {execute (TC_CSE_DMR_RET_001_GRP());}
-		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_GRP());}
 		if(true) {execute (TC_CSE_DMR_RET_013_GRP());}
-		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_GRP());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_GRP_LBL());}
 		if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_002_GRP_LBL());}
 		if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_003_GRP_LBL());}
@@ -348,9 +505,10 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_GMG_UPD_002());}
 		if(true) {execute (TC_CSE_GMG_UPD_007());}
 		if(true) {execute (TC_CSE_GMG_UPD_008());}
-		if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
+		//if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
 		if(PICS_GRP_GN) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
-		if(PICS_GRP_ACPI) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
+		//if(PICS_GRP_ACPI) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
+		
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_CRE_002());}
 		if(true) {execute (TC_CSE_GMG_CRE_004());}
 		if(true) {execute (TC_CSE_GMG_CRE_005());}
@@ -363,6 +521,7 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_GMG_UPD_006());}
 		if(true) {execute (TC_CSE_GMG_UPD_009());}
 		if(true) {execute (TC_CSE_GMG_UPD_010());}
+		
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_RET_001());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_CRE());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_RET());}
@@ -388,7 +547,44 @@ module OneM2M_TestControl_IN_profile {
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_RET());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_UPD());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_DEL());}
-		if(PICS_GRP_MACP) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
+		//if(PICS_GRP_MACP) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
+		
+		//CE_DIS_00001
+		if(true) {execute (TC_CSE_DIS_001());}
+		if(true) {execute (TC_CSE_DIS_004());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DIS_005());}
+		if(true) {execute (TC_CSE_DIS_006());}
+		
+		if(true) {execute (TC_CSE_DIS_002());}
+		if(true) {execute (TC_CSE_DIS_003());}
+		if(true) {execute (TC_CSE_DIS_007());}
+		if(true) {execute (TC_CSE_DIS_008_CRB_CRA());}
+		if(true) {execute (TC_CSE_DIS_008_MS_US());}
+		if(true) {execute (TC_CSE_DIS_008_STS_STB());}
+		if(true) {execute (TC_CSE_DIS_008_EXB_EXA());}
+		if(true) {execute (TC_CSE_DIS_009());}
+		
+		//CE_PCH_001
+		if(true) {execute (TC_CSE_DMR_CRE_001_PCH_AE());}
+		if(true) {execute (TC_CSE_DMR_CRE_002_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_003_PCH());}
+		if(true) {execute (TC_CSE_DMR_RET_001_PCH());}
+		if(true) {execute (TC_CSE_DMR_UPD_001_PCH_LBL());}
+		if(true) {execute (TC_CSE_DMR_UPD_002_PCH_LBL());}
+		if(true) {execute (TC_CSE_DMR_UPD_003_PCH_LBL());}
+		if(true) {execute (TC_CSE_DMR_UPD_007_PCH_CT());}
+		if(true) {execute (TC_CSE_DMR_UPD_009_PCH_EXC());}
+		if(true) {execute (TC_CSE_DMR_DEL_001_PCH());}
+		
+		if(true) {execute (TC_CSE_PCH_001());}
+		if(true) {execute (TC_CSE_PCH_002());}
+		if(true) {execute (TC_CSE_PCH_003());}
+		if(true) {execute (TC_CSE_PCH_004());}
+		if(true) {execute (TC_CSE_PCH_005_RET());}
+		if(true) {execute (TC_CSE_PCH_005_UPD());}
+		if(true) {execute (TC_CSE_PCH_005_DEL());}
+		if(true) {execute (TC_CSE_PCH_006());}
+		
 	}
 }  // end of module OneM2M_TestControl_IN_profile
 
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index 7ea593c7b53dde80d13b084b3c08444e14818ddf..959590b1a31083ca1789962a503c84f32916226a 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -43,8 +43,133 @@ module OneM2M_TestControl_MN_profile {
 		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_CSR());}
 		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_SPR());}
 		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_003_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_003_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_003_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_003_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_003_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_003_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_003_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_003_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_003_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_003_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_003_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_003_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_004_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_004_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_004_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_004_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_004_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_004_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_004_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_004_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_004_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_004_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_004_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_004_ABS());}
 		
 		//CE_GEN_00002 
+		if(true) {execute (TC_CSE_RT_BR_001_CRE());}
+		if(true) {execute (TC_CSE_RT_BR_001_RET());}
+		if(true) {execute (TC_CSE_RT_BR_001_UPD());}
+		if(true) {execute (TC_CSE_RT_BR_001_DEL());}
+		
+		if(true) {execute (TC_CSE_DMR_CRE_015_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_015_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_015_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_015_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_015_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_016_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_017_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_019_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_CNT());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_GRP());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_ACP());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_SUB());}
+		if(true) {execute (TC_CSE_DMR_CRE_020_PCH());}
+		if(true) {execute (TC_CSE_DMR_RET_020_RCN_0());}
+		if(true) {execute (TC_CSE_DMR_RET_020_RCN_2());}
+		if(true) {execute (TC_CSE_DMR_RET_020_RCN_3());}
+		if(true) {execute (TC_CSE_DMR_RET_020_RCN_9());}
+		if(true) {execute (TC_CSE_DMR_RET_021_CNT());}
+		if(true) {execute (TC_CSE_DMR_RET_021_GRP());}
+		if(true) {execute (TC_CSE_DMR_RET_021_ACP());}
+		if(true) {execute (TC_CSE_DMR_RET_021_SUB());}
+		if(true) {execute (TC_CSE_DMR_RET_021_PCH());}
+		if(true) {execute (TC_CSE_DMR_UPD_019_RCN_2());}
+		if(true) {execute (TC_CSE_DMR_UPD_019_RCN_3());}
+		if(true) {execute (TC_CSE_DMR_UPD_020_CNT());}
+		if(true) {execute (TC_CSE_DMR_UPD_020_GRP());}
+		if(true) {execute (TC_CSE_DMR_UPD_020_ACP());}
+		if(true) {execute (TC_CSE_DMR_UPD_021_CNT());}
+		if(true) {execute (TC_CSE_DMR_UPD_021_GRP());}
+		if(true) {execute (TC_CSE_DMR_UPD_021_ACP());}
+		if(true) {execute (TC_CSE_DMR_UPD_022_CNT());}
+		if(true) {execute (TC_CSE_DMR_UPD_022_GRP());}
+		if(true) {execute (TC_CSE_DMR_UPD_022_ACP());}
+		if(true) {execute (TC_CSE_DMR_DEL_011_RCN_2());}
+		if(true) {execute (TC_CSE_DMR_DEL_011_RCN_3());}
+		if(true) {execute (TC_CSE_DMR_DEL_011_RCN_9());}
+		if(true) {execute (TC_CSE_DMR_DEL_012_CNT());}
+		if(true) {execute (TC_CSE_DMR_DEL_012_GRP());}
+		if(true) {execute (TC_CSE_DMR_DEL_012_ACP());}
+		if(true) {execute (TC_CSE_DMR_DEL_013_CNT());}
+		if(true) {execute (TC_CSE_DMR_DEL_013_GRP());}
+		if(true) {execute (TC_CSE_DMR_DEL_013_ACP());}
+				
+		if(true) {execute (TC_CSE_RT_NBS_001_CRE());}
+		if(true) {execute (TC_CSE_RT_NBS_001_UPD());}
+		if(true) {execute (TC_CSE_RT_NBS_001_RET());}
+		if(true) {execute (TC_CSE_RT_NBS_001_DEL());}
+		if(true) {execute (TC_CSE_RT_NBS_002_CRE());}
+		if(true) {execute (TC_CSE_RT_NBS_002_UPD());}
+		if(true) {execute (TC_CSE_RT_NBS_002_RET());}
+		if(true) {execute (TC_CSE_RT_NBS_002_DEL());}
+		if(true) {execute (TC_CSE_RT_NBS_003_CRE());}
+		if(true) {execute (TC_CSE_RT_NBS_003_UPD());}
+		if(true) {execute (TC_CSE_RT_NBS_003_RET());}
+		if(true) {execute (TC_CSE_RT_NBS_003_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_001_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_001_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_001_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_001_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_002_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_002_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_002_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_002_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_003_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_003_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_003_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_003_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_004_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_004_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_004_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_004_DEL());}
+		if(true) {execute (TC_CSE_RT_NBA_005_CRE());}
+		if(true) {execute (TC_CSE_RT_NBA_005_UPD());}
+		if(true) {execute (TC_CSE_RT_NBA_005_RET());}
+		if(true) {execute (TC_CSE_RT_NBA_005_DEL());}
+		
+		if(true) {execute (TC_CSE_DMR_001_CRE());}
+		if(true) {execute (TC_CSE_DMR_001_UPD());}
+		if(true) {execute (TC_CSE_DMR_001_RET());}
+		if(true) {execute (TC_CSE_DMR_001_DEL());}
+		if(true) {execute (TC_CSE_DMR_002_CRE());}
+		if(true) {execute (TC_CSE_DMR_002_UPD());}
+		if(true) {execute (TC_CSE_DMR_002_RET());}
+		if(true) {execute (TC_CSE_DMR_002_DEL());}
 		
 		//CE_REG_00001
 		if(true) {execute (TC_CSE_REG_CRE_021());}
@@ -57,21 +182,24 @@ module OneM2M_TestControl_MN_profile {
 		if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
 
 		//CE_REG_00002
+		if(true) {execute (TC_CSE_REG_CRE_016());}
+		if(true) {execute (TC_CSE_REG_CRE_017_API());}
+		if(true) {execute (TC_CSE_REG_CRE_017_RR());}
 		if(true) {execute (TC_CSE_REG_RET_003());}
 		if(true) {execute (TC_CSE_REG_DEL_003());}
 		if(true) {execute (TC_CSE_DMR_RET_013_AE());} 
 		if(true) {execute (TC_CSE_DMR_UPD_016_AE_ET());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_AE_RR());}
+		
 		if(true) {execute (TC_CSE_REG_CRE_004());}
+		
 		if(true) {execute (TC_CSE_REG_CRE_005());}
 		if(PICS_MN_CSE or PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_006());}
 		if(PICS_MN_CSE) {execute (TC_CSE_REG_CRE_007());}
 		if(PICS_MN_CSE) {execute (TC_CSE_REG_CRE_008());}
 		if(PICS_MN_CSE) {execute (TC_CSE_REG_CRE_010());}
 		if(true) {execute (TC_CSE_REG_CRE_011());}
-		if(true) {execute (TC_CSE_REG_CRE_016());}
-		if(true) {execute (TC_CSE_REG_CRE_017_API());}
-		if(true) {execute (TC_CSE_REG_CRE_017_RR());}
+		
 		if(true) {execute (TC_CSE_REG_CRE_022());}
 		if(true) {execute (TC_CSE_REG_CRE_023());}
 		if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
@@ -96,10 +224,10 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_REG_DEL_002());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_CSR_ET());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_CSR_RR());}
-		if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
-		if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
-		if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
-		if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
+		//if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
+		//if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
+		//if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
+		//if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
 		if(PICS_CSR_CST) {execute (TC_CSE_REG_CRE_013_CST());}
 		if(true) {execute (TC_CSE_REG_CRE_027());}
 		if(PICS_CSR_CST) {execute (TC_CSE_REG_RET_007_CST());}
@@ -139,13 +267,14 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_CRE_002_CNT());}
 		if(true) {execute (TC_CSE_DMR_CRE_003_CNT());}
 		if(true) {execute (TC_CSE_DMR_CRE_007_CNT_CIN ());}
-		if(true) {execute (TC_CSE_DMR_CRE_008 ());}
+		if(true) {execute (TC_CSE_DMR_CRE_008_CNT_CIN ());}
 		if(true) {execute (TC_CSE_DMR_CRE_009 ());}
 		if(true) {execute (TC_CSE_DMR_CRE_010 ());}
 		if(true) {execute (TC_CSE_DMR_CRE_011 ());}
+		if(true) {execute (TC_CSE_DMR_CRE_013_CNT_CIN());}
+		if(true) {execute (TC_CSE_DMR_CRE_014_CNT_CIN ());}
 		if(true) {execute (TC_CSE_DMR_RET_001_CNT());}
 		if(true) {execute (TC_CSE_DMR_RET_013_CNT());}
-		if(true) {execute (TC_CSE_DMR_CRE_014_CNT_CIN ());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_CNT_LBL());}
 		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_002_CNT_LBL());}
 		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_003_CNT_LBL());}
@@ -156,12 +285,14 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_010_CNT());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
-		if(true) {execute (TC_CSE_DMR_DEL_005 ());}
-		if(true) {execute (TC_CSE_DMR_DEL_006());}
-		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
-		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
-		if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
+		if(true) {execute (TC_CSE_DMR_DEL_005_CNT ());}
+		if(true) {execute (TC_CSE_DMR_DEL_006_CNT_CIN());}
+		//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
+		//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
+		//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
+
 		if(PICS_CNT_CR) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
+
 		if(true) {execute (TC_CSE_DMR_CRE_005_MNI());}
 		if(true) {execute (TC_CSE_DMR_CRE_006_MNI());}
 		if(PICS_CNT_MNI) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
@@ -184,12 +315,16 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
 		if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
-		if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
+		
+		//if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
 		if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
+		
 		if(PICS_CIN_CNF) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
+		
 		if(true) {execute (TC_CSE_DMR_RET_012());}
 		if(true) {execute (TC_CSE_DMR_UPD_012());}
 		if(true) {execute (TC_CSE_DMR_DEL_007());}
+		
 		if(true) {execute (TC_CSE_DMR_RET_010());}
 		if(true) {execute (TC_CSE_DMR_UPD_013());}
 		if(true) {execute (TC_CSE_DMR_DEL_009());}
@@ -215,18 +350,35 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NCT());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_SUB());}
-		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
-		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
-		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
+		
+		//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
+		//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
+		//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
 		if(PICS_SUB_CR) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
 
+		if(true) {execute (TC_CSE_DMR_CRE_012_SUB_SU());}		
 		//CE_SUB_00004
 		if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
 		if(true) {execute (TC_CSE_SUB_CRE_001_CIN());}
 		if(true) {execute (TC_CSE_SUB_CRE_003());}
 		if(true) {execute (TC_CSE_SUB_CRE_005());}
+		
 		if(true) {execute (TC_CSE_SUB_UPD_001());}
+		if(true) {execute (TC_CSE_SUB_UPD_002());}
+		if(true) {execute (TC_CSE_SUB_UPD_003());}
+		if(true) {execute (TC_CSE_SUB_UPD_004());}
+		if(true) {execute (TC_CSE_SUB_UPD_005());}
+		if(true) {execute (TC_CSE_SUB_UPD_006());}
+		if(true) {execute (TC_CSE_SUB_UPD_007());}
+		if(true) {execute (TC_CSE_SUB_UPD_008());}
+		if(true) {execute (TC_CSE_SUB_UPD_009());}
 		if(true) {execute (TC_CSE_SUB_DEL_001());}
+		if(true) {execute (TC_CSE_SUB_DEL_002());}
+		if(true) {execute (TC_CSE_SUB_DEL_003());}
+		if(true) {execute (TC_CSE_SUB_NTF_001());}
+		if(true) {execute (TC_CSE_SUB_NTF_002());}
+		if(true) {execute (TC_CSE_SUB_NTF_003());}
+
 		if(true) {execute (TC_CSE_SUB_CRE_004());}
 
 		//CE_SEC_00001
@@ -265,14 +417,18 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_SEC_ACP_UPD_001());}
 		if(true) {execute (TC_CSE_SEC_ACP_UPD_002());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_CNT());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_GRP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_ACP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_SUB());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_PCH());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_ACP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_CNT());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_GRP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_SUB());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_ACP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_AE());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_CNT());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_GRP());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_CSR());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_SUB());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
@@ -331,31 +487,17 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_SEC_ACP_012_RET());}
 		if(true) {execute (TC_CSE_SEC_ACP_012_DEL());}		
 	
-		//Extendable Feature set
-		if(true) {execute (TC_CSE_DIS_001());}
-		if(true) {execute (TC_CSE_DIS_002());}
-		if(true) {execute (TC_CSE_DIS_003());}
-		if(true) {execute (TC_CSE_DIS_004());}
-		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DIS_005());}
-		if(true) {execute (TC_CSE_DIS_006());}
-		if(true) {execute (TC_CSE_DIS_007());}
-		if(true) {execute (TC_CSE_DIS_008_CRB_CRA());}
-		if(true) {execute (TC_CSE_DIS_008_MS_US());}
-		if(true) {execute (TC_CSE_DIS_008_STS_STB());}
-		if(true) {execute (TC_CSE_DIS_008_EXB_EXA());}
-		if(true) {execute (TC_CSE_DIS_009());}
+		//CE_GMG_00001
 		if(true) {execute (TC_CSE_DMR_CRE_001_GRP_CB());}
 		if(true) {execute (TC_CSE_DMR_CRE_001_GRP_AE());}
 		if(true) {execute (TC_CSE_DMR_CRE_002_GRP());}
 		if(true) {execute (TC_CSE_DMR_CRE_003_GRP());}
-		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_GRP());}
 		if(true) {execute (TC_CSE_DMR_RET_001_GRP());}
 		if(true) {execute (TC_CSE_DMR_RET_013_GRP());}
-		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_GRP());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_GRP_LBL());}
 		if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_002_GRP_LBL());}
 		if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_003_GRP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
+		if(PICS_GRP_GN and PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_007_GRP_CT());}
 		if(true) {execute (TC_CSE_DMR_UPD_008_GRP_MNM());}
@@ -370,9 +512,10 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_GMG_UPD_002());}
 		if(true) {execute (TC_CSE_GMG_UPD_007());}
 		if(true) {execute (TC_CSE_GMG_UPD_008());}
-		if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
+		//if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
 		if(PICS_GRP_GN) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
-		if(PICS_GRP_ACPI) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
+		//if(PICS_GRP_ACPI) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
+		
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_CRE_002());}
 		if(true) {execute (TC_CSE_GMG_CRE_004());}
 		if(true) {execute (TC_CSE_GMG_CRE_005());}
@@ -385,6 +528,7 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_GMG_UPD_006());}
 		if(true) {execute (TC_CSE_GMG_UPD_009());}
 		if(true) {execute (TC_CSE_GMG_UPD_010());}
+		
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_RET_001());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_CRE());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_RET());}
@@ -410,7 +554,43 @@ module OneM2M_TestControl_MN_profile {
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_RET());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_UPD());}
 		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_DEL());}
-		if(PICS_GRP_MACP) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
+		//if(PICS_GRP_MACP) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
+		
+		//CE_DIS_00001
+		if(true) {execute (TC_CSE_DIS_001());}
+		if(true) {execute (TC_CSE_DIS_004());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DIS_005());}
+		if(true) {execute (TC_CSE_DIS_006());}
+		
+		if(true) {execute (TC_CSE_DIS_002());}
+		if(true) {execute (TC_CSE_DIS_003());}
+		if(true) {execute (TC_CSE_DIS_007());}
+		if(true) {execute (TC_CSE_DIS_008_CRB_CRA());}
+		if(true) {execute (TC_CSE_DIS_008_MS_US());}
+		if(true) {execute (TC_CSE_DIS_008_STS_STB());}
+		if(true) {execute (TC_CSE_DIS_008_EXB_EXA());}
+		if(true) {execute (TC_CSE_DIS_009());}
+		
+		//CE_PCH_001
+		if(true) {execute (TC_CSE_DMR_CRE_001_PCH_AE());}
+		if(true) {execute (TC_CSE_DMR_CRE_002_PCH());}
+		if(true) {execute (TC_CSE_DMR_CRE_003_PCH());}
+		if(true) {execute (TC_CSE_DMR_RET_001_PCH());}
+		if(true) {execute (TC_CSE_DMR_UPD_001_PCH_LBL());}
+		if(true) {execute (TC_CSE_DMR_UPD_002_PCH_LBL());}
+		if(true) {execute (TC_CSE_DMR_UPD_003_PCH_LBL());}
+		if(true) {execute (TC_CSE_DMR_UPD_007_PCH_CT());}
+		if(true) {execute (TC_CSE_DMR_UPD_009_PCH_EXC());}
+		if(true) {execute (TC_CSE_DMR_DEL_001_PCH());}
+		
+		if(true) {execute (TC_CSE_PCH_001());}
+		if(true) {execute (TC_CSE_PCH_002());}
+		if(true) {execute (TC_CSE_PCH_003());}
+		if(true) {execute (TC_CSE_PCH_004());}
+		if(true) {execute (TC_CSE_PCH_005_RET());}
+		if(true) {execute (TC_CSE_PCH_005_UPD());}
+		if(true) {execute (TC_CSE_PCH_005_DEL());}
+		if(true) {execute (TC_CSE_PCH_006());}
 	}
 
 }  // end of module OneM2M_TestControl_IN_profile