diff --git a/v1_12_0/CDT-AE-v1_12_0.xsd b/v1_12_0/CDT-AE-v1_12_0.xsd
index 1ecdc7f9aead7fda3159f3faac405cff87d1f865..7d60e7b3ada5cc5a6f938066a2318d9b11fa38c8 100644
--- a/v1_12_0/CDT-AE-v1_12_0.xsd
+++ b/v1_12_0/CDT-AE-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_12_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-CSEBase-v1_12_0.xsd b/v1_12_0/CDT-CSEBase-v1_12_0.xsd
index 3bcd8bd735a22ff21980c6f48c5342124a9bc4ae..155824d6979c1c73c311723ce2117f36e5d4f0ac 100644
--- a/v1_12_0/CDT-CSEBase-v1_12_0.xsd
+++ b/v1_12_0/CDT-CSEBase-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_11_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_11_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_12_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_12_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-accessControlPolicy-v1_12_0.xsd b/v1_12_0/CDT-accessControlPolicy-v1_12_0.xsd
index be7db1b8e9be2e985f5d5dd68c41c900a11f23b5..c15be404a786c3d21d37f76128682dfdb12e4ef5 100644
--- a/v1_12_0/CDT-accessControlPolicy-v1_12_0.xsd
+++ b/v1_12_0/CDT-accessControlPolicy-v1_12_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_11_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-activeCmdhPolicy-v1_12_0.xsd b/v1_12_0/CDT-activeCmdhPolicy-v1_12_0.xsd
index ab7312830a7865398fc5e4c6d5bbcb4628ef25ef..17293e83832e40f18fa585bd3950b6e5a2c57444 100644
--- a/v1_12_0/CDT-activeCmdhPolicy-v1_12_0.xsd
+++ b/v1_12_0/CDT-activeCmdhPolicy-v1_12_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_11_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_12_0/CDT-areaNwkDeviceInfo-v1_12_0.xsd b/v1_12_0/CDT-areaNwkDeviceInfo-v1_12_0.xsd
index 3c5d6dd453b5e267acea9f2aaf0ae77bfaf3dc90..fc76bc39249a930a943fd10ea0524ab83b442a6c 100644
--- a/v1_12_0/CDT-areaNwkDeviceInfo-v1_12_0.xsd
+++ b/v1_12_0/CDT-areaNwkDeviceInfo-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-areaNwkInfo-v1_12_0.xsd b/v1_12_0/CDT-areaNwkInfo-v1_12_0.xsd
index 0c3186a78d8422ecf8578e1d1f629481f316d367..951118834910e258ab3f1e7330d6649c3722bbbd 100644
--- a/v1_12_0/CDT-areaNwkInfo-v1_12_0.xsd
+++ b/v1_12_0/CDT-areaNwkInfo-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-battery-v1_12_0.xsd b/v1_12_0/CDT-battery-v1_12_0.xsd
index 2072d0aa0e6471d12f38442697876d66cb8d0ef5..aff73bd0a61e29d5c75ce2d7ee3da29bb867fa75 100644
--- a/v1_12_0/CDT-battery-v1_12_0.xsd
+++ b/v1_12_0/CDT-battery-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-cmdhBuffer-v1_12_0.xsd b/v1_12_0/CDT-cmdhBuffer-v1_12_0.xsd
index 5b94a033128bd7487152f717dc02ca59c82a8006..cc25e7112db59d2afee31f1b7d30692078633c01 100644
--- a/v1_12_0/CDT-cmdhBuffer-v1_12_0.xsd
+++ b/v1_12_0/CDT-cmdhBuffer-v1_12_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_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_12_0/CDT-cmdhDefEcValue-v1_12_0.xsd b/v1_12_0/CDT-cmdhDefEcValue-v1_12_0.xsd
index 529b41d79f13897090c4b1a891b8fb3627ba96ed..e646638da6c58b40856d41765470588a904e671a 100644
--- a/v1_12_0/CDT-cmdhDefEcValue-v1_12_0.xsd
+++ b/v1_12_0/CDT-cmdhDefEcValue-v1_12_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_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_12_0/CDT-cmdhDefaults-v1_12_0.xsd b/v1_12_0/CDT-cmdhDefaults-v1_12_0.xsd
index 4aba65af37f92c89f7056a750ae224a927eb3818..df62ddb3b14f12d805ae73f22bf21e96d2f02e26 100644
--- a/v1_12_0/CDT-cmdhDefaults-v1_12_0.xsd
+++ b/v1_12_0/CDT-cmdhDefaults-v1_12_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_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_12_0/CDT-cmdhEcDefParamValues-v1_12_0.xsd b/v1_12_0/CDT-cmdhEcDefParamValues-v1_12_0.xsd
index 558ce130af88c324585d038253844da66918eba6..dd1051c23e4b5821f7c8bae644e5382d8406171c 100644
--- a/v1_12_0/CDT-cmdhEcDefParamValues-v1_12_0.xsd
+++ b/v1_12_0/CDT-cmdhEcDefParamValues-v1_12_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_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_12_0/CDT-cmdhLimits-v1_12_0.xsd b/v1_12_0/CDT-cmdhLimits-v1_12_0.xsd
index f625bc64f172613b5fcdb65485f8dbaca21d1b49..8acbba071219b4ea9326a704f5cee00ee01ff141 100644
--- a/v1_12_0/CDT-cmdhLimits-v1_12_0.xsd
+++ b/v1_12_0/CDT-cmdhLimits-v1_12_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_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_12_0/CDT-cmdhNetworkAccessRules-v1_12_0.xsd b/v1_12_0/CDT-cmdhNetworkAccessRules-v1_12_0.xsd
index f51661fc8d93a97f01cb4da9e83f835b10d93993..876180f68dc7d6d658e47a75a32b0207a0d5ade1 100644
--- a/v1_12_0/CDT-cmdhNetworkAccessRules-v1_12_0.xsd
+++ b/v1_12_0/CDT-cmdhNetworkAccessRules-v1_12_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_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_12_0/CDT-cmdhNwAccessRule-v1_12_0.xsd b/v1_12_0/CDT-cmdhNwAccessRule-v1_12_0.xsd
index 5126571d2ab3b8d4c08c83c4c0e3683206d3b78d..1315e7af639538ce7cd102144384ecb5cf32b693 100644
--- a/v1_12_0/CDT-cmdhNwAccessRule-v1_12_0.xsd
+++ b/v1_12_0/CDT-cmdhNwAccessRule-v1_12_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_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_12_0/CDT-cmdhPolicy-v1_12_0.xsd b/v1_12_0/CDT-cmdhPolicy-v1_12_0.xsd
index 5991cc0633ebc3c1faaea5755c86a05289eb4976..3b5ee276e882941c2d162071522617bd2c6bf265 100644
--- a/v1_12_0/CDT-cmdhPolicy-v1_12_0.xsd
+++ b/v1_12_0/CDT-cmdhPolicy-v1_12_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_11_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_12_0/CDT-commonTypes-v1_12_0.xsd b/v1_12_0/CDT-commonTypes-v1_12_0.xsd
index 068f81382b35c3183c2e213ba9f7766971b88178..1f7e1897c3c8d7a339181e2997c713a648e401f7 100644
--- a/v1_12_0/CDT-commonTypes-v1_12_0.xsd
+++ b/v1_12_0/CDT-commonTypes-v1_12_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_11_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_12_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_12_0/CDT-container-v1_12_0.xsd b/v1_12_0/CDT-container-v1_12_0.xsd
index b919c33ec60b5100187ac5c37d4ae85ef37cd14d..311cba5cae11d0c56031640f993b36d5161e3122 100644
--- a/v1_12_0/CDT-container-v1_12_0.xsd
+++ b/v1_12_0/CDT-container-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-contentInstance-v1_12_0.xsd b/v1_12_0/CDT-contentInstance-v1_12_0.xsd
index 26dd192025250e5a47e29b1344feae3156f90db0..45e9d2dcd9ed2eef24c7e266dc68228c030efea0 100644
--- a/v1_12_0/CDT-contentInstance-v1_12_0.xsd
+++ b/v1_12_0/CDT-contentInstance-v1_12_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_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-delivery-v1_12_0.xsd b/v1_12_0/CDT-delivery-v1_12_0.xsd
index c9d8f99bc9714fc3b3f6603cb5bc0947b41ffb28..a47cb0f3e7c8e80d6ca41117f7184f2ada38027e 100644
--- a/v1_12_0/CDT-delivery-v1_12_0.xsd
+++ b/v1_12_0/CDT-delivery-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_12_0/CDT-deviceCapability-v1_12_0.xsd b/v1_12_0/CDT-deviceCapability-v1_12_0.xsd
index fc7c401d796ddfd54e41de80776062122bdb88ff..88563c8874da36ec5f0cc7ede033afd9618bb82c 100644
--- a/v1_12_0/CDT-deviceCapability-v1_12_0.xsd
+++ b/v1_12_0/CDT-deviceCapability-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-deviceInfo-v1_12_0.xsd b/v1_12_0/CDT-deviceInfo-v1_12_0.xsd
index d96155ec2a9ff271bd0117120f48803615516c57..a17b5cceaa74f5c21117cee6df5bed737e5f5f71 100644
--- a/v1_12_0/CDT-deviceInfo-v1_12_0.xsd
+++ b/v1_12_0/CDT-deviceInfo-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-eventConfig-v1_12_0.xsd b/v1_12_0/CDT-eventConfig-v1_12_0.xsd
index 38b9bd1c44f5de14883e913669de33f8f55831e0..73e6805f2ca4fc5610f4867837963ad05406d8e5 100644
--- a/v1_12_0/CDT-eventConfig-v1_12_0.xsd
+++ b/v1_12_0/CDT-eventConfig-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-eventLog-v1_12_0.xsd b/v1_12_0/CDT-eventLog-v1_12_0.xsd
index 99f41be06254ce458965e70dc033f6057c36e968..4bbc5acaf3bdebaae022e7f4fd21d04efce2488e 100644
--- a/v1_12_0/CDT-eventLog-v1_12_0.xsd
+++ b/v1_12_0/CDT-eventLog-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-execInstance-v1_12_0.xsd b/v1_12_0/CDT-execInstance-v1_12_0.xsd
index b2d1bbb4c795de07b7fd2f20e43c18d003e3dc72..7885c53d569644a3c0e56e7b90c5035295fca886 100644
--- a/v1_12_0/CDT-execInstance-v1_12_0.xsd
+++ b/v1_12_0/CDT-execInstance-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-firmware-v1_12_0.xsd b/v1_12_0/CDT-firmware-v1_12_0.xsd
index 39027e58d33bac9b88ab909d5c042cc3e24b91b3..35031635fdbc2c3a577c02dd6e0915131445ec27 100644
--- a/v1_12_0/CDT-firmware-v1_12_0.xsd
+++ b/v1_12_0/CDT-firmware-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-group-v1_12_0.xsd b/v1_12_0/CDT-group-v1_12_0.xsd
index 5dfc0a7aa29f1d2b4145599795badaaf756adf30..034a70a357080cf2ad6fd66f39d427831b8c6571 100644
--- a/v1_12_0/CDT-group-v1_12_0.xsd
+++ b/v1_12_0/CDT-group-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-locationPolicy-v1_12_0.xsd b/v1_12_0/CDT-locationPolicy-v1_12_0.xsd
index 8ae07106aeffacdb28d4df112903e1751c7bcfd8..bc0a911e038951ed513204def36eb80c88a3f284 100644
--- a/v1_12_0/CDT-locationPolicy-v1_12_0.xsd
+++ b/v1_12_0/CDT-locationPolicy-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd b/v1_12_0/CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd
index ae8c72c5c3bc45338c74a840d9d9f1e1a5e9221a..3c5a6325aa9b2b3b8948f31f5e999249a3340bcc 100644
--- a/v1_12_0/CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd
+++ b/v1_12_0/CDT-m2mServiceSubscriptionProfile-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_12_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-memory-v1_12_0.xsd b/v1_12_0/CDT-memory-v1_12_0.xsd
index 7768fc24005f02b17d8d6a1ddabd8ba914fb0392..174f20f9136405a07b502e2593ddb139d4c8728b 100644
--- a/v1_12_0/CDT-memory-v1_12_0.xsd
+++ b/v1_12_0/CDT-memory-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-mgmtCmd-v1_12_0.xsd b/v1_12_0/CDT-mgmtCmd-v1_12_0.xsd
index e60da0bd2bc3c5dd3ad99de92323fe411f154574..d5fdb68c55926db4b7a5f7c6e10a9fd9213d8f37 100644
--- a/v1_12_0/CDT-mgmtCmd-v1_12_0.xsd
+++ b/v1_12_0/CDT-mgmtCmd-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_12_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-node-v1_12_0.xsd b/v1_12_0/CDT-node-v1_12_0.xsd
index 8b8b5541876f428906159088ce3974ca5944dee3..4af42f30529527979e4849814a202b19f3b7a939 100644
--- a/v1_12_0/CDT-node-v1_12_0.xsd
+++ b/v1_12_0/CDT-node-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-notification-v1_12_0.xsd b/v1_12_0/CDT-notification-v1_12_0.xsd
index 012b7ced147e3142494b43c1fb752dc610ed10bb..85be4be4ea1c784358ad44b94572303d8f30b25d 100644
--- a/v1_12_0/CDT-notification-v1_12_0.xsd
+++ b/v1_12_0/CDT-notification-v1_12_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_11_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_11_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_12_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_12_0/CDT-pollingChannel-v1_12_0.xsd b/v1_12_0/CDT-pollingChannel-v1_12_0.xsd
index 2c5031a8949e9d5915bfaecf70f8e73ce95da140..6363d332871acd2b5ba9733e0c45e5ef5f0d4201 100644
--- a/v1_12_0/CDT-pollingChannel-v1_12_0.xsd
+++ b/v1_12_0/CDT-pollingChannel-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-reboot-v1_12_0.xsd b/v1_12_0/CDT-reboot-v1_12_0.xsd
index e5670e1684978fd26fb451bd1513bc0afb48cf3f..fe9eada448a38b93e5ad4cec83698f2bf6fcee8f 100644
--- a/v1_12_0/CDT-reboot-v1_12_0.xsd
+++ b/v1_12_0/CDT-reboot-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-remoteCSE-v1_12_0.xsd b/v1_12_0/CDT-remoteCSE-v1_12_0.xsd
index 0de424ca19cdf16381ec4998b27647e4bbc745b3..ea59ff0938a40f9361c0c5e4ad973e53997961ac 100644
--- a/v1_12_0/CDT-remoteCSE-v1_12_0.xsd
+++ b/v1_12_0/CDT-remoteCSE-v1_12_0.xsd
@@ -26,16 +26,16 @@ 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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v1_12_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-request-v1_12_0.xsd b/v1_12_0/CDT-request-v1_12_0.xsd
index 16a8bd4b2b65963c085916d1f517f7e025d04434..90b66268650243b93e09a60973890aa1eb4ba83f 100644
--- a/v1_12_0/CDT-request-v1_12_0.xsd
+++ b/v1_12_0/CDT-request-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-requestPrimitive-v1_12_0.xsd b/v1_12_0/CDT-requestPrimitive-v1_12_0.xsd
index b7fe1933e28099d2e5f9a4833dfd5d5e0380e90a..a3d5985d2e9cb3b560213f8dc889504118429f5f 100644
--- a/v1_12_0/CDT-requestPrimitive-v1_12_0.xsd
+++ b/v1_12_0/CDT-requestPrimitive-v1_12_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_11_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_12_0/CDT-responsePrimitive-v1_12_0.xsd b/v1_12_0/CDT-responsePrimitive-v1_12_0.xsd
index 67990dbd4ed79940b2b7d8c2f2bc6c0944b2e7fe..1efd20142999d8357031cf4bef80efed53fa16fb 100644
--- a/v1_12_0/CDT-responsePrimitive-v1_12_0.xsd
+++ b/v1_12_0/CDT-responsePrimitive-v1_12_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_11_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v1_11_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v1_12_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
   
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_12_0/CDT-schedule-v1_12_0.xsd b/v1_12_0/CDT-schedule-v1_12_0.xsd
index 3f3191e2c4d2ab205e68f90845c37f331c395f38..7a12b47fd37cb6e2a92d4ec0e2373404e2988a88 100644
--- a/v1_12_0/CDT-schedule-v1_12_0.xsd
+++ b/v1_12_0/CDT-schedule-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-serviceSubscribedAppRule-v1_12_0.xsd b/v1_12_0/CDT-serviceSubscribedAppRule-v1_12_0.xsd
index a74fd0690d0c936a7d7065c42e83f8fada3748cf..62de2d676be0125bc672dae2a0be1f9b718ee51e 100644
--- a/v1_12_0/CDT-serviceSubscribedAppRule-v1_12_0.xsd
+++ b/v1_12_0/CDT-serviceSubscribedAppRule-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-serviceSubscribedNode-v1_12_0.xsd b/v1_12_0/CDT-serviceSubscribedNode-v1_12_0.xsd
index d2ed817e55aca26b6921d00629b7672b2b7e3c21..f6a35c938c44c4bf270fcaa3a53346e53918c44b 100644
--- a/v1_12_0/CDT-serviceSubscribedNode-v1_12_0.xsd
+++ b/v1_12_0/CDT-serviceSubscribedNode-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-software-v1_12_0.xsd b/v1_12_0/CDT-software-v1_12_0.xsd
index db16894beeb523116be4b8c76630d9b68e0fbc5a..3aacad7913048002f7d3165accad6a1e9ae254f9 100644
--- a/v1_12_0/CDT-software-v1_12_0.xsd
+++ b/v1_12_0/CDT-software-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-statsCollect-v1_12_0.xsd b/v1_12_0/CDT-statsCollect-v1_12_0.xsd
index 959ce3d40af065a8f17f6d23ea53e520e3be48b7..3eb3df02ec050565208b447418dc8ddd7069f714 100644
--- a/v1_12_0/CDT-statsCollect-v1_12_0.xsd
+++ b/v1_12_0/CDT-statsCollect-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-statsConfig-v1_12_0.xsd b/v1_12_0/CDT-statsConfig-v1_12_0.xsd
index 566856a261d1856399f35235d8dac1203796fa95..a0a83d98f8c6ac5d5c872bb4e13e5d30b71db5b7 100644
--- a/v1_12_0/CDT-statsConfig-v1_12_0.xsd
+++ b/v1_12_0/CDT-statsConfig-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_12_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_12_0/CDT-subscription-v1_12_0.xsd b/v1_12_0/CDT-subscription-v1_12_0.xsd
index 5f16974064bd11a5518584e3ac87d387a2a53982..96d71f75131560054d97302ace5e846c69ea3a81 100644
--- a/v1_12_0/CDT-subscription-v1_12_0.xsd
+++ b/v1_12_0/CDT-subscription-v1_12_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_11_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_12_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_12_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>