From 2d1288851324189b4f08bbaa9a2342b54465b857 Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Thu, 26 Nov 2015 18:38:24 +0100
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_3_0/CDT-AE-v2_3_0.xsd b/v2_3_0/CDT-AE-v2_3_0.xsd
index 323e625..a909d47 100644
--- a/v2_3_0/CDT-AE-v2_3_0.xsd
+++ b/v2_3_0/CDT-AE-v2_3_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-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-CSEBase-v2_3_0.xsd b/v2_3_0/CDT-CSEBase-v2_3_0.xsd
index df2f31f..3e57d1a 100644
--- a/v2_3_0/CDT-CSEBase-v2_3_0.xsd
+++ b/v2_3_0/CDT-CSEBase-v2_3_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-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_2_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_2_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_3_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_3_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-accessControlPolicy-v2_3_0.xsd b/v2_3_0/CDT-accessControlPolicy-v2_3_0.xsd
index f176ad7..dffdb7a 100644
--- a/v2_3_0/CDT-accessControlPolicy-v2_3_0.xsd
+++ b/v2_3_0/CDT-accessControlPolicy-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-activeCmdhPolicy-v2_3_0.xsd b/v2_3_0/CDT-activeCmdhPolicy-v2_3_0.xsd
index 87b02f0..5d27391 100644
--- a/v2_3_0/CDT-activeCmdhPolicy-v2_3_0.xsd
+++ b/v2_3_0/CDT-activeCmdhPolicy-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v2_3_0/CDT-areaNwkDeviceInfo-v2_3_0.xsd b/v2_3_0/CDT-areaNwkDeviceInfo-v2_3_0.xsd
index c789174..0b7f95a 100644
--- a/v2_3_0/CDT-areaNwkDeviceInfo-v2_3_0.xsd
+++ b/v2_3_0/CDT-areaNwkDeviceInfo-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-areaNwkInfo-v2_3_0.xsd b/v2_3_0/CDT-areaNwkInfo-v2_3_0.xsd
index c971b9b..2f29169 100644
--- a/v2_3_0/CDT-areaNwkInfo-v2_3_0.xsd
+++ b/v2_3_0/CDT-areaNwkInfo-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-battery-v2_3_0.xsd b/v2_3_0/CDT-battery-v2_3_0.xsd
index 6856175..7c25e87 100644
--- a/v2_3_0/CDT-battery-v2_3_0.xsd
+++ b/v2_3_0/CDT-battery-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-cmdhBuffer-v2_3_0.xsd b/v2_3_0/CDT-cmdhBuffer-v2_3_0.xsd
index bd00176..1dbbfc8 100644
--- a/v2_3_0/CDT-cmdhBuffer-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhBuffer-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhDefEcValue-v2_3_0.xsd b/v2_3_0/CDT-cmdhDefEcValue-v2_3_0.xsd
index 1b1a36e..c17d544 100644
--- a/v2_3_0/CDT-cmdhDefEcValue-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhDefEcValue-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhDefaults-v2_3_0.xsd b/v2_3_0/CDT-cmdhDefaults-v2_3_0.xsd
index 297b84f..70a4bb8 100644
--- a/v2_3_0/CDT-cmdhDefaults-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhDefaults-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhEcDefParamValues-v2_3_0.xsd b/v2_3_0/CDT-cmdhEcDefParamValues-v2_3_0.xsd
index 988d877..1dfd07c 100644
--- a/v2_3_0/CDT-cmdhEcDefParamValues-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhEcDefParamValues-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v2_3_0/CDT-cmdhLimits-v2_3_0.xsd b/v2_3_0/CDT-cmdhLimits-v2_3_0.xsd
index db7f6f2..35023cd 100644
--- a/v2_3_0/CDT-cmdhLimits-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhLimits-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhNetworkAccessRules-v2_3_0.xsd b/v2_3_0/CDT-cmdhNetworkAccessRules-v2_3_0.xsd
index 298c230..63ee950 100644
--- a/v2_3_0/CDT-cmdhNetworkAccessRules-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhNetworkAccessRules-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhNwAccessRule-v2_3_0.xsd b/v2_3_0/CDT-cmdhNwAccessRule-v2_3_0.xsd
index 3c37f11..fd242d7 100644
--- a/v2_3_0/CDT-cmdhNwAccessRule-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhNwAccessRule-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v2_3_0/CDT-cmdhPolicy-v2_3_0.xsd b/v2_3_0/CDT-cmdhPolicy-v2_3_0.xsd
index 5d1ea3d..9e2e6fe 100644
--- a/v2_3_0/CDT-cmdhPolicy-v2_3_0.xsd
+++ b/v2_3_0/CDT-cmdhPolicy-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v2_3_0/CDT-commonTypes-v2_3_0.xsd b/v2_3_0/CDT-commonTypes-v2_3_0.xsd
index 308e269..a0d12e4 100644
--- a/v2_3_0/CDT-commonTypes-v2_3_0.xsd
+++ b/v2_3_0/CDT-commonTypes-v2_3_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_3_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_3_0/CDT-container-v2_3_0.xsd b/v2_3_0/CDT-container-v2_3_0.xsd
index a3a5a14..1d8373f 100644
--- a/v2_3_0/CDT-container-v2_3_0.xsd
+++ b/v2_3_0/CDT-container-v2_3_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-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-contentInstance-v2_3_0.xsd b/v2_3_0/CDT-contentInstance-v2_3_0.xsd
index 68cc401..eaf5f63 100644
--- a/v2_3_0/CDT-contentInstance-v2_3_0.xsd
+++ b/v2_3_0/CDT-contentInstance-v2_3_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-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-delivery-v2_3_0.xsd b/v2_3_0/CDT-delivery-v2_3_0.xsd
index b8fd0d4..ee4ecaf 100644
--- a/v2_3_0/CDT-delivery-v2_3_0.xsd
+++ b/v2_3_0/CDT-delivery-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v2_3_0/CDT-deviceCapability-v2_3_0.xsd b/v2_3_0/CDT-deviceCapability-v2_3_0.xsd
index 48a5645..9f943ae 100644
--- a/v2_3_0/CDT-deviceCapability-v2_3_0.xsd
+++ b/v2_3_0/CDT-deviceCapability-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-deviceInfo-v2_3_0.xsd b/v2_3_0/CDT-deviceInfo-v2_3_0.xsd
index 3516d9a..08c2c16 100644
--- a/v2_3_0/CDT-deviceInfo-v2_3_0.xsd
+++ b/v2_3_0/CDT-deviceInfo-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-eventConfig-v2_3_0.xsd b/v2_3_0/CDT-eventConfig-v2_3_0.xsd
index 2db9bdc..9004af8 100644
--- a/v2_3_0/CDT-eventConfig-v2_3_0.xsd
+++ b/v2_3_0/CDT-eventConfig-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-eventLog-v2_3_0.xsd b/v2_3_0/CDT-eventLog-v2_3_0.xsd
index ec8fe35..01be4ea 100644
--- a/v2_3_0/CDT-eventLog-v2_3_0.xsd
+++ b/v2_3_0/CDT-eventLog-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-execInstance-v2_3_0.xsd b/v2_3_0/CDT-execInstance-v2_3_0.xsd
index 4fdb38b..e5827e4 100644
--- a/v2_3_0/CDT-execInstance-v2_3_0.xsd
+++ b/v2_3_0/CDT-execInstance-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-firmware-v2_3_0.xsd b/v2_3_0/CDT-firmware-v2_3_0.xsd
index a13c4c3..30534aa 100644
--- a/v2_3_0/CDT-firmware-v2_3_0.xsd
+++ b/v2_3_0/CDT-firmware-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-group-v2_3_0.xsd b/v2_3_0/CDT-group-v2_3_0.xsd
index c08227f..bd851c3 100644
--- a/v2_3_0/CDT-group-v2_3_0.xsd
+++ b/v2_3_0/CDT-group-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-locationPolicy-v2_3_0.xsd b/v2_3_0/CDT-locationPolicy-v2_3_0.xsd
index d14f9dc..036f200 100644
--- a/v2_3_0/CDT-locationPolicy-v2_3_0.xsd
+++ b/v2_3_0/CDT-locationPolicy-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd b/v2_3_0/CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd
index f045298..3614701 100644
--- a/v2_3_0/CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd
+++ b/v2_3_0/CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_3_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-memory-v2_3_0.xsd b/v2_3_0/CDT-memory-v2_3_0.xsd
index 7997060..3b0d470 100644
--- a/v2_3_0/CDT-memory-v2_3_0.xsd
+++ b/v2_3_0/CDT-memory-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-mgmtCmd-v2_3_0.xsd b/v2_3_0/CDT-mgmtCmd-v2_3_0.xsd
index acac8fd..41677db 100644
--- a/v2_3_0/CDT-mgmtCmd-v2_3_0.xsd
+++ b/v2_3_0/CDT-mgmtCmd-v2_3_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_3_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-node-v2_3_0.xsd b/v2_3_0/CDT-node-v2_3_0.xsd
index 1da51e0..b1d24ee 100644
--- a/v2_3_0/CDT-node-v2_3_0.xsd
+++ b/v2_3_0/CDT-node-v2_3_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-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-notification-v2_3_0.xsd b/v2_3_0/CDT-notification-v2_3_0.xsd
index bfd0b88..c74f696 100644
--- a/v2_3_0/CDT-notification-v2_3_0.xsd
+++ b/v2_3_0/CDT-notification-v2_3_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_3_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_3_0/CDT-pollingChannel-v2_3_0.xsd b/v2_3_0/CDT-pollingChannel-v2_3_0.xsd
index 12ea937..1245474 100644
--- a/v2_3_0/CDT-pollingChannel-v2_3_0.xsd
+++ b/v2_3_0/CDT-pollingChannel-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-reboot-v2_3_0.xsd b/v2_3_0/CDT-reboot-v2_3_0.xsd
index 8fdb59b..0c5e849 100644
--- a/v2_3_0/CDT-reboot-v2_3_0.xsd
+++ b/v2_3_0/CDT-reboot-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-remoteCSE-v2_3_0.xsd b/v2_3_0/CDT-remoteCSE-v2_3_0.xsd
index ff0297c..c456c14 100644
--- a/v2_3_0/CDT-remoteCSE-v2_3_0.xsd
+++ b/v2_3_0/CDT-remoteCSE-v2_3_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-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-request-v2_3_0.xsd b/v2_3_0/CDT-request-v2_3_0.xsd
index 425606a..3260482 100644
--- a/v2_3_0/CDT-request-v2_3_0.xsd
+++ b/v2_3_0/CDT-request-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-requestPrimitive-v2_3_0.xsd b/v2_3_0/CDT-requestPrimitive-v2_3_0.xsd
index d17512f..c7a0fef 100644
--- a/v2_3_0/CDT-requestPrimitive-v2_3_0.xsd
+++ b/v2_3_0/CDT-requestPrimitive-v2_3_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_3_0/CDT-responsePrimitive-v2_3_0.xsd b/v2_3_0/CDT-responsePrimitive-v2_3_0.xsd
index 762cd85..510af00 100644
--- a/v2_3_0/CDT-responsePrimitive-v2_3_0.xsd
+++ b/v2_3_0/CDT-responsePrimitive-v2_3_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-v2_2_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_2_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_3_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_3_0/CDT-schedule-v2_3_0.xsd b/v2_3_0/CDT-schedule-v2_3_0.xsd
index ce3ec17..f3269f4 100644
--- a/v2_3_0/CDT-schedule-v2_3_0.xsd
+++ b/v2_3_0/CDT-schedule-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-serviceSubscribedAppRule-v2_3_0.xsd b/v2_3_0/CDT-serviceSubscribedAppRule-v2_3_0.xsd
index cc7519b..aa59c62 100644
--- a/v2_3_0/CDT-serviceSubscribedAppRule-v2_3_0.xsd
+++ b/v2_3_0/CDT-serviceSubscribedAppRule-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-serviceSubscribedNode-v2_3_0.xsd b/v2_3_0/CDT-serviceSubscribedNode-v2_3_0.xsd
index 88d0582..3a69b18 100644
--- a/v2_3_0/CDT-serviceSubscribedNode-v2_3_0.xsd
+++ b/v2_3_0/CDT-serviceSubscribedNode-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-software-v2_3_0.xsd b/v2_3_0/CDT-software-v2_3_0.xsd
index 6db4857..99f3ace 100644
--- a/v2_3_0/CDT-software-v2_3_0.xsd
+++ b/v2_3_0/CDT-software-v2_3_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-statsCollect-v2_3_0.xsd b/v2_3_0/CDT-statsCollect-v2_3_0.xsd
index 01aa723..eeb4954 100644
--- a/v2_3_0/CDT-statsCollect-v2_3_0.xsd
+++ b/v2_3_0/CDT-statsCollect-v2_3_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-statsConfig-v2_3_0.xsd b/v2_3_0/CDT-statsConfig-v2_3_0.xsd
index a328d04..0b41e32 100644
--- a/v2_3_0/CDT-statsConfig-v2_3_0.xsd
+++ b/v2_3_0/CDT-statsConfig-v2_3_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v2_3_0/CDT-subscription-v2_3_0.xsd b/v2_3_0/CDT-subscription-v2_3_0.xsd
index 1079e6b..e784c1e 100644
--- a/v2_3_0/CDT-subscription-v2_3_0.xsd
+++ b/v2_3_0/CDT-subscription-v2_3_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-v2_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab