diff --git a/v2_10_0/CDT-AE-v2_10_0.xsd b/v2_10_0/CDT-AE-v2_10_0.xsd
index 718c8267ba3899e6510f48cd6cefbd9552daca93..b79c95e004d957e88df95d28c36eb7ac5adaa773 100644
--- a/v2_10_0/CDT-AE-v2_10_0.xsd
+++ b/v2_10_0/CDT-AE-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_10_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-CSEBase-v2_10_0.xsd b/v2_10_0/CDT-CSEBase-v2_10_0.xsd
index 8c582fec6ec5ed310dba711d426a6160092b0296..f93179ac26c54ee595c718af6048cc247d1cff5d 100644
--- a/v2_10_0/CDT-CSEBase-v2_10_0.xsd
+++ b/v2_10_0/CDT-CSEBase-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_9_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_9_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_10_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_10_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_10_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-accessControlPolicy-v2_10_0.xsd b/v2_10_0/CDT-accessControlPolicy-v2_10_0.xsd
index f7547f3dc315a86b75730dd9dd6f79823add11e7..64b5f4dc6c1e1060ffdfacbe420720ca357b4834 100644
--- a/v2_10_0/CDT-accessControlPolicy-v2_10_0.xsd
+++ b/v2_10_0/CDT-accessControlPolicy-v2_10_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-v2_9_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-activeCmdhPolicy-v2_10_0.xsd b/v2_10_0/CDT-activeCmdhPolicy-v2_10_0.xsd
index 83e3ef0912716a927b6cb42157d4cd25a31d6dea..610a452ecf843d41cb2ac1f49e4d90a5bb4b62bf 100644
--- a/v2_10_0/CDT-activeCmdhPolicy-v2_10_0.xsd
+++ b/v2_10_0/CDT-activeCmdhPolicy-v2_10_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-v2_9_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_10_0/CDT-allJoynApp-v2_10_0.xsd b/v2_10_0/CDT-allJoynApp-v2_10_0.xsd
index 44240b19092bfd504cff8eaf264d2870c7e81e5f..0476b1acd37289f08db67ea413abfb4ace0b26c6 100644
--- a/v2_10_0/CDT-allJoynApp-v2_10_0.xsd
+++ b/v2_10_0/CDT-allJoynApp-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_10_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-allJoynInterface-v2_10_0.xsd b/v2_10_0/CDT-allJoynInterface-v2_10_0.xsd
index 7203fbc7a0daf3adec3a173fdd6d260a2dd8b89c..bec19cff0fd3d7bd489bd845edcf8845870bf6fe 100644
--- a/v2_10_0/CDT-allJoynInterface-v2_10_0.xsd
+++ b/v2_10_0/CDT-allJoynInterface-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_10_0/CDT-allJoynMethod-v2_10_0.xsd b/v2_10_0/CDT-allJoynMethod-v2_10_0.xsd
index f00d54c3e4eee41ab4113dbfd2b9dba87757caf6..cf2b548a5545e5fb7f526978b3a33e91cf8b308b 100644
--- a/v2_10_0/CDT-allJoynMethod-v2_10_0.xsd
+++ b/v2_10_0/CDT-allJoynMethod-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_10_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_10_0/CDT-allJoynMethodCall-v2_10_0.xsd b/v2_10_0/CDT-allJoynMethodCall-v2_10_0.xsd
index 17f476af802de6882ca6ccd1438e1d723f6da2f9..c97d88b7fe2a29d6ca1b8d8f1e75f8ed1fa62104 100644
--- a/v2_10_0/CDT-allJoynMethodCall-v2_10_0.xsd
+++ b/v2_10_0/CDT-allJoynMethodCall-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-allJoynProperty-v2_10_0.xsd b/v2_10_0/CDT-allJoynProperty-v2_10_0.xsd
index 3c62afef2a1ebaedf0ce877552de36319173622d..2d3573b7a04e1dbd6fab2c05f33c149aabc466ca 100644
--- a/v2_10_0/CDT-allJoynProperty-v2_10_0.xsd
+++ b/v2_10_0/CDT-allJoynProperty-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-allJoynSvcObject-v2_10_0.xsd b/v2_10_0/CDT-allJoynSvcObject-v2_10_0.xsd
index 3e68957d297998ba532d13718ae606387d934c51..145a9ff5735602c6c3e523454f60f4265765f3de 100644
--- a/v2_10_0/CDT-allJoynSvcObject-v2_10_0.xsd
+++ b/v2_10_0/CDT-allJoynSvcObject-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_10_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-areaNwkDeviceInfo-v2_10_0.xsd b/v2_10_0/CDT-areaNwkDeviceInfo-v2_10_0.xsd
index 7c7ab5346b717d0a3136a39a830898c450296f22..36a47cdac35d6b3f2f34a29e9bd7886d4d8fe01e 100644
--- a/v2_10_0/CDT-areaNwkDeviceInfo-v2_10_0.xsd
+++ b/v2_10_0/CDT-areaNwkDeviceInfo-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-areaNwkInfo-v2_10_0.xsd b/v2_10_0/CDT-areaNwkInfo-v2_10_0.xsd
index b988d668e69d3c7095d983fa9fd837a4dc789f8e..f672a158f9d636f15d3511c37e835032606970f1 100644
--- a/v2_10_0/CDT-areaNwkInfo-v2_10_0.xsd
+++ b/v2_10_0/CDT-areaNwkInfo-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-battery-v2_10_0.xsd b/v2_10_0/CDT-battery-v2_10_0.xsd
index a34e85a4ea397c2c70ba1cfe33c298a3431e8bf4..62abc25fb2970ab7a5b725ca906d46e39af6d25b 100644
--- a/v2_10_0/CDT-battery-v2_10_0.xsd
+++ b/v2_10_0/CDT-battery-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-cmdhBuffer-v2_10_0.xsd b/v2_10_0/CDT-cmdhBuffer-v2_10_0.xsd
index c508d4e7d61cb99f643f67d0b820dd0eea746c75..901b3d1755e84c378824c7795c46811b18a80c8f 100644
--- a/v2_10_0/CDT-cmdhBuffer-v2_10_0.xsd
+++ b/v2_10_0/CDT-cmdhBuffer-v2_10_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-v2_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_10_0/CDT-cmdhDefEcValue-v2_10_0.xsd b/v2_10_0/CDT-cmdhDefEcValue-v2_10_0.xsd
index c20f04344d3c2c82d3369bbc5c9511e0c4104ad6..aa6ba591eb46e0b201cb9bdf6fb3286f2cf56dbd 100644
--- a/v2_10_0/CDT-cmdhDefEcValue-v2_10_0.xsd
+++ b/v2_10_0/CDT-cmdhDefEcValue-v2_10_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-v2_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_10_0/CDT-cmdhDefaults-v2_10_0.xsd b/v2_10_0/CDT-cmdhDefaults-v2_10_0.xsd
index fd2db6ed9be849af709645f13f6d8dec5bdc0297..402bd81d2b43bdec029fd101d2e1c5f608657cfd 100644
--- a/v2_10_0/CDT-cmdhDefaults-v2_10_0.xsd
+++ b/v2_10_0/CDT-cmdhDefaults-v2_10_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-v2_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_10_0/CDT-cmdhEcDefParamValues-v2_10_0.xsd b/v2_10_0/CDT-cmdhEcDefParamValues-v2_10_0.xsd
index ab21960742dbd68fa6f92906ec9e20d09b19336e..ab108a6d37a1f39f0b36cf1f1943712dcc615aa7 100644
--- a/v2_10_0/CDT-cmdhEcDefParamValues-v2_10_0.xsd
+++ b/v2_10_0/CDT-cmdhEcDefParamValues-v2_10_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-v2_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_10_0/CDT-cmdhLimits-v2_10_0.xsd b/v2_10_0/CDT-cmdhLimits-v2_10_0.xsd
index 36338bb9817c2bc2115c37b9fc1f0619dbc2678a..69d47c509e51811520b54cd2fa52f5aedc2acf16 100644
--- a/v2_10_0/CDT-cmdhLimits-v2_10_0.xsd
+++ b/v2_10_0/CDT-cmdhLimits-v2_10_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-v2_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_10_0/CDT-cmdhNetworkAccessRules-v2_10_0.xsd b/v2_10_0/CDT-cmdhNetworkAccessRules-v2_10_0.xsd
index cc0d606905d7161277bb4919c7e81d4dc3845556..b48f4683b40e555eb61efe99c004181b9606e19d 100644
--- a/v2_10_0/CDT-cmdhNetworkAccessRules-v2_10_0.xsd
+++ b/v2_10_0/CDT-cmdhNetworkAccessRules-v2_10_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-v2_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_10_0/CDT-cmdhNwAccessRule-v2_10_0.xsd b/v2_10_0/CDT-cmdhNwAccessRule-v2_10_0.xsd
index 28c415e8a9d4ed432c8140e72394aeed43927b55..597491eefb89534347b72adfcb8af77209b028df 100644
--- a/v2_10_0/CDT-cmdhNwAccessRule-v2_10_0.xsd
+++ b/v2_10_0/CDT-cmdhNwAccessRule-v2_10_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-v2_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_10_0/CDT-cmdhPolicy-v2_10_0.xsd b/v2_10_0/CDT-cmdhPolicy-v2_10_0.xsd
index 4bd6dcf9cc14ff13ed3e72fcf9601935131d1f94..102ef1a62655febb47c5492ed74e676c788d3e68 100644
--- a/v2_10_0/CDT-cmdhPolicy-v2_10_0.xsd
+++ b/v2_10_0/CDT-cmdhPolicy-v2_10_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-v2_9_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_10_0/CDT-commonTypes-v2_10_0.xsd b/v2_10_0/CDT-commonTypes-v2_10_0.xsd
index c40bfe4f8948b17d1b77937467ee6419d35905fd..6bdc746195862855f395ef6de7de0b7b114c202a 100644
--- a/v2_10_0/CDT-commonTypes-v2_10_0.xsd
+++ b/v2_10_0/CDT-commonTypes-v2_10_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-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_10_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_10_0/CDT-container-v2_10_0.xsd b/v2_10_0/CDT-container-v2_10_0.xsd
index e4814c4f1cfa9603b981aeca65680aa3fb6041a1..dc040aa80e1099d605e896705b8a25581cdca0fa 100644
--- a/v2_10_0/CDT-container-v2_10_0.xsd
+++ b/v2_10_0/CDT-container-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_10_0/CDT-contentInstance-v2_10_0.xsd b/v2_10_0/CDT-contentInstance-v2_10_0.xsd
index 22715c26dbd7f002ad6d38af0adfa3fceb8cf031..b521a67fd0d2618e6d9e613171559b0c3bcf3909 100644
--- a/v2_10_0/CDT-contentInstance-v2_10_0.xsd
+++ b/v2_10_0/CDT-contentInstance-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-delivery-v2_10_0.xsd b/v2_10_0/CDT-delivery-v2_10_0.xsd
index 8119c1e52a35b30bf38b3b8140d15684b3b1bfac..d18f9dda2e56d6c7929ad5ddbe0561b89fb62b36 100644
--- a/v2_10_0/CDT-delivery-v2_10_0.xsd
+++ b/v2_10_0/CDT-delivery-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_10_0/CDT-deviceCapability-v2_10_0.xsd b/v2_10_0/CDT-deviceCapability-v2_10_0.xsd
index 99abeecb17f9a6b682373309e4765c407b04248a..449a79657654e2acfe7ba3bd80dda108fec6262b 100644
--- a/v2_10_0/CDT-deviceCapability-v2_10_0.xsd
+++ b/v2_10_0/CDT-deviceCapability-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-deviceInfo-v2_10_0.xsd b/v2_10_0/CDT-deviceInfo-v2_10_0.xsd
index 0382879779dc3533cee1af33f3a646b9d21bc45b..d54c300ff3d5a826f6f162b9f04ed6cafa206b75 100644
--- a/v2_10_0/CDT-deviceInfo-v2_10_0.xsd
+++ b/v2_10_0/CDT-deviceInfo-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-dynamicAuthorizationConsultation-v2_10_0.xsd b/v2_10_0/CDT-dynamicAuthorizationConsultation-v2_10_0.xsd
index caed94cfec2053f5dd777bc4465e4945f0b56b96..98d5b2e4245661e4e963b586c5ec220b13cdbff2 100644
--- a/v2_10_0/CDT-dynamicAuthorizationConsultation-v2_10_0.xsd
+++ b/v2_10_0/CDT-dynamicAuthorizationConsultation-v2_10_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-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-eventConfig-v2_10_0.xsd b/v2_10_0/CDT-eventConfig-v2_10_0.xsd
index 0e0b58751538b7419e015e9e8158eb9b842dff8f..1ad1990faebeeb75a51e5360f07dc5ee193f6526 100644
--- a/v2_10_0/CDT-eventConfig-v2_10_0.xsd
+++ b/v2_10_0/CDT-eventConfig-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-eventLog-v2_10_0.xsd b/v2_10_0/CDT-eventLog-v2_10_0.xsd
index 0db4bcd6f7128f0fe3f7edd187f9b6051503aa62..2b158dc3983f1d63fa26d038113c5d8ce79b8e2f 100644
--- a/v2_10_0/CDT-eventLog-v2_10_0.xsd
+++ b/v2_10_0/CDT-eventLog-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-execInstance-v2_10_0.xsd b/v2_10_0/CDT-execInstance-v2_10_0.xsd
index 22e025e0f3dc5a773e783009068b785dbeab6aa0..364fa3b0a9808d2a8dcadd7c1a720cea246847cb 100644
--- a/v2_10_0/CDT-execInstance-v2_10_0.xsd
+++ b/v2_10_0/CDT-execInstance-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-firmware-v2_10_0.xsd b/v2_10_0/CDT-firmware-v2_10_0.xsd
index 5cb52c3dec9a90f0ccac80a0386b7255871b589a..e319dcffec4b07f42ded28b87f470efab555e601 100644
--- a/v2_10_0/CDT-firmware-v2_10_0.xsd
+++ b/v2_10_0/CDT-firmware-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-genericInterworkingOperationInstance-v2_10_0.xsd b/v2_10_0/CDT-genericInterworkingOperationInstance-v2_10_0.xsd
index 6ece6050cf3b3121575bce402b1f5dc6400ad971..8bd47e0e314bd647396f8dd0ebb75570182d9a94 100644
--- a/v2_10_0/CDT-genericInterworkingOperationInstance-v2_10_0.xsd
+++ b/v2_10_0/CDT-genericInterworkingOperationInstance-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-genericInterworkingService-v2_10_0.xsd b/v2_10_0/CDT-genericInterworkingService-v2_10_0.xsd
index ddcfcce4b3d79beccab7b9b4aa60aa92c83888ff..8609599b3b7b269bc252ad9415d77458bb27cd89 100644
--- a/v2_10_0/CDT-genericInterworkingService-v2_10_0.xsd
+++ b/v2_10_0/CDT-genericInterworkingService-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_10_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-group-v2_10_0.xsd b/v2_10_0/CDT-group-v2_10_0.xsd
index 97f72331a12cce133d54cae48f9fe8364909ebe6..c4439df2b7a6efe4c23c42d30801d3d5af85a931 100644
--- a/v2_10_0/CDT-group-v2_10_0.xsd
+++ b/v2_10_0/CDT-group-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-locationPolicy-v2_10_0.xsd b/v2_10_0/CDT-locationPolicy-v2_10_0.xsd
index b1b15fa8a87926e02ccfd3cf35a5641893dc253f..035443c5d2055da50fba4334e4d49b9ec298f9a6 100644
--- a/v2_10_0/CDT-locationPolicy-v2_10_0.xsd
+++ b/v2_10_0/CDT-locationPolicy-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd b/v2_10_0/CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd
index 84e6c88ff3365bbf31444dc13f2cb0d176c14905..aba43fee5962d9464174d73c14a1276159c3cff3 100644
--- a/v2_10_0/CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd
+++ b/v2_10_0/CDT-m2mServiceSubscriptionProfile-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_10_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-memory-v2_10_0.xsd b/v2_10_0/CDT-memory-v2_10_0.xsd
index 5cac1cdef89ed76232af2248ffb262c0b77e91a8..21fecf669205393970cc9b91cac453e12b110e93 100644
--- a/v2_10_0/CDT-memory-v2_10_0.xsd
+++ b/v2_10_0/CDT-memory-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-mgmtCmd-v2_10_0.xsd b/v2_10_0/CDT-mgmtCmd-v2_10_0.xsd
index 447f4267761efd2c94cef19f52cf287ed2d3181e..61baaef251aec3c299fe46cca263e62c1aac6498 100644
--- a/v2_10_0/CDT-mgmtCmd-v2_10_0.xsd
+++ b/v2_10_0/CDT-mgmtCmd-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_10_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-node-v2_10_0.xsd b/v2_10_0/CDT-node-v2_10_0.xsd
index 8cdd9f826dd625e0c64c54f4dcfb22001a70977a..dc3058bff05bec32df141ed6fc8c710e0e9020bf 100644
--- a/v2_10_0/CDT-node-v2_10_0.xsd
+++ b/v2_10_0/CDT-node-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_10_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-notification-v2_10_0.xsd b/v2_10_0/CDT-notification-v2_10_0.xsd
index 4de5e1fa0f435f0c6d3b8d6094f3e6628592bac0..e4be88818fec6278abb0681679e70917c7e5e45b 100644
--- a/v2_10_0/CDT-notification-v2_10_0.xsd
+++ b/v2_10_0/CDT-notification-v2_10_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-v2_9_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_9_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_10_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_10_0/CDT-notificationTargetMgmtPolicyRef-v2_10_0.xsd b/v2_10_0/CDT-notificationTargetMgmtPolicyRef-v2_10_0.xsd
index 322c49494e75a0ca3a2874caf70d3323136a9225..1ff52d8c93f929c46c4752175ff0a94907863cf0 100644
--- a/v2_10_0/CDT-notificationTargetMgmtPolicyRef-v2_10_0.xsd
+++ b/v2_10_0/CDT-notificationTargetMgmtPolicyRef-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-notificationTargetPolicy-v2_10_0.xsd b/v2_10_0/CDT-notificationTargetPolicy-v2_10_0.xsd
index ce0a6ce86a2d24a7e1c94d375ecc586639177fb6..06fee4e9dd9c6aad83e55bdf7a0d2bde4cc3f1ef 100644
--- a/v2_10_0/CDT-notificationTargetPolicy-v2_10_0.xsd
+++ b/v2_10_0/CDT-notificationTargetPolicy-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-policyDeletionRules-v2_10_0.xsd b/v2_10_0/CDT-policyDeletionRules-v2_10_0.xsd
index db3fdb176baa31ab07b5805ed72c9eafb8394d23..5562acaed0d47629324da64131f2f36dcb14ebac 100644
--- a/v2_10_0/CDT-policyDeletionRules-v2_10_0.xsd
+++ b/v2_10_0/CDT-policyDeletionRules-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-pollingChannel-v2_10_0.xsd b/v2_10_0/CDT-pollingChannel-v2_10_0.xsd
index 23a7ff1a39c4b9c540b7857421e4f0bbd7ea42c1..6f6eb65d0f1a057844ae90e7914350ac6fc1e750 100644
--- a/v2_10_0/CDT-pollingChannel-v2_10_0.xsd
+++ b/v2_10_0/CDT-pollingChannel-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-reboot-v2_10_0.xsd b/v2_10_0/CDT-reboot-v2_10_0.xsd
index f36b1609275a07ccdd658d69a0696e2600b1f525..5d88191231e749b505ce455212a7c18dee21daee 100644
--- a/v2_10_0/CDT-reboot-v2_10_0.xsd
+++ b/v2_10_0/CDT-reboot-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-remoteCSE-v2_10_0.xsd b/v2_10_0/CDT-remoteCSE-v2_10_0.xsd
index f2f659e41f3668912fea83f028b330710f8d3656..480597dfe311053688ba4cee2d2467f893e2fd04 100644
--- a/v2_10_0/CDT-remoteCSE-v2_10_0.xsd
+++ b/v2_10_0/CDT-remoteCSE-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-request-v2_10_0.xsd b/v2_10_0/CDT-request-v2_10_0.xsd
index 56de33cdc280cff96e4651e9d257d06714116d32..2b0f99879776bd4c8c0c109ebf5f15b82417b23d 100644
--- a/v2_10_0/CDT-request-v2_10_0.xsd
+++ b/v2_10_0/CDT-request-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-requestPrimitive-v2_10_0.xsd b/v2_10_0/CDT-requestPrimitive-v2_10_0.xsd
index 283f9597ac67da9928dcbea4831d124eff925083..119f0f89d366c980eb226ee1fbdd35a14acd32fa 100644
--- a/v2_10_0/CDT-requestPrimitive-v2_10_0.xsd
+++ b/v2_10_0/CDT-requestPrimitive-v2_10_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-v2_9_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_10_0/CDT-responsePrimitive-v2_10_0.xsd b/v2_10_0/CDT-responsePrimitive-v2_10_0.xsd
index c1cf4ab1f7bfba4d151735dafeb82928111e0ab0..464e07c4f24edc7649aedaf6288377bef57e660e 100644
--- a/v2_10_0/CDT-responsePrimitive-v2_10_0.xsd
+++ b/v2_10_0/CDT-responsePrimitive-v2_10_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-v2_9_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_9_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_9_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_10_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_10_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_10_0/CDT-role-v2_10_0.xsd b/v2_10_0/CDT-role-v2_10_0.xsd
index 8ee193a186b32b88af5973299ff9875f4df01229..aff89ad2aa1b987a997af0ffe8dd037a08e2aac2 100644
--- a/v2_10_0/CDT-role-v2_10_0.xsd
+++ b/v2_10_0/CDT-role-v2_10_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-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-schedule-v2_10_0.xsd b/v2_10_0/CDT-schedule-v2_10_0.xsd
index c20cca07cdaa454edd7b7a6fff9f9bd7b6358555..7e8156be1c20358a83ef40741a39be162fc17160 100644
--- a/v2_10_0/CDT-schedule-v2_10_0.xsd
+++ b/v2_10_0/CDT-schedule-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-semanticDescriptor-v2_10_0.xsd b/v2_10_0/CDT-semanticDescriptor-v2_10_0.xsd
index 477ca2fbc731d9a665480a4480344e3b5695f6a8..6dedc8378d97d9631a297ac527da2d8eed94d6d7 100644
--- a/v2_10_0/CDT-semanticDescriptor-v2_10_0.xsd
+++ b/v2_10_0/CDT-semanticDescriptor-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-serviceSubscribedAppRule-v2_10_0.xsd b/v2_10_0/CDT-serviceSubscribedAppRule-v2_10_0.xsd
index 0261105a9725ddeece29078d852fe33dc71ce54e..568c458357f71e04b056eaecaeda39da069033cd 100644
--- a/v2_10_0/CDT-serviceSubscribedAppRule-v2_10_0.xsd
+++ b/v2_10_0/CDT-serviceSubscribedAppRule-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-serviceSubscribedNode-v2_10_0.xsd b/v2_10_0/CDT-serviceSubscribedNode-v2_10_0.xsd
index 4a053071b38e9187e03897cbb9a63a22c80c68de..8e08894023c732142e7223a695e570e74eb0fd62 100644
--- a/v2_10_0/CDT-serviceSubscribedNode-v2_10_0.xsd
+++ b/v2_10_0/CDT-serviceSubscribedNode-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-software-v2_10_0.xsd b/v2_10_0/CDT-software-v2_10_0.xsd
index ff9995678705932892b7f24060d25f84345f2543..1be2e304186dab1b559c4678f4c7457c7f6ee875 100644
--- a/v2_10_0/CDT-software-v2_10_0.xsd
+++ b/v2_10_0/CDT-software-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-statsCollect-v2_10_0.xsd b/v2_10_0/CDT-statsCollect-v2_10_0.xsd
index f7ac0f4c45a89faeac902542624a74f956a87e9c..6e2f649062d2e42be5fc8b1eb51562380338d4ec 100644
--- a/v2_10_0/CDT-statsCollect-v2_10_0.xsd
+++ b/v2_10_0/CDT-statsCollect-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-statsConfig-v2_10_0.xsd b/v2_10_0/CDT-statsConfig-v2_10_0.xsd
index 20617508b90063cecac62465a4b2f030571f551b..89c59deb2422cb2e330883c7449b27e9c5172991 100644
--- a/v2_10_0/CDT-statsConfig-v2_10_0.xsd
+++ b/v2_10_0/CDT-statsConfig-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-subscription-v2_10_0.xsd b/v2_10_0/CDT-subscription-v2_10_0.xsd
index f8a2a0f19d1cbb03114a741bc4a419a49f6ddcd9..683fdfb552aaadc1bf5efdc021e520ee2efad8d2 100644
--- a/v2_10_0/CDT-subscription-v2_10_0.xsd
+++ b/v2_10_0/CDT-subscription-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_10_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-svcFwWrapper-v2_10_0.xsd b/v2_10_0/CDT-svcFwWrapper-v2_10_0.xsd
index 7218a69118859c56030d3d351c311a1028907bc3..242bd367c04cbedbdad0a639ba764c80db4a63c7 100644
--- a/v2_10_0/CDT-svcFwWrapper-v2_10_0.xsd
+++ b/v2_10_0/CDT-svcFwWrapper-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-svcObjWrapper-v2_10_0.xsd b/v2_10_0/CDT-svcObjWrapper-v2_10_0.xsd
index 60327fefb45073b9e36adf5062f947404b2c3237..e99835090b3357cede7e1059808ab2763bd249c4 100644
--- a/v2_10_0/CDT-svcObjWrapper-v2_10_0.xsd
+++ b/v2_10_0/CDT-svcObjWrapper-v2_10_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-v2_9_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_10_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-timeSeries-v2_10_0.xsd b/v2_10_0/CDT-timeSeries-v2_10_0.xsd
index 7775a260d7c648065888173df022a5b313048658..db997f6e43d73f9793efac52a74b9c37c7901d7b 100644
--- a/v2_10_0/CDT-timeSeries-v2_10_0.xsd
+++ b/v2_10_0/CDT-timeSeries-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_10_0/CDT-timeSeriesInstance-v2_10_0.xsd b/v2_10_0/CDT-timeSeriesInstance-v2_10_0.xsd
index c1f72488832091f40c7166bbb5ef728c8f6eeb26..8081f5fa29fb69d09551ab0d1510212230559e26 100644
--- a/v2_10_0/CDT-timeSeriesInstance-v2_10_0.xsd
+++ b/v2_10_0/CDT-timeSeriesInstance-v2_10_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-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-token-v2_10_0.xsd b/v2_10_0/CDT-token-v2_10_0.xsd
index a060413626b9844ec92c91f4de8b6eebee1974fb..44fa13fff6545ab7e9ec491ae9ae5c7b53bef9cd 100644
--- a/v2_10_0/CDT-token-v2_10_0.xsd
+++ b/v2_10_0/CDT-token-v2_10_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-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_10_0/CDT-trafficPattern-v2_10_0.xsd b/v2_10_0/CDT-trafficPattern-v2_10_0.xsd
index 3f10cd4cb0fde6364de4c5ef5d9a587e409dd932..408b97786e3b250f47142ba142a1d81065c1dcb0 100644
--- a/v2_10_0/CDT-trafficPattern-v2_10_0.xsd
+++ b/v2_10_0/CDT-trafficPattern-v2_10_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-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>