diff --git a/v1_3_0/CDT-AE-v1_3_0.xsd b/v1_3_0/CDT-AE-v1_3_0.xsd
index c714dc6ee67b9cdc9b6f8968f25dbdfcd11015eb..7056edcfe0ebb262fb9072eca5a11c1535ccdaaf 100644
--- a/v1_3_0/CDT-AE-v1_3_0.xsd
+++ b/v1_3_0/CDT-AE-v1_3_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_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-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-CSEBase-v1_3_0.xsd b/v1_3_0/CDT-CSEBase-v1_3_0.xsd
index af55d14adff528e1bc244268c9106c81280cdcb5..92b0bccb1a678fc43db3ff225b42c445c4ddb20e 100644
--- a/v1_3_0/CDT-CSEBase-v1_3_0.xsd
+++ b/v1_3_0/CDT-CSEBase-v1_3_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_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:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_3_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_3_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_3_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-accessControlPolicy-v1_3_0.xsd b/v1_3_0/CDT-accessControlPolicy-v1_3_0.xsd
index d6591928827da0f3c2d30d10f2f71edfa841f192..bff1f5a997b6c980f4971203f1817660081d86d0 100644
--- a/v1_3_0/CDT-accessControlPolicy-v1_3_0.xsd
+++ b/v1_3_0/CDT-accessControlPolicy-v1_3_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_2_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-activeCmdhPolicy-v1_3_0.xsd b/v1_3_0/CDT-activeCmdhPolicy-v1_3_0.xsd
index ff5fcb455935abd1819df9a78e078515f69587d9..da75e5e7257fdd06543e49f986aeb77f13b58e74 100644
--- a/v1_3_0/CDT-activeCmdhPolicy-v1_3_0.xsd
+++ b/v1_3_0/CDT-activeCmdhPolicy-v1_3_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_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_3_0/CDT-areaNwkDeviceInfo-v1_3_0.xsd b/v1_3_0/CDT-areaNwkDeviceInfo-v1_3_0.xsd
index f353cd62f692493224010ab9180b2d29f45fa0fe..14d51992755101617cde6ba65bf509467a8c4a73 100644
--- a/v1_3_0/CDT-areaNwkDeviceInfo-v1_3_0.xsd
+++ b/v1_3_0/CDT-areaNwkDeviceInfo-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-areaNwkInfo-v1_3_0.xsd b/v1_3_0/CDT-areaNwkInfo-v1_3_0.xsd
index 6581fda8e003863350b1488e0bbb34b6d261cec8..f0861c18e366c79567d546e0291dccaf386868b3 100644
--- a/v1_3_0/CDT-areaNwkInfo-v1_3_0.xsd
+++ b/v1_3_0/CDT-areaNwkInfo-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-battery-v1_3_0.xsd b/v1_3_0/CDT-battery-v1_3_0.xsd
index 280ee56985364903271278a8a1bc486b3e355b87..cec9f92a3e8baa8c9998ca76a104b9562915a37b 100644
--- a/v1_3_0/CDT-battery-v1_3_0.xsd
+++ b/v1_3_0/CDT-battery-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-cmdhBuffer-v1_3_0.xsd b/v1_3_0/CDT-cmdhBuffer-v1_3_0.xsd
index 762c8e0b3dc0689c61150eb2b4534a6d88bc2263..e2613af2d9faf2a36d05bbc7faac124423447167 100644
--- a/v1_3_0/CDT-cmdhBuffer-v1_3_0.xsd
+++ b/v1_3_0/CDT-cmdhBuffer-v1_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_3_0/CDT-cmdhDefEcValue-v1_3_0.xsd b/v1_3_0/CDT-cmdhDefEcValue-v1_3_0.xsd
index 19bd0bcaa3957a9eb8477c1259ad50a948c01847..db5805a1db4ce68f340e414135e6b3f5f0e3f9f5 100644
--- a/v1_3_0/CDT-cmdhDefEcValue-v1_3_0.xsd
+++ b/v1_3_0/CDT-cmdhDefEcValue-v1_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_3_0/CDT-cmdhDefaults-v1_3_0.xsd b/v1_3_0/CDT-cmdhDefaults-v1_3_0.xsd
index 51e29d8f8a87d37fc18613df008e035208ae1619..d4915e843ab32e31bd6670d590681892f98ddfe7 100644
--- a/v1_3_0/CDT-cmdhDefaults-v1_3_0.xsd
+++ b/v1_3_0/CDT-cmdhDefaults-v1_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_3_0/CDT-cmdhEcDefParamValues-v1_3_0.xsd b/v1_3_0/CDT-cmdhEcDefParamValues-v1_3_0.xsd
index 908fa7679e488e11b51e0fbf15bf20640c95bb9e..c10fe1f0276421d778a41f658e21cbf7b533d239 100644
--- a/v1_3_0/CDT-cmdhEcDefParamValues-v1_3_0.xsd
+++ b/v1_3_0/CDT-cmdhEcDefParamValues-v1_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_3_0/CDT-cmdhLimits-v1_3_0.xsd b/v1_3_0/CDT-cmdhLimits-v1_3_0.xsd
index b483eacf5c34300606d37850aaf6d23e0efcca2f..deeac6aa4eb275ebbf923aada95b15df5fdbf1a5 100644
--- a/v1_3_0/CDT-cmdhLimits-v1_3_0.xsd
+++ b/v1_3_0/CDT-cmdhLimits-v1_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_3_0/CDT-cmdhNetworkAccessRules-v1_3_0.xsd b/v1_3_0/CDT-cmdhNetworkAccessRules-v1_3_0.xsd
index 407ee27de65bb0be5ecc803488d62105d41e4b6f..37fa67ecefa47f0901a8e834e450959d44e03725 100644
--- a/v1_3_0/CDT-cmdhNetworkAccessRules-v1_3_0.xsd
+++ b/v1_3_0/CDT-cmdhNetworkAccessRules-v1_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_3_0/CDT-cmdhNwAccessRule-v1_3_0.xsd b/v1_3_0/CDT-cmdhNwAccessRule-v1_3_0.xsd
index c4ceae1f41b3446751ddceb04eb295cec8ab2984..b4f02bd92d91d87e384bdb7df41510bb1c9743ee 100644
--- a/v1_3_0/CDT-cmdhNwAccessRule-v1_3_0.xsd
+++ b/v1_3_0/CDT-cmdhNwAccessRule-v1_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_3_0/CDT-cmdhPolicy-v1_3_0.xsd b/v1_3_0/CDT-cmdhPolicy-v1_3_0.xsd
index 03dc83f96b5951c809e5001d41a2c39bd325a7b9..2e8967c2545f8d5d80611285c1ecdc7774b89bb2 100644
--- a/v1_3_0/CDT-cmdhPolicy-v1_3_0.xsd
+++ b/v1_3_0/CDT-cmdhPolicy-v1_3_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_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_3_0/CDT-commonTypes-v1_3_0.xsd b/v1_3_0/CDT-commonTypes-v1_3_0.xsd
index 1f1171f3ec900d9b9170c9b1c2624f77966648aa..162a2a4df25080e54d5050203aff63707f05862c 100644
--- a/v1_3_0/CDT-commonTypes-v1_3_0.xsd
+++ b/v1_3_0/CDT-commonTypes-v1_3_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_2_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_3_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_3_0/CDT-container-v1_3_0.xsd b/v1_3_0/CDT-container-v1_3_0.xsd
index a63f7d49bcea641eef29dbdf221be1057baea382..329340ad1af35bd41ddd86e541f0b2b33c4ec6da 100644
--- a/v1_3_0/CDT-container-v1_3_0.xsd
+++ b/v1_3_0/CDT-container-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-contentInstance-v1_3_0.xsd b/v1_3_0/CDT-contentInstance-v1_3_0.xsd
index cfaf378f09e52dec39b69d321d3986f8f01e65b9..a4a3e3670d219d98ecd4ad3ee2b719bd7044a553 100644
--- a/v1_3_0/CDT-contentInstance-v1_3_0.xsd
+++ b/v1_3_0/CDT-contentInstance-v1_3_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_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-delivery-v1_3_0.xsd b/v1_3_0/CDT-delivery-v1_3_0.xsd
index ab39bcb7173419dc7726d7ff9bb347360aa51460..ebc9c8af02773062256a47a7fee7b54bbeebba80 100644
--- a/v1_3_0/CDT-delivery-v1_3_0.xsd
+++ b/v1_3_0/CDT-delivery-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_3_0/CDT-deviceCapability-v1_3_0.xsd b/v1_3_0/CDT-deviceCapability-v1_3_0.xsd
index 15179b32bfb716ae6ea611b42e43478b265d5bc5..bfaa5a893a36962f222b164c9bf175d62d508ddb 100644
--- a/v1_3_0/CDT-deviceCapability-v1_3_0.xsd
+++ b/v1_3_0/CDT-deviceCapability-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-deviceInfo-v1_3_0.xsd b/v1_3_0/CDT-deviceInfo-v1_3_0.xsd
index eec603ec1b07a370885c637063a431a35631f7f4..a8b2f713e8b22ac52f901585c1c5205fa387c6a5 100644
--- a/v1_3_0/CDT-deviceInfo-v1_3_0.xsd
+++ b/v1_3_0/CDT-deviceInfo-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-eventConfig-v1_3_0.xsd b/v1_3_0/CDT-eventConfig-v1_3_0.xsd
index 1dad89eee9d4fce650e7e1d0ccfeb33bebca6726..1c6274e39eb349b173dc20e52395716250c0ee40 100644
--- a/v1_3_0/CDT-eventConfig-v1_3_0.xsd
+++ b/v1_3_0/CDT-eventConfig-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-eventLog-v1_3_0.xsd b/v1_3_0/CDT-eventLog-v1_3_0.xsd
index 316310b2ef2b2c02b402c5f234a98badeb026fa8..5ccb02293fc191da9f10a3171c197cd354dd1a0c 100644
--- a/v1_3_0/CDT-eventLog-v1_3_0.xsd
+++ b/v1_3_0/CDT-eventLog-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-execInstance-v1_3_0.xsd b/v1_3_0/CDT-execInstance-v1_3_0.xsd
index 013dd69b042fc1ad51eda790e899750882d004d9..45f30d8e7e1a0dabac65ddf711c8e146284f0819 100644
--- a/v1_3_0/CDT-execInstance-v1_3_0.xsd
+++ b/v1_3_0/CDT-execInstance-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-firmware-v1_3_0.xsd b/v1_3_0/CDT-firmware-v1_3_0.xsd
index 9d29134c1ebd866cc866701471cdc8f104d7a853..2a3409d7c282fb386305fc8ed6828a794fae9615 100644
--- a/v1_3_0/CDT-firmware-v1_3_0.xsd
+++ b/v1_3_0/CDT-firmware-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-group-v1_3_0.xsd b/v1_3_0/CDT-group-v1_3_0.xsd
index 8e84047c125b8890d6a04c610b24113b29e52153..70adc8f500c2b15cc1fa4aff4bbdcc2efa593d77 100644
--- a/v1_3_0/CDT-group-v1_3_0.xsd
+++ b/v1_3_0/CDT-group-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-locationPolicy-v1_3_0.xsd b/v1_3_0/CDT-locationPolicy-v1_3_0.xsd
index 7ab9ef09d1cdf0143edfe0a72f73fd272afb1364..51997fd062ae09a3286d04d0dde9f5aaa9f39452 100644
--- a/v1_3_0/CDT-locationPolicy-v1_3_0.xsd
+++ b/v1_3_0/CDT-locationPolicy-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-m2mServiceSubscriptionProfile-v1_3_0.xsd b/v1_3_0/CDT-m2mServiceSubscriptionProfile-v1_3_0.xsd
index 7c84090a3e1df1f35d1079fefed16af4df53c583..3be20659ab2c3ff52fb1758a7db0ce9cf303be99 100644
--- a/v1_3_0/CDT-m2mServiceSubscriptionProfile-v1_3_0.xsd
+++ b/v1_3_0/CDT-m2mServiceSubscriptionProfile-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_3_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-memory-v1_3_0.xsd b/v1_3_0/CDT-memory-v1_3_0.xsd
index 29380ceaf8bf118462a3f9941d4496fd9ef073d5..e4ad7dd3f3f9ed6485fea1809c8ea82be82a65da 100644
--- a/v1_3_0/CDT-memory-v1_3_0.xsd
+++ b/v1_3_0/CDT-memory-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-mgmtCmd-v1_3_0.xsd b/v1_3_0/CDT-mgmtCmd-v1_3_0.xsd
index 52976398bfb632faaf75dd5e6e67b4264ab5da1b..95fd009b5d991dd307e29aecde0d900911411214 100644
--- a/v1_3_0/CDT-mgmtCmd-v1_3_0.xsd
+++ b/v1_3_0/CDT-mgmtCmd-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_3_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-node-v1_3_0.xsd b/v1_3_0/CDT-node-v1_3_0.xsd
index 0880e983858d8f52034c31b753fca0fba60ed8b6..321c4d05bf56ddd273223aa08d0be8ac88f09507 100644
--- a/v1_3_0/CDT-node-v1_3_0.xsd
+++ b/v1_3_0/CDT-node-v1_3_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_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:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-notification-v1_3_0.xsd b/v1_3_0/CDT-notification-v1_3_0.xsd
index f6db12cd224a3def8af2d6fe083f80b064d5cfaa..b30dc251b7494e0d0565ccaaae76d5adab91f33f 100644
--- a/v1_3_0/CDT-notification-v1_3_0.xsd
+++ b/v1_3_0/CDT-notification-v1_3_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_2_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_3_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_3_0/CDT-pollingChannel-v1_3_0.xsd b/v1_3_0/CDT-pollingChannel-v1_3_0.xsd
index 24a5bec9bbbc4ef1291460a07045bdc398108dce..26a9a20520ee19293bf076d20b6eedc6001e9a34 100644
--- a/v1_3_0/CDT-pollingChannel-v1_3_0.xsd
+++ b/v1_3_0/CDT-pollingChannel-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-reboot-v1_3_0.xsd b/v1_3_0/CDT-reboot-v1_3_0.xsd
index 4d0d45fcd5b2628fefd6e0a8d4827f78551adaf6..e5d03c9640cd4d1e054a14ebedc9538b49a52e7c 100644
--- a/v1_3_0/CDT-reboot-v1_3_0.xsd
+++ b/v1_3_0/CDT-reboot-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-remoteCSE-v1_3_0.xsd b/v1_3_0/CDT-remoteCSE-v1_3_0.xsd
index da58b317b107b41805016e550b79dfec2e49febf..0bb024aeccb434a95a14581e1464875b711aa431 100644
--- a/v1_3_0/CDT-remoteCSE-v1_3_0.xsd
+++ b/v1_3_0/CDT-remoteCSE-v1_3_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_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:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_3_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-request-v1_3_0.xsd b/v1_3_0/CDT-request-v1_3_0.xsd
index cea8bac9af169af28c39275bb762147a47279a9f..9d005b3a68a2ea60140a51a25b2157d5dff557a6 100644
--- a/v1_3_0/CDT-request-v1_3_0.xsd
+++ b/v1_3_0/CDT-request-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-requestPrimitive-v1_3_0.xsd b/v1_3_0/CDT-requestPrimitive-v1_3_0.xsd
index a5a299a6f2bb15fd6ad5caefd230611fcebe86a7..61f360a17591d3e4bc88e3211510369c6408ac88 100644
--- a/v1_3_0/CDT-requestPrimitive-v1_3_0.xsd
+++ b/v1_3_0/CDT-requestPrimitive-v1_3_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_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_3_0/CDT-responsePrimitive-v1_3_0.xsd b/v1_3_0/CDT-responsePrimitive-v1_3_0.xsd
index b68079b50173adff46d5b13e0f23845b1ea48495..fc0625597bbe47eb2bade2c67f46b2d70b98c02c 100644
--- a/v1_3_0/CDT-responsePrimitive-v1_3_0.xsd
+++ b/v1_3_0/CDT-responsePrimitive-v1_3_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_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" /> 
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_3_0/CDT-schedule-v1_3_0.xsd b/v1_3_0/CDT-schedule-v1_3_0.xsd
index a0ac22361be97619732fc0d7a32fa4c4181b9ff1..a7eefd81f3afa359863e5fc2ad266ed2a2002f04 100644
--- a/v1_3_0/CDT-schedule-v1_3_0.xsd
+++ b/v1_3_0/CDT-schedule-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-serviceSubscribedAppRule-v1_3_0.xsd b/v1_3_0/CDT-serviceSubscribedAppRule-v1_3_0.xsd
index 0b79394743d18f719a0ec56ee411d5f393c88490..2fdbf3cd65610b6eeec5133e3f6153fbb92e2663 100644
--- a/v1_3_0/CDT-serviceSubscribedAppRule-v1_3_0.xsd
+++ b/v1_3_0/CDT-serviceSubscribedAppRule-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-serviceSubscribedNode-v1_3_0.xsd b/v1_3_0/CDT-serviceSubscribedNode-v1_3_0.xsd
index eba0487597c04c24199cf851cf7299d86c7c2654..377fb5055a401ca36fcfd6439a72622fcaf42474 100644
--- a/v1_3_0/CDT-serviceSubscribedNode-v1_3_0.xsd
+++ b/v1_3_0/CDT-serviceSubscribedNode-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-software-v1_3_0.xsd b/v1_3_0/CDT-software-v1_3_0.xsd
index a4337402b21c0bb45f9a8867fa7df1e0c4c95c3e..00189b35f9987488d79809d8849b13bf085122a7 100644
--- a/v1_3_0/CDT-software-v1_3_0.xsd
+++ b/v1_3_0/CDT-software-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-statsCollect-v1_3_0.xsd b/v1_3_0/CDT-statsCollect-v1_3_0.xsd
index 2f94d69eb51796ee7323d91ee80a336e9a60c70b..736d3acea8e6f062eebab04922a80810feab56d2 100644
--- a/v1_3_0/CDT-statsCollect-v1_3_0.xsd
+++ b/v1_3_0/CDT-statsCollect-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-statsConfig-v1_3_0.xsd b/v1_3_0/CDT-statsConfig-v1_3_0.xsd
index 60b1b978a07df06e26727771d96ac9f2c15b574f..8c7f02d2f3133f4bc07488ff8d8fae72adeb5d94 100644
--- a/v1_3_0/CDT-statsConfig-v1_3_0.xsd
+++ b/v1_3_0/CDT-statsConfig-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_3_0/CDT-subscription-v1_3_0.xsd b/v1_3_0/CDT-subscription-v1_3_0.xsd
index 0869584e9613e82cfcfd95ab6aff5a68443ccaa9..e821c09293cc25ac72ca1c4efaa819a0778c7f4a 100644
--- a/v1_3_0/CDT-subscription-v1_3_0.xsd
+++ b/v1_3_0/CDT-subscription-v1_3_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_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>