From fc1b38fbb6fbc90880859d31b8f35fab9761fa6c Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Thu, 12 Jan 2017 17:19:41 +0100
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_9_0/CDT-AE-v2_9_0.xsd b/v2_9_0/CDT-AE-v2_9_0.xsd
index d36c001..718c826 100644
--- a/v2_9_0/CDT-AE-v2_9_0.xsd
+++ b/v2_9_0/CDT-AE-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_8_0.xsd" />
+	<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:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-CSEBase-v2_9_0.xsd b/v2_9_0/CDT-CSEBase-v2_9_0.xsd
index 40c7494..8c582fe 100644
--- a/v2_9_0/CDT-CSEBase-v2_9_0.xsd
+++ b/v2_9_0/CDT-CSEBase-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_8_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_8_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_8_0.xsd" />
+	<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:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-accessControlPolicy-v2_9_0.xsd b/v2_9_0/CDT-accessControlPolicy-v2_9_0.xsd
index 312549a..f7547f3 100644
--- a/v2_9_0/CDT-accessControlPolicy-v2_9_0.xsd
+++ b/v2_9_0/CDT-accessControlPolicy-v2_9_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_8_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-activeCmdhPolicy-v2_9_0.xsd b/v2_9_0/CDT-activeCmdhPolicy-v2_9_0.xsd
index d43356c..83e3ef0 100644
--- a/v2_9_0/CDT-activeCmdhPolicy-v2_9_0.xsd
+++ b/v2_9_0/CDT-activeCmdhPolicy-v2_9_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_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_9_0/CDT-allJoynApp-v2_9_0.xsd b/v2_9_0/CDT-allJoynApp-v2_9_0.xsd
index f173fd6..44240b1 100644
--- a/v2_9_0/CDT-allJoynApp-v2_9_0.xsd
+++ b/v2_9_0/CDT-allJoynApp-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_8_0.xsd" />
+	<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:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-allJoynInterface-v2_9_0.xsd b/v2_9_0/CDT-allJoynInterface-v2_9_0.xsd
index c32a457..7203fbc 100644
--- a/v2_9_0/CDT-allJoynInterface-v2_9_0.xsd
+++ b/v2_9_0/CDT-allJoynInterface-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
+	<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:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_9_0/CDT-allJoynMethod-v2_9_0.xsd b/v2_9_0/CDT-allJoynMethod-v2_9_0.xsd
index d3f0c4f..f00d54c 100644
--- a/v2_9_0/CDT-allJoynMethod-v2_9_0.xsd
+++ b/v2_9_0/CDT-allJoynMethod-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_8_0.xsd" />
+	<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:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_9_0/CDT-allJoynMethodCall-v2_9_0.xsd b/v2_9_0/CDT-allJoynMethodCall-v2_9_0.xsd
index ba49d38..17f476a 100644
--- a/v2_9_0/CDT-allJoynMethodCall-v2_9_0.xsd
+++ b/v2_9_0/CDT-allJoynMethodCall-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<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:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-allJoynProperty-v2_9_0.xsd b/v2_9_0/CDT-allJoynProperty-v2_9_0.xsd
index fb35604..3c62afe 100644
--- a/v2_9_0/CDT-allJoynProperty-v2_9_0.xsd
+++ b/v2_9_0/CDT-allJoynProperty-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<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:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-allJoynSvcObject-v2_9_0.xsd b/v2_9_0/CDT-allJoynSvcObject-v2_9_0.xsd
index f44b45d..3e68957 100644
--- a/v2_9_0/CDT-allJoynSvcObject-v2_9_0.xsd
+++ b/v2_9_0/CDT-allJoynSvcObject-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_8_0.xsd" />
+	<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:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-areaNwkDeviceInfo-v2_9_0.xsd b/v2_9_0/CDT-areaNwkDeviceInfo-v2_9_0.xsd
index 0c8cd29..7c7ab53 100644
--- a/v2_9_0/CDT-areaNwkDeviceInfo-v2_9_0.xsd
+++ b/v2_9_0/CDT-areaNwkDeviceInfo-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-areaNwkInfo-v2_9_0.xsd b/v2_9_0/CDT-areaNwkInfo-v2_9_0.xsd
index 090abf0..b988d66 100644
--- a/v2_9_0/CDT-areaNwkInfo-v2_9_0.xsd
+++ b/v2_9_0/CDT-areaNwkInfo-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-battery-v2_9_0.xsd b/v2_9_0/CDT-battery-v2_9_0.xsd
index e1fdd6a..a34e85a 100644
--- a/v2_9_0/CDT-battery-v2_9_0.xsd
+++ b/v2_9_0/CDT-battery-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-cmdhBuffer-v2_9_0.xsd b/v2_9_0/CDT-cmdhBuffer-v2_9_0.xsd
index 0fbf4a8..c508d4e 100644
--- a/v2_9_0/CDT-cmdhBuffer-v2_9_0.xsd
+++ b/v2_9_0/CDT-cmdhBuffer-v2_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_9_0/CDT-cmdhDefEcValue-v2_9_0.xsd b/v2_9_0/CDT-cmdhDefEcValue-v2_9_0.xsd
index 68813bb..c20f043 100644
--- a/v2_9_0/CDT-cmdhDefEcValue-v2_9_0.xsd
+++ b/v2_9_0/CDT-cmdhDefEcValue-v2_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_9_0/CDT-cmdhDefaults-v2_9_0.xsd b/v2_9_0/CDT-cmdhDefaults-v2_9_0.xsd
index f94db76..fd2db6e 100644
--- a/v2_9_0/CDT-cmdhDefaults-v2_9_0.xsd
+++ b/v2_9_0/CDT-cmdhDefaults-v2_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_9_0/CDT-cmdhEcDefParamValues-v2_9_0.xsd b/v2_9_0/CDT-cmdhEcDefParamValues-v2_9_0.xsd
index c0394ff..ab21960 100644
--- a/v2_9_0/CDT-cmdhEcDefParamValues-v2_9_0.xsd
+++ b/v2_9_0/CDT-cmdhEcDefParamValues-v2_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_9_0/CDT-cmdhLimits-v2_9_0.xsd b/v2_9_0/CDT-cmdhLimits-v2_9_0.xsd
index c82c680..36338bb 100644
--- a/v2_9_0/CDT-cmdhLimits-v2_9_0.xsd
+++ b/v2_9_0/CDT-cmdhLimits-v2_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_9_0/CDT-cmdhNetworkAccessRules-v2_9_0.xsd b/v2_9_0/CDT-cmdhNetworkAccessRules-v2_9_0.xsd
index d31863a..cc0d606 100644
--- a/v2_9_0/CDT-cmdhNetworkAccessRules-v2_9_0.xsd
+++ b/v2_9_0/CDT-cmdhNetworkAccessRules-v2_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_9_0/CDT-cmdhNwAccessRule-v2_9_0.xsd b/v2_9_0/CDT-cmdhNwAccessRule-v2_9_0.xsd
index 022e6fc..28c415e 100644
--- a/v2_9_0/CDT-cmdhNwAccessRule-v2_9_0.xsd
+++ b/v2_9_0/CDT-cmdhNwAccessRule-v2_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_9_0/CDT-cmdhPolicy-v2_9_0.xsd b/v2_9_0/CDT-cmdhPolicy-v2_9_0.xsd
index 52168b6..4bd6dcf 100644
--- a/v2_9_0/CDT-cmdhPolicy-v2_9_0.xsd
+++ b/v2_9_0/CDT-cmdhPolicy-v2_9_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_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_9_0/CDT-commonTypes-v2_9_0.xsd b/v2_9_0/CDT-commonTypes-v2_9_0.xsd
index fc9462b..c40bfe4 100644
--- a/v2_9_0/CDT-commonTypes-v2_9_0.xsd
+++ b/v2_9_0/CDT-commonTypes-v2_9_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_8_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_9_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_9_0/CDT-container-v2_9_0.xsd b/v2_9_0/CDT-container-v2_9_0.xsd
index f68bddc..e4814c4 100644
--- a/v2_9_0/CDT-container-v2_9_0.xsd
+++ b/v2_9_0/CDT-container-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<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:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_9_0/CDT-contentInstance-v2_9_0.xsd b/v2_9_0/CDT-contentInstance-v2_9_0.xsd
index e71fff2..22715c2 100644
--- a/v2_9_0/CDT-contentInstance-v2_9_0.xsd
+++ b/v2_9_0/CDT-contentInstance-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_9_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-delivery-v2_9_0.xsd b/v2_9_0/CDT-delivery-v2_9_0.xsd
index d0750f5..8119c1e 100644
--- a/v2_9_0/CDT-delivery-v2_9_0.xsd
+++ b/v2_9_0/CDT-delivery-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_9_0/CDT-deviceCapability-v2_9_0.xsd b/v2_9_0/CDT-deviceCapability-v2_9_0.xsd
index 78eea82..99abeec 100644
--- a/v2_9_0/CDT-deviceCapability-v2_9_0.xsd
+++ b/v2_9_0/CDT-deviceCapability-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-deviceInfo-v2_9_0.xsd b/v2_9_0/CDT-deviceInfo-v2_9_0.xsd
index 8c39eaf..0382879 100644
--- a/v2_9_0/CDT-deviceInfo-v2_9_0.xsd
+++ b/v2_9_0/CDT-deviceInfo-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-dynamicAuthorizationConsultation-v2_9_0.xsd b/v2_9_0/CDT-dynamicAuthorizationConsultation-v2_9_0.xsd
index 4848b81..caed94c 100644
--- a/v2_9_0/CDT-dynamicAuthorizationConsultation-v2_9_0.xsd
+++ b/v2_9_0/CDT-dynamicAuthorizationConsultation-v2_9_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_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-eventConfig-v2_9_0.xsd b/v2_9_0/CDT-eventConfig-v2_9_0.xsd
index ed0fc0f..0e0b587 100644
--- a/v2_9_0/CDT-eventConfig-v2_9_0.xsd
+++ b/v2_9_0/CDT-eventConfig-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-eventLog-v2_9_0.xsd b/v2_9_0/CDT-eventLog-v2_9_0.xsd
index ac69167..0db4bcd 100644
--- a/v2_9_0/CDT-eventLog-v2_9_0.xsd
+++ b/v2_9_0/CDT-eventLog-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-execInstance-v2_9_0.xsd b/v2_9_0/CDT-execInstance-v2_9_0.xsd
index 55a6b4b..22e025e 100644
--- a/v2_9_0/CDT-execInstance-v2_9_0.xsd
+++ b/v2_9_0/CDT-execInstance-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-firmware-v2_9_0.xsd b/v2_9_0/CDT-firmware-v2_9_0.xsd
index 9a4d27e..5cb52c3 100644
--- a/v2_9_0/CDT-firmware-v2_9_0.xsd
+++ b/v2_9_0/CDT-firmware-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-genericInterworkingOperationInstance-v2_9_0.xsd b/v2_9_0/CDT-genericInterworkingOperationInstance-v2_9_0.xsd
index c611f1f..6ece605 100644
--- a/v2_9_0/CDT-genericInterworkingOperationInstance-v2_9_0.xsd
+++ b/v2_9_0/CDT-genericInterworkingOperationInstance-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<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:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-genericInterworkingService-v2_9_0.xsd b/v2_9_0/CDT-genericInterworkingService-v2_9_0.xsd
index d18d818..ddcfcce 100644
--- a/v2_9_0/CDT-genericInterworkingService-v2_9_0.xsd
+++ b/v2_9_0/CDT-genericInterworkingService-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_8_0.xsd" />
+	<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:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-group-v2_9_0.xsd b/v2_9_0/CDT-group-v2_9_0.xsd
index 6f3eb39..6c3459a 100644
--- a/v2_9_0/CDT-group-v2_9_0.xsd
+++ b/v2_9_0/CDT-group-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<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:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-locationPolicy-v2_9_0.xsd b/v2_9_0/CDT-locationPolicy-v2_9_0.xsd
index 28441d4..b1b15fa 100644
--- a/v2_9_0/CDT-locationPolicy-v2_9_0.xsd
+++ b/v2_9_0/CDT-locationPolicy-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-m2mServiceSubscriptionProfile-v2_9_0.xsd b/v2_9_0/CDT-m2mServiceSubscriptionProfile-v2_9_0.xsd
index fcf9390..84e6c88 100644
--- a/v2_9_0/CDT-m2mServiceSubscriptionProfile-v2_9_0.xsd
+++ b/v2_9_0/CDT-m2mServiceSubscriptionProfile-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_8_0.xsd" />
+	<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:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-memory-v2_9_0.xsd b/v2_9_0/CDT-memory-v2_9_0.xsd
index 7d1fd42..5cac1cd 100644
--- a/v2_9_0/CDT-memory-v2_9_0.xsd
+++ b/v2_9_0/CDT-memory-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-mgmtCmd-v2_9_0.xsd b/v2_9_0/CDT-mgmtCmd-v2_9_0.xsd
index a16064a..447f426 100644
--- a/v2_9_0/CDT-mgmtCmd-v2_9_0.xsd
+++ b/v2_9_0/CDT-mgmtCmd-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_8_0.xsd" />
+	<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:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-node-v2_9_0.xsd b/v2_9_0/CDT-node-v2_9_0.xsd
index 5047b04..cdd0979 100644
--- a/v2_9_0/CDT-node-v2_9_0.xsd
+++ b/v2_9_0/CDT-node-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_8_0.xsd" />
+	<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:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-notification-v2_9_0.xsd b/v2_9_0/CDT-notification-v2_9_0.xsd
index f8d1c49..4de5e1f 100644
--- a/v2_9_0/CDT-notification-v2_9_0.xsd
+++ b/v2_9_0/CDT-notification-v2_9_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_8_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_8_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_9_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_9_0/CDT-notificationTargetMgmtPolicyRef-v2_9_0.xsd b/v2_9_0/CDT-notificationTargetMgmtPolicyRef-v2_9_0.xsd
index 371b3a8..322c494 100644
--- a/v2_9_0/CDT-notificationTargetMgmtPolicyRef-v2_9_0.xsd
+++ b/v2_9_0/CDT-notificationTargetMgmtPolicyRef-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-notificationTargetPolicy-v2_9_0.xsd b/v2_9_0/CDT-notificationTargetPolicy-v2_9_0.xsd
index 206dd6a..ce0a6ce 100644
--- a/v2_9_0/CDT-notificationTargetPolicy-v2_9_0.xsd
+++ b/v2_9_0/CDT-notificationTargetPolicy-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<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:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-policyDeletionRules-v2_9_0.xsd b/v2_9_0/CDT-policyDeletionRules-v2_9_0.xsd
index 5c06c78..db3fdb1 100644
--- a/v2_9_0/CDT-policyDeletionRules-v2_9_0.xsd
+++ b/v2_9_0/CDT-policyDeletionRules-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-pollingChannel-v2_9_0.xsd b/v2_9_0/CDT-pollingChannel-v2_9_0.xsd
index 999b24d..23a7ff1 100644
--- a/v2_9_0/CDT-pollingChannel-v2_9_0.xsd
+++ b/v2_9_0/CDT-pollingChannel-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-reboot-v2_9_0.xsd b/v2_9_0/CDT-reboot-v2_9_0.xsd
index 36d59de..f36b160 100644
--- a/v2_9_0/CDT-reboot-v2_9_0.xsd
+++ b/v2_9_0/CDT-reboot-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-remoteCSE-v2_9_0.xsd b/v2_9_0/CDT-remoteCSE-v2_9_0.xsd
index fe29b36..f2f659e 100644
--- a/v2_9_0/CDT-remoteCSE-v2_9_0.xsd
+++ b/v2_9_0/CDT-remoteCSE-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_8_0.xsd" />
+	<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:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-request-v2_9_0.xsd b/v2_9_0/CDT-request-v2_9_0.xsd
index 0d310ba..56de33c 100644
--- a/v2_9_0/CDT-request-v2_9_0.xsd
+++ b/v2_9_0/CDT-request-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-requestPrimitive-v2_9_0.xsd b/v2_9_0/CDT-requestPrimitive-v2_9_0.xsd
index 7bb14d2..283f959 100644
--- a/v2_9_0/CDT-requestPrimitive-v2_9_0.xsd
+++ b/v2_9_0/CDT-requestPrimitive-v2_9_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_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_9_0/CDT-responsePrimitive-v2_9_0.xsd b/v2_9_0/CDT-responsePrimitive-v2_9_0.xsd
index 499d808..c1cf4ab 100644
--- a/v2_9_0/CDT-responsePrimitive-v2_9_0.xsd
+++ b/v2_9_0/CDT-responsePrimitive-v2_9_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_8_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_8_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_8_0.xsd" />
+  <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:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_9_0/CDT-role-v2_9_0.xsd b/v2_9_0/CDT-role-v2_9_0.xsd
index 556790a..8ee193a 100644
--- a/v2_9_0/CDT-role-v2_9_0.xsd
+++ b/v2_9_0/CDT-role-v2_9_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_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-schedule-v2_9_0.xsd b/v2_9_0/CDT-schedule-v2_9_0.xsd
index 7b2096f..c20cca0 100644
--- a/v2_9_0/CDT-schedule-v2_9_0.xsd
+++ b/v2_9_0/CDT-schedule-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-semanticDescriptor-v2_9_0.xsd b/v2_9_0/CDT-semanticDescriptor-v2_9_0.xsd
index 16e0343..477ca2f 100644
--- a/v2_9_0/CDT-semanticDescriptor-v2_9_0.xsd
+++ b/v2_9_0/CDT-semanticDescriptor-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-serviceSubscribedAppRule-v2_9_0.xsd b/v2_9_0/CDT-serviceSubscribedAppRule-v2_9_0.xsd
index 65c40f0..0261105 100644
--- a/v2_9_0/CDT-serviceSubscribedAppRule-v2_9_0.xsd
+++ b/v2_9_0/CDT-serviceSubscribedAppRule-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-serviceSubscribedNode-v2_9_0.xsd b/v2_9_0/CDT-serviceSubscribedNode-v2_9_0.xsd
index 03d162a..4a05307 100644
--- a/v2_9_0/CDT-serviceSubscribedNode-v2_9_0.xsd
+++ b/v2_9_0/CDT-serviceSubscribedNode-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-software-v2_9_0.xsd b/v2_9_0/CDT-software-v2_9_0.xsd
index 6efc92f..ff99956 100644
--- a/v2_9_0/CDT-software-v2_9_0.xsd
+++ b/v2_9_0/CDT-software-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-statsCollect-v2_9_0.xsd b/v2_9_0/CDT-statsCollect-v2_9_0.xsd
index 0f85515..f7ac0f4 100644
--- a/v2_9_0/CDT-statsCollect-v2_9_0.xsd
+++ b/v2_9_0/CDT-statsCollect-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-statsConfig-v2_9_0.xsd b/v2_9_0/CDT-statsConfig-v2_9_0.xsd
index f79bb2b..2061750 100644
--- a/v2_9_0/CDT-statsConfig-v2_9_0.xsd
+++ b/v2_9_0/CDT-statsConfig-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<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:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-subscription-v2_9_0.xsd b/v2_9_0/CDT-subscription-v2_9_0.xsd
index 8dad3d9..f8a2a0f 100644
--- a/v2_9_0/CDT-subscription-v2_9_0.xsd
+++ b/v2_9_0/CDT-subscription-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_8_0.xsd" />
+	<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:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-svcFwWrapper-v2_9_0.xsd b/v2_9_0/CDT-svcFwWrapper-v2_9_0.xsd
index 16e7811..7218a69 100644
--- a/v2_9_0/CDT-svcFwWrapper-v2_9_0.xsd
+++ b/v2_9_0/CDT-svcFwWrapper-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<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:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-svcObjWrapper-v2_9_0.xsd b/v2_9_0/CDT-svcObjWrapper-v2_9_0.xsd
index 31a029b..60327fe 100644
--- a/v2_9_0/CDT-svcObjWrapper-v2_9_0.xsd
+++ b/v2_9_0/CDT-svcObjWrapper-v2_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_8_0.xsd" />
+	<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:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-timeSeries-v2_9_0.xsd b/v2_9_0/CDT-timeSeries-v2_9_0.xsd
index a5addda..b277bc7 100644
--- a/v2_9_0/CDT-timeSeries-v2_9_0.xsd
+++ b/v2_9_0/CDT-timeSeries-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<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:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_9_0/CDT-timeSeriesInstance-v2_9_0.xsd b/v2_9_0/CDT-timeSeriesInstance-v2_9_0.xsd
index eef4d21..c1f7248 100644
--- a/v2_9_0/CDT-timeSeriesInstance-v2_9_0.xsd
+++ b/v2_9_0/CDT-timeSeriesInstance-v2_9_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_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_9_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-token-v2_9_0.xsd b/v2_9_0/CDT-token-v2_9_0.xsd
index 854db43..a060413 100644
--- a/v2_9_0/CDT-token-v2_9_0.xsd
+++ b/v2_9_0/CDT-token-v2_9_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_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_9_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_9_0/CDT-trafficPattern-v2_9_0.xsd b/v2_9_0/CDT-trafficPattern-v2_9_0.xsd
index dd3fcc8..3f10cd4 100644
--- a/v2_9_0/CDT-trafficPattern-v2_9_0.xsd
+++ b/v2_9_0/CDT-trafficPattern-v2_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
+	<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:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab