From 2523677eb8e8435c3fb6281d12abb5c4df8bf78b Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Thu, 4 Aug 2016 20:39:57 +0200
Subject: [PATCH] updated schemaLocation attribute values

---
 v1_9_0/CDT-AE-v1_9_0.xsd                      | 14 +--
 v1_9_0/CDT-CSEBase-v1_9_0.xsd                 | 34 +++----
 v1_9_0/CDT-accessControlPolicy-v1_9_0.xsd     |  4 +-
 v1_9_0/CDT-activeCmdhPolicy-v1_9_0.xsd        |  2 +-
 v1_9_0/CDT-areaNwkDeviceInfo-v1_9_0.xsd       |  4 +-
 v1_9_0/CDT-areaNwkInfo-v1_9_0.xsd             |  4 +-
 v1_9_0/CDT-battery-v1_9_0.xsd                 |  4 +-
 v1_9_0/CDT-cmdhBuffer-v1_9_0.xsd              |  2 +-
 v1_9_0/CDT-cmdhDefEcValue-v1_9_0.xsd          |  2 +-
 v1_9_0/CDT-cmdhDefaults-v1_9_0.xsd            |  2 +-
 v1_9_0/CDT-cmdhEcDefParamValues-v1_9_0.xsd    |  2 +-
 v1_9_0/CDT-cmdhLimits-v1_9_0.xsd              |  2 +-
 v1_9_0/CDT-cmdhNetworkAccessRules-v1_9_0.xsd  |  2 +-
 v1_9_0/CDT-cmdhNwAccessRule-v1_9_0.xsd        |  2 +-
 v1_9_0/CDT-cmdhPolicy-v1_9_0.xsd              |  2 +-
 v1_9_0/CDT-commonTypes-v1_9_0.xsd             |  2 +-
 v1_9_0/CDT-container-v1_9_0.xsd               |  6 +-
 v1_9_0/CDT-contentInstance-v1_9_0.xsd         |  2 +-
 v1_9_0/CDT-delivery-v1_9_0.xsd                |  4 +-
 v1_9_0/CDT-deviceCapability-v1_9_0.xsd        |  4 +-
 v1_9_0/CDT-deviceInfo-v1_9_0.xsd              |  4 +-
 v1_9_0/CDT-eventConfig-v1_9_0.xsd             |  4 +-
 v1_9_0/CDT-eventLog-v1_9_0.xsd                |  4 +-
 v1_9_0/CDT-execInstance-v1_9_0.xsd            |  4 +-
 v1_9_0/CDT-firmware-v1_9_0.xsd                |  4 +-
 v1_9_0/CDT-group-v1_9_0.xsd                   |  4 +-
 v1_9_0/CDT-locationPolicy-v1_9_0.xsd          |  4 +-
 ...T-m2mServiceSubscriptionProfile-v1_9_0.xsd |  6 +-
 v1_9_0/CDT-memory-v1_9_0.xsd                  |  4 +-
 v1_9_0/CDT-mgmtCmd-v1_9_0.xsd                 |  6 +-
 v1_9_0/CDT-node-v1_9_0.xsd                    | 28 +++---
 v1_9_0/CDT-notification-v1_9_0.xsd            |  4 +-
 v1_9_0/CDT-pollingChannel-v1_9_0.xsd          |  4 +-
 v1_9_0/CDT-reboot-v1_9_0.xsd                  |  4 +-
 v1_9_0/CDT-remoteCSE-v1_9_0.xsd               | 18 ++--
 v1_9_0/CDT-request-v1_9_0.xsd                 |  4 +-
 v1_9_0/CDT-requestPrimitive-v1_9_0.xsd        |  2 +-
 v1_9_0/CDT-responsePrimitive-v1_9_0.xsd       | 90 +++++++++----------
 v1_9_0/CDT-schedule-v1_9_0.xsd                |  4 +-
 .../CDT-serviceSubscribedAppRule-v1_9_0.xsd   |  4 +-
 v1_9_0/CDT-serviceSubscribedNode-v1_9_0.xsd   |  4 +-
 v1_9_0/CDT-software-v1_9_0.xsd                |  4 +-
 v1_9_0/CDT-statsCollect-v1_9_0.xsd            |  4 +-
 v1_9_0/CDT-statsConfig-v1_9_0.xsd             |  6 +-
 v1_9_0/CDT-subscription-v1_9_0.xsd            |  4 +-
 45 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/v1_9_0/CDT-AE-v1_9_0.xsd b/v1_9_0/CDT-AE-v1_9_0.xsd
index 1054c5c..c8db5b8 100644
--- a/v1_9_0/CDT-AE-v1_9_0.xsd
+++ b/v1_9_0/CDT-AE-v1_9_0.xsd
@@ -26,13 +26,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_9_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-CSEBase-v1_9_0.xsd b/v1_9_0/CDT-CSEBase-v1_9_0.xsd
index 202f2e4..a0c8107 100644
--- a/v1_9_0/CDT-CSEBase-v1_9_0.xsd
+++ b/v1_9_0/CDT-CSEBase-v1_9_0.xsd
@@ -26,23 +26,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_8_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_9_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_9_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_9_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-accessControlPolicy-v1_9_0.xsd b/v1_9_0/CDT-accessControlPolicy-v1_9_0.xsd
index b0418b1..8b2b238 100644
--- a/v1_9_0/CDT-accessControlPolicy-v1_9_0.xsd
+++ b/v1_9_0/CDT-accessControlPolicy-v1_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-v1_8_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-activeCmdhPolicy-v1_9_0.xsd b/v1_9_0/CDT-activeCmdhPolicy-v1_9_0.xsd
index a409c76..f1be895 100644
--- a/v1_9_0/CDT-activeCmdhPolicy-v1_9_0.xsd
+++ b/v1_9_0/CDT-activeCmdhPolicy-v1_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-v1_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_9_0/CDT-areaNwkDeviceInfo-v1_9_0.xsd b/v1_9_0/CDT-areaNwkDeviceInfo-v1_9_0.xsd
index 7b0eb26..d02743f 100644
--- a/v1_9_0/CDT-areaNwkDeviceInfo-v1_9_0.xsd
+++ b/v1_9_0/CDT-areaNwkDeviceInfo-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-areaNwkInfo-v1_9_0.xsd b/v1_9_0/CDT-areaNwkInfo-v1_9_0.xsd
index 8e967e5..ec3f517 100644
--- a/v1_9_0/CDT-areaNwkInfo-v1_9_0.xsd
+++ b/v1_9_0/CDT-areaNwkInfo-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-battery-v1_9_0.xsd b/v1_9_0/CDT-battery-v1_9_0.xsd
index f4990dd..abc832f 100644
--- a/v1_9_0/CDT-battery-v1_9_0.xsd
+++ b/v1_9_0/CDT-battery-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-cmdhBuffer-v1_9_0.xsd b/v1_9_0/CDT-cmdhBuffer-v1_9_0.xsd
index 6d0e945..6474f72 100644
--- a/v1_9_0/CDT-cmdhBuffer-v1_9_0.xsd
+++ b/v1_9_0/CDT-cmdhBuffer-v1_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-v1_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_9_0/CDT-cmdhDefEcValue-v1_9_0.xsd b/v1_9_0/CDT-cmdhDefEcValue-v1_9_0.xsd
index a80458c..6c8a5eb 100644
--- a/v1_9_0/CDT-cmdhDefEcValue-v1_9_0.xsd
+++ b/v1_9_0/CDT-cmdhDefEcValue-v1_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-v1_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_9_0/CDT-cmdhDefaults-v1_9_0.xsd b/v1_9_0/CDT-cmdhDefaults-v1_9_0.xsd
index b1e440f..9f5508c 100644
--- a/v1_9_0/CDT-cmdhDefaults-v1_9_0.xsd
+++ b/v1_9_0/CDT-cmdhDefaults-v1_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-v1_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_9_0/CDT-cmdhEcDefParamValues-v1_9_0.xsd b/v1_9_0/CDT-cmdhEcDefParamValues-v1_9_0.xsd
index 3365c60..3d8b3c7 100644
--- a/v1_9_0/CDT-cmdhEcDefParamValues-v1_9_0.xsd
+++ b/v1_9_0/CDT-cmdhEcDefParamValues-v1_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-v1_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_9_0/CDT-cmdhLimits-v1_9_0.xsd b/v1_9_0/CDT-cmdhLimits-v1_9_0.xsd
index 5525b6e..fa9bf08 100644
--- a/v1_9_0/CDT-cmdhLimits-v1_9_0.xsd
+++ b/v1_9_0/CDT-cmdhLimits-v1_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-v1_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_9_0/CDT-cmdhNetworkAccessRules-v1_9_0.xsd b/v1_9_0/CDT-cmdhNetworkAccessRules-v1_9_0.xsd
index edf4c3d..6ced1b3 100644
--- a/v1_9_0/CDT-cmdhNetworkAccessRules-v1_9_0.xsd
+++ b/v1_9_0/CDT-cmdhNetworkAccessRules-v1_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-v1_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_9_0/CDT-cmdhNwAccessRule-v1_9_0.xsd b/v1_9_0/CDT-cmdhNwAccessRule-v1_9_0.xsd
index f5c7aa5..6012ac3 100644
--- a/v1_9_0/CDT-cmdhNwAccessRule-v1_9_0.xsd
+++ b/v1_9_0/CDT-cmdhNwAccessRule-v1_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-v1_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_9_0/CDT-cmdhPolicy-v1_9_0.xsd b/v1_9_0/CDT-cmdhPolicy-v1_9_0.xsd
index 397b03e..fc33dc5 100644
--- a/v1_9_0/CDT-cmdhPolicy-v1_9_0.xsd
+++ b/v1_9_0/CDT-cmdhPolicy-v1_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-v1_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_9_0/CDT-commonTypes-v1_9_0.xsd b/v1_9_0/CDT-commonTypes-v1_9_0.xsd
index 0c3b223..ebe052f 100644
--- a/v1_9_0/CDT-commonTypes-v1_9_0.xsd
+++ b/v1_9_0/CDT-commonTypes-v1_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-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_9_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_9_0/CDT-container-v1_9_0.xsd b/v1_9_0/CDT-container-v1_9_0.xsd
index 1c233fa..1b3a79f 100644
--- a/v1_9_0/CDT-container-v1_9_0.xsd
+++ b/v1_9_0/CDT-container-v1_9_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-contentInstance-v1_9_0.xsd b/v1_9_0/CDT-contentInstance-v1_9_0.xsd
index ada2aec..44e51a7 100644
--- a/v1_9_0/CDT-contentInstance-v1_9_0.xsd
+++ b/v1_9_0/CDT-contentInstance-v1_9_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-delivery-v1_9_0.xsd b/v1_9_0/CDT-delivery-v1_9_0.xsd
index aa860f0..f7000c3 100644
--- a/v1_9_0/CDT-delivery-v1_9_0.xsd
+++ b/v1_9_0/CDT-delivery-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_9_0/CDT-deviceCapability-v1_9_0.xsd b/v1_9_0/CDT-deviceCapability-v1_9_0.xsd
index ec9970b..a233e65 100644
--- a/v1_9_0/CDT-deviceCapability-v1_9_0.xsd
+++ b/v1_9_0/CDT-deviceCapability-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-deviceInfo-v1_9_0.xsd b/v1_9_0/CDT-deviceInfo-v1_9_0.xsd
index 75598e0..650f523 100644
--- a/v1_9_0/CDT-deviceInfo-v1_9_0.xsd
+++ b/v1_9_0/CDT-deviceInfo-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-eventConfig-v1_9_0.xsd b/v1_9_0/CDT-eventConfig-v1_9_0.xsd
index 5134334..5a68a26 100644
--- a/v1_9_0/CDT-eventConfig-v1_9_0.xsd
+++ b/v1_9_0/CDT-eventConfig-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-eventLog-v1_9_0.xsd b/v1_9_0/CDT-eventLog-v1_9_0.xsd
index c1d0307..c034125 100644
--- a/v1_9_0/CDT-eventLog-v1_9_0.xsd
+++ b/v1_9_0/CDT-eventLog-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-execInstance-v1_9_0.xsd b/v1_9_0/CDT-execInstance-v1_9_0.xsd
index a336be8..f9267de 100644
--- a/v1_9_0/CDT-execInstance-v1_9_0.xsd
+++ b/v1_9_0/CDT-execInstance-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-firmware-v1_9_0.xsd b/v1_9_0/CDT-firmware-v1_9_0.xsd
index 03a23ab..04506b7 100644
--- a/v1_9_0/CDT-firmware-v1_9_0.xsd
+++ b/v1_9_0/CDT-firmware-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-group-v1_9_0.xsd b/v1_9_0/CDT-group-v1_9_0.xsd
index 88b38c0..850bf6f 100644
--- a/v1_9_0/CDT-group-v1_9_0.xsd
+++ b/v1_9_0/CDT-group-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-locationPolicy-v1_9_0.xsd b/v1_9_0/CDT-locationPolicy-v1_9_0.xsd
index e34a652..9f00c2a 100644
--- a/v1_9_0/CDT-locationPolicy-v1_9_0.xsd
+++ b/v1_9_0/CDT-locationPolicy-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-m2mServiceSubscriptionProfile-v1_9_0.xsd b/v1_9_0/CDT-m2mServiceSubscriptionProfile-v1_9_0.xsd
index fb45f63..d9b1206 100644
--- a/v1_9_0/CDT-m2mServiceSubscriptionProfile-v1_9_0.xsd
+++ b/v1_9_0/CDT-m2mServiceSubscriptionProfile-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_9_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-memory-v1_9_0.xsd b/v1_9_0/CDT-memory-v1_9_0.xsd
index 5112928..d409add 100644
--- a/v1_9_0/CDT-memory-v1_9_0.xsd
+++ b/v1_9_0/CDT-memory-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-mgmtCmd-v1_9_0.xsd b/v1_9_0/CDT-mgmtCmd-v1_9_0.xsd
index 9b09e80..16a499d 100644
--- a/v1_9_0/CDT-mgmtCmd-v1_9_0.xsd
+++ b/v1_9_0/CDT-mgmtCmd-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_9_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-node-v1_9_0.xsd b/v1_9_0/CDT-node-v1_9_0.xsd
index 8c322e9..2ce0961 100644
--- a/v1_9_0/CDT-node-v1_9_0.xsd
+++ b/v1_9_0/CDT-node-v1_9_0.xsd
@@ -27,20 +27,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-notification-v1_9_0.xsd b/v1_9_0/CDT-notification-v1_9_0.xsd
index d63600e..e4c5fe2 100644
--- a/v1_9_0/CDT-notification-v1_9_0.xsd
+++ b/v1_9_0/CDT-notification-v1_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-v1_8_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_8_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_9_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_9_0/CDT-pollingChannel-v1_9_0.xsd b/v1_9_0/CDT-pollingChannel-v1_9_0.xsd
index 4553779..f4d54ec 100644
--- a/v1_9_0/CDT-pollingChannel-v1_9_0.xsd
+++ b/v1_9_0/CDT-pollingChannel-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-reboot-v1_9_0.xsd b/v1_9_0/CDT-reboot-v1_9_0.xsd
index 590cc61..3558676 100644
--- a/v1_9_0/CDT-reboot-v1_9_0.xsd
+++ b/v1_9_0/CDT-reboot-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-remoteCSE-v1_9_0.xsd b/v1_9_0/CDT-remoteCSE-v1_9_0.xsd
index e00fc32..c7c1ff9 100644
--- a/v1_9_0/CDT-remoteCSE-v1_9_0.xsd
+++ b/v1_9_0/CDT-remoteCSE-v1_9_0.xsd
@@ -26,15 +26,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_9_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-request-v1_9_0.xsd b/v1_9_0/CDT-request-v1_9_0.xsd
index 2ca7669..dc9fab1 100644
--- a/v1_9_0/CDT-request-v1_9_0.xsd
+++ b/v1_9_0/CDT-request-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-requestPrimitive-v1_9_0.xsd b/v1_9_0/CDT-requestPrimitive-v1_9_0.xsd
index 300b908..2ca0aad 100644
--- a/v1_9_0/CDT-requestPrimitive-v1_9_0.xsd
+++ b/v1_9_0/CDT-requestPrimitive-v1_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-v1_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_9_0/CDT-responsePrimitive-v1_9_0.xsd b/v1_9_0/CDT-responsePrimitive-v1_9_0.xsd
index 765add7..631b264 100644
--- a/v1_9_0/CDT-responsePrimitive-v1_9_0.xsd
+++ b/v1_9_0/CDT-responsePrimitive-v1_9_0.xsd
@@ -28,51 +28,51 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v1_8_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v1_9_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
   
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_9_0/CDT-schedule-v1_9_0.xsd b/v1_9_0/CDT-schedule-v1_9_0.xsd
index 0afe8b4..af09011 100644
--- a/v1_9_0/CDT-schedule-v1_9_0.xsd
+++ b/v1_9_0/CDT-schedule-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-serviceSubscribedAppRule-v1_9_0.xsd b/v1_9_0/CDT-serviceSubscribedAppRule-v1_9_0.xsd
index 3d749ec..9085184 100644
--- a/v1_9_0/CDT-serviceSubscribedAppRule-v1_9_0.xsd
+++ b/v1_9_0/CDT-serviceSubscribedAppRule-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-serviceSubscribedNode-v1_9_0.xsd b/v1_9_0/CDT-serviceSubscribedNode-v1_9_0.xsd
index a3313b5..98dc6e1 100644
--- a/v1_9_0/CDT-serviceSubscribedNode-v1_9_0.xsd
+++ b/v1_9_0/CDT-serviceSubscribedNode-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-software-v1_9_0.xsd b/v1_9_0/CDT-software-v1_9_0.xsd
index b7ffefa..ce2ca9a 100644
--- a/v1_9_0/CDT-software-v1_9_0.xsd
+++ b/v1_9_0/CDT-software-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-statsCollect-v1_9_0.xsd b/v1_9_0/CDT-statsCollect-v1_9_0.xsd
index 375ffec..f9b6742 100644
--- a/v1_9_0/CDT-statsCollect-v1_9_0.xsd
+++ b/v1_9_0/CDT-statsCollect-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-statsConfig-v1_9_0.xsd b/v1_9_0/CDT-statsConfig-v1_9_0.xsd
index c1b9b90..95dfac1 100644
--- a/v1_9_0/CDT-statsConfig-v1_9_0.xsd
+++ b/v1_9_0/CDT-statsConfig-v1_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-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_9_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_9_0/CDT-subscription-v1_9_0.xsd b/v1_9_0/CDT-subscription-v1_9_0.xsd
index 39f1546..792b4da 100644
--- a/v1_9_0/CDT-subscription-v1_9_0.xsd
+++ b/v1_9_0/CDT-subscription-v1_9_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_9_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_9_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab