From c0ce2c612b355e801bbf39109e0b31cfb2b0d501 Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Thu, 12 May 2022 11:53:38 +0200
Subject: [PATCH] Change include statements to reference 3_24_0

---
 v3_24_0/CDT-AE-v3_24_0.xsd                    | 28 +++---
 v3_24_0/CDT-AEContactList-v3_24_0.xsd         |  8 +-
 v3_24_0/CDT-AEContactListPerCSE-v3_24_0.xsd   |  2 +-
 v3_24_0/CDT-CSEBase-v3_24_0.xsd               | 64 ++++++-------
 v3_24_0/CDT-accessControlPolicy-v3_24_0.xsd   |  6 +-
 v3_24_0/CDT-activeCmdhPolicy-v3_24_0.xsd      |  2 +-
 v3_24_0/CDT-allJoynApp-v3_24_0.xsd            |  8 +-
 v3_24_0/CDT-allJoynInterface-v3_24_0.xsd      | 12 +--
 v3_24_0/CDT-allJoynMethod-v3_24_0.xsd         |  8 +-
 v3_24_0/CDT-allJoynMethodCall-v3_24_0.xsd     |  6 +-
 v3_24_0/CDT-allJoynProperty-v3_24_0.xsd       |  6 +-
 v3_24_0/CDT-allJoynSvcObject-v3_24_0.xsd      |  8 +-
 v3_24_0/CDT-areaNwkDeviceInfo-v3_24_0.xsd     |  4 +-
 v3_24_0/CDT-areaNwkInfo-v3_24_0.xsd           |  4 +-
 v3_24_0/CDT-authorizationDecision-v3_24_0.xsd |  6 +-
 .../CDT-authorizationInformation-v3_24_0.xsd  | 10 +-
 v3_24_0/CDT-authorizationPolicy-v3_24_0.xsd   |  6 +-
 .../CDT-backgroundDataTransfer-v3_24_0.xsd    |  4 +-
 v3_24_0/CDT-battery-v3_24_0.xsd               |  4 +-
 v3_24_0/CDT-cmdhBuffer-v3_24_0.xsd            |  2 +-
 v3_24_0/CDT-cmdhDefEcValue-v3_24_0.xsd        |  2 +-
 v3_24_0/CDT-cmdhDefaults-v3_24_0.xsd          |  2 +-
 v3_24_0/CDT-cmdhEcDefParamValues-v3_24_0.xsd  |  2 +-
 v3_24_0/CDT-cmdhLimits-v3_24_0.xsd            |  2 +-
 .../CDT-cmdhNetworkAccessRules-v3_24_0.xsd    |  2 +-
 v3_24_0/CDT-cmdhNwAccessRule-v3_24_0.xsd      |  2 +-
 v3_24_0/CDT-cmdhPolicy-v3_24_0.xsd            |  2 +-
 v3_24_0/CDT-commonTypes-v3_24_0.xsd           |  2 +-
 v3_24_0/CDT-container-v3_24_0.xsd             | 12 +--
 v3_24_0/CDT-contentInstance-v3_24_0.xsd       |  6 +-
 .../CDT-crossResourceSubscription-v3_24_0.xsd |  8 +-
 v3_24_0/CDT-delivery-v3_24_0.xsd              |  4 +-
 v3_24_0/CDT-deviceCapability-v3_24_0.xsd      |  4 +-
 v3_24_0/CDT-deviceInfo-v3_24_0.xsd            |  4 +-
 ...namicAuthorizationConsultation-v3_24_0.xsd |  6 +-
 v3_24_0/CDT-eventConfig-v3_24_0.xsd           |  6 +-
 v3_24_0/CDT-eventLog-v3_24_0.xsd              |  4 +-
 v3_24_0/CDT-execInstance-v3_24_0.xsd          |  6 +-
 v3_24_0/CDT-firmware-v3_24_0.xsd              |  4 +-
 v3_24_0/CDT-group-v3_24_0.xsd                 |  8 +-
 v3_24_0/CDT-localMulticastGroup-v3_24_0.xsd   |  4 +-
 v3_24_0/CDT-locationPolicy-v3_24_0.xsd        |  6 +-
 ...-m2mServiceSubscriptionProfile-v3_24_0.xsd |  8 +-
 v3_24_0/CDT-memory-v3_24_0.xsd                |  4 +-
 v3_24_0/CDT-mgmtCmd-v3_24_0.xsd               |  8 +-
 v3_24_0/CDT-multimediaSession-v3_24_0.xsd     |  6 +-
 v3_24_0/CDT-node-v3_24_0.xsd                  | 34 +++----
 v3_24_0/CDT-notification-v3_24_0.xsd          |  4 +-
 ...otificationTargetMgmtPolicyRef-v3_24_0.xsd |  6 +-
 .../CDT-notificationTargetPolicy-v3_24_0.xsd  |  8 +-
 v3_24_0/CDT-ontology-v3_24_0.xsd              |  6 +-
 v3_24_0/CDT-ontologyRepository-v3_24_0.xsd    |  8 +-
 v3_24_0/CDT-policyDeletionRules-v3_24_0.xsd   |  6 +-
 v3_24_0/CDT-pollingChannel-v3_24_0.xsd        |  6 +-
 v3_24_0/CDT-reboot-v3_24_0.xsd                |  4 +-
 v3_24_0/CDT-remoteCSE-v3_24_0.xsd             | 32 +++----
 v3_24_0/CDT-request-v3_24_0.xsd               |  4 +-
 v3_24_0/CDT-requestPrimitive-v3_24_0.xsd      |  2 +-
 v3_24_0/CDT-responsePrimitive-v3_24_0.xsd     | 96 +++++++++----------
 v3_24_0/CDT-role-v3_24_0.xsd                  |  6 +-
 v3_24_0/CDT-schedule-v3_24_0.xsd              |  4 +-
 v3_24_0/CDT-semanticDescriptor-v3_24_0.xsd    |  6 +-
 .../CDT-semanticMashupInstance-v3_24_0.xsd    | 10 +-
 .../CDT-semanticMashupJobProfile-v3_24_0.xsd  | 10 +-
 v3_24_0/CDT-semanticMashupResult-v3_24_0.xsd  |  6 +-
 .../CDT-serviceSubscribedAppRule-v3_24_0.xsd  |  6 +-
 v3_24_0/CDT-serviceSubscribedNode-v3_24_0.xsd |  6 +-
 v3_24_0/CDT-software-v3_24_0.xsd              |  4 +-
 v3_24_0/CDT-statsCollect-v3_24_0.xsd          |  6 +-
 v3_24_0/CDT-statsConfig-v3_24_0.xsd           |  8 +-
 v3_24_0/CDT-subscription-v3_24_0.xsd          |  8 +-
 v3_24_0/CDT-svcFwWrapper-v3_24_0.xsd          |  6 +-
 v3_24_0/CDT-svcObjWrapper-v3_24_0.xsd         |  8 +-
 v3_24_0/CDT-timeSeries-v3_24_0.xsd            | 10 +-
 v3_24_0/CDT-timeSeriesInstance-v3_24_0.xsd    |  6 +-
 .../CDT-timeSeriesNotification-v3_24_0.xsd    |  2 +-
 v3_24_0/CDT-token-v3_24_0.xsd                 |  6 +-
 v3_24_0/CDT-transaction-v3_24_0.xsd           |  6 +-
 v3_24_0/CDT-transactionMgmt-v3_24_0.xsd       |  6 +-
 v3_24_0/CDT-triggerPayload-v3_24_0.xsd        |  2 +-
 v3_24_0/CDT-triggerRequest-v3_24_0.xsd        |  6 +-
 81 files changed, 338 insertions(+), 338 deletions(-)

diff --git a/v3_24_0/CDT-AE-v3_24_0.xsd b/v3_24_0/CDT-AE-v3_24_0.xsd
index 1f58646..48bb78b 100644
--- a/v3_24_0/CDT-AE-v3_24_0.xsd
+++ b/v3_24_0/CDT-AE-v3_24_0.xsd
@@ -26,20 +26,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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-AEContactList-v3_24_0.xsd b/v3_24_0/CDT-AEContactList-v3_24_0.xsd
index 7923961..df8a2e5 100644
--- a/v3_24_0/CDT-AEContactList-v3_24_0.xsd
+++ b/v3_24_0/CDT-AEContactList-v3_24_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-AEContactListPerCSE-v3_24_0.xsd b/v3_24_0/CDT-AEContactListPerCSE-v3_24_0.xsd
index 3ce933a..c58ce60 100644
--- a/v3_24_0/CDT-AEContactListPerCSE-v3_24_0.xsd
+++ b/v3_24_0/CDT-AEContactListPerCSE-v3_24_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-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-CSEBase-v3_24_0.xsd b/v3_24_0/CDT-CSEBase-v3_24_0.xsd
index d597ce7..778ab58 100644
--- a/v3_24_0/CDT-CSEBase-v3_24_0.xsd
+++ b/v3_24_0/CDT-CSEBase-v3_24_0.xsd
@@ -26,38 +26,38 @@ 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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_23_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_23_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_23_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_24_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_24_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_24_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_24_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-accessControlPolicy-v3_24_0.xsd b/v3_24_0/CDT-accessControlPolicy-v3_24_0.xsd
index d62c5af..a185777 100644
--- a/v3_24_0/CDT-accessControlPolicy-v3_24_0.xsd
+++ b/v3_24_0/CDT-accessControlPolicy-v3_24_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-activeCmdhPolicy-v3_24_0.xsd b/v3_24_0/CDT-activeCmdhPolicy-v3_24_0.xsd
index 44eaf00..a12aad9 100644
--- a/v3_24_0/CDT-activeCmdhPolicy-v3_24_0.xsd
+++ b/v3_24_0/CDT-activeCmdhPolicy-v3_24_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-v3_23_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_24_0/CDT-allJoynApp-v3_24_0.xsd b/v3_24_0/CDT-allJoynApp-v3_24_0.xsd
index 62c4097..f21e39a 100644
--- a/v3_24_0/CDT-allJoynApp-v3_24_0.xsd
+++ b/v3_24_0/CDT-allJoynApp-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_24_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-allJoynInterface-v3_24_0.xsd b/v3_24_0/CDT-allJoynInterface-v3_24_0.xsd
index 0c1fd4f..9f90311 100644
--- a/v3_24_0/CDT-allJoynInterface-v3_24_0.xsd
+++ b/v3_24_0/CDT-allJoynInterface-v3_24_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_24_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_24_0/CDT-allJoynMethod-v3_24_0.xsd b/v3_24_0/CDT-allJoynMethod-v3_24_0.xsd
index 4f05fb1..286b684 100644
--- a/v3_24_0/CDT-allJoynMethod-v3_24_0.xsd
+++ b/v3_24_0/CDT-allJoynMethod-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_24_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_24_0/CDT-allJoynMethodCall-v3_24_0.xsd b/v3_24_0/CDT-allJoynMethodCall-v3_24_0.xsd
index 050a4f6..146b50e 100644
--- a/v3_24_0/CDT-allJoynMethodCall-v3_24_0.xsd
+++ b/v3_24_0/CDT-allJoynMethodCall-v3_24_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-v3_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-allJoynProperty-v3_24_0.xsd b/v3_24_0/CDT-allJoynProperty-v3_24_0.xsd
index 40db54c..b83c119 100644
--- a/v3_24_0/CDT-allJoynProperty-v3_24_0.xsd
+++ b/v3_24_0/CDT-allJoynProperty-v3_24_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-v3_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-allJoynSvcObject-v3_24_0.xsd b/v3_24_0/CDT-allJoynSvcObject-v3_24_0.xsd
index c34fe67..aff18e1 100644
--- a/v3_24_0/CDT-allJoynSvcObject-v3_24_0.xsd
+++ b/v3_24_0/CDT-allJoynSvcObject-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_24_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-areaNwkDeviceInfo-v3_24_0.xsd b/v3_24_0/CDT-areaNwkDeviceInfo-v3_24_0.xsd
index b28a578..dac03f9 100644
--- a/v3_24_0/CDT-areaNwkDeviceInfo-v3_24_0.xsd
+++ b/v3_24_0/CDT-areaNwkDeviceInfo-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-areaNwkInfo-v3_24_0.xsd b/v3_24_0/CDT-areaNwkInfo-v3_24_0.xsd
index 5d01b78..7610e0b 100644
--- a/v3_24_0/CDT-areaNwkInfo-v3_24_0.xsd
+++ b/v3_24_0/CDT-areaNwkInfo-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-authorizationDecision-v3_24_0.xsd b/v3_24_0/CDT-authorizationDecision-v3_24_0.xsd
index 763c5d3..3d33018 100644
--- a/v3_24_0/CDT-authorizationDecision-v3_24_0.xsd
+++ b/v3_24_0/CDT-authorizationDecision-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-authorizationInformation-v3_24_0.xsd b/v3_24_0/CDT-authorizationInformation-v3_24_0.xsd
index f69f17a..ea7f815 100644
--- a/v3_24_0/CDT-authorizationInformation-v3_24_0.xsd
+++ b/v3_24_0/CDT-authorizationInformation-v3_24_0.xsd
@@ -26,11 +26,11 @@ 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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-authorizationPolicy-v3_24_0.xsd b/v3_24_0/CDT-authorizationPolicy-v3_24_0.xsd
index 6e1db36..f69b601 100644
--- a/v3_24_0/CDT-authorizationPolicy-v3_24_0.xsd
+++ b/v3_24_0/CDT-authorizationPolicy-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-backgroundDataTransfer-v3_24_0.xsd b/v3_24_0/CDT-backgroundDataTransfer-v3_24_0.xsd
index 9b11c18..187569d 100644
--- a/v3_24_0/CDT-backgroundDataTransfer-v3_24_0.xsd
+++ b/v3_24_0/CDT-backgroundDataTransfer-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-battery-v3_24_0.xsd b/v3_24_0/CDT-battery-v3_24_0.xsd
index 1dafe51..eb45f3f 100644
--- a/v3_24_0/CDT-battery-v3_24_0.xsd
+++ b/v3_24_0/CDT-battery-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-cmdhBuffer-v3_24_0.xsd b/v3_24_0/CDT-cmdhBuffer-v3_24_0.xsd
index db6637b..87402bb 100644
--- a/v3_24_0/CDT-cmdhBuffer-v3_24_0.xsd
+++ b/v3_24_0/CDT-cmdhBuffer-v3_24_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-v3_23_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_24_0/CDT-cmdhDefEcValue-v3_24_0.xsd b/v3_24_0/CDT-cmdhDefEcValue-v3_24_0.xsd
index a811641..1080411 100644
--- a/v3_24_0/CDT-cmdhDefEcValue-v3_24_0.xsd
+++ b/v3_24_0/CDT-cmdhDefEcValue-v3_24_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-v3_23_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_24_0/CDT-cmdhDefaults-v3_24_0.xsd b/v3_24_0/CDT-cmdhDefaults-v3_24_0.xsd
index 4519340..f80c165 100644
--- a/v3_24_0/CDT-cmdhDefaults-v3_24_0.xsd
+++ b/v3_24_0/CDT-cmdhDefaults-v3_24_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-v3_23_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_24_0/CDT-cmdhEcDefParamValues-v3_24_0.xsd b/v3_24_0/CDT-cmdhEcDefParamValues-v3_24_0.xsd
index 85f60ec..f9f4161 100644
--- a/v3_24_0/CDT-cmdhEcDefParamValues-v3_24_0.xsd
+++ b/v3_24_0/CDT-cmdhEcDefParamValues-v3_24_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-v3_23_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_24_0/CDT-cmdhLimits-v3_24_0.xsd b/v3_24_0/CDT-cmdhLimits-v3_24_0.xsd
index e080ad7..dcb9940 100644
--- a/v3_24_0/CDT-cmdhLimits-v3_24_0.xsd
+++ b/v3_24_0/CDT-cmdhLimits-v3_24_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-v3_23_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_24_0/CDT-cmdhNetworkAccessRules-v3_24_0.xsd b/v3_24_0/CDT-cmdhNetworkAccessRules-v3_24_0.xsd
index 5c38624..258b763 100644
--- a/v3_24_0/CDT-cmdhNetworkAccessRules-v3_24_0.xsd
+++ b/v3_24_0/CDT-cmdhNetworkAccessRules-v3_24_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-v3_23_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_24_0/CDT-cmdhNwAccessRule-v3_24_0.xsd b/v3_24_0/CDT-cmdhNwAccessRule-v3_24_0.xsd
index a15c9b0..47818a2 100644
--- a/v3_24_0/CDT-cmdhNwAccessRule-v3_24_0.xsd
+++ b/v3_24_0/CDT-cmdhNwAccessRule-v3_24_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-v3_23_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_24_0/CDT-cmdhPolicy-v3_24_0.xsd b/v3_24_0/CDT-cmdhPolicy-v3_24_0.xsd
index 83deff4..af54021 100644
--- a/v3_24_0/CDT-cmdhPolicy-v3_24_0.xsd
+++ b/v3_24_0/CDT-cmdhPolicy-v3_24_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-v3_23_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_24_0/CDT-commonTypes-v3_24_0.xsd b/v3_24_0/CDT-commonTypes-v3_24_0.xsd
index 3e66105..bb1bd47 100644
--- a/v3_24_0/CDT-commonTypes-v3_24_0.xsd
+++ b/v3_24_0/CDT-commonTypes-v3_24_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-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_24_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_24_0/CDT-container-v3_24_0.xsd b/v3_24_0/CDT-container-v3_24_0.xsd
index a1c933f..a24201a 100644
--- a/v3_24_0/CDT-container-v3_24_0.xsd
+++ b/v3_24_0/CDT-container-v3_24_0.xsd
@@ -26,12 +26,12 @@ 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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_24_0/CDT-contentInstance-v3_24_0.xsd b/v3_24_0/CDT-contentInstance-v3_24_0.xsd
index 9cd3d9d..6639a64 100644
--- a/v3_24_0/CDT-contentInstance-v3_24_0.xsd
+++ b/v3_24_0/CDT-contentInstance-v3_24_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-crossResourceSubscription-v3_24_0.xsd b/v3_24_0/CDT-crossResourceSubscription-v3_24_0.xsd
index 7d22dbb..d973e0c 100644
--- a/v3_24_0/CDT-crossResourceSubscription-v3_24_0.xsd
+++ b/v3_24_0/CDT-crossResourceSubscription-v3_24_0.xsd
@@ -27,10 +27,10 @@ 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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-delivery-v3_24_0.xsd b/v3_24_0/CDT-delivery-v3_24_0.xsd
index ac88738..b240369 100644
--- a/v3_24_0/CDT-delivery-v3_24_0.xsd
+++ b/v3_24_0/CDT-delivery-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_24_0/CDT-deviceCapability-v3_24_0.xsd b/v3_24_0/CDT-deviceCapability-v3_24_0.xsd
index f10c03c..e6c45c6 100644
--- a/v3_24_0/CDT-deviceCapability-v3_24_0.xsd
+++ b/v3_24_0/CDT-deviceCapability-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-deviceInfo-v3_24_0.xsd b/v3_24_0/CDT-deviceInfo-v3_24_0.xsd
index 7546aa8..26c8525 100644
--- a/v3_24_0/CDT-deviceInfo-v3_24_0.xsd
+++ b/v3_24_0/CDT-deviceInfo-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-dynamicAuthorizationConsultation-v3_24_0.xsd b/v3_24_0/CDT-dynamicAuthorizationConsultation-v3_24_0.xsd
index 43ac0d7..ce6e3aa 100644
--- a/v3_24_0/CDT-dynamicAuthorizationConsultation-v3_24_0.xsd
+++ b/v3_24_0/CDT-dynamicAuthorizationConsultation-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-eventConfig-v3_24_0.xsd b/v3_24_0/CDT-eventConfig-v3_24_0.xsd
index a6fdb49..0939742 100644
--- a/v3_24_0/CDT-eventConfig-v3_24_0.xsd
+++ b/v3_24_0/CDT-eventConfig-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-eventLog-v3_24_0.xsd b/v3_24_0/CDT-eventLog-v3_24_0.xsd
index d7f9f8a..f6120a8 100644
--- a/v3_24_0/CDT-eventLog-v3_24_0.xsd
+++ b/v3_24_0/CDT-eventLog-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-execInstance-v3_24_0.xsd b/v3_24_0/CDT-execInstance-v3_24_0.xsd
index 5247284..5d7eedd 100644
--- a/v3_24_0/CDT-execInstance-v3_24_0.xsd
+++ b/v3_24_0/CDT-execInstance-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-firmware-v3_24_0.xsd b/v3_24_0/CDT-firmware-v3_24_0.xsd
index efb4616..bb2032a 100644
--- a/v3_24_0/CDT-firmware-v3_24_0.xsd
+++ b/v3_24_0/CDT-firmware-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-group-v3_24_0.xsd b/v3_24_0/CDT-group-v3_24_0.xsd
index 7cc7964..c9badd4 100644
--- a/v3_24_0/CDT-group-v3_24_0.xsd
+++ b/v3_24_0/CDT-group-v3_24_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_24_0/CDT-localMulticastGroup-v3_24_0.xsd b/v3_24_0/CDT-localMulticastGroup-v3_24_0.xsd
index 7404150..e1e38fd 100644
--- a/v3_24_0/CDT-localMulticastGroup-v3_24_0.xsd
+++ b/v3_24_0/CDT-localMulticastGroup-v3_24_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_23_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_24_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_24_0/CDT-locationPolicy-v3_24_0.xsd b/v3_24_0/CDT-locationPolicy-v3_24_0.xsd
index 1570ad7..ced6579 100644
--- a/v3_24_0/CDT-locationPolicy-v3_24_0.xsd
+++ b/v3_24_0/CDT-locationPolicy-v3_24_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-m2mServiceSubscriptionProfile-v3_24_0.xsd b/v3_24_0/CDT-m2mServiceSubscriptionProfile-v3_24_0.xsd
index cd1429b..4513f28 100644
--- a/v3_24_0/CDT-m2mServiceSubscriptionProfile-v3_24_0.xsd
+++ b/v3_24_0/CDT-m2mServiceSubscriptionProfile-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-memory-v3_24_0.xsd b/v3_24_0/CDT-memory-v3_24_0.xsd
index f8ed14f..5654895 100644
--- a/v3_24_0/CDT-memory-v3_24_0.xsd
+++ b/v3_24_0/CDT-memory-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-mgmtCmd-v3_24_0.xsd b/v3_24_0/CDT-mgmtCmd-v3_24_0.xsd
index 9a940d5..eeea261 100644
--- a/v3_24_0/CDT-mgmtCmd-v3_24_0.xsd
+++ b/v3_24_0/CDT-mgmtCmd-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-multimediaSession-v3_24_0.xsd b/v3_24_0/CDT-multimediaSession-v3_24_0.xsd
index b46e9b2..17359dd 100644
--- a/v3_24_0/CDT-multimediaSession-v3_24_0.xsd
+++ b/v3_24_0/CDT-multimediaSession-v3_24_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-node-v3_24_0.xsd b/v3_24_0/CDT-node-v3_24_0.xsd
index a5d69ff..f8485f9 100644
--- a/v3_24_0/CDT-node-v3_24_0.xsd
+++ b/v3_24_0/CDT-node-v3_24_0.xsd
@@ -27,23 +27,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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_24_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-notification-v3_24_0.xsd b/v3_24_0/CDT-notification-v3_24_0.xsd
index fd5d88b..54aed35 100644
--- a/v3_24_0/CDT-notification-v3_24_0.xsd
+++ b/v3_24_0/CDT-notification-v3_24_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-v3_23_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_23_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_24_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_24_0/CDT-notificationTargetMgmtPolicyRef-v3_24_0.xsd b/v3_24_0/CDT-notificationTargetMgmtPolicyRef-v3_24_0.xsd
index c72ae60..d9b6616 100644
--- a/v3_24_0/CDT-notificationTargetMgmtPolicyRef-v3_24_0.xsd
+++ b/v3_24_0/CDT-notificationTargetMgmtPolicyRef-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-notificationTargetPolicy-v3_24_0.xsd b/v3_24_0/CDT-notificationTargetPolicy-v3_24_0.xsd
index 298cc9a..8ae801d 100644
--- a/v3_24_0/CDT-notificationTargetPolicy-v3_24_0.xsd
+++ b/v3_24_0/CDT-notificationTargetPolicy-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-ontology-v3_24_0.xsd b/v3_24_0/CDT-ontology-v3_24_0.xsd
index 969ce07..e87c892 100644
--- a/v3_24_0/CDT-ontology-v3_24_0.xsd
+++ b/v3_24_0/CDT-ontology-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_24_0/CDT-ontologyRepository-v3_24_0.xsd b/v3_24_0/CDT-ontologyRepository-v3_24_0.xsd
index 34282e8..7d76fea 100644
--- a/v3_24_0/CDT-ontologyRepository-v3_24_0.xsd
+++ b/v3_24_0/CDT-ontologyRepository-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_24_0/CDT-policyDeletionRules-v3_24_0.xsd b/v3_24_0/CDT-policyDeletionRules-v3_24_0.xsd
index 34f965e..40ed1be 100644
--- a/v3_24_0/CDT-policyDeletionRules-v3_24_0.xsd
+++ b/v3_24_0/CDT-policyDeletionRules-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-pollingChannel-v3_24_0.xsd b/v3_24_0/CDT-pollingChannel-v3_24_0.xsd
index e19914a..fe8cd7d 100644
--- a/v3_24_0/CDT-pollingChannel-v3_24_0.xsd
+++ b/v3_24_0/CDT-pollingChannel-v3_24_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-reboot-v3_24_0.xsd b/v3_24_0/CDT-reboot-v3_24_0.xsd
index b1a44fb..5b68388 100644
--- a/v3_24_0/CDT-reboot-v3_24_0.xsd
+++ b/v3_24_0/CDT-reboot-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-remoteCSE-v3_24_0.xsd b/v3_24_0/CDT-remoteCSE-v3_24_0.xsd
index b4f2577..77c792d 100644
--- a/v3_24_0/CDT-remoteCSE-v3_24_0.xsd
+++ b/v3_24_0/CDT-remoteCSE-v3_24_0.xsd
@@ -26,22 +26,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-request-v3_24_0.xsd b/v3_24_0/CDT-request-v3_24_0.xsd
index cc3e878..e7f079e 100644
--- a/v3_24_0/CDT-request-v3_24_0.xsd
+++ b/v3_24_0/CDT-request-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-requestPrimitive-v3_24_0.xsd b/v3_24_0/CDT-requestPrimitive-v3_24_0.xsd
index 8a9393e..d0767b5 100644
--- a/v3_24_0/CDT-requestPrimitive-v3_24_0.xsd
+++ b/v3_24_0/CDT-requestPrimitive-v3_24_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-v3_23_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_24_0/CDT-responsePrimitive-v3_24_0.xsd b/v3_24_0/CDT-responsePrimitive-v3_24_0.xsd
index 7608de6..1bd0425 100644
--- a/v3_24_0/CDT-responsePrimitive-v3_24_0.xsd
+++ b/v3_24_0/CDT-responsePrimitive-v3_24_0.xsd
@@ -28,54 +28,54 @@ 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-v3_23_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_23_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_24_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_24_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_24_0/CDT-role-v3_24_0.xsd b/v3_24_0/CDT-role-v3_24_0.xsd
index e83166a..ff28bce 100644
--- a/v3_24_0/CDT-role-v3_24_0.xsd
+++ b/v3_24_0/CDT-role-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-schedule-v3_24_0.xsd b/v3_24_0/CDT-schedule-v3_24_0.xsd
index 742dc2b..7970430 100644
--- a/v3_24_0/CDT-schedule-v3_24_0.xsd
+++ b/v3_24_0/CDT-schedule-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-semanticDescriptor-v3_24_0.xsd b/v3_24_0/CDT-semanticDescriptor-v3_24_0.xsd
index ee28ba0..f503884 100644
--- a/v3_24_0/CDT-semanticDescriptor-v3_24_0.xsd
+++ b/v3_24_0/CDT-semanticDescriptor-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-semanticMashupInstance-v3_24_0.xsd b/v3_24_0/CDT-semanticMashupInstance-v3_24_0.xsd
index d2b68ba..e510e6b 100644
--- a/v3_24_0/CDT-semanticMashupInstance-v3_24_0.xsd
+++ b/v3_24_0/CDT-semanticMashupInstance-v3_24_0.xsd
@@ -26,11 +26,11 @@ 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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-semanticMashupJobProfile-v3_24_0.xsd b/v3_24_0/CDT-semanticMashupJobProfile-v3_24_0.xsd
index b19f6c9..1d37443 100644
--- a/v3_24_0/CDT-semanticMashupJobProfile-v3_24_0.xsd
+++ b/v3_24_0/CDT-semanticMashupJobProfile-v3_24_0.xsd
@@ -26,11 +26,11 @@ 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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-semanticMashupResult-v3_24_0.xsd b/v3_24_0/CDT-semanticMashupResult-v3_24_0.xsd
index 0a2d016..61650ca 100644
--- a/v3_24_0/CDT-semanticMashupResult-v3_24_0.xsd
+++ b/v3_24_0/CDT-semanticMashupResult-v3_24_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-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-serviceSubscribedAppRule-v3_24_0.xsd b/v3_24_0/CDT-serviceSubscribedAppRule-v3_24_0.xsd
index 99c8214..f0d3525 100644
--- a/v3_24_0/CDT-serviceSubscribedAppRule-v3_24_0.xsd
+++ b/v3_24_0/CDT-serviceSubscribedAppRule-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-serviceSubscribedNode-v3_24_0.xsd b/v3_24_0/CDT-serviceSubscribedNode-v3_24_0.xsd
index cd84dc8..c9b1791 100644
--- a/v3_24_0/CDT-serviceSubscribedNode-v3_24_0.xsd
+++ b/v3_24_0/CDT-serviceSubscribedNode-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-software-v3_24_0.xsd b/v3_24_0/CDT-software-v3_24_0.xsd
index 8620e9c..74038d2 100644
--- a/v3_24_0/CDT-software-v3_24_0.xsd
+++ b/v3_24_0/CDT-software-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-statsCollect-v3_24_0.xsd b/v3_24_0/CDT-statsCollect-v3_24_0.xsd
index fc6725e..67a73b0 100644
--- a/v3_24_0/CDT-statsCollect-v3_24_0.xsd
+++ b/v3_24_0/CDT-statsCollect-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-statsConfig-v3_24_0.xsd b/v3_24_0/CDT-statsConfig-v3_24_0.xsd
index c6b870f..4bf31b3 100644
--- a/v3_24_0/CDT-statsConfig-v3_24_0.xsd
+++ b/v3_24_0/CDT-statsConfig-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-subscription-v3_24_0.xsd b/v3_24_0/CDT-subscription-v3_24_0.xsd
index d937e2b..9f9fee8 100644
--- a/v3_24_0/CDT-subscription-v3_24_0.xsd
+++ b/v3_24_0/CDT-subscription-v3_24_0.xsd
@@ -27,10 +27,10 @@ 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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-svcFwWrapper-v3_24_0.xsd b/v3_24_0/CDT-svcFwWrapper-v3_24_0.xsd
index 894e91e..6709bd6 100644
--- a/v3_24_0/CDT-svcFwWrapper-v3_24_0.xsd
+++ b/v3_24_0/CDT-svcFwWrapper-v3_24_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-v3_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-svcObjWrapper-v3_24_0.xsd b/v3_24_0/CDT-svcObjWrapper-v3_24_0.xsd
index 8e79e2f..dc4a952 100644
--- a/v3_24_0/CDT-svcObjWrapper-v3_24_0.xsd
+++ b/v3_24_0/CDT-svcObjWrapper-v3_24_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_24_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-timeSeries-v3_24_0.xsd b/v3_24_0/CDT-timeSeries-v3_24_0.xsd
index 15596b2..3d79892 100644
--- a/v3_24_0/CDT-timeSeries-v3_24_0.xsd
+++ b/v3_24_0/CDT-timeSeries-v3_24_0.xsd
@@ -26,11 +26,11 @@ 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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_24_0/CDT-timeSeriesInstance-v3_24_0.xsd b/v3_24_0/CDT-timeSeriesInstance-v3_24_0.xsd
index b2767e2..24a3d05 100644
--- a/v3_24_0/CDT-timeSeriesInstance-v3_24_0.xsd
+++ b/v3_24_0/CDT-timeSeriesInstance-v3_24_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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-timeSeriesNotification-v3_24_0.xsd b/v3_24_0/CDT-timeSeriesNotification-v3_24_0.xsd
index cd0e35f..57ada6a 100644
--- a/v3_24_0/CDT-timeSeriesNotification-v3_24_0.xsd
+++ b/v3_24_0/CDT-timeSeriesNotification-v3_24_0.xsd
@@ -27,7 +27,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" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
 	
 	<xs:element name="timeSeriesNotification">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-token-v3_24_0.xsd b/v3_24_0/CDT-token-v3_24_0.xsd
index a27ae7e..330f2f3 100644
--- a/v3_24_0/CDT-token-v3_24_0.xsd
+++ b/v3_24_0/CDT-token-v3_24_0.xsd
@@ -27,9 +27,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-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_24_0/CDT-transaction-v3_24_0.xsd b/v3_24_0/CDT-transaction-v3_24_0.xsd
index 629ce77..86817f2 100644
--- a/v3_24_0/CDT-transaction-v3_24_0.xsd
+++ b/v3_24_0/CDT-transaction-v3_24_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_24_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-transactionMgmt-v3_24_0.xsd b/v3_24_0/CDT-transactionMgmt-v3_24_0.xsd
index fb393a6..4ae64d5 100644
--- a/v3_24_0/CDT-transactionMgmt-v3_24_0.xsd
+++ b/v3_24_0/CDT-transactionMgmt-v3_24_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_24_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-triggerPayload-v3_24_0.xsd b/v3_24_0/CDT-triggerPayload-v3_24_0.xsd
index 48bdc59..aefd81b 100644
--- a/v3_24_0/CDT-triggerPayload-v3_24_0.xsd
+++ b/v3_24_0/CDT-triggerPayload-v3_24_0.xsd
@@ -27,7 +27,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" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_24_0/CDT-triggerRequest-v3_24_0.xsd b/v3_24_0/CDT-triggerRequest-v3_24_0.xsd
index 4a08dcd..f09087e 100644
--- a/v3_24_0/CDT-triggerRequest-v3_24_0.xsd
+++ b/v3_24_0/CDT-triggerRequest-v3_24_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
-- 
GitLab