diff --git a/v3_24_0/CDT-AE-v3_24_0.xsd b/v3_24_0/CDT-AE-v3_24_0.xsd
index 1f58646295c6a373d1290e5f34b448fe63dbcf64..48bb78b53bcfb90c22f6da7bc154448ae696d73d 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 79239611af559e87e1ea21a3dbc35e1f73e6e717..df8a2e547a0fb04719b92875bf27ac489bd6a0ec 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 3ce933a07eb6eb6858ec2669df3d4c9209e00438..c58ce60565eb8e4643549a42a586c7bb89141c7d 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 d597ce72b252c2264d83dc7ceba01bd76143d5bc..778ab58c8507f959ab4cca90be8cac704e6619dd 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 d62c5af9badad66f4ec8d51b2cf4ee8f29703b35..a185777a6b76d79b9574839d48fc533f7c33e812 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 44eaf003f7d7156aa9e1bc7b751057018a9f75ad..a12aad9d71f8c628f9b329c46361a75c2e5bb063 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 62c4097bf7008768ed2f81d733faf2d2ac076435..f21e39a528d9fff4abe2dbb4694bd938eab11732 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 0c1fd4f80edc6821405b9fb37a4411334106d87c..9f90311484fa9a5a5829ff5505bf8e05690d20e1 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 4f05fb1d16d4a1c34b6f0cc2d5d99ef17c93978d..286b6844b8f581204d9621f40fb974bb229e8d7c 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 050a4f614c471d67a7a6198658189de539088b19..146b50e34d91a40d1688fd95b702c434272efa54 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 40db54c1d9e928187e3d8e42395be28bc707d0c6..b83c119cbe8d4acb01924c3c1c4be71c614edb85 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 c34fe67906b6489cb486bae422bfea4a844409e4..aff18e16b44c811bf465f81d3f24af2f489c005d 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 b28a578f64cb501a72e38bc59a6a8a0577618ab4..dac03f93ea8fd566152525fdd9dd7037ddc01fb9 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 5d01b78f844c67ec2699fc3cf1a4141a76145f42..7610e0b5b014b5b80640874ad457dd4b081ac883 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 763c5d3e384ba082ec71044bae9d5b67631862c9..3d33018a61a9ed7c5a9ab81905a8ef06d1d12d57 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 f69f17ab87417062b029a715d0f939a78064859b..ea7f81549986ea8930b2367cf8f4417473b71716 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 6e1db364d8a52332473f5c08f8e57a8ae6ad499c..f69b601d2ac4a865a89626fe73256b131ed97ad8 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 9b11c1805e89890e69639cbe13a5e735894a9618..187569d2fea7bc62879b4bb92e3c7c041d24efd8 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 1dafe51dda2c3e424f3440b275c1dba2abd7910b..eb45f3f2b6ac3cce03926189790b727ccf038df4 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 db6637b95720f52922b9c12889e69c6087df63b3..87402bbcebee1bb4ed1f6511af3a3e68a7e368a6 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 a81164135194a0f67e551ada1f22452f165ea575..10804117cbaf65a54611b793d2f830d518b65f8c 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 4519340552e41dfdea2ce77dafc7edde6f1bdac1..f80c165acea9eba83f712c5d265acc40984f1713 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 85f60ecc2543c18156f096741affc9b6bc0aeb47..f9f41614c05c0cd0429c6b7f0eb48f4ea4a129a1 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 e080ad74cd28db775002db981f9884ace8ad3335..dcb9940991154ecbc21debb8032126a7f577028a 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 5c386241c438bb7faa124ca27c6864a34fafce44..258b7634611da2e56870e7c10777d7e0215fdbe6 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 a15c9b0d53e0a2739bcc94c965cdccb05b6ea55c..47818a283fa8fd2f89c01e37e05e3372998517c2 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 83deff4fa0058ee7ef7e851004a4df14f56d52b7..af54021bc5fa048a33f8613b4bee92de1fe96414 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 3e66105807193bb438053a852ed0eab8d612bbb0..bb1bd47fda1cdaaadee5e96b61e354a1490a554a 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 a1c933f80664111329b18278d0f8b0b0932d5236..a24201afe91e72f351a48696778697587e0cbd44 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 9cd3d9d78ce59527a3e694b20835a7eb14b89b82..6639a647ef7b854e0fb94838519eed900050259c 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 7d22dbb34a3152af582a325494f5ad967a72038c..d973e0ce7d2b5f8cfa23098498ba5c2ff0cb74f0 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 ac88738d1412dde7f38456e92462294e45c13f02..b240369bb8e5eb79894ccafde8f1089de5bb54d1 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 f10c03c8ee6629a2a40ce7fb3fed57b81243c612..e6c45c63ede9c207b349bc0dc83c13dd8769b7a2 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 7546aa87fa062c837c674153cd48f6485f1c096e..26c85259f6e07296aeedaf62f7f825669d65642e 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 43ac0d77fb65d4ad950859516d973679d150b0f9..ce6e3aa4f4e224829f9a2bec56444544e414639e 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 a6fdb49ea5354ff17f2b7ea38e991a52fddc7bad..09397424292d8a1dc5808945879a6724482ae99b 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 d7f9f8abc07d20d9832db148320e62184df4188b..f6120a8910e3839907162808c0b0ffbd8a896a6e 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 5247284696c5953597564663832d4c05bcbea982..5d7eedd21a247d9d16549dab47e6e609b684ae28 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 efb4616ff2e6b69939ebbb0d1afe350eb3e7dd55..bb2032a3838284cc6e8a67f44fcee30fdf38e89a 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 7cc79647753308bdc7958710c3461010b3398b04..c9badd4a72c3be4b8e88aefffa2d5ed8bd9f80c0 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 7404150e2397959bcaf3236d62a947df18fde564..e1e38fdb0ed980b33abb5696d5d2276ef63c7ba6 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 1570ad7dc3b6ad015c92dabc845e7c46e4e93935..ced65794ed3da2738032ec430bb1199697aba26c 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 cd1429b70b18aae79ff2668b9c8a460985e144c5..4513f28e2315cf5c3a8656a78956ed318e0e49af 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 f8ed14ff98134b9b7197bd31512a341cf3772a79..5654895738eadb6b05ec131eccbaa14fe0eafb1c 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 9a940d53f2f1e376f539278804bc23adbbcc0837..eeea26178a70c54e8165be4ee375cbd1b1e210ae 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 b46e9b2eed7cf8f6c482e5de5047dd321be9d989..17359ddf5316f2abbf6dd4e1edb95548a030da86 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 a5d69ff5df72e6ea97a6218d176c296f88cc79f0..f8485f9ce26aabad3ec2293e308fbc70e2037c83 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 fd5d88b343bfd88734cb750b29c040b883fe1d48..54aed354751c49f1e130b09d18d3b4ecd2493e71 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 c72ae604b73fd14411b9ddbf0d6d6144b339b199..d9b66164d0a92200a6d740418f8e7dc6bdef126a 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 298cc9a3140771b1bfba66cb734fef78743d4794..8ae801d319888af49e4c5c094b5ff7c4526909fc 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 969ce0767cbf847e70ae8deeef18a8cea55dc13c..e87c8926ef0c1236f90cc4a91c1e34fd56f64653 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 34282e866c8152803563fded87f041a6e340c061..7d76fead4ba08f3a8790da3bf57eb98e9a4abdc6 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 34f965edb50548a20bca36b460c398d50bd776be..40ed1be31a444dfb7545055b40eab9a455d88cfd 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 e19914aa36040472cc3abe6be193ec453022c8b8..fe8cd7d8a716b65fbe97530baecb36d8e9fa86da 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 b1a44fb433189be4b18bbaac26e83e7e494697e6..5b68388a0aa46f9f77e4276de3145aba50c1af72 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 b4f2577a0a143f2cccdae9a3ac420d7637878d04..77c792dc31025f12208a700bf8bba18474929835 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 cc3e8781f1c03cea4fb50e178bfdab7cbff64858..e7f079e211dfcf588a936dd15944ba07a6fe4b9a 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 8a9393ea687e777b1039295dcc4b6608d8876cd5..d0767b5b8dc81d74348799297dd1359a78a83106 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 7608de6da424b7d980d79e35374a01468a75555f..1bd042547486601698c291eb80576d4479067a85 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 e83166a36074217cd6ee032316806609bc39c02a..ff28bcec84115f39e526488fcea63262ae01511e 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 742dc2bc3e64023b1f6d10ea634e08e97daa0177..79704304c9b436aa4cbcd1aeef104dfe2e4652dd 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 ee28ba0a95db1689d470a93dbcee58e7f95cb514..f50388470641f4a2e1932f9f228302d163fa41fb 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 d2b68ba8e045cfb8a99d0efd61f159f9f10ebfe9..e510e6b8908dd53adfec69f3e3b31ad173e49e96 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 b19f6c915a6d010cc16447d3f240188c4331e233..1d3744389623742d0c2ac72d3c579534f4822f16 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 0a2d0163edc04bd347f2b940cf54ca31d82951ea..61650ca09bf90f636ffd1872a54de0f28414d062 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 99c82142c17838629a5259e6029085cf7396db59..f0d3525ecb1b843a2c0c7b1b477774d908cd7534 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 cd84dc8353b90b12323231d0759aa0aeeccdb3ce..c9b17913470131e471cad59efcac52d2a26d6b79 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 8620e9c5db6b84c7fab1e7e133d08ecd4128e886..74038d257f38557da51b3a572b97dc76197e55c4 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 fc6725e18273ff0a834ef3207547f128050a7610..67a73b06b6b1d0d96bc32fc0647e6113a815468b 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 c6b870f09d625dbfb6a1e3e1d31093d6351afcf6..4bf31b3320ee49ad990fac0bab7c2980db642c33 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 d937e2bec17e78e51b1908255eed367731358c95..9f9fee83696fc9040e02337dd984e198b1d0983a 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 894e91e35bc88986a93f0b96c83dbb33bea3ff32..6709bd68018fdd1ea56a5771c058993f810390bb 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 8e79e2f0fbedfae4800166cb8e86c8c6c23a4510..dc4a95232226ac936012329c9eaa05cc0f1edf97 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 15596b23fcd5fc5dc2512f92a0984fe3be8d1ff4..3d79892bbebef8d51d794d154d55be17e3c794b4 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 b2767e232a907ab3c167f4b974215e442f31915b..24a3d05c93ca70df12b3e16910b72526a74f27e5 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 cd0e35f8d6f122e12ce67c9a4491ec9b33cc24b4..57ada6a7074fd8c324dd78f112a2eaafaf0c8d41 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 a27ae7ef0328aab582da968cac9bbc8b5976b11d..330f2f39331afd26f429a8015dae7260db40ba44 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 629ce772ef47525bd2a8d007441fb4b2b087eaec..86817f2dbb78b037c53c10f63260cb96ea56c445 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 fb393a63d858ff2baa64b37ca4f74436430c049c..4ae64d58c8e091716aa65fb4ba13f2c06d3f3812 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 48bdc59e37771474196d5d384a2b41cca405a2ea..aefd81bebeac976b8554d6499ae24d341667e7d3 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 4a08dcdfe4483d8b1664113731a2db656e222f0a..f09087e8c89557f38fc1150ad1105e502e6b3294 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>