diff --git a/v1_9_0/CDT-AE-v1_9_0.xsd b/v1_9_0/CDT-AE-v1_9_0.xsd
index 1054c5ce2f2d93f422c667bd2939874adc881746..c8db5b82c354f2ebbb9cacd5b598d1c6822bee19 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 202f2e42672855c40a64c3f34f1b42feaeb55bd5..a0c8107f1e746d2847189bf2d6a972891b93553a 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 b0418b1216feb34aaab05d4c021731cfc83fdfac..8b2b23865ad65a25d34a2999d89d865d6f4f56e2 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 a409c76cb7e220f80a8feae461a091642ed4e1fc..f1be895ca013063a168e17ad88f2cd4afa66f2e7 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 7b0eb26a4ddfe441bf46f263d07f50993b9354c1..d02743f3325c1b9a1fcf73dfd3dfc508a1804382 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 8e967e50443d7c6e4ec159f2156dcdd1983331cf..ec3f517d6795828b689db4d5231059be7acb51bf 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 f4990dd7b4bceeac5543879166df5538100a9b2d..abc832f107d3e5620079ce0210fc3881723c8476 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 6d0e9450234ad0e73f5cfbfc473ec99556323cb5..6474f728066e4bdc718b10724603e1c9992e4c35 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 a80458c115f3a5c1622ed1f5ddb0a8f4475d2ddf..6c8a5eb4bca79b91953e214c8a4ccadb0381e3e4 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 b1e440fb9c5dbd93def17aeb4e946dab76c81c33..9f5508cf95fa95d5941a864c2090ea0053f9ebc7 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 3365c60ff312691af9290cd58e5a6c07063a3377..3d8b3c706bc313744c68747360a7e0f5fb54082f 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 5525b6ed9eea858093b2bbe71284da52762702dc..fa9bf08e92c1d6e1771b7526345146568e5e4025 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 edf4c3daea41c34ed00a5656cadc0c651de03276..6ced1b33e1debac3f38dee1929d16b3551c3afa9 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 f5c7aa5460cbb1547b848d31d7d808362beb06e4..6012ac35e8a82e2fe9efe9e1a583c46eed6b4039 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 397b03e235fe0fe66065433757276d301532f293..fc33dc567900f6e3f8f1a9c31a1d6c461652c0c9 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 0c3b22385c7a24e552c4157e362b6169f2e486d3..ebe052f74830c02c746235cb0b8577bedc71515e 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 1c233faedfa4835cb6d8c7a694951a3256ef7ddf..1b3a79f3db2312f9625d0073439652b2ecd57126 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 ada2aecc8f3954cb0ebd291a0859b78c24ac33d4..44e51a7c19aa2249d96fb607aa277221123b1aac 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 aa860f0d2982060bd3e6f6e6b647afbfe1944296..f7000c374aef287185734863d6a3d6e08bd70a3e 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 ec9970b42bc743e27cad21bfa9c4f92f0e52560e..a233e659b2365a7f97519037acc3d06fdbb2001a 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 75598e0d74ddfe8e85035cf17912a1ffcc6d9acb..650f523e44066f0755ca507158581a3074c49ae2 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 513433408265cb8130855fda3e276aa77ea49d72..5a68a26cd9a313bd6f3d0bb47c2a675647373a67 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 c1d03078922e035b71b88f455745b9c6a69c6141..c0341255ce748f251c6cf8c26bcf0ddf7624b3da 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 a336be84c26f78cbda7b03352847b002bda0fbc7..f9267de6c6536a874e4866f8e1070786e065c9d4 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 03a23aba0b38cf797ae9240185f6ae15bfcfe97b..04506b77020f7eeae343fed6fd6d3a8cfb376805 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 88b38c0086e1bc99e0e30eef92aac926282fe710..850bf6ffa21e6c437f8ff38979c3a5cf2bb945a6 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 e34a652479e9a89a60260ae3eca303df54ef6d11..9f00c2a9d472af22576ee266cbe31a3938c847cc 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 fb45f6354db7c47a1e05db6cc514102f646e2da3..d9b12061cccbb5fddbac177b995a088c2ddee498 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 51129282e4af786db0d3a372e2f375bdd7e37bee..d409add11988be3c135b8548cd7a1de7a402d2bc 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 9b09e805e1fc5b36f94bc2f43531f234166bb9fd..16a499dec9b112102eb32c118afd6477e6d0e4ee 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 8c322e9fa5e930b013792d5539a589e923a26930..2ce096191a4f919054e2ac3a41e0ddae3046e461 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 d63600e9d897d530e84d37a48c766260f525d0d9..e4c5fe20d9ec321b84dd02e6f848b4559bf93b53 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 4553779a6a42fa27dc61fda3e9709f03b3bc99b7..f4d54ec2fb08091ed24dda2eb1cedd17e254a737 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 590cc61a40c2c05c834d8b6882eb215315c64db7..3558676fe265dee2d01e072217b0a0a5ce555623 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 e00fc32c729058e11c4af6be4d5f69f5784452b8..c7c1ff93d4ea6ba4b935386e26fb4eeab4cd24d3 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 2ca766937a93dd44e384bab5cb54f9b1235a70e2..dc9fab164ec434543d1a08cd8b50d7703f2b8f03 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 300b908ac786ed26f4205ceebabe4abe9494ba84..2ca0aad1a4a150a44af44cea769fe9c997b30b49 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 765add714c68dd4150e8d93c34f558c5983ea6f5..631b26442be26b8d311f1e697010fd3304f9ef11 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 0afe8b4412d401b152010e2995369b4eb20337f2..af09011496c1cbacbc05911f8710cb06255b34a7 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 3d749ec842761e2d33bffea1287db9d4af3adbbb..90851844b1b8c2fc588603a779914e638bf4477e 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 a3313b5d3275032b3d1b039b29d613b1e9ef5423..98dc6e1833b02804cee0881b8992dd2e34aee154 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 b7ffefac15838f0642633e59979d15249f55b605..ce2ca9ad3f5a0dfaccd23193a6baa9aab4483729 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 375ffecb22a21a936fa1d37c14b9e91bb72991b2..f9b6742719a26e4dcb3effc1b71b6502536b0955 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 c1b9b90812ebdaec8f60d09771df9426b8718948..95dfac1dd1d5276cda159f45a5353081c112d300 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 39f1546d99ddd7cb030ff0c59d2af4a1f4a182da..792b4dab27e334fc38399d6e647f77bf4e05c5c0 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>