diff --git a/v3_1_0/CDT-AE-v3_1_0.xsd b/v3_1_0/CDT-AE-v3_1_0.xsd
index 091410848650ea984d11c5ee693f49e672a86fed..e14216344fd41db2af25d9cb42820d3b856cebd1 100644
--- a/v3_1_0/CDT-AE-v3_1_0.xsd
+++ b/v3_1_0/CDT-AE-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_1_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-CSEBase-v3_1_0.xsd b/v3_1_0/CDT-CSEBase-v3_1_0.xsd
index 7283a2a48cbe1d7573187e537866188a3dee6615..ed39c4607583b44aeed893244e19f48b6d70a6aa 100644
--- a/v3_1_0/CDT-CSEBase-v3_1_0.xsd
+++ b/v3_1_0/CDT-CSEBase-v3_1_0.xsd
@@ -26,26 +26,26 @@ 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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_0_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_1_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_1_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-accessControlPolicy-v3_1_0.xsd b/v3_1_0/CDT-accessControlPolicy-v3_1_0.xsd
index fa3ee59b0060888d47d9a7aada63a53656f2c06f..64598ca99b44348bc64e1154d7d3b7b9a7385bc6 100644
--- a/v3_1_0/CDT-accessControlPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-accessControlPolicy-v3_1_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-v3_0_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-activeCmdhPolicy-v3_1_0.xsd b/v3_1_0/CDT-activeCmdhPolicy-v3_1_0.xsd
index 0846d2d7e2ef50345b6be4d18fb0d64f0ca4ac59..ca4e584f367a0a0b54e5c1dfd2c2335e9910db25 100644
--- a/v3_1_0/CDT-activeCmdhPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-activeCmdhPolicy-v3_1_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-v3_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_1_0/CDT-allJoynApp-v3_1_0.xsd b/v3_1_0/CDT-allJoynApp-v3_1_0.xsd
index b92b177404b567066698c25166ab904cd560c47b..cfb6286fdcb989a994502b62d81da0d942c0961a 100644
--- a/v3_1_0/CDT-allJoynApp-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynApp-v3_1_0.xsd
@@ -26,10 +26,10 @@ 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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_1_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-allJoynInterface-v3_1_0.xsd b/v3_1_0/CDT-allJoynInterface-v3_1_0.xsd
index 1b829b6b8f7b32f6fc2370e40bc1dc998272b17f..b577379222d2d28968ce6939283a7a6b50d06117 100644
--- a/v3_1_0/CDT-allJoynInterface-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynInterface-v3_1_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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_1_0/CDT-allJoynMethod-v3_1_0.xsd b/v3_1_0/CDT-allJoynMethod-v3_1_0.xsd
index 88bfce70983686b35f54f5371dd989b0e45ae8a4..69f859c5b3c91e3d0356d047aeb0f55c19f2a3d7 100644
--- a/v3_1_0/CDT-allJoynMethod-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynMethod-v3_1_0.xsd
@@ -26,10 +26,10 @@ 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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_1_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_1_0/CDT-allJoynMethodCall-v3_1_0.xsd b/v3_1_0/CDT-allJoynMethodCall-v3_1_0.xsd
index 2a8673557b4d53a56c5eb2c0b19b97deda6a11ad..68765ce7171a16e2a4217ca65d0b8b2bfce88b60 100644
--- a/v3_1_0/CDT-allJoynMethodCall-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynMethodCall-v3_1_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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-allJoynProperty-v3_1_0.xsd b/v3_1_0/CDT-allJoynProperty-v3_1_0.xsd
index 233503f6466e36f6b3ebe870dd22b0b235575328..6a2c84a3793f067d3f04eb86e16015ca5a8831eb 100644
--- a/v3_1_0/CDT-allJoynProperty-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynProperty-v3_1_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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-allJoynSvcObject-v3_1_0.xsd b/v3_1_0/CDT-allJoynSvcObject-v3_1_0.xsd
index c7a93a7be6fc269ecd81ad2cef5c71866ade0445..c84b2aed0b46e7d5342c7e5ae3521a49fd3f3e08 100644
--- a/v3_1_0/CDT-allJoynSvcObject-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynSvcObject-v3_1_0.xsd
@@ -26,10 +26,10 @@ 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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_1_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-areaNwkDeviceInfo-v3_1_0.xsd b/v3_1_0/CDT-areaNwkDeviceInfo-v3_1_0.xsd
index 9eba7bc18d56c290e97459e60a2cf8941cd0a20e..b9e14b176afae574615a61144e22152418bd0d5d 100644
--- a/v3_1_0/CDT-areaNwkDeviceInfo-v3_1_0.xsd
+++ b/v3_1_0/CDT-areaNwkDeviceInfo-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-areaNwkInfo-v3_1_0.xsd b/v3_1_0/CDT-areaNwkInfo-v3_1_0.xsd
index 1252401717dc9415ed0a1aba7ed29f17aabbfceb..b57ee330d020e31657f53a783c21edd5e203cad9 100644
--- a/v3_1_0/CDT-areaNwkInfo-v3_1_0.xsd
+++ b/v3_1_0/CDT-areaNwkInfo-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-battery-v3_1_0.xsd b/v3_1_0/CDT-battery-v3_1_0.xsd
index 8d6770d118374b865947b761990de99e274b6f50..3b14cff529d1eb09c9f0ab22377a6a9062df4fd7 100644
--- a/v3_1_0/CDT-battery-v3_1_0.xsd
+++ b/v3_1_0/CDT-battery-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-cmdhBuffer-v3_1_0.xsd b/v3_1_0/CDT-cmdhBuffer-v3_1_0.xsd
index 4c4821a3824d4e2cab12ae5319b484eeae31c4f8..72c3661853a0e8da1d5e79765870ce6cf2e08a27 100644
--- a/v3_1_0/CDT-cmdhBuffer-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhBuffer-v3_1_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-v3_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhDefEcValue-v3_1_0.xsd b/v3_1_0/CDT-cmdhDefEcValue-v3_1_0.xsd
index b85cc45d85484ec8acb72978508751c9b91b2931..1dd6a7759d4dff6c1870a4e8244047bba2dcf349 100644
--- a/v3_1_0/CDT-cmdhDefEcValue-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhDefEcValue-v3_1_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-v3_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhDefaults-v3_1_0.xsd b/v3_1_0/CDT-cmdhDefaults-v3_1_0.xsd
index 64a89fb4dbe1ec256b45259ce271955624443d7a..0279336c8edca6b73fd693bb872af46b50b30f9a 100644
--- a/v3_1_0/CDT-cmdhDefaults-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhDefaults-v3_1_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-v3_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhEcDefParamValues-v3_1_0.xsd b/v3_1_0/CDT-cmdhEcDefParamValues-v3_1_0.xsd
index 37a73695f02f29f73610549acee82813e2d3753c..d6ba56efe994c83fc4beea13b7795fd57fb45c8b 100644
--- a/v3_1_0/CDT-cmdhEcDefParamValues-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhEcDefParamValues-v3_1_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-v3_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_1_0/CDT-cmdhLimits-v3_1_0.xsd b/v3_1_0/CDT-cmdhLimits-v3_1_0.xsd
index fdb3e8605f09bc4298fe14edd2ffbeff4f3f302e..9e4cef6dee7072ce97f0c2f3a17ea5a6f90a0942 100644
--- a/v3_1_0/CDT-cmdhLimits-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhLimits-v3_1_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-v3_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhNetworkAccessRules-v3_1_0.xsd b/v3_1_0/CDT-cmdhNetworkAccessRules-v3_1_0.xsd
index d79c6b16f3742ca91f8578c5d2be13338b2b5f41..dcd9572b969486d5fd93b0b45be2b63b941cfe37 100644
--- a/v3_1_0/CDT-cmdhNetworkAccessRules-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhNetworkAccessRules-v3_1_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-v3_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhNwAccessRule-v3_1_0.xsd b/v3_1_0/CDT-cmdhNwAccessRule-v3_1_0.xsd
index 5d43bf1bfead955a52fece927fac1d7dccee8ef6..7c50fb1c2a653d1782180036d8c500e73fdec5e5 100644
--- a/v3_1_0/CDT-cmdhNwAccessRule-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhNwAccessRule-v3_1_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-v3_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhPolicy-v3_1_0.xsd b/v3_1_0/CDT-cmdhPolicy-v3_1_0.xsd
index f3a91b5679d0167989c27f098e221bfca49c7e85..c4d0482c1c462c817c65fea7ff8f3620bf3d3f5e 100644
--- a/v3_1_0/CDT-cmdhPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhPolicy-v3_1_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-v3_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_1_0/CDT-commonTypes-v3_1_0.xsd b/v3_1_0/CDT-commonTypes-v3_1_0.xsd
index 9050a1d478952c5e75782a43266e556d59e0776a..4295a02bcef56085157af0a9d568c5b3466bee57 100644
--- a/v3_1_0/CDT-commonTypes-v3_1_0.xsd
+++ b/v3_1_0/CDT-commonTypes-v3_1_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-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_1_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_1_0/CDT-container-v3_1_0.xsd b/v3_1_0/CDT-container-v3_1_0.xsd
index 175833178074d1f2f61a8f17c4e28658bc587dbe..32c052578233dc84ec169b721e11b086a2f47e6a 100644
--- a/v3_1_0/CDT-container-v3_1_0.xsd
+++ b/v3_1_0/CDT-container-v3_1_0.xsd
@@ -26,10 +26,10 @@ 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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_1_0/CDT-contentInstance-v3_1_0.xsd b/v3_1_0/CDT-contentInstance-v3_1_0.xsd
index b04a3f07d8a8d470c77b5fccd6a51f4e6a0c3530..d876dae79edc184642506be06a58f68f8726592b 100644
--- a/v3_1_0/CDT-contentInstance-v3_1_0.xsd
+++ b/v3_1_0/CDT-contentInstance-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-delivery-v3_1_0.xsd b/v3_1_0/CDT-delivery-v3_1_0.xsd
index 9a55e5c7ff6879ecd6fa7f6683406eb7e1113add..57382b4c383e0a36f87e78fdef453f16a10201e0 100644
--- a/v3_1_0/CDT-delivery-v3_1_0.xsd
+++ b/v3_1_0/CDT-delivery-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_1_0/CDT-deviceCapability-v3_1_0.xsd b/v3_1_0/CDT-deviceCapability-v3_1_0.xsd
index 91e862aa1278a3e583f730308e31dbbb9519a9d6..9f3364ff91d9662381556efdd079c7ff689f5498 100644
--- a/v3_1_0/CDT-deviceCapability-v3_1_0.xsd
+++ b/v3_1_0/CDT-deviceCapability-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-deviceInfo-v3_1_0.xsd b/v3_1_0/CDT-deviceInfo-v3_1_0.xsd
index 943210f06093f871fb63c5685f4dfbf406b702b6..46afdd892dee343011975be67fe2c4f27158024d 100644
--- a/v3_1_0/CDT-deviceInfo-v3_1_0.xsd
+++ b/v3_1_0/CDT-deviceInfo-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-dynamicAuthorizationConsultation-v3_1_0.xsd b/v3_1_0/CDT-dynamicAuthorizationConsultation-v3_1_0.xsd
index b32c144d942e165de4abc77b1034ebd0e72c4d05..f41809a63ad11e14496849a251814f68037bedf4 100644
--- a/v3_1_0/CDT-dynamicAuthorizationConsultation-v3_1_0.xsd
+++ b/v3_1_0/CDT-dynamicAuthorizationConsultation-v3_1_0.xsd
@@ -26,7 +26,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-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-eventConfig-v3_1_0.xsd b/v3_1_0/CDT-eventConfig-v3_1_0.xsd
index 4c911ce59f44b94c62cef8a67c66299e630c443a..273f46b65772de159a13b71a888a928c0e4213f3 100644
--- a/v3_1_0/CDT-eventConfig-v3_1_0.xsd
+++ b/v3_1_0/CDT-eventConfig-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-eventLog-v3_1_0.xsd b/v3_1_0/CDT-eventLog-v3_1_0.xsd
index 3574d572116fd6ce2cedaed6a7c75df6c9c24deb..b8c98835aef06d1bfd4663756e1328bdde72efea 100644
--- a/v3_1_0/CDT-eventLog-v3_1_0.xsd
+++ b/v3_1_0/CDT-eventLog-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-execInstance-v3_1_0.xsd b/v3_1_0/CDT-execInstance-v3_1_0.xsd
index 02f51a9efdf53dc2421ab18185037537f71d10d2..ec4ee31a1fd15d30bb4fa943b435be5b5c10a092 100644
--- a/v3_1_0/CDT-execInstance-v3_1_0.xsd
+++ b/v3_1_0/CDT-execInstance-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-firmware-v3_1_0.xsd b/v3_1_0/CDT-firmware-v3_1_0.xsd
index c3525e671aa0d2559e189ee935eae8d008157b4c..10a3c06cc146b0b87e29b785c926287c2dd057a4 100644
--- a/v3_1_0/CDT-firmware-v3_1_0.xsd
+++ b/v3_1_0/CDT-firmware-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-genericInterworkingOperationInstance-v3_1_0.xsd b/v3_1_0/CDT-genericInterworkingOperationInstance-v3_1_0.xsd
index 506d0195961cc1f7945e00c44050b4b4c7d8b522..d6864d950e247f0d58e55803e0260879aa750972 100644
--- a/v3_1_0/CDT-genericInterworkingOperationInstance-v3_1_0.xsd
+++ b/v3_1_0/CDT-genericInterworkingOperationInstance-v3_1_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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-genericInterworkingService-v3_1_0.xsd b/v3_1_0/CDT-genericInterworkingService-v3_1_0.xsd
index 2601eebe28f137bc3f55aad81c74fdb1ae78a874..589530c58ee82e27cf3a02e3c24a67476c5170f9 100644
--- a/v3_1_0/CDT-genericInterworkingService-v3_1_0.xsd
+++ b/v3_1_0/CDT-genericInterworkingService-v3_1_0.xsd
@@ -26,10 +26,10 @@ 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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_1_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-group-v3_1_0.xsd b/v3_1_0/CDT-group-v3_1_0.xsd
index 4c85f8039d1ef86fb789ae58926e8c211113ac92..f4a4a0c5960beb95397bebdcb07b963c1bdcc574 100644
--- a/v3_1_0/CDT-group-v3_1_0.xsd
+++ b/v3_1_0/CDT-group-v3_1_0.xsd
@@ -27,9 +27,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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-locationPolicy-v3_1_0.xsd b/v3_1_0/CDT-locationPolicy-v3_1_0.xsd
index 23797dbd44e7ec048512dde86d78b03ef97745ff..098530a17273259062ab4de8ab6fccc6d703ff7f 100644
--- a/v3_1_0/CDT-locationPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-locationPolicy-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd b/v3_1_0/CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd
index 72a00090a9f5936460708a0e0e8371a3ca2dfa38..c9ce59cc84376222caf589a6cab8cf696f4cbffa 100644
--- a/v3_1_0/CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd
+++ b/v3_1_0/CDT-m2mServiceSubscriptionProfile-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_1_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-memory-v3_1_0.xsd b/v3_1_0/CDT-memory-v3_1_0.xsd
index 15376be127a8eea1be1b6f04ea7b329c09adeec9..43ef25b6f753df5d380285a27b86b92f62a7c150 100644
--- a/v3_1_0/CDT-memory-v3_1_0.xsd
+++ b/v3_1_0/CDT-memory-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-mgmtCmd-v3_1_0.xsd b/v3_1_0/CDT-mgmtCmd-v3_1_0.xsd
index e4f687ff60600af292b079e92c4e830b6ac51cea..67c3c7a897278febcba46df5949d53de44954088 100644
--- a/v3_1_0/CDT-mgmtCmd-v3_1_0.xsd
+++ b/v3_1_0/CDT-mgmtCmd-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_1_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-node-v3_1_0.xsd b/v3_1_0/CDT-node-v3_1_0.xsd
index 85cb5041a1a6960249d30d2cbcb7d5721115b20e..85d04a2bff30ddd525bd3316868b841396a6e77f 100644
--- a/v3_1_0/CDT-node-v3_1_0.xsd
+++ b/v3_1_0/CDT-node-v3_1_0.xsd
@@ -27,22 +27,22 @@ 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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_1_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-notification-v3_1_0.xsd b/v3_1_0/CDT-notification-v3_1_0.xsd
index f4f2a8436fe0ca5b020307640ab7adaefad4ca90..7708d0110034500bb6843050f3e548a0207c955c 100644
--- a/v3_1_0/CDT-notification-v3_1_0.xsd
+++ b/v3_1_0/CDT-notification-v3_1_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-v3_0_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_0_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_1_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_1_0/CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd b/v3_1_0/CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd
index ff8c5f554fbdf8b3c041c4cd0c1128781e6c16b5..ef9602305b1b013a488585179629f60e86739621 100644
--- a/v3_1_0/CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd
+++ b/v3_1_0/CDT-notificationTargetMgmtPolicyRef-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-notificationTargetPolicy-v3_1_0.xsd b/v3_1_0/CDT-notificationTargetPolicy-v3_1_0.xsd
index e5fc8516faaf49662dad86d849d80d67fbfb86b3..9d5b49787e3a33258a6ddbd7d752aa4d24cb22eb 100644
--- a/v3_1_0/CDT-notificationTargetPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-notificationTargetPolicy-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-policyDeletionRules-v3_1_0.xsd b/v3_1_0/CDT-policyDeletionRules-v3_1_0.xsd
index 25c55b8bd9d044c0545e1e26ad7481b3d1572930..99f65f0e5f6aa39a958c7e93aec6fc89d98b77df 100644
--- a/v3_1_0/CDT-policyDeletionRules-v3_1_0.xsd
+++ b/v3_1_0/CDT-policyDeletionRules-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-pollingChannel-v3_1_0.xsd b/v3_1_0/CDT-pollingChannel-v3_1_0.xsd
index 43f73f94fb62bf14217800af47f73f8909b8eb09..c22bc4f1b748f4e4c511aca78b407dedeaefd68a 100644
--- a/v3_1_0/CDT-pollingChannel-v3_1_0.xsd
+++ b/v3_1_0/CDT-pollingChannel-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-reboot-v3_1_0.xsd b/v3_1_0/CDT-reboot-v3_1_0.xsd
index 382ea956a70d67219c7144989c30ee95b93b951e..caa3810d23cb66c6a54825f7175e01e086e6f87a 100644
--- a/v3_1_0/CDT-reboot-v3_1_0.xsd
+++ b/v3_1_0/CDT-reboot-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-remoteCSE-v3_1_0.xsd b/v3_1_0/CDT-remoteCSE-v3_1_0.xsd
index 24073b74c75e06b74641144b893967012b018b18..d8883e65dc9c59ebfeb7e4f7c40ed2e07ae597df 100644
--- a/v3_1_0/CDT-remoteCSE-v3_1_0.xsd
+++ b/v3_1_0/CDT-remoteCSE-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-request-v3_1_0.xsd b/v3_1_0/CDT-request-v3_1_0.xsd
index 99c2700773606b5d13d0a82fdb2bb51dc733f28d..c637e4be01c204b3b483c5712aefe059a8203d83 100644
--- a/v3_1_0/CDT-request-v3_1_0.xsd
+++ b/v3_1_0/CDT-request-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-requestPrimitive-v3_1_0.xsd b/v3_1_0/CDT-requestPrimitive-v3_1_0.xsd
index fcdb8f0ccec12e8df85752f79215010328b68860..c907f3b39bcdc32b36ebffb86d1071b3be760fa2 100644
--- a/v3_1_0/CDT-requestPrimitive-v3_1_0.xsd
+++ b/v3_1_0/CDT-requestPrimitive-v3_1_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-v3_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_1_0/CDT-responsePrimitive-v3_1_0.xsd b/v3_1_0/CDT-responsePrimitive-v3_1_0.xsd
index 470d408e62a22d88e10daa0bae784b9fd3afb00b..1e6913ca809f55bd552963e453b9a9b77202d396 100644
--- a/v3_1_0/CDT-responsePrimitive-v3_1_0.xsd
+++ b/v3_1_0/CDT-responsePrimitive-v3_1_0.xsd
@@ -28,55 +28,55 @@ 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-v3_0_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_0_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_1_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_1_0/CDT-role-v3_1_0.xsd b/v3_1_0/CDT-role-v3_1_0.xsd
index 0b65e0dd4766f17bb2d5fd4a24b1634370e693ce..723207994a017b9bfa43eeec398f17edb0f24226 100644
--- a/v3_1_0/CDT-role-v3_1_0.xsd
+++ b/v3_1_0/CDT-role-v3_1_0.xsd
@@ -26,7 +26,7 @@ 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-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-schedule-v3_1_0.xsd b/v3_1_0/CDT-schedule-v3_1_0.xsd
index 95e3f9c3e742cb44f56f9d4757cb3a662ce7c9b2..17bb6917cc33e9d6d42933686d5e6f41e6ffa83c 100644
--- a/v3_1_0/CDT-schedule-v3_1_0.xsd
+++ b/v3_1_0/CDT-schedule-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-semanticDescriptor-v3_1_0.xsd b/v3_1_0/CDT-semanticDescriptor-v3_1_0.xsd
index a1bac6d75b821656414f61d3c43847a399bbb31d..39732499b6045926738387b90b610ba049ff5907 100644
--- a/v3_1_0/CDT-semanticDescriptor-v3_1_0.xsd
+++ b/v3_1_0/CDT-semanticDescriptor-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-serviceSubscribedAppRule-v3_1_0.xsd b/v3_1_0/CDT-serviceSubscribedAppRule-v3_1_0.xsd
index dac20e56482460cecd196f8d8c82ec75c2959107..ddea8d1d01fd3d5bcf9be68877d3a67a7c890d36 100644
--- a/v3_1_0/CDT-serviceSubscribedAppRule-v3_1_0.xsd
+++ b/v3_1_0/CDT-serviceSubscribedAppRule-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-serviceSubscribedNode-v3_1_0.xsd b/v3_1_0/CDT-serviceSubscribedNode-v3_1_0.xsd
index b2d8786a5021e77a22e52fd19d2d455e9c9b10c1..a4c5ef31213ee0928c8d1053401c9110f11a6e19 100644
--- a/v3_1_0/CDT-serviceSubscribedNode-v3_1_0.xsd
+++ b/v3_1_0/CDT-serviceSubscribedNode-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-software-v3_1_0.xsd b/v3_1_0/CDT-software-v3_1_0.xsd
index 0e01a2962e1af846d1ae484b37aa6957f923895b..24eec1c54e5a47d3262b4ed0bcde1e1c958b4f1b 100644
--- a/v3_1_0/CDT-software-v3_1_0.xsd
+++ b/v3_1_0/CDT-software-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-statsCollect-v3_1_0.xsd b/v3_1_0/CDT-statsCollect-v3_1_0.xsd
index 5101e4f508360ad87719915e7dac0570d4a6d560..fe5145285bb54f6eb38e222bbe127da45267693d 100644
--- a/v3_1_0/CDT-statsCollect-v3_1_0.xsd
+++ b/v3_1_0/CDT-statsCollect-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-statsConfig-v3_1_0.xsd b/v3_1_0/CDT-statsConfig-v3_1_0.xsd
index 84805cc8ac0c52c97dcb0a29ca4ad43bd478383c..dec5df54cc2480e70f066f379d484d785fceb599 100644
--- a/v3_1_0/CDT-statsConfig-v3_1_0.xsd
+++ b/v3_1_0/CDT-statsConfig-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-subscription-v3_1_0.xsd b/v3_1_0/CDT-subscription-v3_1_0.xsd
index 063d3cd2334bb0fbf0858a9664d71a439af97b15..9b6f38c0df6946f979838154e18b4ac5b4607c05 100644
--- a/v3_1_0/CDT-subscription-v3_1_0.xsd
+++ b/v3_1_0/CDT-subscription-v3_1_0.xsd
@@ -27,9 +27,9 @@ 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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-svcFwWrapper-v3_1_0.xsd b/v3_1_0/CDT-svcFwWrapper-v3_1_0.xsd
index 084e18e95ae6e869e45bb76230f9869219eeffeb..dd2acf6098862b695ee2cad6585bb096c6dbcf2d 100644
--- a/v3_1_0/CDT-svcFwWrapper-v3_1_0.xsd
+++ b/v3_1_0/CDT-svcFwWrapper-v3_1_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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-svcObjWrapper-v3_1_0.xsd b/v3_1_0/CDT-svcObjWrapper-v3_1_0.xsd
index ee61b781ec924006bd3b2481cab393f8a17d5a0f..562223d380f11212efd195926243fed1a6c4b038 100644
--- a/v3_1_0/CDT-svcObjWrapper-v3_1_0.xsd
+++ b/v3_1_0/CDT-svcObjWrapper-v3_1_0.xsd
@@ -26,10 +26,10 @@ 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-v3_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_1_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-timeSeries-v3_1_0.xsd b/v3_1_0/CDT-timeSeries-v3_1_0.xsd
index b1949cbdd2b9567927ad57aef5e06c0e38aa7406..23c5dba50de15490f4135ef22fa37b8b07b1b8b1 100644
--- a/v3_1_0/CDT-timeSeries-v3_1_0.xsd
+++ b/v3_1_0/CDT-timeSeries-v3_1_0.xsd
@@ -26,10 +26,10 @@ 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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_1_0/CDT-timeSeriesInstance-v3_1_0.xsd b/v3_1_0/CDT-timeSeriesInstance-v3_1_0.xsd
index 4faa91b16d5396350148c086762c9138b5dd1655..791931040ecafc0d492077fd3eea6a4fc5cfa4c1 100644
--- a/v3_1_0/CDT-timeSeriesInstance-v3_1_0.xsd
+++ b/v3_1_0/CDT-timeSeriesInstance-v3_1_0.xsd
@@ -26,7 +26,7 @@ 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-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-token-v3_1_0.xsd b/v3_1_0/CDT-token-v3_1_0.xsd
index 4300b9cf17f4c4aa7b9afcff0b32abcaefdf54b0..0a2f6bd82ae653f40cc8555459ee60ce9fa97b59 100644
--- a/v3_1_0/CDT-token-v3_1_0.xsd
+++ b/v3_1_0/CDT-token-v3_1_0.xsd
@@ -26,7 +26,7 @@ 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-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-trafficPattern-v3_1_0.xsd b/v3_1_0/CDT-trafficPattern-v3_1_0.xsd
index d463acbe8a9876b78af221a0e0983afd0692f382..05fda4a88cc002668db9675ae4640edd1ac98780 100644
--- a/v3_1_0/CDT-trafficPattern-v3_1_0.xsd
+++ b/v3_1_0/CDT-trafficPattern-v3_1_0.xsd
@@ -27,9 +27,9 @@ 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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>