diff --git a/v1_2_0/CDT-AE-v1_2_0.xsd b/v1_2_0/CDT-AE-v1_2_0.xsd
index 0d7b458701748b6bd5565333128b4938b7d55943..ccd77603b9b5bd6199c971fb1c88da0a7bf11de3 100644
--- a/v1_2_0/CDT-AE-v1_2_0.xsd
+++ b/v1_2_0/CDT-AE-v1_2_0.xsd
@@ -26,12 +26,12 @@ 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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_2_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-CSEBase-v1_2_0.xsd b/v1_2_0/CDT-CSEBase-v1_2_0.xsd
index e8d4a98b5614b04bc666856820b6276c06d4eed1..af55d14adff528e1bc244268c9106c81280cdcb5 100644
--- a/v1_2_0/CDT-CSEBase-v1_2_0.xsd
+++ b/v1_2_0/CDT-CSEBase-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_1_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_2_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_2_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-accessControlPolicy-v1_2_0.xsd b/v1_2_0/CDT-accessControlPolicy-v1_2_0.xsd
index 5b269332aabc8cf4f161fe6e3bbe1bef1dc3c2e5..d6591928827da0f3c2d30d10f2f71edfa841f192 100644
--- a/v1_2_0/CDT-accessControlPolicy-v1_2_0.xsd
+++ b/v1_2_0/CDT-accessControlPolicy-v1_2_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_1_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-activeCmdhPolicy-v1_2_0.xsd b/v1_2_0/CDT-activeCmdhPolicy-v1_2_0.xsd
index 2498167aefeb7695c2c8c3769e4702bd70488e13..ff5fcb455935abd1819df9a78e078515f69587d9 100644
--- a/v1_2_0/CDT-activeCmdhPolicy-v1_2_0.xsd
+++ b/v1_2_0/CDT-activeCmdhPolicy-v1_2_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_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd b/v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd
index 7aace37970c78c5d779364839bc26885e936312a..03fd8414315633198ae90493cdc423b2796a8838 100644
--- a/v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd
+++ b/v1_2_0/CDT-areaNwkDeviceInfo-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-areaNwkInfo-v1_2_0.xsd b/v1_2_0/CDT-areaNwkInfo-v1_2_0.xsd
index 24b6219f405d8eb158c1b8317a8602cb9102406b..6581fda8e003863350b1488e0bbb34b6d261cec8 100644
--- a/v1_2_0/CDT-areaNwkInfo-v1_2_0.xsd
+++ b/v1_2_0/CDT-areaNwkInfo-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-battery-v1_2_0.xsd b/v1_2_0/CDT-battery-v1_2_0.xsd
index b99d174a66c360f0435e32c849389cb19413ce6f..280ee56985364903271278a8a1bc486b3e355b87 100644
--- a/v1_2_0/CDT-battery-v1_2_0.xsd
+++ b/v1_2_0/CDT-battery-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-cmdhBuffer-v1_2_0.xsd b/v1_2_0/CDT-cmdhBuffer-v1_2_0.xsd
index 5addd21c81ce7077fe07711a8cae9020e393958b..762c8e0b3dc0689c61150eb2b4534a6d88bc2263 100644
--- a/v1_2_0/CDT-cmdhBuffer-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhBuffer-v1_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhDefEcValue-v1_2_0.xsd b/v1_2_0/CDT-cmdhDefEcValue-v1_2_0.xsd
index 8181b5f1bfc47681b03e8337407b051ce93d0e84..19bd0bcaa3957a9eb8477c1259ad50a948c01847 100644
--- a/v1_2_0/CDT-cmdhDefEcValue-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhDefEcValue-v1_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhDefaults-v1_2_0.xsd b/v1_2_0/CDT-cmdhDefaults-v1_2_0.xsd
index 896521e57592fdf49189a6815312d832a2821cab..51e29d8f8a87d37fc18613df008e035208ae1619 100644
--- a/v1_2_0/CDT-cmdhDefaults-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhDefaults-v1_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhEcDefParamValues-v1_2_0.xsd b/v1_2_0/CDT-cmdhEcDefParamValues-v1_2_0.xsd
index 595c7a68bf0ef53158ecf6ac03e3bb37e2abadf6..908fa7679e488e11b51e0fbf15bf20640c95bb9e 100644
--- a/v1_2_0/CDT-cmdhEcDefParamValues-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhEcDefParamValues-v1_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_2_0/CDT-cmdhLimits-v1_2_0.xsd b/v1_2_0/CDT-cmdhLimits-v1_2_0.xsd
index 884cf661c5b4ab7f53fb1a3d57897e86a799aa40..b483eacf5c34300606d37850aaf6d23e0efcca2f 100644
--- a/v1_2_0/CDT-cmdhLimits-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhLimits-v1_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_0.xsd b/v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_0.xsd
index f94e81ebddfe8ee5d5f26de9e8a194c877fec466..407ee27de65bb0be5ecc803488d62105d41e4b6f 100644
--- a/v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhNwAccessRule-v1_2_0.xsd b/v1_2_0/CDT-cmdhNwAccessRule-v1_2_0.xsd
index e8986a155ed19479d70e5170adc77ad805ec5c13..c4ceae1f41b3446751ddceb04eb295cec8ab2984 100644
--- a/v1_2_0/CDT-cmdhNwAccessRule-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhNwAccessRule-v1_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd b/v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd
index 2f86969d3964214e29d9a68fdc501c7d69d38ea6..2647b43a2693b91f249ac948b57c49b196a330f4 100644
--- a/v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhPolicy-v1_2_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_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_2_0/CDT-commonTypes-v1_2_0.xsd b/v1_2_0/CDT-commonTypes-v1_2_0.xsd
index eb8788de2d01ba2a5f8cc15f248c6fb576bc82d3..3027cc1d9b5e1a241495808cbe5f3b298c4458cf 100644
--- a/v1_2_0/CDT-commonTypes-v1_2_0.xsd
+++ b/v1_2_0/CDT-commonTypes-v1_2_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_1_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_2_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_2_0/CDT-container-v1_2_0.xsd b/v1_2_0/CDT-container-v1_2_0.xsd
index 4725d4fd81a01182cab61158e5b115a4ad44a749..a63f7d49bcea641eef29dbdf221be1057baea382 100644
--- a/v1_2_0/CDT-container-v1_2_0.xsd
+++ b/v1_2_0/CDT-container-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-contentInstance-v1_2_0.xsd b/v1_2_0/CDT-contentInstance-v1_2_0.xsd
index 6d89077457c5122f7c30c6e175dafc35336567bd..cfaf378f09e52dec39b69d321d3986f8f01e65b9 100644
--- a/v1_2_0/CDT-contentInstance-v1_2_0.xsd
+++ b/v1_2_0/CDT-contentInstance-v1_2_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_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-delivery-v1_2_0.xsd b/v1_2_0/CDT-delivery-v1_2_0.xsd
index b5abe4af8c432c5723da4589f33e361d9e6c81b7..ab39bcb7173419dc7726d7ff9bb347360aa51460 100644
--- a/v1_2_0/CDT-delivery-v1_2_0.xsd
+++ b/v1_2_0/CDT-delivery-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_2_0/CDT-deviceCapability-v1_2_0.xsd b/v1_2_0/CDT-deviceCapability-v1_2_0.xsd
index bd7f5c4b9a77f3619b6e6e0c427baa1abc2f090c..15179b32bfb716ae6ea611b42e43478b265d5bc5 100644
--- a/v1_2_0/CDT-deviceCapability-v1_2_0.xsd
+++ b/v1_2_0/CDT-deviceCapability-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-deviceInfo-v1_2_0.xsd b/v1_2_0/CDT-deviceInfo-v1_2_0.xsd
index f93b78a870429547291e32c9e4eec4c96f1f31a5..eec603ec1b07a370885c637063a431a35631f7f4 100644
--- a/v1_2_0/CDT-deviceInfo-v1_2_0.xsd
+++ b/v1_2_0/CDT-deviceInfo-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-eventConfig-v1_2_0.xsd b/v1_2_0/CDT-eventConfig-v1_2_0.xsd
index 9cc783497597516e969b399b57c0103cce273383..1dad89eee9d4fce650e7e1d0ccfeb33bebca6726 100644
--- a/v1_2_0/CDT-eventConfig-v1_2_0.xsd
+++ b/v1_2_0/CDT-eventConfig-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-eventLog-v1_2_0.xsd b/v1_2_0/CDT-eventLog-v1_2_0.xsd
index 9dca355798a217a26fad9f33bc6826a7d499e19c..316310b2ef2b2c02b402c5f234a98badeb026fa8 100644
--- a/v1_2_0/CDT-eventLog-v1_2_0.xsd
+++ b/v1_2_0/CDT-eventLog-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-execInstance-v1_2_0.xsd b/v1_2_0/CDT-execInstance-v1_2_0.xsd
index 8729a4d19aa1dd10a674d0485331290d8772d141..013dd69b042fc1ad51eda790e899750882d004d9 100644
--- a/v1_2_0/CDT-execInstance-v1_2_0.xsd
+++ b/v1_2_0/CDT-execInstance-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-firmware-v1_2_0.xsd b/v1_2_0/CDT-firmware-v1_2_0.xsd
index c0b8e685732ec5d9c65c052be3f017fef4c20c12..d1800dd9ddefd547fee3cd289626f24df1032d55 100644
--- a/v1_2_0/CDT-firmware-v1_2_0.xsd
+++ b/v1_2_0/CDT-firmware-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-group-v1_2_0.xsd b/v1_2_0/CDT-group-v1_2_0.xsd
index c5d20b30453e7bbff547eb2b98c5c00cae8c70e6..8e84047c125b8890d6a04c610b24113b29e52153 100644
--- a/v1_2_0/CDT-group-v1_2_0.xsd
+++ b/v1_2_0/CDT-group-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-locationPolicy-v1_2_0.xsd b/v1_2_0/CDT-locationPolicy-v1_2_0.xsd
index c498b18958fbcf43c1250b4d3603506f3f14e564..7ab9ef09d1cdf0143edfe0a72f73fd272afb1364 100644
--- a/v1_2_0/CDT-locationPolicy-v1_2_0.xsd
+++ b/v1_2_0/CDT-locationPolicy-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd b/v1_2_0/CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd
index 128533183dd3b1a6aa7a769283c3c133d1ff5b07..7c84090a3e1df1f35d1079fefed16af4df53c583 100644
--- a/v1_2_0/CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd
+++ b/v1_2_0/CDT-m2mServiceSubscriptionProfile-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_2_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-memory-v1_2_0.xsd b/v1_2_0/CDT-memory-v1_2_0.xsd
index bc584cdff90a7e4b280ac56fd0108515c38ce88d..29380ceaf8bf118462a3f9941d4496fd9ef073d5 100644
--- a/v1_2_0/CDT-memory-v1_2_0.xsd
+++ b/v1_2_0/CDT-memory-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-mgmtCmd-v1_2_0.xsd b/v1_2_0/CDT-mgmtCmd-v1_2_0.xsd
index 51a61d1c862f2d927d8c9a7ce88437900b6df4b0..52976398bfb632faaf75dd5e6e67b4264ab5da1b 100644
--- a/v1_2_0/CDT-mgmtCmd-v1_2_0.xsd
+++ b/v1_2_0/CDT-mgmtCmd-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_2_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-node-v1_2_0.xsd b/v1_2_0/CDT-node-v1_2_0.xsd
index f607d87d96a2193357abee267771c4e34b275093..0880e983858d8f52034c31b753fca0fba60ed8b6 100644
--- a/v1_2_0/CDT-node-v1_2_0.xsd
+++ b/v1_2_0/CDT-node-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-notification-v1_2_0.xsd b/v1_2_0/CDT-notification-v1_2_0.xsd
index 0d0b46c7c39879a9f3265555c9d4926a4f7aeefd..a65ff2bb46265e0c867d72e679dd5ae71d4e2295 100644
--- a/v1_2_0/CDT-notification-v1_2_0.xsd
+++ b/v1_2_0/CDT-notification-v1_2_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_1_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_1_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_2_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_2_0/CDT-pollingChannel-v1_2_0.xsd b/v1_2_0/CDT-pollingChannel-v1_2_0.xsd
index adf654053b9d8caf8e1cd6a134300f6ea6ada34b..24a5bec9bbbc4ef1291460a07045bdc398108dce 100644
--- a/v1_2_0/CDT-pollingChannel-v1_2_0.xsd
+++ b/v1_2_0/CDT-pollingChannel-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-reboot-v1_2_0.xsd b/v1_2_0/CDT-reboot-v1_2_0.xsd
index e1adbb10845b6ee687df09eed24f7c1d42d0830b..4d0d45fcd5b2628fefd6e0a8d4827f78551adaf6 100644
--- a/v1_2_0/CDT-reboot-v1_2_0.xsd
+++ b/v1_2_0/CDT-reboot-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-remoteCSE-v1_2_0.xsd b/v1_2_0/CDT-remoteCSE-v1_2_0.xsd
index ea2ebb0c3d1276093fd5852d4e8d759ea17278b7..0b181ed8bbe4c20373d98280041d08e8480c8d37 100644
--- a/v1_2_0/CDT-remoteCSE-v1_2_0.xsd
+++ b/v1_2_0/CDT-remoteCSE-v1_2_0.xsd
@@ -26,17 +26,17 @@ 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_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
 
-	<xs:include schemaLocation="CDT-AE-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_2_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-request-v1_2_0.xsd b/v1_2_0/CDT-request-v1_2_0.xsd
index fc9448c93d699a776f2cc8689b09f7b836201b8d..7d853ab51eefe8798efb19f85ace92dfc9c23fc7 100644
--- a/v1_2_0/CDT-request-v1_2_0.xsd
+++ b/v1_2_0/CDT-request-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd b/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd
index 9d845aba057fb9e592ffb03ee507cb629bb23144..478700dbf51a5bff0b598ded5fb02b7e5deede72 100644
--- a/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd
+++ b/v1_2_0/CDT-requestPrimitive-v1_2_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_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd b/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd
index 40307ced7523725f73d9d75be80db06affdfa3e9..4f9fd85f703bbc96be5a6f5c8b76d92bd6fba055 100644
--- a/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd
+++ b/v1_2_0/CDT-responsePrimitive-v1_2_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_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_2_0/CDT-schedule-v1_2_0.xsd b/v1_2_0/CDT-schedule-v1_2_0.xsd
index 4f3f8d9e29e4b600207c5ec64163d47cace3a8bd..a0ac22361be97619732fc0d7a32fa4c4181b9ff1 100644
--- a/v1_2_0/CDT-schedule-v1_2_0.xsd
+++ b/v1_2_0/CDT-schedule-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-serviceSubscribedAppRule-v1_2_0.xsd b/v1_2_0/CDT-serviceSubscribedAppRule-v1_2_0.xsd
index 8154f3c355a1c2d97fbcfe142cc9ca082ee8c5d4..0b79394743d18f719a0ec56ee411d5f393c88490 100644
--- a/v1_2_0/CDT-serviceSubscribedAppRule-v1_2_0.xsd
+++ b/v1_2_0/CDT-serviceSubscribedAppRule-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-serviceSubscribedNode-v1_2_0.xsd b/v1_2_0/CDT-serviceSubscribedNode-v1_2_0.xsd
index 450c831119658777a484c68b2a8084271ecfa589..eba0487597c04c24199cf851cf7299d86c7c2654 100644
--- a/v1_2_0/CDT-serviceSubscribedNode-v1_2_0.xsd
+++ b/v1_2_0/CDT-serviceSubscribedNode-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-software-v1_2_0.xsd b/v1_2_0/CDT-software-v1_2_0.xsd
index c1901cf0666dbe6bfbf312f8117c60d59e1f22e9..9d191b87cd8c073720ee8e6f4813a82d93e418a9 100644
--- a/v1_2_0/CDT-software-v1_2_0.xsd
+++ b/v1_2_0/CDT-software-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-statsCollect-v1_2_0.xsd b/v1_2_0/CDT-statsCollect-v1_2_0.xsd
index 3e2b734b65deaaa10dd35f8c12c0f008cff3691f..2f94d69eb51796ee7323d91ee80a336e9a60c70b 100644
--- a/v1_2_0/CDT-statsCollect-v1_2_0.xsd
+++ b/v1_2_0/CDT-statsCollect-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-statsConfig-v1_2_0.xsd b/v1_2_0/CDT-statsConfig-v1_2_0.xsd
index e3607ab8f112e7babeda05a2f02cc1db44f824e6..60b1b978a07df06e26727771d96ac9f2c15b574f 100644
--- a/v1_2_0/CDT-statsConfig-v1_2_0.xsd
+++ b/v1_2_0/CDT-statsConfig-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-subscription-v1_2_0.xsd b/v1_2_0/CDT-subscription-v1_2_0.xsd
index fdf89c9aeb8a7ce8d51830f8d575ab80ead0a65f..103597c729520832745370b4a3fa1c866b40a81b 100644
--- a/v1_2_0/CDT-subscription-v1_2_0.xsd
+++ b/v1_2_0/CDT-subscription-v1_2_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_1_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_2_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>