diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd
index ea5c48a2b56858a7416b8772d3f9c91c56ced981..9adc3603952b5cda989071bbac4e95707ebea8aa 100644
--- a/DCFG-MAFClientRegCfg.xsd
+++ b/DCFG-MAFClientRegCfg.xsd
@@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:include schemaLocation="DCFG-commonTypes.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/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd
index e199af3496c37c4c4d007abf44db23579c1ce893..ac4b0da18d2d04453053333ec07f07f1990b89e1 100644
--- a/DCFG-MEFClientRegCfg.xsd
+++ b/DCFG-MEFClientRegCfg.xsd
@@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:include schemaLocation="DCFG-commonTypes.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/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd
index fdef08ca3517225d2363f478ad1034a04820ab1a..54a028568d8965c903ec6cb9080a5d207ada4b81 100644
--- a/DCFG-authenticationProfile.xsd
+++ b/DCFG-authenticationProfile.xsd
@@ -31,8 +31,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:include schemaLocation="DCFG-commonTypes.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/DCFG-commonTypes.xsd b/DCFG-commonTypes.xsd
index 24d71af37d78f95a900d4ffa3d4bc67d7a4d27a5..895be89957a82fdb884ea4917db9329aeeeb21f5 100644
--- a/DCFG-commonTypes.xsd
+++ b/DCFG-commonTypes.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/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd
index 76eca871ab6937bf4f042d36d4bb83ae9478cd5b..a7dece28b1f58e1b6df768c0f43b0687bce6e5d7 100644
--- a/DCFG-dataCollection.xsd
+++ b/DCFG-dataCollection.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/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd
index 3a2f42c0bf8c726530f4721a738f02cb16b4c863..0089d59e7058dad9dd19dba19d58dedfb4199894 100644
--- a/DCFG-myCertFileCred.xsd
+++ b/DCFG-myCertFileCred.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/DCFG-registration.xsd b/DCFG-registration.xsd
index fa56f76eea72013825688901c127122bf0ac32a3..19834d5477215fc17e2bbd6dbe9d32cf05f65040 100644
--- a/DCFG-registration.xsd
+++ b/DCFG-registration.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/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd
index 92fda467fd08136c69746a7c13fdea9c7216516a..2ff1f5203d50caa4be7f0e5b00667849376be57b 100644
--- a/DCFG-trustAnchorCred.xsd
+++ b/DCFG-trustAnchorCred.xsd
@@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:include schemaLocation="DCFG-commonTypes.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">