diff --git a/LibOneM2M/OneM2M_Pics.ttcn b/LibOneM2M/OneM2M_Pics.ttcn
index 3f792c064ba4c86501d30fd3cbea1daf8b181478..e5e472d31de077bb4ab42c69442f2033a56431e0 100644
--- a/LibOneM2M/OneM2M_Pics.ttcn
+++ b/LibOneM2M/OneM2M_Pics.ttcn
@@ -28,5 +28,85 @@ module OneM2M_Pics {
 	modulepar boolean PICS_PRIMITIVE_SCOPE_SP_RELATIVE := true;
 	modulepar boolean PICS_PRIMITIVE_SCOPE_ABSOLUTE := true;
 	
+	//AccessControlPolicy optional attributes
+	
+	modulepar boolean PICS_ACP_LBL := true;
+	modulepar boolean PICS_ACP_AT := true;
+	modulepar boolean PICS_ACP_ET := true;
+	
+	//AE optional attributes
+	
+	modulepar boolean PICS_AE_LBL := true;
+	modulepar boolean PICS_AE_APN := true;
+	modulepar boolean PICS_AE_POA := true;
+	modulepar boolean PICS_AE_NL := true;
+	modulepar boolean PICS_AE_CSZ := true;
+	modulepar boolean PICS_AE_OR := true;
+	modulepar boolean PICS_AE_ACPI := true;
+	
+	//Container optional attributes
+	
+	modulepar boolean PICS_CNT_ACPI := true;
+	modulepar boolean PICS_CNT_MNI := true;
+	modulepar boolean PICS_CNT_MBS := true;
+	modulepar boolean PICS_CNT_MIA := true;
+	modulepar boolean PICS_CNT_OR := true;
+	modulepar boolean PICS_CNT_LI := true;
+	modulepar boolean PICS_CNT_RN := true;
+	modulepar boolean PICS_CNT_ET := true;
+	modulepar boolean PICS_CNT_LBL := true;
+	modulepar boolean PICS_CNT_CR := true;
+	
+	//ContentInstance optional attributes
+	
+	modulepar boolean PICS_CIN_CNF := true;
+	modulepar boolean PICS_CIN_RN := true;
+	modulepar boolean PICS_CIN_ET := true;
+	modulepar boolean PICS_CIN_LBL := true;
+	modulepar boolean PICS_CIN_CR := true;
+	modulepar boolean PICS_CIN_OR := true;	
+	
+	//CSEBase optional attributes
+	
+    modulepar boolean PICS_CB_CST := true;
+    modulepar boolean PICS_CB_NL := true;
+    
+   	//Group optional attributes
+   	
+	modulepar boolean PICS_GRP_LBL := true;
+	modulepar boolean PICS_GRP_GN := true;
+	modulepar boolean PICS_GRP_ACPI := true;
+	modulepar boolean PICS_GRP_MACP := true;
+    
+	//RemoteCSE optional attributes
+	
+	modulepar boolean PICS_CSR_LBL := true;
+	modulepar boolean PICS_CSR_CST := true;
+	modulepar boolean PICS_CSR_POA := true;
+	modulepar boolean PICS_CSR_NL := true;
+	modulepar boolean PICS_CSR_RN := true;
+	modulepar boolean PICS_CSR_ET := true;
+	modulepar boolean PICS_CSR_RR := true;
+	
+	//Subscription optional attributes
+	
+	modulepar boolean PICS_SUB_ACPI := true;
+	modulepar boolean PICS_SUB_ENC := true;
+	modulepar boolean PICS_SUB_EXC := true;
+	modulepar boolean PICS_SUB_NFU := true;
+	modulepar boolean PICS_SUB_NCT := true;
+	modulepar boolean PICS_SUB_NEC := true;
+	modulepar boolean PICS_SUB_SU := true;
+	modulepar boolean PICS_SUB_LBL := true;
+	modulepar boolean PICS_SUB_ET := true;
+	modulepar boolean PICS_SUB_GPI := true;
+	modulepar boolean PICS_SUB_BN := true;
+	modulepar boolean PICS_SUB_RL := true;
+	modulepar boolean PICS_SUB_PN := true;
+	modulepar boolean PICS_SUB_NSP := true;
+	modulepar boolean PICS_SUB_LN := true;
+	modulepar boolean PICS_SUB_PSN := true;
+	modulepar boolean PICS_SUB_CR := true;
+	
 	
 }  // end of module
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 8d7d261b08f8e86cc31e89d8ae496c96c2c31edc..bbba6c7186f86cdd323020c5546065e1d1946419 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -59,13 +59,13 @@ module OneM2M_Pixits {
 			 */	
 			modulepar XSD.ID PX_SUPER_CSE_ID				:= "/admin:admin";	
 			
-			modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C"};
+			modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C-AllowedAeId"};
 			
-			modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"MyAe"};
+			modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"C-NotAllowedAeId"};
 			
-			modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S"};
+			modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S-AllowedAeId"};
 			
-			modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"MyAe"};
+			modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"S-NotAllowedAeId"};
 			
 			modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
 	
diff --git a/OneM2M_TestControl_ADN_profile_3.ttcn b/OneM2M_TestControl_ADN_profile_3.ttcn
index 85f6ef05e09b488535e67dd8239495aae8c469ae..ca513fc3ee1c1fbfbfcf1b95fab0b225a0566e5a 100644
--- a/OneM2M_TestControl_ADN_profile_3.ttcn
+++ b/OneM2M_TestControl_ADN_profile_3.ttcn
@@ -15,34 +15,35 @@ module OneM2M_TestControl_ADN_profile_3 {
 
 
 	import from OneM2M_Testcases_AE_Release_1 all;	
+	import from OneM2M_Pics all;
 
 	control {
 
 		//AE_GEN_00001
-		if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
-		if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
-		if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
-		if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
-		if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
-		if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
-		if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
-		if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
-		if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
-		if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
-		if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
-		if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
-		if(true) {execute (TC_AE_GEN_RET_001_CSR());}
-		if(true) {execute (TC_AE_GEN_RET_001_SPR());}
-		if(true) {execute (TC_AE_GEN_RET_001_ABS());}
-		if(true) {execute (TC_AE_GEN_RET_002_CSR());}
-		if(true) {execute (TC_AE_GEN_RET_002_SPR());}
-		if(true) {execute (TC_AE_GEN_RET_002_ABS());}
-		if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
-		if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
-		if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
-		if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
-		if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
-		if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
+		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
diff --git a/OneM2M_TestControl_ADN_profile_4.ttcn b/OneM2M_TestControl_ADN_profile_4.ttcn
index dd440773164168dcd964983729fc3e6051d72dcf..4fa671f7ada3bb76c8a0c83f3d357d37a4e918a0 100644
--- a/OneM2M_TestControl_ADN_profile_4.ttcn
+++ b/OneM2M_TestControl_ADN_profile_4.ttcn
@@ -15,33 +15,34 @@ module OneM2M_TestControl_ADN_profile_4 {
 
 
 	import from OneM2M_Testcases_AE_Release_1 all;	
+	import from OneM2M_Pics all;
 	
 	control {
 		//AE_GEN_00001
-		if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
-		if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
-		if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
-		if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
-		if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
-		if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
-		if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
-		if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
-		if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
-		if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
-		if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
-		if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
-		if(true) {execute (TC_AE_GEN_RET_001_CSR());}
-		if(true) {execute (TC_AE_GEN_RET_001_SPR());}
-		if(true) {execute (TC_AE_GEN_RET_001_ABS());}
-		if(true) {execute (TC_AE_GEN_RET_002_CSR());}
-		if(true) {execute (TC_AE_GEN_RET_002_SPR());}
-		if(true) {execute (TC_AE_GEN_RET_002_ABS());}
-		if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
-		if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
-		if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
-		if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
-		if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
-		if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
+		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());}
 		if(true) {execute (TC_AE_DMR_RET_001_CB());}
@@ -72,13 +73,13 @@ module OneM2M_TestControl_ADN_profile_4 {
 		if(true) {execute (TC_AE_DMR_RET_001_AE());}
 		//AE/DMR/00001
 		if(true) {execute (TC_AE_DMR_CRE_001());}
-		if(true) {execute (TC_AE_DMR_CRE_004_RN());}
-		if(true) {execute (TC_AE_DMR_CRE_004_ET());}
-		if(true) {execute (TC_AE_DMR_CRE_004_LBL());}
-		if(true) {execute (TC_AE_DMR_CRE_004_CR());}
-		if(true) {execute (TC_AE_DMR_CRE_004_MNI());}
-		if(true) {execute (TC_AE_DMR_CRE_004_MBS());}
-		if(true) {execute (TC_AE_DMR_CRE_004_MIA());}
+		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());}
 		if(true) {execute (TC_AE_DMR_UPD_002_ET());}
 		if(true) {execute (TC_AE_DMR_UPD_002_LBL());}
 		if(true) {execute (TC_AE_DMR_UPD_002_MNI());}
@@ -88,11 +89,11 @@ module OneM2M_TestControl_ADN_profile_4 {
 		if(true) {execute (TC_AE_DMR_RET_004());}
 		//AE/DMR/00002
 		if(true) {execute (TC_AE_DMR_CRE_002());}
-		if(true) {execute (TC_AE_DMR_CRE_003_RN());}
-		if(true) {execute (TC_AE_DMR_CRE_003_ET());}
-		if(true) {execute (TC_AE_DMR_CRE_003_LBL());}
-		if(true) {execute (TC_AE_DMR_CRE_003_CR());}
-		if(true) {execute (TC_AE_DMR_CRE_003_CNF());}
+		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());}
 		if(true) {execute (TC_AE_DMR_RET_005());}
 		if(true) {execute (TC_AE_DMR_RET_002());}
 		if(true) {execute (TC_AE_DMR_RET_003());}
@@ -106,18 +107,18 @@ module OneM2M_TestControl_ADN_profile_4 {
 		if(true) {execute (TC_AE_REG_CRE_002_OR());}
 		if(true) {execute (TC_AE_DMR_UPD_001_OR());}
 		// AE/DMR/00001
-		if(true) {execute (TC_AE_DMR_CRE_004_ACPI());}
-		if(true) {execute (TC_AE_DMR_CRE_004_OR());}
+		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(true) {execute (TC_AE_SUB_CRE_002_SU());}
-		if(true) {execute (TC_AE_SUB_CRE_002_ACPI());}
-		if(true) {execute (TC_AE_SUB_CRE_002_ENC());}
-		if(true) {execute (TC_AE_SUB_CRE_002_EXC());}
-		if(true) {execute (TC_AE_SUB_CRE_002_NFU());}
-		if(true) {execute (TC_AE_SUB_CRE_002_NCT());}
-		if(true) {execute (TC_AE_SUB_CRE_002_NEC());}
+		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());}
 
diff --git a/OneM2M_TestControl_ASN_profile.ttcn b/OneM2M_TestControl_ASN_profile.ttcn
index 035d56642f96853c4a5fb0444b0dc6e85fc4fdc6..5beaa57c753b08f4738c9d426f8dc597000fcfda 100644
--- a/OneM2M_TestControl_ASN_profile.ttcn
+++ b/OneM2M_TestControl_ASN_profile.ttcn
@@ -14,35 +14,36 @@
 module OneM2M_TestControl_ASN_profile {
 
 
-	import from OneM2M_Testcases_CSE_Release_1 all;	
+	import from OneM2M_Testcases_CSE_Release_1 all;
+	import from OneM2M_Pics all;	
 
 	control {	
 
 		//CE_GEN_00001
-		if(true) {execute (TC_CSE_GEN_CRE_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_CRE_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_CRE_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_RET_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_RET_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_RET_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_RET_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_RET_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_RET_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_ABS());}
+		if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_CSR());}
+		if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_SPR());}
+		if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_ABS());}
 		
 		//CE_GEN_00002 
 				
diff --git a/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn b/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn
index de116e76504498410ebc1a23c2dd8269550f7e2e..039553c3f014593a80c2e191fed6ff7560c5f644 100644
--- a/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn
+++ b/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn
@@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_actuator_as_ADN {
 
 
 	import from OneM2M_Testcases_AE_Release_1 all;	
+	import from OneM2M_Pics all;
 			
 	control {
 		
 		//AE_GEN_00001
-		if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
-		if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
-		if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
-		if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
-		if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
-		if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
-		if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
-		if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
-		if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
-		if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
-		if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
-		if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
-		if(true) {execute (TC_AE_GEN_RET_001_CSR());}
-		if(true) {execute (TC_AE_GEN_RET_001_SPR());}
-		if(true) {execute (TC_AE_GEN_RET_001_ABS());}
-		if(true) {execute (TC_AE_GEN_RET_002_CSR());}
-		if(true) {execute (TC_AE_GEN_RET_002_SPR());}
-		if(true) {execute (TC_AE_GEN_RET_002_ABS());}
-		if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
-		if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
-		if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
-		if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
-		if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
-		if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
+		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
diff --git a/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn b/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
index fa27767a1aa25bdba444e2b4a3a61bd98868f84c..17c5fcc4366a0d469e6b3875b41e0f9c1fd938fd 100644
--- a/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
+++ b/OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn
@@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
 
 
 	import from OneM2M_Testcases_AE_Release_1 all;	
+	import from OneM2M_Pics all;
 			
 	control {
 	
 		//AE_GEN_00001
-		if(true){execute (TC_AE_GEN_CRE_001_CSR());}
-		if(true){execute (TC_AE_GEN_CRE_001_SPR());}
-		if(true){execute (TC_AE_GEN_CRE_001_ABS());}
-		if(true){execute (TC_AE_GEN_CRE_002_CSR());}
-		if(true){execute (TC_AE_GEN_CRE_002_SPR());}
-		if(true){execute (TC_AE_GEN_CRE_002_ABS());}
-		if(true){execute (TC_AE_GEN_UPD_001_CSR());}
-		if(true){execute (TC_AE_GEN_UPD_001_SPR());}
-		if(true){execute (TC_AE_GEN_UPD_001_ABS());}
-		if(true){execute (TC_AE_GEN_UPD_002_CSR());}
-		if(true){execute (TC_AE_GEN_UPD_002_SPR());}
-		if(true){execute (TC_AE_GEN_UPD_002_ABS());}
-		if(true){execute (TC_AE_GEN_RET_001_CSR());}
-		if(true){execute (TC_AE_GEN_RET_001_SPR());}
-		if(true){execute (TC_AE_GEN_RET_001_ABS());}
-		if(true) {execute (TC_AE_GEN_RET_002_CSR());}
-		if(true) {execute (TC_AE_GEN_RET_002_SPR());}
-		if(true) {execute (TC_AE_GEN_RET_002_ABS());}
-		if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
-		if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
-		if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
-		if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
-		if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
-		if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
+		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());}
@@ -61,19 +62,19 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
 		if(true) {execute (TC_AE_REG_CRE_002_APN());}
 		//AE/DMR/00001
 		if(true) {execute (TC_AE_DMR_CRE_001());}
-		if(true) {execute (TC_AE_DMR_CRE_004_RN());}
-		if(true) {execute (TC_AE_DMR_CRE_004_ET());}
-		if(true) {execute (TC_AE_DMR_CRE_004_LBL());}
-		if(true) {execute (TC_AE_DMR_CRE_004_CR());}
-		if(true) {execute (TC_AE_DMR_CRE_004_MNI());}
-		if(true) {execute (TC_AE_DMR_CRE_004_MBS());}
-		if(true) {execute (TC_AE_DMR_CRE_004_MIA());}
+		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(true) {execute (TC_AE_DMR_CRE_003_RN());}
-		if(true) {execute (TC_AE_DMR_CRE_003_ET());}
-		if(true) {execute (TC_AE_DMR_CRE_003_LBL());}
-		if(true) {execute (TC_AE_DMR_CRE_003_CR());}
-		if(true) {execute (TC_AE_DMR_CRE_003_CNF());}
+		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());}
 		
 	}
 			
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index 11d1ae0bc72be0e736b31140169df98bd6a8d327..b1850b802d981d92268aae06238c2f5ebd1453ca 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -15,34 +15,35 @@ module OneM2M_TestControl_IN_profile {
 
 
 	import from OneM2M_Testcases_CSE_Release_1 all;	
+	import from OneM2M_Pics all;
 
 	control {	
 
 		//CE_GEN_00001
-		if(true) {execute (TC_CSE_GEN_CRE_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_CRE_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_CRE_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_RET_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_RET_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_RET_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_RET_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_RET_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_RET_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_ABS());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_CSR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_SPR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_ABS());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_CSR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_SPR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_ABS());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_CSR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_SPR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_ABS());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_CSR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_SPR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_ABS());}
+		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());}
 		
 		//CE_GEN_00002 
 		
@@ -52,9 +53,9 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_REG_RET_008());}
 		if(true) {execute (TC_CSE_REG_UPD_001());}
 		if(true) {execute (TC_CSE_REG_DEL_001());}
-		if(true) {execute (TC_CSE_REG_RET_002_CST());}
-		if(true) {execute (TC_CSE_REG_RET_005());}
-		if(true) {execute (TC_CSE_REG_RET_002_NL());}
+		if(PICS_CB_CST) {execute (TC_CSE_REG_RET_002_CST());}
+		if(PICS_IN_CSE) {execute (TC_CSE_REG_RET_005());}
+		if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
 
 		//CE_REG_00002
 		if(true) {execute (TC_CSE_REG_RET_003());}
@@ -63,23 +64,23 @@ module OneM2M_TestControl_IN_profile {
 		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_009());}
+		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(true) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
-		if(true) {execute (TC_CSE_REG_RET_004_LBL());}
+		if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
+		if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_AE_LBL());}
-		if(true) {execute (TC_CSE_REG_CRE_012_AE_APN());}
-		if(true) {execute (TC_CSE_REG_RET_004_APN());}
+		if(PICS_AE_APN) {execute (TC_CSE_REG_CRE_012_AE_APN());}
+		if(PICS_AE_APN) {execute (TC_CSE_REG_RET_004_APN());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
-		if(true) {execute (TC_CSE_REG_CRE_012_AE_POA());}
-		if(true) {execute (TC_CSE_REG_RET_004_POA());}
+		if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
+		if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
-		if(true) {execute (TC_CSE_REG_CRE_001());}
+		if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001());}
 		if(true) {execute (TC_CSE_REG_CRE_002());}
 		
 		//CE_REG_00004
@@ -91,20 +92,20 @@ 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(true) {execute (TC_CSE_REG_CRE_013_LBL());}
-		if(true) {execute (TC_CSE_REG_CRE_028_LBL());}
-		if(true) {execute (TC_CSE_REG_RET_007_LBL());}
-		if(true) {execute (TC_CSE_REG_UPD_002_LBL());}
-		if(true) {execute (TC_CSE_REG_CRE_013_CST());}
-		if(true) {execute (TC_CSE_REG_RET_007_CST());}
-		if(true) {execute (TC_CSE_REG_CRE_013_POA());}
-		if(true) {execute (TC_CSE_REG_CRE_028_POA());}
-		if(true) {execute (TC_CSE_REG_RET_007_POA());}
-		if(true) {execute (TC_CSE_REG_UPD_002_POA());}
-		if(true) {execute (TC_CSE_REG_CRE_013_NL());}
-		if(true) {execute (TC_CSE_REG_CRE_028_NL());}
-		if(true) {execute (TC_CSE_REG_RET_007_NL());}
-		if(true) {execute (TC_CSE_REG_UPD_002_NL());}
+		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());}
+		if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_028_POA());}
+		if(PICS_CSR_POA) {execute (TC_CSE_REG_RET_007_POA());}
+		if(PICS_CSR_POA) {execute (TC_CSE_REG_UPD_002_POA());}
+		if(PICS_CSR_NL) {execute (TC_CSE_REG_CRE_013_NL());}
+		if(PICS_CSR_NL) {execute (TC_CSE_REG_CRE_028_NL());}
+		if(PICS_CSR_NL) {execute (TC_CSE_REG_RET_007_NL());}
+		if(PICS_CSR_NL) {execute (TC_CSE_REG_UPD_002_NL());}
 		
 
 		//CE_DMR_00001
@@ -118,9 +119,9 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_CNT());}
 		if(true) {execute (TC_CSE_DMR_RET_013_CNT());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_002_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_003_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_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());}
+		if(PICS_CNT_MNI and PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_005_CNT_EXC());}
 		if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
 		if(true) {execute (TC_CSE_DMR_UPD_008_CNT_ET());}
@@ -128,24 +129,24 @@ module OneM2M_TestControl_IN_profile {
 		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_006());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
+		if(PICS_ACP_SUPPORT) {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(true) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MNI());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MNI());}
 		if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
 		if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
 		if(true) {execute (TC_CSE_DMR_CRE_013());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
 		if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
 		if(true) {execute (TC_CSE_DMR_CRE_006_MIA());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
 
@@ -154,9 +155,9 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
 		if(true) {execute (TC_CSE_DMR_UPD_011());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
+		if(PICS_ACP_SUPPORT) {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());}
@@ -175,9 +176,9 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_SUB());}
 		if(true) {execute (TC_CSE_DMR_RET_013_SUB());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_002_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
+		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_002_SUB_LBL());}
+		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
+		if(PICS_SUB_LBL and PICS_SUB_EXC) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
 		if(true) {execute (TC_CSE_DMR_UPD_005_SUB_MNI());}
 		if(true) {execute (TC_CSE_DMR_UPD_007_SUB_CT());}
 		if(true) {execute (TC_CSE_DMR_UPD_008_SUB_ET());}
@@ -186,10 +187,10 @@ 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(true) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
 
 		//CE_SUB_00004
 		if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
@@ -208,9 +209,9 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_ACP());}
 		if(true) {execute (TC_CSE_DMR_RET_013_ACP());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_ACP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
+		if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
+		if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
+		if(PICS_ACP_AT and PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_005_ACP_EXC());}
 		if(true) {execute (TC_CSE_DMR_UPD_007_ACP_CT());}
 		if(true) {execute (TC_CSE_DMR_UPD_008_ACP_ET());}
@@ -223,37 +224,37 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_SEC_ACP_CRE_002());}
 		if(true) {execute (TC_CSE_SEC_ACP_CRE_003());} 
 		if(true) {execute (TC_CSE_SEC_ACP_CRE_004());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_ACP_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_ACP_LBL());}
 
 		//CE_SEC_00002
-		if(true) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_ACPI());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_AE_ACPI());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_ACPI());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_SUB_ACPI());}
 		if(true) {execute (TC_CSE_SEC_ACP_UPD_001());}
 		if(true) {execute (TC_CSE_SEC_ACP_UPD_002());}
-		if(true) {execute (TC_CSE_DMR_CRE_004_CNT());}
-		if(true) {execute (TC_CSE_DMR_CRE_004_ACP());}
-		if(true) {execute (TC_CSE_DMR_CRE_004_SUB());}
-		if(true) {execute (TC_CSE_DMR_RET_003_ACP());}
-		if(true) {execute (TC_CSE_DMR_RET_003_CNT());}
-		if(true) {execute (TC_CSE_DMR_RET_003_SUB());}
-		if(true) {execute (TC_CSE_DMR_RET_014_ACP());}
-		if(true) {execute (TC_CSE_DMR_RET_014_AE());}
-		if(true) {execute (TC_CSE_DMR_RET_014_CNT());}
-		if(true) {execute (TC_CSE_DMR_RET_014_CSR());}
-		if(true) {execute (TC_CSE_DMR_RET_014_SUB());}
-		if(true) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_006_ACP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_006_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_DEL_002_CNT());}
-		if(true) {execute (TC_CSE_DMR_DEL_002_ACP());}
-		if(true) {execute (TC_CSE_DMR_DEL_002_SUB());}
-		if(true) {execute (TC_CSE_SUB_CRE_002());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_CNT());}
+		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_RET_003_ACP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_CNT());}
+		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_CSR());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_SUB());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_ACP_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_SUB_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_CNT());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_ACP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_SUB());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_SUB_CRE_002());}
 		if(true) {execute (TC_CSE_SEC_ACP_001_CRE());}
 		if(true) {execute (TC_CSE_SEC_ACP_001_UPD());}
 		if(true) {execute (TC_CSE_SEC_ACP_001_RET());}
@@ -308,7 +309,7 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DIS_002());}
 		if(true) {execute (TC_CSE_DIS_003());}
 		if(true) {execute (TC_CSE_DIS_004());}
-		if(true) {execute (TC_CSE_DIS_005());}
+		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());}
@@ -320,17 +321,17 @@ module OneM2M_TestControl_IN_profile {
 		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(true) {execute (TC_CSE_DMR_CRE_004_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_003_GRP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_GRP());}
 		if(true) {execute (TC_CSE_DMR_RET_013_GRP());}
-		if(true) {execute (TC_CSE_DMR_RET_014_GRP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_GRP());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_GRP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_002_GRP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_003_GRP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_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(PICS_GRP_GN and PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_005_GRP_EXC());}
-		if(true) {execute (TC_CSE_DMR_UPD_006_GRP_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_ET());}
 		if(true) {execute (TC_CSE_DMR_UPD_009_GRP_ET());}
@@ -338,7 +339,7 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MNM());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MID());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_GRP());}
-		if(true) {execute (TC_CSE_DMR_DEL_002_GRP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_GRP());}
 		if(true) {execute (TC_CSE_GMG_CRE_001());}
 		if(true) {execute (TC_CSE_GMG_CRE_003());}
 		if(true) {execute (TC_CSE_GMG_UPD_002());}
@@ -347,43 +348,43 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
-		if(true) {execute (TC_CSE_GMG_CRE_002());}
+		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());}
 		if(true) {execute (TC_CSE_GMG_CRE_006());}
 		if(true) {execute (TC_CSE_GMG_CRE_007());}
-		if(true) {execute (TC_CSE_GMG_UPD_001());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_UPD_001());}
 		if(true) {execute (TC_CSE_GMG_UPD_003());}
 		if(true) {execute (TC_CSE_GMG_UPD_004());}
 		if(true) {execute (TC_CSE_GMG_UPD_005());}
 		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(true) {execute (TC_CSE_GMG_RET_001());}
-		if(true) {execute (TC_CSE_GMG_001_CRE());}
-		if(true) {execute (TC_CSE_GMG_001_RET());}
-		if(true) {execute (TC_CSE_GMG_001_UPD());}
-		if(true) {execute (TC_CSE_GMG_001_DEL());}
-		if(true) {execute (TC_CSE_GMG_002_CRE());}
-		if(true) {execute (TC_CSE_GMG_002_RET());}
-		if(true) {execute (TC_CSE_GMG_002_UPD());}
-		if(true) {execute (TC_CSE_GMG_002_DEL());}
-		if(true) {execute (TC_CSE_GMG_003_CRE());}
-		if(true) {execute (TC_CSE_GMG_003_RET());}
-		if(true) {execute (TC_CSE_GMG_003_UPD());}
-		if(true) {execute (TC_CSE_GMG_003_DEL());}
-		if(true) {execute (TC_CSE_GMG_004_CRE());}
-		if(true) {execute (TC_CSE_GMG_004_RET());}
-		if(true) {execute (TC_CSE_GMG_004_UPD());}
-		if(true) {execute (TC_CSE_GMG_004_DEL());}
+		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());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_UPD());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_DEL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_CRE());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_RET());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_UPD());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_DEL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_CRE());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_RET());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_UPD());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_DEL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_CRE());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_RET());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_UPD());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_DEL());}
 		if(true) {execute (TC_CSE_GMG_005_CRE());}
 		if(true) {execute (TC_CSE_GMG_005_RET());}
 		if(true) {execute (TC_CSE_GMG_005_UPD());}
 		if(true) {execute (TC_CSE_GMG_005_DEL());}
-		if(true) {execute (TC_CSE_GMG_006_CRE());}
-		if(true) {execute (TC_CSE_GMG_006_RET());}
-		if(true) {execute (TC_CSE_GMG_006_UPD());}
-		if(true) {execute (TC_CSE_GMG_006_DEL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_CRE());}
+		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(true) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
 	}
 }  // end of module OneM2M_TestControl_IN_profile
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index f14104be406bb013986e70b84a01a274bc70c6cd..89e999743c9c09911057e1dfbd6c9d39249a2b79 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -15,34 +15,35 @@ module OneM2M_TestControl_MN_profile {
 
 
 	import from OneM2M_Testcases_CSE_Release_1 all;	
+	import from OneM2M_Pics all;
 
 	control {	
 
 		//CE_GEN_00001
-		if(true) {execute (TC_CSE_GEN_CRE_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_CRE_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_CRE_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_RET_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_RET_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_RET_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_UPD_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_CSR());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_SPR());}
-		if(true) {execute (TC_CSE_GEN_DEL_001_ABS());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_CRE_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_RET_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_RET_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_RET_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_UPD_002_ABS());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_CSR());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_SPR());}
-		if(true) {execute (TC_CSE_GEN_DEL_002_ABS());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_CSR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_SPR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_ABS());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_CSR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_SPR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_ABS());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_CSR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_SPR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_ABS());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_CSR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_SPR());}
+		if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_ABS());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_CSR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_SPR());}
+		if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_ABS());}
+		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());}
 		
 		//CE_GEN_00002 
 		
@@ -52,9 +53,9 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_REG_RET_008());}
 		if(true) {execute (TC_CSE_REG_UPD_001());}
 		if(true) {execute (TC_CSE_REG_DEL_001());}
-		if(true) {execute (TC_CSE_REG_RET_002_CST());}
+		if(PICS_CB_CST) {execute (TC_CSE_REG_RET_002_CST());}
 		if(true) {execute (TC_CSE_REG_RET_005());}
-		if(true) {execute (TC_CSE_REG_RET_002_NL());}
+		if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
 
 		//CE_REG_00002
 		if(true) {execute (TC_CSE_REG_RET_003());}
@@ -64,28 +65,28 @@ module OneM2M_TestControl_MN_profile {
 		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(true) {execute (TC_CSE_REG_CRE_006());}//TODO TO BE IMPLEMENTED
-		//if(true) {execute (TC_CSE_REG_CRE_007());}//TODO TO BE IMPLEMENTED
-		if(true) {execute (TC_CSE_REG_CRE_008());}
-		if(true) {execute (TC_CSE_REG_CRE_010());}
+		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(true) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
-		if(true) {execute (TC_CSE_REG_RET_004_LBL());}
+		if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
+		if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_AE_LBL());}
-		if(true) {execute (TC_CSE_REG_CRE_012_AE_APN());}
-		if(true) {execute (TC_CSE_REG_RET_004_APN());}
+		if(PICS_AE_APN) {execute (TC_CSE_REG_CRE_012_AE_APN());}
+		if(PICS_AE_APN) {execute (TC_CSE_REG_RET_004_APN());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
-		if(true) {execute (TC_CSE_REG_CRE_012_AE_POA());}
-		if(true) {execute (TC_CSE_REG_RET_004_POA());}
+		if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
+		if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
 		if(true) {execute (TC_CSE_REG_CRE_002());}
 		//if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED
-		if(true) {execute (TC_CSE_REG_CRE_020());}
+		if(PICS_MN_CSE or PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_020());}
 
 		//CE_REG_00004
 		if(true) {execute (TC_CSE_REG_CRE_018());}
@@ -96,40 +97,40 @@ 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(true) {execute (TC_CSE_REG_CRE_028_LBL());}
-		if(true) {execute (TC_CSE_REG_RET_007_LBL());}
-		if(true) {execute (TC_CSE_REG_UPD_002_LBL());}
-		if(true) {execute (TC_CSE_REG_CRE_013_CST());}
+		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(true) {execute (TC_CSE_REG_RET_007_CST());}
-		if(true) {execute (TC_CSE_REG_CRE_013_POA());}
-		if(true) {execute (TC_CSE_REG_CRE_028_POA());}
-		if(true) {execute (TC_CSE_REG_RET_007_POA());}
-		if(true) {execute (TC_CSE_REG_UPD_002_POA());}
-		if(true) {execute (TC_CSE_REG_CRE_013_NL());}
-		if(true) {execute (TC_CSE_REG_CRE_028_NL());}
-		if(true) {execute (TC_CSE_REG_RET_007_NL());}
-		if(true) {execute (TC_CSE_REG_UPD_002_NL());}
+		if(PICS_CSR_CST) {execute (TC_CSE_REG_RET_007_CST());}
+		if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_013_POA());}
+		if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_028_POA());}
+		if(PICS_CSR_POA) {execute (TC_CSE_REG_RET_007_POA());}
+		if(PICS_CSR_POA) {execute (TC_CSE_REG_UPD_002_POA());}
+		if(PICS_CSR_NL) {execute (TC_CSE_REG_CRE_013_NL());}
+		if(PICS_CSR_NL) {execute (TC_CSE_REG_CRE_028_NL());}
+		if(PICS_CSR_NL) {execute (TC_CSE_REG_RET_007_NL());}
+		if(PICS_CSR_NL) {execute (TC_CSE_REG_UPD_002_NL());}
 		
 		//CE_REG_00005
-		if(true) {execute (TC_CSE_REG_CRE_024());}
+		if(PICS_MN_CSE) {execute (TC_CSE_REG_CRE_024());}
 		if(true) {execute (TC_CSE_DMR_RET_013_CSR());}
-		if(true) {execute (TC_CSE_REG_CRE_026_RN());}
-		if(true) {execute (TC_CSE_REG_CRE_026_ET());}
-		if(true) {execute (TC_CSE_REG_CRE_026_LBL());}
-		if(true) {execute (TC_CSE_REG_CRE_026_CST());}
-		if(true) {execute (TC_CSE_REG_CRE_026_POA());}
-		if(true) {execute (TC_CSE_REG_CRE_026_NL());}
-		if(true) {execute (TC_CSE_REG_UPD_003_LBL());}
+		if(PICS_MN_CSE and PICS_CSR_RN) {execute (TC_CSE_REG_CRE_026_RN());}
+		if(PICS_MN_CSE and PICS_CSR_ET) {execute (TC_CSE_REG_CRE_026_ET());}
+		if(PICS_MN_CSE and PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_026_LBL());}
+		if(PICS_MN_CSE and PICS_CSR_CST) {execute (TC_CSE_REG_CRE_026_CST());}
+		if(PICS_MN_CSE and PICS_CSR_POA) {execute (TC_CSE_REG_CRE_026_POA());}
+		if(PICS_MN_CSE and PICS_CSR_NL) {execute (TC_CSE_REG_CRE_026_NL());}
+		if(PICS_MN_CSE and PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_003_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CSR_LBL());}
-		if(true) {execute (TC_CSE_REG_UPD_003_ET());}
-		if(true) {execute (TC_CSE_REG_UPD_003_POA());}
+		if(PICS_MN_CSE and PICS_CSR_ET) {execute (TC_CSE_REG_UPD_003_ET());}
+		if(PICS_MN_CSE and PICS_CSR_POA) {execute (TC_CSE_REG_UPD_003_POA());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CSR_POA());}
-		if(true) {execute (TC_CSE_REG_UPD_003_RR());}
-		if(true) {execute (TC_CSE_REG_UPD_003_NL());}
+		if(PICS_MN_CSE and PICS_CSR_RR) {execute (TC_CSE_REG_UPD_003_RR());}
+		if(PICS_MN_CSE and PICS_CSR_NL) {execute (TC_CSE_REG_UPD_003_NL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CSR_NL());}
-		if(true) {execute (TC_CSE_REG_DEL_004());}
-		if(true) {execute (TC_CSE_REG_RET_009());}				
+		if(PICS_MN_CSE) {execute (TC_CSE_REG_DEL_004());}
+		if(PICS_MN_CSE) {execute (TC_CSE_REG_RET_009());}				
 		
 		//CE_DMR_00001
 		if(true) {execute (TC_CSE_DMR_CRE_001_CNT_CB());}
@@ -142,9 +143,9 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_CNT());}
 		if(true) {execute (TC_CSE_DMR_RET_013_CNT());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_002_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_003_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_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());}
+		if(PICS_CNT_MNI and PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_005_CNT_EXC());}
 		if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
 		if(true) {execute (TC_CSE_DMR_UPD_008_CNT_ET());}
@@ -152,24 +153,24 @@ module OneM2M_TestControl_MN_profile {
 		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_006());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
+		if(PICS_ACP_SUPPORT) {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(true) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MNI());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MNI());}
 		if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
 		if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
 		if(true) {execute (TC_CSE_DMR_CRE_013());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
 		if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
 		if(true) {execute (TC_CSE_DMR_CRE_006_MIA());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
 
@@ -178,9 +179,9 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
 		if(true) {execute (TC_CSE_DMR_UPD_011());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
+		if(PICS_ACP_SUPPORT) {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());}
@@ -199,8 +200,8 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_SUB());}
 		if(true) {execute (TC_CSE_DMR_RET_013_SUB());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_002_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
+		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_002_SUB_LBL());}
+		if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
 		if(true) {execute (TC_CSE_DMR_UPD_005_SUB_MNI());}
 		if(true) {execute (TC_CSE_DMR_UPD_007_SUB_CT());}
@@ -210,10 +211,10 @@ 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(true) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
 
 		//CE_SUB_00004
 		if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
@@ -232,8 +233,8 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_RET_001_ACP());}
 		if(true) {execute (TC_CSE_DMR_RET_013_ACP());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_ACP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
+		if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
+		if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_005_ACP_EXC());}
 		if(true) {execute (TC_CSE_DMR_UPD_007_ACP_CT());}
@@ -247,37 +248,37 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_SEC_ACP_CRE_002());}
 		if(true) {execute (TC_CSE_SEC_ACP_CRE_003());}
 		if(true) {execute (TC_CSE_SEC_ACP_CRE_004());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_ACP_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_ACP_LBL());}
 
 		//CE_SEC_00002
-		if(true) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
-		if(true) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
 		if(true) {execute (TC_CSE_DMR_UPD_014_CNT_ACPI());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_AE_ACPI());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_CNT_ACPI());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_SUB_ACPI());}
 		if(true) {execute (TC_CSE_SEC_ACP_UPD_001());}
 		if(true) {execute (TC_CSE_SEC_ACP_UPD_002());}
-		if(true) {execute (TC_CSE_DMR_CRE_004_CNT());}
-		if(true) {execute (TC_CSE_DMR_CRE_004_ACP());}
-		if(true) {execute (TC_CSE_DMR_CRE_004_SUB());}
-		if(true) {execute (TC_CSE_DMR_RET_003_ACP());}
-		if(true) {execute (TC_CSE_DMR_RET_003_CNT());}
-		if(true) {execute (TC_CSE_DMR_RET_003_SUB());}
-		if(true) {execute (TC_CSE_DMR_RET_014_ACP());}
-		if(true) {execute (TC_CSE_DMR_RET_014_AE());}
-		if(true) {execute (TC_CSE_DMR_RET_014_CNT());}
-		if(true) {execute (TC_CSE_DMR_RET_014_CSR());}
-		if(true) {execute (TC_CSE_DMR_RET_014_SUB());}
-		if(true) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_006_ACP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_006_SUB_LBL());}
-		if(true) {execute (TC_CSE_DMR_DEL_002_CNT());}
-		if(true) {execute (TC_CSE_DMR_DEL_002_ACP());}
-		if(true) {execute (TC_CSE_DMR_DEL_002_SUB());}
-		if(true) {execute (TC_CSE_SUB_CRE_002());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_CNT());}
+		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_RET_003_ACP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_CNT());}
+		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_CSR());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_SUB());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_ACP_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_SUB_LBL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_CNT());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_ACP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_SUB());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_SUB_CRE_002());}
 		if(true) {execute (TC_CSE_SEC_ACP_001_CRE());}
 		if(true) {execute (TC_CSE_SEC_ACP_001_UPD());}
 		if(true) {execute (TC_CSE_SEC_ACP_001_RET());}
@@ -332,7 +333,7 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DIS_002());}
 		if(true) {execute (TC_CSE_DIS_003());}
 		if(true) {execute (TC_CSE_DIS_004());}
-		if(true) {execute (TC_CSE_DIS_005());}
+		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());}
@@ -344,16 +345,16 @@ module OneM2M_TestControl_MN_profile {
 		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(true) {execute (TC_CSE_DMR_CRE_004_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(true) {execute (TC_CSE_DMR_RET_014_GRP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_GRP());}
 		if(true) {execute (TC_CSE_DMR_UPD_001_GRP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_002_GRP_LBL());}
-		if(true) {execute (TC_CSE_DMR_UPD_003_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(true) {execute (TC_CSE_DMR_UPD_005_GRP_EXC());}
-		if(true) {execute (TC_CSE_DMR_UPD_006_GRP_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_ET());}
 		if(true) {execute (TC_CSE_DMR_UPD_009_GRP_ET());}
@@ -361,7 +362,7 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MNM());}
 		if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MID());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_GRP());}
-		if(true) {execute (TC_CSE_DMR_DEL_002_GRP());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_GRP());}
 		if(true) {execute (TC_CSE_GMG_CRE_001());}
 		if(true) {execute (TC_CSE_GMG_CRE_003());}
 		if(true) {execute (TC_CSE_GMG_UPD_002());}
@@ -370,43 +371,43 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
 		if(true) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
-		if(true) {execute (TC_CSE_GMG_CRE_002());}
+		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());}
 		if(true) {execute (TC_CSE_GMG_CRE_006());}
 		if(true) {execute (TC_CSE_GMG_CRE_007());}
-		if(true) {execute (TC_CSE_GMG_UPD_001());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_UPD_001());}
 		if(true) {execute (TC_CSE_GMG_UPD_003());}
 		if(true) {execute (TC_CSE_GMG_UPD_004());}
 		if(true) {execute (TC_CSE_GMG_UPD_005());}
 		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(true) {execute (TC_CSE_GMG_RET_001());}
-		if(true) {execute (TC_CSE_GMG_001_CRE());}
-		if(true) {execute (TC_CSE_GMG_001_RET());}
-		if(true) {execute (TC_CSE_GMG_001_UPD());}
-		if(true) {execute (TC_CSE_GMG_001_DEL());}
-		if(true) {execute (TC_CSE_GMG_002_CRE());}
-		if(true) {execute (TC_CSE_GMG_002_RET());}
-		if(true) {execute (TC_CSE_GMG_002_UPD());}
-		if(true) {execute (TC_CSE_GMG_002_DEL());}
-		if(true) {execute (TC_CSE_GMG_003_CRE());}
-		if(true) {execute (TC_CSE_GMG_003_RET());}
-		if(true) {execute (TC_CSE_GMG_003_UPD());}
-		if(true) {execute (TC_CSE_GMG_003_DEL());}
-		if(true) {execute (TC_CSE_GMG_004_CRE());}
-		if(true) {execute (TC_CSE_GMG_004_RET());}
-		if(true) {execute (TC_CSE_GMG_004_UPD());}
-		if(true) {execute (TC_CSE_GMG_004_DEL());}
+		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());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_UPD());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_DEL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_CRE());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_RET());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_UPD());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_DEL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_CRE());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_RET());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_UPD());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_DEL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_CRE());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_RET());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_UPD());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_DEL());}
 		if(true) {execute (TC_CSE_GMG_005_CRE());}
 		if(true) {execute (TC_CSE_GMG_005_RET());}
 		if(true) {execute (TC_CSE_GMG_005_UPD());}
 		if(true) {execute (TC_CSE_GMG_005_DEL());}
-		if(true) {execute (TC_CSE_GMG_006_CRE());}
-		if(true) {execute (TC_CSE_GMG_006_RET());}
-		if(true) {execute (TC_CSE_GMG_006_UPD());}
-		if(true) {execute (TC_CSE_GMG_006_DEL());}
+		if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_CRE());}
+		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(true) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
 	}