From e12064301dab4099062b86729c91408ba8e0be9a Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Sat, 18 Mar 2017 12:42:11 +0100
Subject: [PATCH] updated schemaLocation attribute values

---
 v3_0_0/CDT-AE-v3_0_0.xsd                      | 20 ++--
 v3_0_0/CDT-CSEBase-v3_0_0.xsd                 | 40 ++++----
 v3_0_0/CDT-accessControlPolicy-v3_0_0.xsd     |  4 +-
 v3_0_0/CDT-activeCmdhPolicy-v3_0_0.xsd        |  2 +-
 v3_0_0/CDT-allJoynApp-v3_0_0.xsd              |  8 +-
 v3_0_0/CDT-allJoynInterface-v3_0_0.xsd        | 12 +--
 v3_0_0/CDT-allJoynMethod-v3_0_0.xsd           |  8 +-
 v3_0_0/CDT-allJoynMethodCall-v3_0_0.xsd       |  6 +-
 v3_0_0/CDT-allJoynProperty-v3_0_0.xsd         |  6 +-
 v3_0_0/CDT-allJoynSvcObject-v3_0_0.xsd        |  8 +-
 v3_0_0/CDT-areaNwkDeviceInfo-v3_0_0.xsd       |  4 +-
 v3_0_0/CDT-areaNwkInfo-v3_0_0.xsd             |  4 +-
 v3_0_0/CDT-battery-v3_0_0.xsd                 |  4 +-
 v3_0_0/CDT-cmdhBuffer-v3_0_0.xsd              |  2 +-
 v3_0_0/CDT-cmdhDefEcValue-v3_0_0.xsd          |  2 +-
 v3_0_0/CDT-cmdhDefaults-v3_0_0.xsd            |  2 +-
 v3_0_0/CDT-cmdhEcDefParamValues-v3_0_0.xsd    |  2 +-
 v3_0_0/CDT-cmdhLimits-v3_0_0.xsd              |  2 +-
 v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_0.xsd  |  2 +-
 v3_0_0/CDT-cmdhNwAccessRule-v3_0_0.xsd        |  2 +-
 v3_0_0/CDT-cmdhPolicy-v3_0_0.xsd              |  2 +-
 v3_0_0/CDT-commonTypes-v3_0_0.xsd             |  2 +-
 v3_0_0/CDT-container-v3_0_0.xsd               |  8 +-
 v3_0_0/CDT-contentInstance-v3_0_0.xsd         |  4 +-
 v3_0_0/CDT-delivery-v3_0_0.xsd                |  4 +-
 v3_0_0/CDT-deviceCapability-v3_0_0.xsd        |  4 +-
 v3_0_0/CDT-deviceInfo-v3_0_0.xsd              |  4 +-
 ...ynamicAuthorizationConsultation-v3_0_0.xsd |  2 +-
 v3_0_0/CDT-eventConfig-v3_0_0.xsd             |  4 +-
 v3_0_0/CDT-eventLog-v3_0_0.xsd                |  4 +-
 v3_0_0/CDT-execInstance-v3_0_0.xsd            |  4 +-
 v3_0_0/CDT-firmware-v3_0_0.xsd                |  4 +-
 ...icInterworkingOperationInstance-v3_0_0.xsd |  6 +-
 .../CDT-genericInterworkingService-v3_0_0.xsd |  8 +-
 v3_0_0/CDT-group-v3_0_0.xsd                   |  6 +-
 v3_0_0/CDT-locationPolicy-v3_0_0.xsd          |  4 +-
 ...T-m2mServiceSubscriptionProfile-v3_0_0.xsd |  6 +-
 v3_0_0/CDT-memory-v3_0_0.xsd                  |  4 +-
 v3_0_0/CDT-mgmtCmd-v3_0_0.xsd                 |  6 +-
 v3_0_0/CDT-node-v3_0_0.xsd                    | 32 +++---
 v3_0_0/CDT-notification-v3_0_0.xsd            |  4 +-
 ...notificationTargetMgmtPolicyRef-v3_0_0.xsd |  4 +-
 .../CDT-notificationTargetPolicy-v3_0_0.xsd   |  6 +-
 v3_0_0/CDT-policyDeletionRules-v3_0_0.xsd     |  4 +-
 v3_0_0/CDT-pollingChannel-v3_0_0.xsd          |  4 +-
 v3_0_0/CDT-reboot-v3_0_0.xsd                  |  4 +-
 v3_0_0/CDT-remoteCSE-v3_0_0.xsd               | 22 ++---
 v3_0_0/CDT-request-v3_0_0.xsd                 |  4 +-
 v3_0_0/CDT-requestPrimitive-v3_0_0.xsd        |  2 +-
 v3_0_0/CDT-responsePrimitive-v3_0_0.xsd       | 98 +++++++++----------
 v3_0_0/CDT-role-v3_0_0.xsd                    |  2 +-
 v3_0_0/CDT-schedule-v3_0_0.xsd                |  4 +-
 v3_0_0/CDT-semanticDescriptor-v3_0_0.xsd      |  4 +-
 .../CDT-serviceSubscribedAppRule-v3_0_0.xsd   |  4 +-
 v3_0_0/CDT-serviceSubscribedNode-v3_0_0.xsd   |  4 +-
 v3_0_0/CDT-software-v3_0_0.xsd                |  4 +-
 v3_0_0/CDT-statsCollect-v3_0_0.xsd            |  4 +-
 v3_0_0/CDT-statsConfig-v3_0_0.xsd             |  6 +-
 v3_0_0/CDT-subscription-v3_0_0.xsd            |  6 +-
 v3_0_0/CDT-svcFwWrapper-v3_0_0.xsd            |  6 +-
 v3_0_0/CDT-svcObjWrapper-v3_0_0.xsd           |  8 +-
 v3_0_0/CDT-timeSeries-v3_0_0.xsd              |  8 +-
 v3_0_0/CDT-timeSeriesInstance-v3_0_0.xsd      |  2 +-
 v3_0_0/CDT-token-v3_0_0.xsd                   |  2 +-
 v3_0_0/CDT-trafficPattern-v3_0_0.xsd          |  6 +-
 65 files changed, 240 insertions(+), 240 deletions(-)

diff --git a/v3_0_0/CDT-AE-v3_0_0.xsd b/v3_0_0/CDT-AE-v3_0_0.xsd
index b79c95e..0914108 100644
--- a/v3_0_0/CDT-AE-v3_0_0.xsd
+++ b/v3_0_0/CDT-AE-v3_0_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_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: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:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-CSEBase-v3_0_0.xsd b/v3_0_0/CDT-CSEBase-v3_0_0.xsd
index f93179a..7283a2a 100644
--- a/v3_0_0/CDT-CSEBase-v3_0_0.xsd
+++ b/v3_0_0/CDT-CSEBase-v3_0_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_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: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:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-accessControlPolicy-v3_0_0.xsd b/v3_0_0/CDT-accessControlPolicy-v3_0_0.xsd
index 64b5f4d..fa3ee59 100644
--- a/v3_0_0/CDT-accessControlPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-accessControlPolicy-v3_0_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_10_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-activeCmdhPolicy-v3_0_0.xsd b/v3_0_0/CDT-activeCmdhPolicy-v3_0_0.xsd
index 610a452..0846d2d 100644
--- a/v3_0_0/CDT-activeCmdhPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-activeCmdhPolicy-v3_0_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_0_0/CDT-allJoynApp-v3_0_0.xsd b/v3_0_0/CDT-allJoynApp-v3_0_0.xsd
index 0476b1a..b92b177 100644
--- a/v3_0_0/CDT-allJoynApp-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynApp-v3_0_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_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: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:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-allJoynInterface-v3_0_0.xsd b/v3_0_0/CDT-allJoynInterface-v3_0_0.xsd
index bec19cf..1b829b6 100644
--- a/v3_0_0/CDT-allJoynInterface-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynInterface-v3_0_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_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: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:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_0_0/CDT-allJoynMethod-v3_0_0.xsd b/v3_0_0/CDT-allJoynMethod-v3_0_0.xsd
index cf2b548..88bfce7 100644
--- a/v3_0_0/CDT-allJoynMethod-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynMethod-v3_0_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_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: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:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_0_0/CDT-allJoynMethodCall-v3_0_0.xsd b/v3_0_0/CDT-allJoynMethodCall-v3_0_0.xsd
index c97d88b..2a86735 100644
--- a/v3_0_0/CDT-allJoynMethodCall-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynMethodCall-v3_0_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_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-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-allJoynProperty-v3_0_0.xsd b/v3_0_0/CDT-allJoynProperty-v3_0_0.xsd
index 2d3573b..233503f 100644
--- a/v3_0_0/CDT-allJoynProperty-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynProperty-v3_0_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_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-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-allJoynSvcObject-v3_0_0.xsd b/v3_0_0/CDT-allJoynSvcObject-v3_0_0.xsd
index 145a9ff..c7a93a7 100644
--- a/v3_0_0/CDT-allJoynSvcObject-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynSvcObject-v3_0_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_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: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:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-areaNwkDeviceInfo-v3_0_0.xsd b/v3_0_0/CDT-areaNwkDeviceInfo-v3_0_0.xsd
index 36a47cd..9eba7bc 100644
--- a/v3_0_0/CDT-areaNwkDeviceInfo-v3_0_0.xsd
+++ b/v3_0_0/CDT-areaNwkDeviceInfo-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-areaNwkInfo-v3_0_0.xsd b/v3_0_0/CDT-areaNwkInfo-v3_0_0.xsd
index f672a15..1252401 100644
--- a/v3_0_0/CDT-areaNwkInfo-v3_0_0.xsd
+++ b/v3_0_0/CDT-areaNwkInfo-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-battery-v3_0_0.xsd b/v3_0_0/CDT-battery-v3_0_0.xsd
index 62abc25..8d6770d 100644
--- a/v3_0_0/CDT-battery-v3_0_0.xsd
+++ b/v3_0_0/CDT-battery-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhBuffer-v3_0_0.xsd b/v3_0_0/CDT-cmdhBuffer-v3_0_0.xsd
index 901b3d1..4c4821a 100644
--- a/v3_0_0/CDT-cmdhBuffer-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhBuffer-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_0_0/CDT-cmdhDefEcValue-v3_0_0.xsd b/v3_0_0/CDT-cmdhDefEcValue-v3_0_0.xsd
index aa6ba59..b85cc45 100644
--- a/v3_0_0/CDT-cmdhDefEcValue-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhDefEcValue-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_0_0/CDT-cmdhDefaults-v3_0_0.xsd b/v3_0_0/CDT-cmdhDefaults-v3_0_0.xsd
index 402bd81..64a89fb 100644
--- a/v3_0_0/CDT-cmdhDefaults-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhDefaults-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_0_0/CDT-cmdhEcDefParamValues-v3_0_0.xsd b/v3_0_0/CDT-cmdhEcDefParamValues-v3_0_0.xsd
index ab108a6..37a7369 100644
--- a/v3_0_0/CDT-cmdhEcDefParamValues-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhEcDefParamValues-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_0_0/CDT-cmdhLimits-v3_0_0.xsd b/v3_0_0/CDT-cmdhLimits-v3_0_0.xsd
index 69d47c5..fdb3e86 100644
--- a/v3_0_0/CDT-cmdhLimits-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhLimits-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_0.xsd b/v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_0.xsd
index b48f468..d79c6b1 100644
--- a/v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_0_0/CDT-cmdhNwAccessRule-v3_0_0.xsd b/v3_0_0/CDT-cmdhNwAccessRule-v3_0_0.xsd
index 597491e..5d43bf1 100644
--- a/v3_0_0/CDT-cmdhNwAccessRule-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhNwAccessRule-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_0_0/CDT-cmdhPolicy-v3_0_0.xsd b/v3_0_0/CDT-cmdhPolicy-v3_0_0.xsd
index 102ef1a..f3a91b5 100644
--- a/v3_0_0/CDT-cmdhPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhPolicy-v3_0_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_0_0/CDT-commonTypes-v3_0_0.xsd b/v3_0_0/CDT-commonTypes-v3_0_0.xsd
index e703809..286f73a 100644
--- a/v3_0_0/CDT-commonTypes-v3_0_0.xsd
+++ b/v3_0_0/CDT-commonTypes-v3_0_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_0_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_0_0/CDT-container-v3_0_0.xsd b/v3_0_0/CDT-container-v3_0_0.xsd
index dc040aa..1758331 100644
--- a/v3_0_0/CDT-container-v3_0_0.xsd
+++ b/v3_0_0/CDT-container-v3_0_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_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: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:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_0_0/CDT-contentInstance-v3_0_0.xsd b/v3_0_0/CDT-contentInstance-v3_0_0.xsd
index b521a67..b04a3f0 100644
--- a/v3_0_0/CDT-contentInstance-v3_0_0.xsd
+++ b/v3_0_0/CDT-contentInstance-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-delivery-v3_0_0.xsd b/v3_0_0/CDT-delivery-v3_0_0.xsd
index d18f9dd..9a55e5c 100644
--- a/v3_0_0/CDT-delivery-v3_0_0.xsd
+++ b/v3_0_0/CDT-delivery-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_0_0/CDT-deviceCapability-v3_0_0.xsd b/v3_0_0/CDT-deviceCapability-v3_0_0.xsd
index 449a796..91e862a 100644
--- a/v3_0_0/CDT-deviceCapability-v3_0_0.xsd
+++ b/v3_0_0/CDT-deviceCapability-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-deviceInfo-v3_0_0.xsd b/v3_0_0/CDT-deviceInfo-v3_0_0.xsd
index d54c300..943210f 100644
--- a/v3_0_0/CDT-deviceInfo-v3_0_0.xsd
+++ b/v3_0_0/CDT-deviceInfo-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_0.xsd b/v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_0.xsd
index 98d5b2e..b32c144 100644
--- a/v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_0.xsd
+++ b/v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-eventConfig-v3_0_0.xsd b/v3_0_0/CDT-eventConfig-v3_0_0.xsd
index 1ad1990..4c911ce 100644
--- a/v3_0_0/CDT-eventConfig-v3_0_0.xsd
+++ b/v3_0_0/CDT-eventConfig-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-eventLog-v3_0_0.xsd b/v3_0_0/CDT-eventLog-v3_0_0.xsd
index 2b158dc..3574d57 100644
--- a/v3_0_0/CDT-eventLog-v3_0_0.xsd
+++ b/v3_0_0/CDT-eventLog-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-execInstance-v3_0_0.xsd b/v3_0_0/CDT-execInstance-v3_0_0.xsd
index 364fa3b..02f51a9 100644
--- a/v3_0_0/CDT-execInstance-v3_0_0.xsd
+++ b/v3_0_0/CDT-execInstance-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-firmware-v3_0_0.xsd b/v3_0_0/CDT-firmware-v3_0_0.xsd
index e319dcf..c3525e6 100644
--- a/v3_0_0/CDT-firmware-v3_0_0.xsd
+++ b/v3_0_0/CDT-firmware-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_0.xsd b/v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_0.xsd
index 8bd47e0..506d019 100644
--- a/v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_0.xsd
+++ b/v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_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_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-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-genericInterworkingService-v3_0_0.xsd b/v3_0_0/CDT-genericInterworkingService-v3_0_0.xsd
index 8609599..2601eeb 100644
--- a/v3_0_0/CDT-genericInterworkingService-v3_0_0.xsd
+++ b/v3_0_0/CDT-genericInterworkingService-v3_0_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_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: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:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-group-v3_0_0.xsd b/v3_0_0/CDT-group-v3_0_0.xsd
index c4439df..4c85f80 100644
--- a/v3_0_0/CDT-group-v3_0_0.xsd
+++ b/v3_0_0/CDT-group-v3_0_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_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-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-locationPolicy-v3_0_0.xsd b/v3_0_0/CDT-locationPolicy-v3_0_0.xsd
index 035443c..23797db 100644
--- a/v3_0_0/CDT-locationPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-locationPolicy-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd b/v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd
index aba43fe..72a0009 100644
--- a/v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd
+++ b/v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_10_0.xsd" />
+	<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:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-memory-v3_0_0.xsd b/v3_0_0/CDT-memory-v3_0_0.xsd
index 21fecf6..15376be 100644
--- a/v3_0_0/CDT-memory-v3_0_0.xsd
+++ b/v3_0_0/CDT-memory-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-mgmtCmd-v3_0_0.xsd b/v3_0_0/CDT-mgmtCmd-v3_0_0.xsd
index 61baaef..e4f687f 100644
--- a/v3_0_0/CDT-mgmtCmd-v3_0_0.xsd
+++ b/v3_0_0/CDT-mgmtCmd-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_10_0.xsd" />
+	<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:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-node-v3_0_0.xsd b/v3_0_0/CDT-node-v3_0_0.xsd
index dc3058b..85cb504 100644
--- a/v3_0_0/CDT-node-v3_0_0.xsd
+++ b/v3_0_0/CDT-node-v3_0_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_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: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:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-notification-v3_0_0.xsd b/v3_0_0/CDT-notification-v3_0_0.xsd
index 048bd8d..f4f2a84 100644
--- a/v3_0_0/CDT-notification-v3_0_0.xsd
+++ b/v3_0_0/CDT-notification-v3_0_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_10_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_10_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_0_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd b/v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd
index 1ff52d8..ff8c5f5 100644
--- a/v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd
+++ b/v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-notificationTargetPolicy-v3_0_0.xsd b/v3_0_0/CDT-notificationTargetPolicy-v3_0_0.xsd
index 06fee4e..e5fc851 100644
--- a/v3_0_0/CDT-notificationTargetPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-notificationTargetPolicy-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<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:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-policyDeletionRules-v3_0_0.xsd b/v3_0_0/CDT-policyDeletionRules-v3_0_0.xsd
index 5562aca..25c55b8 100644
--- a/v3_0_0/CDT-policyDeletionRules-v3_0_0.xsd
+++ b/v3_0_0/CDT-policyDeletionRules-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-pollingChannel-v3_0_0.xsd b/v3_0_0/CDT-pollingChannel-v3_0_0.xsd
index 6f6eb65..43f73f9 100644
--- a/v3_0_0/CDT-pollingChannel-v3_0_0.xsd
+++ b/v3_0_0/CDT-pollingChannel-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-reboot-v3_0_0.xsd b/v3_0_0/CDT-reboot-v3_0_0.xsd
index 5d88191..382ea95 100644
--- a/v3_0_0/CDT-reboot-v3_0_0.xsd
+++ b/v3_0_0/CDT-reboot-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-remoteCSE-v3_0_0.xsd b/v3_0_0/CDT-remoteCSE-v3_0_0.xsd
index 480597d..24073b7 100644
--- a/v3_0_0/CDT-remoteCSE-v3_0_0.xsd
+++ b/v3_0_0/CDT-remoteCSE-v3_0_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_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: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:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-request-v3_0_0.xsd b/v3_0_0/CDT-request-v3_0_0.xsd
index 2b0f998..99c2700 100644
--- a/v3_0_0/CDT-request-v3_0_0.xsd
+++ b/v3_0_0/CDT-request-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-requestPrimitive-v3_0_0.xsd b/v3_0_0/CDT-requestPrimitive-v3_0_0.xsd
index 119f0f8..e5a48a0 100644
--- a/v3_0_0/CDT-requestPrimitive-v3_0_0.xsd
+++ b/v3_0_0/CDT-requestPrimitive-v3_0_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_0_0/CDT-responsePrimitive-v3_0_0.xsd b/v3_0_0/CDT-responsePrimitive-v3_0_0.xsd
index 464e07c..470d408 100644
--- a/v3_0_0/CDT-responsePrimitive-v3_0_0.xsd
+++ b/v3_0_0/CDT-responsePrimitive-v3_0_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_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: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:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_0_0/CDT-role-v3_0_0.xsd b/v3_0_0/CDT-role-v3_0_0.xsd
index aff89ad..0b65e0d 100644
--- a/v3_0_0/CDT-role-v3_0_0.xsd
+++ b/v3_0_0/CDT-role-v3_0_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-schedule-v3_0_0.xsd b/v3_0_0/CDT-schedule-v3_0_0.xsd
index 7e8156b..95e3f9c 100644
--- a/v3_0_0/CDT-schedule-v3_0_0.xsd
+++ b/v3_0_0/CDT-schedule-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-semanticDescriptor-v3_0_0.xsd b/v3_0_0/CDT-semanticDescriptor-v3_0_0.xsd
index 6dedc83..a1bac6d 100644
--- a/v3_0_0/CDT-semanticDescriptor-v3_0_0.xsd
+++ b/v3_0_0/CDT-semanticDescriptor-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-serviceSubscribedAppRule-v3_0_0.xsd b/v3_0_0/CDT-serviceSubscribedAppRule-v3_0_0.xsd
index 568c458..dac20e5 100644
--- a/v3_0_0/CDT-serviceSubscribedAppRule-v3_0_0.xsd
+++ b/v3_0_0/CDT-serviceSubscribedAppRule-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-serviceSubscribedNode-v3_0_0.xsd b/v3_0_0/CDT-serviceSubscribedNode-v3_0_0.xsd
index 8e08894..b2d8786 100644
--- a/v3_0_0/CDT-serviceSubscribedNode-v3_0_0.xsd
+++ b/v3_0_0/CDT-serviceSubscribedNode-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-software-v3_0_0.xsd b/v3_0_0/CDT-software-v3_0_0.xsd
index 1be2e30..0e01a29 100644
--- a/v3_0_0/CDT-software-v3_0_0.xsd
+++ b/v3_0_0/CDT-software-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-statsCollect-v3_0_0.xsd b/v3_0_0/CDT-statsCollect-v3_0_0.xsd
index 6e2f649..5101e4f 100644
--- a/v3_0_0/CDT-statsCollect-v3_0_0.xsd
+++ b/v3_0_0/CDT-statsCollect-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-statsConfig-v3_0_0.xsd b/v3_0_0/CDT-statsConfig-v3_0_0.xsd
index 89c59de..84805cc 100644
--- a/v3_0_0/CDT-statsConfig-v3_0_0.xsd
+++ b/v3_0_0/CDT-statsConfig-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<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:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-subscription-v3_0_0.xsd b/v3_0_0/CDT-subscription-v3_0_0.xsd
index 683fdfb..063d3cd 100644
--- a/v3_0_0/CDT-subscription-v3_0_0.xsd
+++ b/v3_0_0/CDT-subscription-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_10_0.xsd" />
+	<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:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-svcFwWrapper-v3_0_0.xsd b/v3_0_0/CDT-svcFwWrapper-v3_0_0.xsd
index 242bd36..084e18e 100644
--- a/v3_0_0/CDT-svcFwWrapper-v3_0_0.xsd
+++ b/v3_0_0/CDT-svcFwWrapper-v3_0_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_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-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-svcObjWrapper-v3_0_0.xsd b/v3_0_0/CDT-svcObjWrapper-v3_0_0.xsd
index e998350..ee61b78 100644
--- a/v3_0_0/CDT-svcObjWrapper-v3_0_0.xsd
+++ b/v3_0_0/CDT-svcObjWrapper-v3_0_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_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: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:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-timeSeries-v3_0_0.xsd b/v3_0_0/CDT-timeSeries-v3_0_0.xsd
index db997f6..b1949cb 100644
--- a/v3_0_0/CDT-timeSeries-v3_0_0.xsd
+++ b/v3_0_0/CDT-timeSeries-v3_0_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_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: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:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_0_0/CDT-timeSeriesInstance-v3_0_0.xsd b/v3_0_0/CDT-timeSeriesInstance-v3_0_0.xsd
index 8081f5f..4faa91b 100644
--- a/v3_0_0/CDT-timeSeriesInstance-v3_0_0.xsd
+++ b/v3_0_0/CDT-timeSeriesInstance-v3_0_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-token-v3_0_0.xsd b/v3_0_0/CDT-token-v3_0_0.xsd
index 44fa13f..4300b9c 100644
--- a/v3_0_0/CDT-token-v3_0_0.xsd
+++ b/v3_0_0/CDT-token-v3_0_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_0_0/CDT-trafficPattern-v3_0_0.xsd b/v3_0_0/CDT-trafficPattern-v3_0_0.xsd
index 408b977..d463acb 100644
--- a/v3_0_0/CDT-trafficPattern-v3_0_0.xsd
+++ b/v3_0_0/CDT-trafficPattern-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
+	<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:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab