diff --git a/v1_7_0/CDT-AE-v1_7_0.xsd b/v1_7_0/CDT-AE-v1_7_0.xsd
index 79ad12101c78ba70c6e9fda3899f8e4b9016962c..76b738fde035264b9fe906d3f8364bf6b0d9c4ee 100644
--- a/v1_7_0/CDT-AE-v1_7_0.xsd
+++ b/v1_7_0/CDT-AE-v1_7_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_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-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-CSEBase-v1_7_0.xsd b/v1_7_0/CDT-CSEBase-v1_7_0.xsd
index afe4111639cdf5df5140c66d58adff56f4b686ee..667c614aea6b7b978abf78cbfd670203a97c8ed2 100644
--- a/v1_7_0/CDT-CSEBase-v1_7_0.xsd
+++ b/v1_7_0/CDT-CSEBase-v1_7_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_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:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_7_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_7_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-accessControlPolicy-v1_7_0.xsd b/v1_7_0/CDT-accessControlPolicy-v1_7_0.xsd
index df94e9c781f25c3715b19b8eaac7e47c9d5d57af..7389adfb6b8c92cfaa5ada5b3c19c19826bd45d3 100644
--- a/v1_7_0/CDT-accessControlPolicy-v1_7_0.xsd
+++ b/v1_7_0/CDT-accessControlPolicy-v1_7_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_6_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-activeCmdhPolicy-v1_7_0.xsd b/v1_7_0/CDT-activeCmdhPolicy-v1_7_0.xsd
index fc897850248a797fe0517aa4454789f283290789..cf8e2252992dcee4114d95f5e75d5517a5feb3e1 100644
--- a/v1_7_0/CDT-activeCmdhPolicy-v1_7_0.xsd
+++ b/v1_7_0/CDT-activeCmdhPolicy-v1_7_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_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_7_0/CDT-areaNwkDeviceInfo-v1_7_0.xsd b/v1_7_0/CDT-areaNwkDeviceInfo-v1_7_0.xsd
index 348e53c3cd4651921bea65d825e9d0bbcfe6168f..bc9e0e1184e0f759ea56725940b1734be104e791 100644
--- a/v1_7_0/CDT-areaNwkDeviceInfo-v1_7_0.xsd
+++ b/v1_7_0/CDT-areaNwkDeviceInfo-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-areaNwkInfo-v1_7_0.xsd b/v1_7_0/CDT-areaNwkInfo-v1_7_0.xsd
index e18a7c7f3b10b28224ec06e3aad3a0bfd8df2caa..f805291eae0e316446833e511833212598826d11 100644
--- a/v1_7_0/CDT-areaNwkInfo-v1_7_0.xsd
+++ b/v1_7_0/CDT-areaNwkInfo-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-battery-v1_7_0.xsd b/v1_7_0/CDT-battery-v1_7_0.xsd
index 8b7bee517e8c4f059d32dfc2b20e33d16c7d7ebd..4873e472f2c4ba5549516424b279bdd9ae4a4072 100644
--- a/v1_7_0/CDT-battery-v1_7_0.xsd
+++ b/v1_7_0/CDT-battery-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-cmdhBuffer-v1_7_0.xsd b/v1_7_0/CDT-cmdhBuffer-v1_7_0.xsd
index 793d16ec9389f4b32cf933b285911d0074ac895c..c22840b16c11ade7c04050bcbc577015cc6b7001 100644
--- a/v1_7_0/CDT-cmdhBuffer-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhBuffer-v1_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhDefEcValue-v1_7_0.xsd b/v1_7_0/CDT-cmdhDefEcValue-v1_7_0.xsd
index 87827f6b12bab91e4737317b783ebb5c078c7924..5bf46688fa0c81e2142b1ba35feec81405ef8bf0 100644
--- a/v1_7_0/CDT-cmdhDefEcValue-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhDefEcValue-v1_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhDefaults-v1_7_0.xsd b/v1_7_0/CDT-cmdhDefaults-v1_7_0.xsd
index 2927c73ec2c322fe9d9a14173eecfcbe09e1267a..7632e27847a3a51c6e313e2376066bd25b4ac4bb 100644
--- a/v1_7_0/CDT-cmdhDefaults-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhDefaults-v1_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhEcDefParamValues-v1_7_0.xsd b/v1_7_0/CDT-cmdhEcDefParamValues-v1_7_0.xsd
index e65ed67a5584a331414a10e500c8a3f428859f65..22cd6fa729dfa16907f256a3c879279410236718 100644
--- a/v1_7_0/CDT-cmdhEcDefParamValues-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhEcDefParamValues-v1_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_7_0/CDT-cmdhLimits-v1_7_0.xsd b/v1_7_0/CDT-cmdhLimits-v1_7_0.xsd
index 84c3d74db434cf290423ad16723ba81b5f760eb4..17c12ffc71ea650fc6691e8bb98899ca8f413f2a 100644
--- a/v1_7_0/CDT-cmdhLimits-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhLimits-v1_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_0.xsd b/v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_0.xsd
index b9eba3c557eb30801e6d95ab7664c08098549154..45a46d2872a7069d35a4f7671e408f06d80cbf48 100644
--- a/v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhNwAccessRule-v1_7_0.xsd b/v1_7_0/CDT-cmdhNwAccessRule-v1_7_0.xsd
index 974fecca8486ee08e02ecbd046e5eda18f3b78c6..5ba3621a1644bfa9574ef1d7d5dfb0bd3224f579 100644
--- a/v1_7_0/CDT-cmdhNwAccessRule-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhNwAccessRule-v1_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhPolicy-v1_7_0.xsd b/v1_7_0/CDT-cmdhPolicy-v1_7_0.xsd
index d519bed485be1220adae9c4631ec8282f0d19311..285e682047c36b33980a34c7d58b3df4f7cf1a71 100644
--- a/v1_7_0/CDT-cmdhPolicy-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhPolicy-v1_7_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_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_7_0/CDT-commonTypes-v1_7_0.xsd b/v1_7_0/CDT-commonTypes-v1_7_0.xsd
index 9cea8a7d45e2be042da915d689671cb5bcf5c443..18125e63529cb387ba19060775e9a25baa9b6f20 100644
--- a/v1_7_0/CDT-commonTypes-v1_7_0.xsd
+++ b/v1_7_0/CDT-commonTypes-v1_7_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_6_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_7_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_7_0/CDT-container-v1_7_0.xsd b/v1_7_0/CDT-container-v1_7_0.xsd
index df5146c6f2e81149af4a69a0ffc4c8103e24762c..cc4dd1ed7f91b29341ad6855667713ba6d2b5fe0 100644
--- a/v1_7_0/CDT-container-v1_7_0.xsd
+++ b/v1_7_0/CDT-container-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-contentInstance-v1_7_0.xsd b/v1_7_0/CDT-contentInstance-v1_7_0.xsd
index 73c088c2ed4024819a80a392757a545f6e2643c7..744aa03ff25dad18f22da4d0b513fb68100a8c7d 100644
--- a/v1_7_0/CDT-contentInstance-v1_7_0.xsd
+++ b/v1_7_0/CDT-contentInstance-v1_7_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_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-delivery-v1_7_0.xsd b/v1_7_0/CDT-delivery-v1_7_0.xsd
index e7acb3daea0b93e84e8fbde370b940460a0b3779..d4e851ec64ddf499fad7dcea97fb0aa4950202fc 100644
--- a/v1_7_0/CDT-delivery-v1_7_0.xsd
+++ b/v1_7_0/CDT-delivery-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_7_0/CDT-deviceCapability-v1_7_0.xsd b/v1_7_0/CDT-deviceCapability-v1_7_0.xsd
index 85dc62e6e212cb5e508cfc924fb9e7911b53495c..bbd5c659a0c442c571d7d2c96ed9ee9ad194700e 100644
--- a/v1_7_0/CDT-deviceCapability-v1_7_0.xsd
+++ b/v1_7_0/CDT-deviceCapability-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-deviceInfo-v1_7_0.xsd b/v1_7_0/CDT-deviceInfo-v1_7_0.xsd
index 30305fd813156d70088897a1d8186d044275023c..40bb767d5c1c4d9acb9d8a7641930f63a3d5ebd5 100644
--- a/v1_7_0/CDT-deviceInfo-v1_7_0.xsd
+++ b/v1_7_0/CDT-deviceInfo-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-eventConfig-v1_7_0.xsd b/v1_7_0/CDT-eventConfig-v1_7_0.xsd
index 31406762f290c44ccd55cb6a9337539dc460cc34..79ec3aa84e91f167e9a690abbdee69d573e60825 100644
--- a/v1_7_0/CDT-eventConfig-v1_7_0.xsd
+++ b/v1_7_0/CDT-eventConfig-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-eventLog-v1_7_0.xsd b/v1_7_0/CDT-eventLog-v1_7_0.xsd
index 7a713f2ec1f36b1abd02630b7542fbc055e73891..e1be4e4f0f967ae54dcb80cdcb9b589aafff8862 100644
--- a/v1_7_0/CDT-eventLog-v1_7_0.xsd
+++ b/v1_7_0/CDT-eventLog-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-execInstance-v1_7_0.xsd b/v1_7_0/CDT-execInstance-v1_7_0.xsd
index 37c790fb199fe6366daa26a56c626930d776ea0f..546fdd7beb865cdcc1be2bd6e5f1d0a38ef5ea80 100644
--- a/v1_7_0/CDT-execInstance-v1_7_0.xsd
+++ b/v1_7_0/CDT-execInstance-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-firmware-v1_7_0.xsd b/v1_7_0/CDT-firmware-v1_7_0.xsd
index 47944e2406e6a54d9ce094cf64e97d1bafbd23ce..5b5e1c25ae8bc566078580bf200556fee23dab90 100644
--- a/v1_7_0/CDT-firmware-v1_7_0.xsd
+++ b/v1_7_0/CDT-firmware-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-group-v1_7_0.xsd b/v1_7_0/CDT-group-v1_7_0.xsd
index c2e408c1bde6e89413d76690864d5799194d6aa1..cb50c47eb9b0229c7806ff034f10a668b5aacc24 100644
--- a/v1_7_0/CDT-group-v1_7_0.xsd
+++ b/v1_7_0/CDT-group-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-locationPolicy-v1_7_0.xsd b/v1_7_0/CDT-locationPolicy-v1_7_0.xsd
index 3631265c355b87fef2ea85a38250534471541138..49c99219108e283e6ee629850d7560fc28f38f78 100644
--- a/v1_7_0/CDT-locationPolicy-v1_7_0.xsd
+++ b/v1_7_0/CDT-locationPolicy-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd b/v1_7_0/CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd
index 1460b01faa824e854bd8550a09f0963727de00c9..58c8e21fe63279be1a1bc51b1b8acd2cb6b62eeb 100644
--- a/v1_7_0/CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd
+++ b/v1_7_0/CDT-m2mServiceSubscriptionProfile-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_7_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-memory-v1_7_0.xsd b/v1_7_0/CDT-memory-v1_7_0.xsd
index 0e7821db9398ec5769752b9796c2274f53abee3f..ec1760234d92ac1477784d03041ea400d2c79d63 100644
--- a/v1_7_0/CDT-memory-v1_7_0.xsd
+++ b/v1_7_0/CDT-memory-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-mgmtCmd-v1_7_0.xsd b/v1_7_0/CDT-mgmtCmd-v1_7_0.xsd
index 97ccc0d0e2353783a2dbab9f7fb78037e4ae0015..786f5606b3246e0a68027792c3e7b59281323774 100644
--- a/v1_7_0/CDT-mgmtCmd-v1_7_0.xsd
+++ b/v1_7_0/CDT-mgmtCmd-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_7_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-node-v1_7_0.xsd b/v1_7_0/CDT-node-v1_7_0.xsd
index 633dec83864a3696049f7ada4167972324ed5b94..a463e5d9f4b374c91440be81c250daa130cbd33a 100644
--- a/v1_7_0/CDT-node-v1_7_0.xsd
+++ b/v1_7_0/CDT-node-v1_7_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_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:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-notification-v1_7_0.xsd b/v1_7_0/CDT-notification-v1_7_0.xsd
index 8170b2b301cb0538c65403ba5b7b571c6fef1238..4307296372c690104018f6a55145d7dceb4fe1bf 100644
--- a/v1_7_0/CDT-notification-v1_7_0.xsd
+++ b/v1_7_0/CDT-notification-v1_7_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_6_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_6_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_7_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_7_0/CDT-pollingChannel-v1_7_0.xsd b/v1_7_0/CDT-pollingChannel-v1_7_0.xsd
index 4f5959f4c63f1ace4ed9236b1e1fca7f392d652b..0113d4330d32fa7556be3057f34dd774c9937a48 100644
--- a/v1_7_0/CDT-pollingChannel-v1_7_0.xsd
+++ b/v1_7_0/CDT-pollingChannel-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-reboot-v1_7_0.xsd b/v1_7_0/CDT-reboot-v1_7_0.xsd
index b0375f71e5d5b8166d41b4d0d62636e0ec8a16d8..fbc828fbc79c98295bc5ade3babceb048973ff8d 100644
--- a/v1_7_0/CDT-reboot-v1_7_0.xsd
+++ b/v1_7_0/CDT-reboot-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-remoteCSE-v1_7_0.xsd b/v1_7_0/CDT-remoteCSE-v1_7_0.xsd
index c55247eb4fc61265dc4df71bb0419cca815e32d5..6b46c04faad8493cf59aeed76f68387b6fdc9512 100644
--- a/v1_7_0/CDT-remoteCSE-v1_7_0.xsd
+++ b/v1_7_0/CDT-remoteCSE-v1_7_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_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:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-request-v1_7_0.xsd b/v1_7_0/CDT-request-v1_7_0.xsd
index af63e0e8cdf9257832a8ff41ccdcc3c160789721..eda24d9d25cfe00a8ab8d649f6129a5dac0b7eab 100644
--- a/v1_7_0/CDT-request-v1_7_0.xsd
+++ b/v1_7_0/CDT-request-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-requestPrimitive-v1_7_0.xsd b/v1_7_0/CDT-requestPrimitive-v1_7_0.xsd
index 9bff80a0feb8f723390de7d6e64855d22a9d101d..41056248b5114d5dfc736d0d55140325d26da5f4 100644
--- a/v1_7_0/CDT-requestPrimitive-v1_7_0.xsd
+++ b/v1_7_0/CDT-requestPrimitive-v1_7_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_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd b/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd
index 68b232a0663cfa2a9398c3600db08f0584b332de..99c71119a29e65d313bb0cc8ddfd13316a26d081 100644
--- a/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd
+++ b/v1_7_0/CDT-responsePrimitive-v1_7_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_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:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
   
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_7_0/CDT-schedule-v1_7_0.xsd b/v1_7_0/CDT-schedule-v1_7_0.xsd
index bbb0e6cbf83b46c658c1999124bf13c2dac30635..6c2088094a46baf034fe92b34770af216f88613d 100644
--- a/v1_7_0/CDT-schedule-v1_7_0.xsd
+++ b/v1_7_0/CDT-schedule-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-serviceSubscribedAppRule-v1_7_0.xsd b/v1_7_0/CDT-serviceSubscribedAppRule-v1_7_0.xsd
index f0c26f2b1015d7c6355ef93720c495d44cab03e7..f53d58869e8334d79f790a1ebc9afe6744592c36 100644
--- a/v1_7_0/CDT-serviceSubscribedAppRule-v1_7_0.xsd
+++ b/v1_7_0/CDT-serviceSubscribedAppRule-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-serviceSubscribedNode-v1_7_0.xsd b/v1_7_0/CDT-serviceSubscribedNode-v1_7_0.xsd
index acba5e20b2e12d69c2dd723a05f5829d92b0fdf8..da3972079feb28ff9e0b3bb17ac030fd9b220aee 100644
--- a/v1_7_0/CDT-serviceSubscribedNode-v1_7_0.xsd
+++ b/v1_7_0/CDT-serviceSubscribedNode-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-software-v1_7_0.xsd b/v1_7_0/CDT-software-v1_7_0.xsd
index 9f329585a2be379fa88c65e938c3dab8dade8dea..6eb760e66bd544ab6932b08bc73d3f217be3551a 100644
--- a/v1_7_0/CDT-software-v1_7_0.xsd
+++ b/v1_7_0/CDT-software-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-statsCollect-v1_7_0.xsd b/v1_7_0/CDT-statsCollect-v1_7_0.xsd
index d8985c4072db77a6af10b0126df0056380cacf81..4461fa617490b8d21c776f5433ead4225cac3663 100644
--- a/v1_7_0/CDT-statsCollect-v1_7_0.xsd
+++ b/v1_7_0/CDT-statsCollect-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-statsConfig-v1_7_0.xsd b/v1_7_0/CDT-statsConfig-v1_7_0.xsd
index 20938341416894751cd7f8cd07109885ca7d8e6e..5481b5497c994eb672d137bebde1c7cfaf174488 100644
--- a/v1_7_0/CDT-statsConfig-v1_7_0.xsd
+++ b/v1_7_0/CDT-statsConfig-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-subscription-v1_7_0.xsd b/v1_7_0/CDT-subscription-v1_7_0.xsd
index 4ed60b06dff292e363d2ad4c4b81f55a07adf664..2fc1c490cfad63b00b83cfaa66356be5c8786383 100644
--- a/v1_7_0/CDT-subscription-v1_7_0.xsd
+++ b/v1_7_0/CDT-subscription-v1_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>