diff --git a/v2_3_0/DCFG-MAFClientRegCfg-v2_3_0.xsd b/v2_3_0/DCFG-MAFClientRegCfg-v2_3_0.xsd
index 3abdda579d83d782c5f7330ecb7d6880890c19ad..8911a839b13a0cc4391ccb83652fed9221458a1e 100644
--- a/v2_3_0/DCFG-MAFClientRegCfg-v2_3_0.xsd
+++ b/v2_3_0/DCFG-MAFClientRegCfg-v2_3_0.xsd
@@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:include schemaLocation="DCFG-commonTypes-v2_3_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 
 	
 	<xs:element name="MAFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_3_0/DCFG-MEFClientRegCfg-v2_3_0.xsd b/v2_3_0/DCFG-MEFClientRegCfg-v2_3_0.xsd
index 889ae4b66489c458354166bd3c05aa45d1d5012c..0f99408799a5b4e18d419395def9745ae21f0417 100644
--- a/v2_3_0/DCFG-MEFClientRegCfg-v2_3_0.xsd
+++ b/v2_3_0/DCFG-MEFClientRegCfg-v2_3_0.xsd
@@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:include schemaLocation="DCFG-commonTypes-v2_3_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 
 	
 	<xs:element name="MEFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_3_0/DCFG-authenticationProfile-v2_3_0.xsd b/v2_3_0/DCFG-authenticationProfile-v2_3_0.xsd
index 0a69357addc7e54fe173eca051b935a81b40770a..a958c62974477f4e1a287481e83a511037154178 100644
--- a/v2_3_0/DCFG-authenticationProfile-v2_3_0.xsd
+++ b/v2_3_0/DCFG-authenticationProfile-v2_3_0.xsd
@@ -31,8 +31,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:include schemaLocation="DCFG-commonTypes-v2_3_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 	
 	<xs:element name="authenticationProfile" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_3_0/DCFG-commonTypes-v2_3_0.xsd b/v2_3_0/DCFG-commonTypes-v2_3_0.xsd
index 3534cd3f3ff41307c8b8ee5ff376311080985f0f..42087a13d3e0cc38d6a791e3a28ca41eb9266890 100644
--- a/v2_3_0/DCFG-commonTypes-v2_3_0.xsd
+++ b/v2_3_0/DCFG-commonTypes-v2_3_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<!-- <xs:include schemaLocation="CDT-enumerationTypes-v2_12_0.xsd" />  -->
+	<!-- <xs:include schemaLocation="CDT-enumerationTypes-v2_16_0.xsd" />  -->
 
 	<!--********************** -->
 	<!-- Simple Types   -->
diff --git a/v2_3_0/DCFG-dataCollection-v2_3_0.xsd b/v2_3_0/DCFG-dataCollection-v2_3_0.xsd
index dfd0d6f329e273b9d7c7650150b876768503cff4..ca60501a2edabd1fc3599807041d81a398864249 100644
--- a/v2_3_0/DCFG-dataCollection-v2_3_0.xsd
+++ b/v2_3_0/DCFG-dataCollection-v2_3_0.xsd
@@ -29,8 +29,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 	
 	
 	<xs:element name="dataCollection" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_3_0/DCFG-myCertFileCred-v2_3_0.xsd b/v2_3_0/DCFG-myCertFileCred-v2_3_0.xsd
index 7a01428a08296f0198a7ae8cb51e8cfebf816941..c4f4201f6a5d7ca2f2649947e17f8b0e5e6afd5d 100644
--- a/v2_3_0/DCFG-myCertFileCred-v2_3_0.xsd
+++ b/v2_3_0/DCFG-myCertFileCred-v2_3_0.xsd
@@ -29,8 +29,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 	
 	
diff --git a/v2_3_0/DCFG-registration-v2_3_0.xsd b/v2_3_0/DCFG-registration-v2_3_0.xsd
index fc7ce29d1fcc092cc39b270b766c662d377d675c..80b73fbeed25fd5101f2a9bb13e207b31afd0d55 100644
--- a/v2_3_0/DCFG-registration-v2_3_0.xsd
+++ b/v2_3_0/DCFG-registration-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 	
 	
 	<xs:element name="registration" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_3_0/DCFG-trustAnchorCred-v2_3_0.xsd b/v2_3_0/DCFG-trustAnchorCred-v2_3_0.xsd
index 33e6a10f73504ea0f8476a5d80aa83ecc9d6d3c2..d8b7e5d5d1943c47473b57dcf3726b8e00318982 100644
--- a/v2_3_0/DCFG-trustAnchorCred-v2_3_0.xsd
+++ b/v2_3_0/DCFG-trustAnchorCred-v2_3_0.xsd
@@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:include schemaLocation="DCFG-commonTypes-v2_3_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 
 	
 	<xs:element name="trustAnchorCred" substitutionGroup="m2m:sg_mgmtResource">