From c5c22fc771192d5d013423d538b54d32d1412a73 Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Fri, 5 Feb 2016 16:19:38 +0100
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_4_0/CDT-AE-v2_4_0.xsd b/v2_4_0/CDT-AE-v2_4_0.xsd
index 856893f..567fff9 100644
--- a/v2_4_0/CDT-AE-v2_4_0.xsd
+++ b/v2_4_0/CDT-AE-v2_4_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_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-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-CSEBase-v2_4_0.xsd b/v2_4_0/CDT-CSEBase-v2_4_0.xsd
index 3e57d1a..1af5893 100644
--- a/v2_4_0/CDT-CSEBase-v2_4_0.xsd
+++ b/v2_4_0/CDT-CSEBase-v2_4_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_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:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_4_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_4_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-accessControlPolicy-v2_4_0.xsd b/v2_4_0/CDT-accessControlPolicy-v2_4_0.xsd
index dffdb7a..503edf4 100644
--- a/v2_4_0/CDT-accessControlPolicy-v2_4_0.xsd
+++ b/v2_4_0/CDT-accessControlPolicy-v2_4_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_3_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-activeCmdhPolicy-v2_4_0.xsd b/v2_4_0/CDT-activeCmdhPolicy-v2_4_0.xsd
index 5d27391..6706662 100644
--- a/v2_4_0/CDT-activeCmdhPolicy-v2_4_0.xsd
+++ b/v2_4_0/CDT-activeCmdhPolicy-v2_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v2_4_0/CDT-areaNwkDeviceInfo-v2_4_0.xsd b/v2_4_0/CDT-areaNwkDeviceInfo-v2_4_0.xsd
index 0b7f95a..3526f29 100644
--- a/v2_4_0/CDT-areaNwkDeviceInfo-v2_4_0.xsd
+++ b/v2_4_0/CDT-areaNwkDeviceInfo-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-areaNwkInfo-v2_4_0.xsd b/v2_4_0/CDT-areaNwkInfo-v2_4_0.xsd
index 2f29169..1b1fcba 100644
--- a/v2_4_0/CDT-areaNwkInfo-v2_4_0.xsd
+++ b/v2_4_0/CDT-areaNwkInfo-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-battery-v2_4_0.xsd b/v2_4_0/CDT-battery-v2_4_0.xsd
index 7c25e87..d1c13a1 100644
--- a/v2_4_0/CDT-battery-v2_4_0.xsd
+++ b/v2_4_0/CDT-battery-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhBuffer-v2_4_0.xsd b/v2_4_0/CDT-cmdhBuffer-v2_4_0.xsd
index 1dbbfc8..173a44f 100644
--- a/v2_4_0/CDT-cmdhBuffer-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhBuffer-v2_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v2_4_0/CDT-cmdhDefEcValue-v2_4_0.xsd b/v2_4_0/CDT-cmdhDefEcValue-v2_4_0.xsd
index c17d544..f074f72 100644
--- a/v2_4_0/CDT-cmdhDefEcValue-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhDefEcValue-v2_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v2_4_0/CDT-cmdhDefaults-v2_4_0.xsd b/v2_4_0/CDT-cmdhDefaults-v2_4_0.xsd
index 70a4bb8..e9c4f48 100644
--- a/v2_4_0/CDT-cmdhDefaults-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhDefaults-v2_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v2_4_0/CDT-cmdhEcDefParamValues-v2_4_0.xsd b/v2_4_0/CDT-cmdhEcDefParamValues-v2_4_0.xsd
index 1dfd07c..7b21708 100644
--- a/v2_4_0/CDT-cmdhEcDefParamValues-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhEcDefParamValues-v2_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v2_4_0/CDT-cmdhLimits-v2_4_0.xsd b/v2_4_0/CDT-cmdhLimits-v2_4_0.xsd
index 35023cd..46ef4e1 100644
--- a/v2_4_0/CDT-cmdhLimits-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhLimits-v2_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v2_4_0/CDT-cmdhNetworkAccessRules-v2_4_0.xsd b/v2_4_0/CDT-cmdhNetworkAccessRules-v2_4_0.xsd
index 63ee950..e387acf 100644
--- a/v2_4_0/CDT-cmdhNetworkAccessRules-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhNetworkAccessRules-v2_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v2_4_0/CDT-cmdhNwAccessRule-v2_4_0.xsd b/v2_4_0/CDT-cmdhNwAccessRule-v2_4_0.xsd
index fd242d7..b5e62ae 100644
--- a/v2_4_0/CDT-cmdhNwAccessRule-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhNwAccessRule-v2_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v2_4_0/CDT-cmdhPolicy-v2_4_0.xsd b/v2_4_0/CDT-cmdhPolicy-v2_4_0.xsd
index 9e2e6fe..c99eed8 100644
--- a/v2_4_0/CDT-cmdhPolicy-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhPolicy-v2_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v2_4_0/CDT-commonTypes-v2_4_0.xsd b/v2_4_0/CDT-commonTypes-v2_4_0.xsd
index e4295d9..0d5e5c8 100644
--- a/v2_4_0/CDT-commonTypes-v2_4_0.xsd
+++ b/v2_4_0/CDT-commonTypes-v2_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_4_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_4_0/CDT-container-v2_4_0.xsd b/v2_4_0/CDT-container-v2_4_0.xsd
index 1d8373f..a71c3bd 100644
--- a/v2_4_0/CDT-container-v2_4_0.xsd
+++ b/v2_4_0/CDT-container-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-contentInstance-v2_4_0.xsd b/v2_4_0/CDT-contentInstance-v2_4_0.xsd
index eaf5f63..b1aa0ab 100644
--- a/v2_4_0/CDT-contentInstance-v2_4_0.xsd
+++ b/v2_4_0/CDT-contentInstance-v2_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-delivery-v2_4_0.xsd b/v2_4_0/CDT-delivery-v2_4_0.xsd
index ee4ecaf..b5e9c7a 100644
--- a/v2_4_0/CDT-delivery-v2_4_0.xsd
+++ b/v2_4_0/CDT-delivery-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v2_4_0/CDT-deviceCapability-v2_4_0.xsd b/v2_4_0/CDT-deviceCapability-v2_4_0.xsd
index 9f943ae..584fcee 100644
--- a/v2_4_0/CDT-deviceCapability-v2_4_0.xsd
+++ b/v2_4_0/CDT-deviceCapability-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-deviceInfo-v2_4_0.xsd b/v2_4_0/CDT-deviceInfo-v2_4_0.xsd
index 08c2c16..fd2fda8 100644
--- a/v2_4_0/CDT-deviceInfo-v2_4_0.xsd
+++ b/v2_4_0/CDT-deviceInfo-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-eventConfig-v2_4_0.xsd b/v2_4_0/CDT-eventConfig-v2_4_0.xsd
index 9004af8..6f029ba 100644
--- a/v2_4_0/CDT-eventConfig-v2_4_0.xsd
+++ b/v2_4_0/CDT-eventConfig-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-eventLog-v2_4_0.xsd b/v2_4_0/CDT-eventLog-v2_4_0.xsd
index 01be4ea..a620d0c 100644
--- a/v2_4_0/CDT-eventLog-v2_4_0.xsd
+++ b/v2_4_0/CDT-eventLog-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-execInstance-v2_4_0.xsd b/v2_4_0/CDT-execInstance-v2_4_0.xsd
index e5827e4..efd19f2 100644
--- a/v2_4_0/CDT-execInstance-v2_4_0.xsd
+++ b/v2_4_0/CDT-execInstance-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-firmware-v2_4_0.xsd b/v2_4_0/CDT-firmware-v2_4_0.xsd
index 30534aa..b314411 100644
--- a/v2_4_0/CDT-firmware-v2_4_0.xsd
+++ b/v2_4_0/CDT-firmware-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-group-v2_4_0.xsd b/v2_4_0/CDT-group-v2_4_0.xsd
index 62d8aa9..f4b89fb 100644
--- a/v2_4_0/CDT-group-v2_4_0.xsd
+++ b/v2_4_0/CDT-group-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-locationPolicy-v2_4_0.xsd b/v2_4_0/CDT-locationPolicy-v2_4_0.xsd
index 036f200..409e444 100644
--- a/v2_4_0/CDT-locationPolicy-v2_4_0.xsd
+++ b/v2_4_0/CDT-locationPolicy-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd b/v2_4_0/CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd
index 3614701..37deb72 100644
--- a/v2_4_0/CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd
+++ b/v2_4_0/CDT-m2mServiceSubscriptionProfile-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_4_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-memory-v2_4_0.xsd b/v2_4_0/CDT-memory-v2_4_0.xsd
index 3b0d470..cbe9a47 100644
--- a/v2_4_0/CDT-memory-v2_4_0.xsd
+++ b/v2_4_0/CDT-memory-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-mgmtCmd-v2_4_0.xsd b/v2_4_0/CDT-mgmtCmd-v2_4_0.xsd
index 41677db..44c5f10 100644
--- a/v2_4_0/CDT-mgmtCmd-v2_4_0.xsd
+++ b/v2_4_0/CDT-mgmtCmd-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_4_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-node-v2_4_0.xsd b/v2_4_0/CDT-node-v2_4_0.xsd
index b1d24ee..5316a30 100644
--- a/v2_4_0/CDT-node-v2_4_0.xsd
+++ b/v2_4_0/CDT-node-v2_4_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_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:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-notification-v2_4_0.xsd b/v2_4_0/CDT-notification-v2_4_0.xsd
index 4dc8664..1bed6d6 100644
--- a/v2_4_0/CDT-notification-v2_4_0.xsd
+++ b/v2_4_0/CDT-notification-v2_4_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_3_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_4_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_4_0/CDT-pollingChannel-v2_4_0.xsd b/v2_4_0/CDT-pollingChannel-v2_4_0.xsd
index 1245474..7eb7131 100644
--- a/v2_4_0/CDT-pollingChannel-v2_4_0.xsd
+++ b/v2_4_0/CDT-pollingChannel-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-reboot-v2_4_0.xsd b/v2_4_0/CDT-reboot-v2_4_0.xsd
index 0c5e849..84577fc 100644
--- a/v2_4_0/CDT-reboot-v2_4_0.xsd
+++ b/v2_4_0/CDT-reboot-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-remoteCSE-v2_4_0.xsd b/v2_4_0/CDT-remoteCSE-v2_4_0.xsd
index c456c14..d762cf6 100644
--- a/v2_4_0/CDT-remoteCSE-v2_4_0.xsd
+++ b/v2_4_0/CDT-remoteCSE-v2_4_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_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:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-request-v2_4_0.xsd b/v2_4_0/CDT-request-v2_4_0.xsd
index 3260482..7055c2b 100644
--- a/v2_4_0/CDT-request-v2_4_0.xsd
+++ b/v2_4_0/CDT-request-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-requestPrimitive-v2_4_0.xsd b/v2_4_0/CDT-requestPrimitive-v2_4_0.xsd
index 843c6ba..a8c337d 100644
--- a/v2_4_0/CDT-requestPrimitive-v2_4_0.xsd
+++ b/v2_4_0/CDT-requestPrimitive-v2_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_4_0/CDT-responsePrimitive-v2_4_0.xsd b/v2_4_0/CDT-responsePrimitive-v2_4_0.xsd
index 510af00..adec6e7 100644
--- a/v2_4_0/CDT-responsePrimitive-v2_4_0.xsd
+++ b/v2_4_0/CDT-responsePrimitive-v2_4_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_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:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_4_0/CDT-schedule-v2_4_0.xsd b/v2_4_0/CDT-schedule-v2_4_0.xsd
index f3269f4..5841643 100644
--- a/v2_4_0/CDT-schedule-v2_4_0.xsd
+++ b/v2_4_0/CDT-schedule-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-serviceSubscribedAppRule-v2_4_0.xsd b/v2_4_0/CDT-serviceSubscribedAppRule-v2_4_0.xsd
index aa59c62..c68124c 100644
--- a/v2_4_0/CDT-serviceSubscribedAppRule-v2_4_0.xsd
+++ b/v2_4_0/CDT-serviceSubscribedAppRule-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-serviceSubscribedNode-v2_4_0.xsd b/v2_4_0/CDT-serviceSubscribedNode-v2_4_0.xsd
index 3a69b18..4125575 100644
--- a/v2_4_0/CDT-serviceSubscribedNode-v2_4_0.xsd
+++ b/v2_4_0/CDT-serviceSubscribedNode-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-software-v2_4_0.xsd b/v2_4_0/CDT-software-v2_4_0.xsd
index 99f3ace..dccdb98 100644
--- a/v2_4_0/CDT-software-v2_4_0.xsd
+++ b/v2_4_0/CDT-software-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-statsCollect-v2_4_0.xsd b/v2_4_0/CDT-statsCollect-v2_4_0.xsd
index eeb4954..11aeb29 100644
--- a/v2_4_0/CDT-statsCollect-v2_4_0.xsd
+++ b/v2_4_0/CDT-statsCollect-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-statsConfig-v2_4_0.xsd b/v2_4_0/CDT-statsConfig-v2_4_0.xsd
index 0b41e32..7715789 100644
--- a/v2_4_0/CDT-statsConfig-v2_4_0.xsd
+++ b/v2_4_0/CDT-statsConfig-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v2_4_0/CDT-subscription-v2_4_0.xsd b/v2_4_0/CDT-subscription-v2_4_0.xsd
index e784c1e..836cd60 100644
--- a/v2_4_0/CDT-subscription-v2_4_0.xsd
+++ b/v2_4_0/CDT-subscription-v2_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab