diff --git a/v1_6_0/CDT-AE-v1_6_0.xsd b/v1_6_0/CDT-AE-v1_6_0.xsd
index c47f986835607c1c71c4137f56ab73c67db2f296..79ad12101c78ba70c6e9fda3899f8e4b9016962c 100644
--- a/v1_6_0/CDT-AE-v1_6_0.xsd
+++ b/v1_6_0/CDT-AE-v1_6_0.xsd
@@ -26,13 +26,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-CSEBase-v1_6_0.xsd b/v1_6_0/CDT-CSEBase-v1_6_0.xsd
index 13d78c36d5d3ba6888d105a53d439fe89cfd508d..afe4111639cdf5df5140c66d58adff56f4b686ee 100644
--- a/v1_6_0/CDT-CSEBase-v1_6_0.xsd
+++ b/v1_6_0/CDT-CSEBase-v1_6_0.xsd
@@ -26,23 +26,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_5_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_5_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_6_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_6_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-accessControlPolicy-v1_6_0.xsd b/v1_6_0/CDT-accessControlPolicy-v1_6_0.xsd
index c67955e9e9fbed835407fd42eaee9f8b9c9a81ff..df94e9c781f25c3715b19b8eaac7e47c9d5d57af 100644
--- a/v1_6_0/CDT-accessControlPolicy-v1_6_0.xsd
+++ b/v1_6_0/CDT-accessControlPolicy-v1_6_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:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-activeCmdhPolicy-v1_6_0.xsd b/v1_6_0/CDT-activeCmdhPolicy-v1_6_0.xsd
index dff3e900a4f37c83f844af1e81da4183fd9ad1cc..fc897850248a797fe0517aa4454789f283290789 100644
--- a/v1_6_0/CDT-activeCmdhPolicy-v1_6_0.xsd
+++ b/v1_6_0/CDT-activeCmdhPolicy-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_6_0/CDT-areaNwkDeviceInfo-v1_6_0.xsd b/v1_6_0/CDT-areaNwkDeviceInfo-v1_6_0.xsd
index cc927c87e2ab0c63e22eb7e2b2e7c53268c281be..348e53c3cd4651921bea65d825e9d0bbcfe6168f 100644
--- a/v1_6_0/CDT-areaNwkDeviceInfo-v1_6_0.xsd
+++ b/v1_6_0/CDT-areaNwkDeviceInfo-v1_6_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-areaNwkInfo-v1_6_0.xsd b/v1_6_0/CDT-areaNwkInfo-v1_6_0.xsd
index 71b55e9c257b0fa829daf903da15a78661449b63..e18a7c7f3b10b28224ec06e3aad3a0bfd8df2caa 100644
--- a/v1_6_0/CDT-areaNwkInfo-v1_6_0.xsd
+++ b/v1_6_0/CDT-areaNwkInfo-v1_6_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-battery-v1_6_0.xsd b/v1_6_0/CDT-battery-v1_6_0.xsd
index 3e18a9357346a3ea58d1c988c1d87b72476dca5d..8b7bee517e8c4f059d32dfc2b20e33d16c7d7ebd 100644
--- a/v1_6_0/CDT-battery-v1_6_0.xsd
+++ b/v1_6_0/CDT-battery-v1_6_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-cmdhBuffer-v1_6_0.xsd b/v1_6_0/CDT-cmdhBuffer-v1_6_0.xsd
index 55f695464e8ac0ad3c9b3ef039b102990528ad39..793d16ec9389f4b32cf933b285911d0074ac895c 100644
--- a/v1_6_0/CDT-cmdhBuffer-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhBuffer-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhDefEcValue-v1_6_0.xsd b/v1_6_0/CDT-cmdhDefEcValue-v1_6_0.xsd
index 3476ec87d7e0147cd69b1a8de5ce8fd2b5e617b3..87827f6b12bab91e4737317b783ebb5c078c7924 100644
--- a/v1_6_0/CDT-cmdhDefEcValue-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhDefEcValue-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhDefaults-v1_6_0.xsd b/v1_6_0/CDT-cmdhDefaults-v1_6_0.xsd
index dab928e58954fe9bd40dbd7d772bd1a1753b2530..2927c73ec2c322fe9d9a14173eecfcbe09e1267a 100644
--- a/v1_6_0/CDT-cmdhDefaults-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhDefaults-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhEcDefParamValues-v1_6_0.xsd b/v1_6_0/CDT-cmdhEcDefParamValues-v1_6_0.xsd
index c8e2bed510af91de25eb1f1080efcdad60e1bfa4..e65ed67a5584a331414a10e500c8a3f428859f65 100644
--- a/v1_6_0/CDT-cmdhEcDefParamValues-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhEcDefParamValues-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_6_0/CDT-cmdhLimits-v1_6_0.xsd b/v1_6_0/CDT-cmdhLimits-v1_6_0.xsd
index 1de54ffa510daa3a2331fab80ab8ce5ce292d413..84c3d74db434cf290423ad16723ba81b5f760eb4 100644
--- a/v1_6_0/CDT-cmdhLimits-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhLimits-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_0.xsd b/v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_0.xsd
index 7c0cf21bf2dc246146f3e2520a77b08b060fe82a..b9eba3c557eb30801e6d95ab7664c08098549154 100644
--- a/v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhNwAccessRule-v1_6_0.xsd b/v1_6_0/CDT-cmdhNwAccessRule-v1_6_0.xsd
index c029299a99f48b4b7ccca4bc8899924d79fe48c0..974fecca8486ee08e02ecbd046e5eda18f3b78c6 100644
--- a/v1_6_0/CDT-cmdhNwAccessRule-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhNwAccessRule-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhPolicy-v1_6_0.xsd b/v1_6_0/CDT-cmdhPolicy-v1_6_0.xsd
index 6551ee7b9b5452d7dd91100ac92fc6c017cb3d73..d519bed485be1220adae9c4631ec8282f0d19311 100644
--- a/v1_6_0/CDT-cmdhPolicy-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhPolicy-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_6_0/CDT-commonTypes-v1_6_0.xsd b/v1_6_0/CDT-commonTypes-v1_6_0.xsd
index 55239361205e5efc63f412ec76dc1915a52d72d9..9cea8a7d45e2be042da915d689671cb5bcf5c443 100644
--- a/v1_6_0/CDT-commonTypes-v1_6_0.xsd
+++ b/v1_6_0/CDT-commonTypes-v1_6_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_6_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_6_0/CDT-container-v1_6_0.xsd b/v1_6_0/CDT-container-v1_6_0.xsd
index 7e82affcb9aa081f34047cada74ec03f72122a79..df5146c6f2e81149af4a69a0ffc4c8103e24762c 100644
--- a/v1_6_0/CDT-container-v1_6_0.xsd
+++ b/v1_6_0/CDT-container-v1_6_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-contentInstance-v1_6_0.xsd b/v1_6_0/CDT-contentInstance-v1_6_0.xsd
index 8ae2d7b84e3f1d3955ac3f81ac8822f271cbda4f..73c088c2ed4024819a80a392757a545f6e2643c7 100644
--- a/v1_6_0/CDT-contentInstance-v1_6_0.xsd
+++ b/v1_6_0/CDT-contentInstance-v1_6_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-delivery-v1_6_0.xsd b/v1_6_0/CDT-delivery-v1_6_0.xsd
index a50974bb0d15ffcc0003a466ca3393c6693e4887..e7acb3daea0b93e84e8fbde370b940460a0b3779 100644
--- a/v1_6_0/CDT-delivery-v1_6_0.xsd
+++ b/v1_6_0/CDT-delivery-v1_6_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_6_0/CDT-deviceCapability-v1_6_0.xsd b/v1_6_0/CDT-deviceCapability-v1_6_0.xsd
index c3da6cfe44c9214e2c90ae865496f07ca5ab0fde..85dc62e6e212cb5e508cfc924fb9e7911b53495c 100644
--- a/v1_6_0/CDT-deviceCapability-v1_6_0.xsd
+++ b/v1_6_0/CDT-deviceCapability-v1_6_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-deviceInfo-v1_6_0.xsd b/v1_6_0/CDT-deviceInfo-v1_6_0.xsd
index 574d70c2ad25e6e6727399b56493ce400c1bf08e..30305fd813156d70088897a1d8186d044275023c 100644
--- a/v1_6_0/CDT-deviceInfo-v1_6_0.xsd
+++ b/v1_6_0/CDT-deviceInfo-v1_6_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-eventConfig-v1_6_0.xsd b/v1_6_0/CDT-eventConfig-v1_6_0.xsd
index 007fc247d168f648934732e940a45ab769d73bca..31406762f290c44ccd55cb6a9337539dc460cc34 100644
--- a/v1_6_0/CDT-eventConfig-v1_6_0.xsd
+++ b/v1_6_0/CDT-eventConfig-v1_6_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-eventLog-v1_6_0.xsd b/v1_6_0/CDT-eventLog-v1_6_0.xsd
index 542e18aa7d3024db7156c54ffe217be1011ee747..7a713f2ec1f36b1abd02630b7542fbc055e73891 100644
--- a/v1_6_0/CDT-eventLog-v1_6_0.xsd
+++ b/v1_6_0/CDT-eventLog-v1_6_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-execInstance-v1_6_0.xsd b/v1_6_0/CDT-execInstance-v1_6_0.xsd
index 4e41d4409cc636f1b37dc22f4c418bd37bf4a102..37c790fb199fe6366daa26a56c626930d776ea0f 100644
--- a/v1_6_0/CDT-execInstance-v1_6_0.xsd
+++ b/v1_6_0/CDT-execInstance-v1_6_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-firmware-v1_6_0.xsd b/v1_6_0/CDT-firmware-v1_6_0.xsd
index 5ac63a2300de10c0fbb3a667beaf4a1b7f058285..47944e2406e6a54d9ce094cf64e97d1bafbd23ce 100644
--- a/v1_6_0/CDT-firmware-v1_6_0.xsd
+++ b/v1_6_0/CDT-firmware-v1_6_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-group-v1_6_0.xsd b/v1_6_0/CDT-group-v1_6_0.xsd
index d28deba47964d2d1ea10bec70e41910a2a2096e9..c2e408c1bde6e89413d76690864d5799194d6aa1 100644
--- a/v1_6_0/CDT-group-v1_6_0.xsd
+++ b/v1_6_0/CDT-group-v1_6_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-locationPolicy-v1_6_0.xsd b/v1_6_0/CDT-locationPolicy-v1_6_0.xsd
index 34f0592d7c4d096a5c817d2a8441c8f9ac4686db..3631265c355b87fef2ea85a38250534471541138 100644
--- a/v1_6_0/CDT-locationPolicy-v1_6_0.xsd
+++ b/v1_6_0/CDT-locationPolicy-v1_6_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd b/v1_6_0/CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd
index fc998190d7561b4226e9fe1b5c858cff2e671a6c..1460b01faa824e854bd8550a09f0963727de00c9 100644
--- a/v1_6_0/CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd
+++ b/v1_6_0/CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_6_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-memory-v1_6_0.xsd b/v1_6_0/CDT-memory-v1_6_0.xsd
index d6630434f3bb653bbb788c9278f3586efe10bf53..0e7821db9398ec5769752b9796c2274f53abee3f 100644
--- a/v1_6_0/CDT-memory-v1_6_0.xsd
+++ b/v1_6_0/CDT-memory-v1_6_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" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-mgmtCmd-v1_6_0.xsd b/v1_6_0/CDT-mgmtCmd-v1_6_0.xsd
index 154baac56f0e0cab8f021804491a1ed4bc729447..97ccc0d0e2353783a2dbab9f7fb78037e4ae0015 100644
--- a/v1_6_0/CDT-mgmtCmd-v1_6_0.xsd
+++ b/v1_6_0/CDT-mgmtCmd-v1_6_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_6_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-node-v1_6_0.xsd b/v1_6_0/CDT-node-v1_6_0.xsd
index 8145de09065708ceb8934266f0376a852e425506..d369c055dfd1bd99efa27ae7f756308ff326732d 100644
--- a/v1_6_0/CDT-node-v1_6_0.xsd
+++ b/v1_6_0/CDT-node-v1_6_0.xsd
@@ -27,20 +27,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-notification-v1_6_0.xsd b/v1_6_0/CDT-notification-v1_6_0.xsd
index 6c6dba46e791caea192e4c0e99a91f98b6e1db6b..8170b2b301cb0538c65403ba5b7b571c6fef1238 100644
--- a/v1_6_0/CDT-notification-v1_6_0.xsd
+++ b/v1_6_0/CDT-notification-v1_6_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_5_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_6_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_6_0/CDT-pollingChannel-v1_6_0.xsd b/v1_6_0/CDT-pollingChannel-v1_6_0.xsd
index 983a7dff6c6ecc3ea8ce233057aa759658d84aa7..4f5959f4c63f1ace4ed9236b1e1fca7f392d652b 100644
--- a/v1_6_0/CDT-pollingChannel-v1_6_0.xsd
+++ b/v1_6_0/CDT-pollingChannel-v1_6_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-reboot-v1_6_0.xsd b/v1_6_0/CDT-reboot-v1_6_0.xsd
index f0904a2ced414ca2459e9c2d61bc11aa6301a08a..b0375f71e5d5b8166d41b4d0d62636e0ec8a16d8 100644
--- a/v1_6_0/CDT-reboot-v1_6_0.xsd
+++ b/v1_6_0/CDT-reboot-v1_6_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-remoteCSE-v1_6_0.xsd b/v1_6_0/CDT-remoteCSE-v1_6_0.xsd
index 3736a00b632f1275471371ea6d9f464f24bb8af7..c55247eb4fc61265dc4df71bb0419cca815e32d5 100644
--- a/v1_6_0/CDT-remoteCSE-v1_6_0.xsd
+++ b/v1_6_0/CDT-remoteCSE-v1_6_0.xsd
@@ -26,15 +26,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-request-v1_6_0.xsd b/v1_6_0/CDT-request-v1_6_0.xsd
index 7c7cb6e51a42f2ff9960b3d2935db70db5bf7dfd..af63e0e8cdf9257832a8ff41ccdcc3c160789721 100644
--- a/v1_6_0/CDT-request-v1_6_0.xsd
+++ b/v1_6_0/CDT-request-v1_6_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-requestPrimitive-v1_6_0.xsd b/v1_6_0/CDT-requestPrimitive-v1_6_0.xsd
index a995bba2a8c9ef307a8b993ff9e2b1bffc628dc7..9bff80a0feb8f723390de7d6e64855d22a9d101d 100644
--- a/v1_6_0/CDT-requestPrimitive-v1_6_0.xsd
+++ b/v1_6_0/CDT-requestPrimitive-v1_6_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_6_0/CDT-responsePrimitive-v1_6_0.xsd b/v1_6_0/CDT-responsePrimitive-v1_6_0.xsd
index 33608ed92e12f10a08531a405f189962d090be32..68b232a0663cfa2a9398c3600db08f0584b332de 100644
--- a/v1_6_0/CDT-responsePrimitive-v1_6_0.xsd
+++ b/v1_6_0/CDT-responsePrimitive-v1_6_0.xsd
@@ -28,51 +28,51 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v1_5_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
   
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_6_0/CDT-schedule-v1_6_0.xsd b/v1_6_0/CDT-schedule-v1_6_0.xsd
index 19bd5f7a606f5a5809241864023721be4fe4b826..bbb0e6cbf83b46c658c1999124bf13c2dac30635 100644
--- a/v1_6_0/CDT-schedule-v1_6_0.xsd
+++ b/v1_6_0/CDT-schedule-v1_6_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-serviceSubscribedAppRule-v1_6_0.xsd b/v1_6_0/CDT-serviceSubscribedAppRule-v1_6_0.xsd
index e56e3a25636701c46554833438be528adf674e9a..f0c26f2b1015d7c6355ef93720c495d44cab03e7 100644
--- a/v1_6_0/CDT-serviceSubscribedAppRule-v1_6_0.xsd
+++ b/v1_6_0/CDT-serviceSubscribedAppRule-v1_6_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-serviceSubscribedNode-v1_6_0.xsd b/v1_6_0/CDT-serviceSubscribedNode-v1_6_0.xsd
index b253f303892d67fb7f3c772d7728d94204ccac9a..acba5e20b2e12d69c2dd723a05f5829d92b0fdf8 100644
--- a/v1_6_0/CDT-serviceSubscribedNode-v1_6_0.xsd
+++ b/v1_6_0/CDT-serviceSubscribedNode-v1_6_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-software-v1_6_0.xsd b/v1_6_0/CDT-software-v1_6_0.xsd
index c4593a1329f667e38eb500dea334df7d979363da..9f329585a2be379fa88c65e938c3dab8dade8dea 100644
--- a/v1_6_0/CDT-software-v1_6_0.xsd
+++ b/v1_6_0/CDT-software-v1_6_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-statsCollect-v1_6_0.xsd b/v1_6_0/CDT-statsCollect-v1_6_0.xsd
index e270bbafa58f4853438f3e9ee8c62125b6c6bb5b..d8985c4072db77a6af10b0126df0056380cacf81 100644
--- a/v1_6_0/CDT-statsCollect-v1_6_0.xsd
+++ b/v1_6_0/CDT-statsCollect-v1_6_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-statsConfig-v1_6_0.xsd b/v1_6_0/CDT-statsConfig-v1_6_0.xsd
index 13772df13271e6d63fbd1b9c31c8638c98d806bd..20938341416894751cd7f8cd07109885ca7d8e6e 100644
--- a/v1_6_0/CDT-statsConfig-v1_6_0.xsd
+++ b/v1_6_0/CDT-statsConfig-v1_6_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-subscription-v1_6_0.xsd b/v1_6_0/CDT-subscription-v1_6_0.xsd
index 375d66683745fecc2ef96f3dc05d4d1e1fb6eb86..4ed60b06dff292e363d2ad4c4b81f55a07adf664 100644
--- a/v1_6_0/CDT-subscription-v1_6_0.xsd
+++ b/v1_6_0/CDT-subscription-v1_6_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>