diff --git a/v3_25_0/CDT-AE-v3_25_0.xsd b/v3_25_0/CDT-AE-v3_25_0.xsd
index 48bb78b53bcfb90c22f6da7bc154448ae696d73d..2371822486fa8da63801e5b4bf067029dc35d124 100644
--- a/v3_25_0/CDT-AE-v3_25_0.xsd
+++ b/v3_25_0/CDT-AE-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-AEContactList-v3_25_0.xsd b/v3_25_0/CDT-AEContactList-v3_25_0.xsd
index df8a2e547a0fb04719b92875bf27ac489bd6a0ec..87eaa220d4ae34e472369e26540e416bcf8f516c 100644
--- a/v3_25_0/CDT-AEContactList-v3_25_0.xsd
+++ b/v3_25_0/CDT-AEContactList-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-AEContactListPerCSE-v3_25_0.xsd b/v3_25_0/CDT-AEContactListPerCSE-v3_25_0.xsd
index c58ce60565eb8e4643549a42a586c7bb89141c7d..9b2f24846762797379510ab40ad71fe9adccfc98 100644
--- a/v3_25_0/CDT-AEContactListPerCSE-v3_25_0.xsd
+++ b/v3_25_0/CDT-AEContactListPerCSE-v3_25_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_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-CSEBase-v3_25_0.xsd b/v3_25_0/CDT-CSEBase-v3_25_0.xsd
index 778ab58c8507f959ab4cca90be8cac704e6619dd..4504906fb67ea61742bf669dc904db2d3682c652 100644
--- a/v3_25_0/CDT-CSEBase-v3_25_0.xsd
+++ b/v3_25_0/CDT-CSEBase-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_25_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_25_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_25_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_25_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-accessControlPolicy-v3_25_0.xsd b/v3_25_0/CDT-accessControlPolicy-v3_25_0.xsd
index a185777a6b76d79b9574839d48fc533f7c33e812..534f52fded329365dc8176cbe99afe917e06499e 100644
--- a/v3_25_0/CDT-accessControlPolicy-v3_25_0.xsd
+++ b/v3_25_0/CDT-accessControlPolicy-v3_25_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_24_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-activeCmdhPolicy-v3_25_0.xsd b/v3_25_0/CDT-activeCmdhPolicy-v3_25_0.xsd
index a12aad9d71f8c628f9b329c46361a75c2e5bb063..3a7612da602313f5cf26a583574a2a7a28171006 100644
--- a/v3_25_0/CDT-activeCmdhPolicy-v3_25_0.xsd
+++ b/v3_25_0/CDT-activeCmdhPolicy-v3_25_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_24_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_25_0/CDT-allJoynApp-v3_25_0.xsd b/v3_25_0/CDT-allJoynApp-v3_25_0.xsd
index f21e39a528d9fff4abe2dbb4694bd938eab11732..d5359f5813fbd0d9ab53923a8a8bc34e2b5aef81 100644
--- a/v3_25_0/CDT-allJoynApp-v3_25_0.xsd
+++ b/v3_25_0/CDT-allJoynApp-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_25_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-allJoynInterface-v3_25_0.xsd b/v3_25_0/CDT-allJoynInterface-v3_25_0.xsd
index 9f90311484fa9a5a5829ff5505bf8e05690d20e1..5d39af273cb88d8573a78b1d1e598e040c228421 100644
--- a/v3_25_0/CDT-allJoynInterface-v3_25_0.xsd
+++ b/v3_25_0/CDT-allJoynInterface-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_25_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_25_0/CDT-allJoynMethod-v3_25_0.xsd b/v3_25_0/CDT-allJoynMethod-v3_25_0.xsd
index 286b6844b8f581204d9621f40fb974bb229e8d7c..2e52f1077454652023db44b25c5378930d716f57 100644
--- a/v3_25_0/CDT-allJoynMethod-v3_25_0.xsd
+++ b/v3_25_0/CDT-allJoynMethod-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_25_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_25_0/CDT-allJoynMethodCall-v3_25_0.xsd b/v3_25_0/CDT-allJoynMethodCall-v3_25_0.xsd
index 146b50e34d91a40d1688fd95b702c434272efa54..34c7a398fa96df3cb021f3c99f46892298f9b0e8 100644
--- a/v3_25_0/CDT-allJoynMethodCall-v3_25_0.xsd
+++ b/v3_25_0/CDT-allJoynMethodCall-v3_25_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_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-commonTypes-v3_25_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-allJoynProperty-v3_25_0.xsd b/v3_25_0/CDT-allJoynProperty-v3_25_0.xsd
index b83c119cbe8d4acb01924c3c1c4be71c614edb85..11fc7079df511e4179dc6bcf387a6d4562891aec 100644
--- a/v3_25_0/CDT-allJoynProperty-v3_25_0.xsd
+++ b/v3_25_0/CDT-allJoynProperty-v3_25_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_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-commonTypes-v3_25_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-allJoynSvcObject-v3_25_0.xsd b/v3_25_0/CDT-allJoynSvcObject-v3_25_0.xsd
index aff18e16b44c811bf465f81d3f24af2f489c005d..f3911118a964debc7af8ffb8918f2c24e73bcedb 100644
--- a/v3_25_0/CDT-allJoynSvcObject-v3_25_0.xsd
+++ b/v3_25_0/CDT-allJoynSvcObject-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_25_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-areaNwkDeviceInfo-v3_25_0.xsd b/v3_25_0/CDT-areaNwkDeviceInfo-v3_25_0.xsd
index dac03f93ea8fd566152525fdd9dd7037ddc01fb9..d046e92905aec6f9852447be2cca8779f313ff42 100644
--- a/v3_25_0/CDT-areaNwkDeviceInfo-v3_25_0.xsd
+++ b/v3_25_0/CDT-areaNwkDeviceInfo-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-areaNwkInfo-v3_25_0.xsd b/v3_25_0/CDT-areaNwkInfo-v3_25_0.xsd
index 7610e0b5b014b5b80640874ad457dd4b081ac883..cdade824228d19da094aef7eb8a5ae1118d57b6d 100644
--- a/v3_25_0/CDT-areaNwkInfo-v3_25_0.xsd
+++ b/v3_25_0/CDT-areaNwkInfo-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-authorizationDecision-v3_25_0.xsd b/v3_25_0/CDT-authorizationDecision-v3_25_0.xsd
index 3d33018a61a9ed7c5a9ab81905a8ef06d1d12d57..d0f7e21209e7496f446fe5eb0126738739c52cd7 100644
--- a/v3_25_0/CDT-authorizationDecision-v3_25_0.xsd
+++ b/v3_25_0/CDT-authorizationDecision-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-authorizationInformation-v3_25_0.xsd b/v3_25_0/CDT-authorizationInformation-v3_25_0.xsd
index ea7f81549986ea8930b2367cf8f4417473b71716..965604ae929a303040f32206adad586a6ba2af69 100644
--- a/v3_25_0/CDT-authorizationInformation-v3_25_0.xsd
+++ b/v3_25_0/CDT-authorizationInformation-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-authorizationPolicy-v3_25_0.xsd b/v3_25_0/CDT-authorizationPolicy-v3_25_0.xsd
index f69b601d2ac4a865a89626fe73256b131ed97ad8..d00682e301fd47950c09266ba3c87161fbec652f 100644
--- a/v3_25_0/CDT-authorizationPolicy-v3_25_0.xsd
+++ b/v3_25_0/CDT-authorizationPolicy-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-backgroundDataTransfer-v3_25_0.xsd b/v3_25_0/CDT-backgroundDataTransfer-v3_25_0.xsd
index 187569d2fea7bc62879b4bb92e3c7c041d24efd8..955ddc2cae7dee26a0b6dec19bb9adcbd4da75e3 100644
--- a/v3_25_0/CDT-backgroundDataTransfer-v3_25_0.xsd
+++ b/v3_25_0/CDT-backgroundDataTransfer-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-battery-v3_25_0.xsd b/v3_25_0/CDT-battery-v3_25_0.xsd
index eb45f3f2b6ac3cce03926189790b727ccf038df4..f79b9bb590f9ebeba71a372aa9176f64bd897c1d 100644
--- a/v3_25_0/CDT-battery-v3_25_0.xsd
+++ b/v3_25_0/CDT-battery-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-cmdhBuffer-v3_25_0.xsd b/v3_25_0/CDT-cmdhBuffer-v3_25_0.xsd
index 87402bbcebee1bb4ed1f6511af3a3e68a7e368a6..7576e1b05752c82095cfb4cab6a11ca0fda6fae3 100644
--- a/v3_25_0/CDT-cmdhBuffer-v3_25_0.xsd
+++ b/v3_25_0/CDT-cmdhBuffer-v3_25_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_24_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_25_0/CDT-cmdhDefEcValue-v3_25_0.xsd b/v3_25_0/CDT-cmdhDefEcValue-v3_25_0.xsd
index 10804117cbaf65a54611b793d2f830d518b65f8c..62cb208c66b2d57ba8390777815653cb29e1d804 100644
--- a/v3_25_0/CDT-cmdhDefEcValue-v3_25_0.xsd
+++ b/v3_25_0/CDT-cmdhDefEcValue-v3_25_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_24_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_25_0/CDT-cmdhDefaults-v3_25_0.xsd b/v3_25_0/CDT-cmdhDefaults-v3_25_0.xsd
index f80c165acea9eba83f712c5d265acc40984f1713..ca13a87349584c09a93c6b29c0550e2a2a36e6c0 100644
--- a/v3_25_0/CDT-cmdhDefaults-v3_25_0.xsd
+++ b/v3_25_0/CDT-cmdhDefaults-v3_25_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_24_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_25_0/CDT-cmdhEcDefParamValues-v3_25_0.xsd b/v3_25_0/CDT-cmdhEcDefParamValues-v3_25_0.xsd
index f9f41614c05c0cd0429c6b7f0eb48f4ea4a129a1..c92bdb1bc38d9d9bc608eaecc7fa29f5f7ab449b 100644
--- a/v3_25_0/CDT-cmdhEcDefParamValues-v3_25_0.xsd
+++ b/v3_25_0/CDT-cmdhEcDefParamValues-v3_25_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_24_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_25_0/CDT-cmdhLimits-v3_25_0.xsd b/v3_25_0/CDT-cmdhLimits-v3_25_0.xsd
index dcb9940991154ecbc21debb8032126a7f577028a..4011561cd828d92f0051078724d52e88b77f3478 100644
--- a/v3_25_0/CDT-cmdhLimits-v3_25_0.xsd
+++ b/v3_25_0/CDT-cmdhLimits-v3_25_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_24_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_25_0/CDT-cmdhNetworkAccessRules-v3_25_0.xsd b/v3_25_0/CDT-cmdhNetworkAccessRules-v3_25_0.xsd
index 258b7634611da2e56870e7c10777d7e0215fdbe6..dababe03e4fafb19c9649c1df991157195939366 100644
--- a/v3_25_0/CDT-cmdhNetworkAccessRules-v3_25_0.xsd
+++ b/v3_25_0/CDT-cmdhNetworkAccessRules-v3_25_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_24_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_25_0/CDT-cmdhNwAccessRule-v3_25_0.xsd b/v3_25_0/CDT-cmdhNwAccessRule-v3_25_0.xsd
index 47818a283fa8fd2f89c01e37e05e3372998517c2..410e4f27bb2c57d3542335a9619e8697c5876c7b 100644
--- a/v3_25_0/CDT-cmdhNwAccessRule-v3_25_0.xsd
+++ b/v3_25_0/CDT-cmdhNwAccessRule-v3_25_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_24_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_25_0/CDT-cmdhPolicy-v3_25_0.xsd b/v3_25_0/CDT-cmdhPolicy-v3_25_0.xsd
index af54021bc5fa048a33f8613b4bee92de1fe96414..f7050d8d15f391007423064abf21dbe6454c2f8f 100644
--- a/v3_25_0/CDT-cmdhPolicy-v3_25_0.xsd
+++ b/v3_25_0/CDT-cmdhPolicy-v3_25_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_24_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_25_0/CDT-commonTypes-v3_25_0.xsd b/v3_25_0/CDT-commonTypes-v3_25_0.xsd
index bb1bd47fda1cdaaadee5e96b61e354a1490a554a..60aef37ccf7fbf4aa18fa2b6d43b344995e6ddd9 100644
--- a/v3_25_0/CDT-commonTypes-v3_25_0.xsd
+++ b/v3_25_0/CDT-commonTypes-v3_25_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_24_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_25_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_25_0/CDT-container-v3_25_0.xsd b/v3_25_0/CDT-container-v3_25_0.xsd
index a24201afe91e72f351a48696778697587e0cbd44..76d88c8a3b843a34e02bfb9928b960a6ba5a6597 100644
--- a/v3_25_0/CDT-container-v3_25_0.xsd
+++ b/v3_25_0/CDT-container-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_25_0/CDT-contentInstance-v3_25_0.xsd b/v3_25_0/CDT-contentInstance-v3_25_0.xsd
index 6639a647ef7b854e0fb94838519eed900050259c..edd0d98fd0105feceb8dd104020d2893c440a1f5 100644
--- a/v3_25_0/CDT-contentInstance-v3_25_0.xsd
+++ b/v3_25_0/CDT-contentInstance-v3_25_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_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-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-crossResourceSubscription-v3_25_0.xsd b/v3_25_0/CDT-crossResourceSubscription-v3_25_0.xsd
index d973e0ce7d2b5f8cfa23098498ba5c2ff0cb74f0..4394d2afcce6017efc58e76c81b1bf255b1fa08f 100644
--- a/v3_25_0/CDT-crossResourceSubscription-v3_25_0.xsd
+++ b/v3_25_0/CDT-crossResourceSubscription-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-delivery-v3_25_0.xsd b/v3_25_0/CDT-delivery-v3_25_0.xsd
index b240369bb8e5eb79894ccafde8f1089de5bb54d1..63bc7ae2268b233f101825fc29c7b6e9af9d2020 100644
--- a/v3_25_0/CDT-delivery-v3_25_0.xsd
+++ b/v3_25_0/CDT-delivery-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_25_0/CDT-deviceCapability-v3_25_0.xsd b/v3_25_0/CDT-deviceCapability-v3_25_0.xsd
index e6c45c63ede9c207b349bc0dc83c13dd8769b7a2..8ece81e67580a933f00075d071bfa6a52a8417b3 100644
--- a/v3_25_0/CDT-deviceCapability-v3_25_0.xsd
+++ b/v3_25_0/CDT-deviceCapability-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-deviceInfo-v3_25_0.xsd b/v3_25_0/CDT-deviceInfo-v3_25_0.xsd
index 26c85259f6e07296aeedaf62f7f825669d65642e..66b3e79c905d884379c12bd548ba7a0d681dba40 100644
--- a/v3_25_0/CDT-deviceInfo-v3_25_0.xsd
+++ b/v3_25_0/CDT-deviceInfo-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-dynamicAuthorizationConsultation-v3_25_0.xsd b/v3_25_0/CDT-dynamicAuthorizationConsultation-v3_25_0.xsd
index ce6e3aa4f4e224829f9a2bec56444544e414639e..6d4b2108793e1f134da440b09e578b08f7a20c9d 100644
--- a/v3_25_0/CDT-dynamicAuthorizationConsultation-v3_25_0.xsd
+++ b/v3_25_0/CDT-dynamicAuthorizationConsultation-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-eventConfig-v3_25_0.xsd b/v3_25_0/CDT-eventConfig-v3_25_0.xsd
index 09397424292d8a1dc5808945879a6724482ae99b..195611b5434cc38a4702b8d68ed274a05867b522 100644
--- a/v3_25_0/CDT-eventConfig-v3_25_0.xsd
+++ b/v3_25_0/CDT-eventConfig-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-eventLog-v3_25_0.xsd b/v3_25_0/CDT-eventLog-v3_25_0.xsd
index f6120a8910e3839907162808c0b0ffbd8a896a6e..e641afc55b26eea7f42f507d88a9ea2ed10e5d74 100644
--- a/v3_25_0/CDT-eventLog-v3_25_0.xsd
+++ b/v3_25_0/CDT-eventLog-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-execInstance-v3_25_0.xsd b/v3_25_0/CDT-execInstance-v3_25_0.xsd
index 5d7eedd21a247d9d16549dab47e6e609b684ae28..160354b10d1ec30c9d8ce0326799404f96474bba 100644
--- a/v3_25_0/CDT-execInstance-v3_25_0.xsd
+++ b/v3_25_0/CDT-execInstance-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-firmware-v3_25_0.xsd b/v3_25_0/CDT-firmware-v3_25_0.xsd
index bb2032a3838284cc6e8a67f44fcee30fdf38e89a..dd12909dd55cde0c31b2f6be6f09de3e558cabe3 100644
--- a/v3_25_0/CDT-firmware-v3_25_0.xsd
+++ b/v3_25_0/CDT-firmware-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-group-v3_25_0.xsd b/v3_25_0/CDT-group-v3_25_0.xsd
index c9badd4a72c3be4b8e88aefffa2d5ed8bd9f80c0..4f1f835657d7bd18863a7aa677c2e390d8980713 100644
--- a/v3_25_0/CDT-group-v3_25_0.xsd
+++ b/v3_25_0/CDT-group-v3_25_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_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-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_25_0/CDT-localMulticastGroup-v3_25_0.xsd b/v3_25_0/CDT-localMulticastGroup-v3_25_0.xsd
index e1e38fdb0ed980b33abb5696d5d2276ef63c7ba6..51598e0401294b48a468cee6f26d2a655c6da98e 100644
--- a/v3_25_0/CDT-localMulticastGroup-v3_25_0.xsd
+++ b/v3_25_0/CDT-localMulticastGroup-v3_25_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_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_24_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_25_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_25_0/CDT-locationPolicy-v3_25_0.xsd b/v3_25_0/CDT-locationPolicy-v3_25_0.xsd
index ced65794ed3da2738032ec430bb1199697aba26c..a6e5434edd715eea005f7c3ccbc83bc8135d1de9 100644
--- a/v3_25_0/CDT-locationPolicy-v3_25_0.xsd
+++ b/v3_25_0/CDT-locationPolicy-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-m2mServiceSubscriptionProfile-v3_25_0.xsd b/v3_25_0/CDT-m2mServiceSubscriptionProfile-v3_25_0.xsd
index 4513f28e2315cf5c3a8656a78956ed318e0e49af..3f8938db046bd9497df08a38636d3c636a638262 100644
--- a/v3_25_0/CDT-m2mServiceSubscriptionProfile-v3_25_0.xsd
+++ b/v3_25_0/CDT-m2mServiceSubscriptionProfile-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-memory-v3_25_0.xsd b/v3_25_0/CDT-memory-v3_25_0.xsd
index 5654895738eadb6b05ec131eccbaa14fe0eafb1c..020c61398230b82ed15a0a3c1851c4164f46ff8f 100644
--- a/v3_25_0/CDT-memory-v3_25_0.xsd
+++ b/v3_25_0/CDT-memory-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-mgmtCmd-v3_25_0.xsd b/v3_25_0/CDT-mgmtCmd-v3_25_0.xsd
index eeea26178a70c54e8165be4ee375cbd1b1e210ae..33b14b29c2d763695aa144104d32f6a355b81cd3 100644
--- a/v3_25_0/CDT-mgmtCmd-v3_25_0.xsd
+++ b/v3_25_0/CDT-mgmtCmd-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-multimediaSession-v3_25_0.xsd b/v3_25_0/CDT-multimediaSession-v3_25_0.xsd
index 17359ddf5316f2abbf6dd4e1edb95548a030da86..5f2f856e65e3114d01598e1090451b1070988fea 100644
--- a/v3_25_0/CDT-multimediaSession-v3_25_0.xsd
+++ b/v3_25_0/CDT-multimediaSession-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-node-v3_25_0.xsd b/v3_25_0/CDT-node-v3_25_0.xsd
index f8485f9ce26aabad3ec2293e308fbc70e2037c83..5174f5c9a6c186ab37f66759f9d355a079de7d5d 100644
--- a/v3_25_0/CDT-node-v3_25_0.xsd
+++ b/v3_25_0/CDT-node-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_25_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-notification-v3_25_0.xsd b/v3_25_0/CDT-notification-v3_25_0.xsd
index 54aed354751c49f1e130b09d18d3b4ecd2493e71..bf2470a06c4db42007abe6ac3f858fd13addf1ef 100644
--- a/v3_25_0/CDT-notification-v3_25_0.xsd
+++ b/v3_25_0/CDT-notification-v3_25_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_24_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_24_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_25_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_25_0/CDT-notificationTargetMgmtPolicyRef-v3_25_0.xsd b/v3_25_0/CDT-notificationTargetMgmtPolicyRef-v3_25_0.xsd
index d9b66164d0a92200a6d740418f8e7dc6bdef126a..c60afbe58ddfc4cfdb05fd92314a0fe4d418a066 100644
--- a/v3_25_0/CDT-notificationTargetMgmtPolicyRef-v3_25_0.xsd
+++ b/v3_25_0/CDT-notificationTargetMgmtPolicyRef-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-notificationTargetPolicy-v3_25_0.xsd b/v3_25_0/CDT-notificationTargetPolicy-v3_25_0.xsd
index 8ae801d319888af49e4c5c094b5ff7c4526909fc..2444979d7c5f9d41ec400b7a8bf9c45a37ff3bcb 100644
--- a/v3_25_0/CDT-notificationTargetPolicy-v3_25_0.xsd
+++ b/v3_25_0/CDT-notificationTargetPolicy-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-ontology-v3_25_0.xsd b/v3_25_0/CDT-ontology-v3_25_0.xsd
index e87c8926ef0c1236f90cc4a91c1e34fd56f64653..c57c5bba9b78ccf71cf0d1de1ea573d675825cdc 100644
--- a/v3_25_0/CDT-ontology-v3_25_0.xsd
+++ b/v3_25_0/CDT-ontology-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_25_0/CDT-ontologyRepository-v3_25_0.xsd b/v3_25_0/CDT-ontologyRepository-v3_25_0.xsd
index 7d76fead4ba08f3a8790da3bf57eb98e9a4abdc6..6b4cf50c065b8dbd54e558ae2667dab06575b763 100644
--- a/v3_25_0/CDT-ontologyRepository-v3_25_0.xsd
+++ b/v3_25_0/CDT-ontologyRepository-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_25_0/CDT-policyDeletionRules-v3_25_0.xsd b/v3_25_0/CDT-policyDeletionRules-v3_25_0.xsd
index 40ed1be31a444dfb7545055b40eab9a455d88cfd..3cc319e0a5d4ed3450be2b82c53f94fb953af32c 100644
--- a/v3_25_0/CDT-policyDeletionRules-v3_25_0.xsd
+++ b/v3_25_0/CDT-policyDeletionRules-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-pollingChannel-v3_25_0.xsd b/v3_25_0/CDT-pollingChannel-v3_25_0.xsd
index fe8cd7d8a716b65fbe97530baecb36d8e9fa86da..9f83135ce06fff420460ed6c318cdc86d6dc0a3e 100644
--- a/v3_25_0/CDT-pollingChannel-v3_25_0.xsd
+++ b/v3_25_0/CDT-pollingChannel-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-reboot-v3_25_0.xsd b/v3_25_0/CDT-reboot-v3_25_0.xsd
index 5b68388a0aa46f9f77e4276de3145aba50c1af72..3fc704f6f2808a9bbaf47f69ac452725121052c6 100644
--- a/v3_25_0/CDT-reboot-v3_25_0.xsd
+++ b/v3_25_0/CDT-reboot-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-remoteCSE-v3_25_0.xsd b/v3_25_0/CDT-remoteCSE-v3_25_0.xsd
index 77c792dc31025f12208a700bf8bba18474929835..cdfbcc6f0abe1388ebdb2f2c82752567342bf866 100644
--- a/v3_25_0/CDT-remoteCSE-v3_25_0.xsd
+++ b/v3_25_0/CDT-remoteCSE-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-request-v3_25_0.xsd b/v3_25_0/CDT-request-v3_25_0.xsd
index e7f079e211dfcf588a936dd15944ba07a6fe4b9a..089a95f8e2078c05bdf6e112a1d9277116af7ad8 100644
--- a/v3_25_0/CDT-request-v3_25_0.xsd
+++ b/v3_25_0/CDT-request-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-requestPrimitive-v3_25_0.xsd b/v3_25_0/CDT-requestPrimitive-v3_25_0.xsd
index d0767b5b8dc81d74348799297dd1359a78a83106..de993081837a705a46e7e072da693c70a3af601f 100644
--- a/v3_25_0/CDT-requestPrimitive-v3_25_0.xsd
+++ b/v3_25_0/CDT-requestPrimitive-v3_25_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_24_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_25_0/CDT-responsePrimitive-v3_25_0.xsd b/v3_25_0/CDT-responsePrimitive-v3_25_0.xsd
index 1bd042547486601698c291eb80576d4479067a85..895bc3083b0ab0c81c74d293b9218071e18d0a20 100644
--- a/v3_25_0/CDT-responsePrimitive-v3_25_0.xsd
+++ b/v3_25_0/CDT-responsePrimitive-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_25_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_25_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_25_0/CDT-role-v3_25_0.xsd b/v3_25_0/CDT-role-v3_25_0.xsd
index ff28bcec84115f39e526488fcea63262ae01511e..38cee813559f4a6e5625a5a2a19d7a9a7f938ae8 100644
--- a/v3_25_0/CDT-role-v3_25_0.xsd
+++ b/v3_25_0/CDT-role-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-schedule-v3_25_0.xsd b/v3_25_0/CDT-schedule-v3_25_0.xsd
index 79704304c9b436aa4cbcd1aeef104dfe2e4652dd..925f41408c9076a92bac3fe3ee00bf9f41be5d82 100644
--- a/v3_25_0/CDT-schedule-v3_25_0.xsd
+++ b/v3_25_0/CDT-schedule-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-semanticDescriptor-v3_25_0.xsd b/v3_25_0/CDT-semanticDescriptor-v3_25_0.xsd
index f50388470641f4a2e1932f9f228302d163fa41fb..1e45be8b68eb5da12e8317ea8a1f06a2285ca8ed 100644
--- a/v3_25_0/CDT-semanticDescriptor-v3_25_0.xsd
+++ b/v3_25_0/CDT-semanticDescriptor-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-semanticMashupInstance-v3_25_0.xsd b/v3_25_0/CDT-semanticMashupInstance-v3_25_0.xsd
index e510e6b8908dd53adfec69f3e3b31ad173e49e96..cab611cfafef73762404ba2049aed35da2d3d546 100644
--- a/v3_25_0/CDT-semanticMashupInstance-v3_25_0.xsd
+++ b/v3_25_0/CDT-semanticMashupInstance-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-semanticMashupJobProfile-v3_25_0.xsd b/v3_25_0/CDT-semanticMashupJobProfile-v3_25_0.xsd
index 1d3744389623742d0c2ac72d3c579534f4822f16..7e976c4dafcdf81b2ddcf13dafce21cfe145b371 100644
--- a/v3_25_0/CDT-semanticMashupJobProfile-v3_25_0.xsd
+++ b/v3_25_0/CDT-semanticMashupJobProfile-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-semanticMashupResult-v3_25_0.xsd b/v3_25_0/CDT-semanticMashupResult-v3_25_0.xsd
index 61650ca09bf90f636ffd1872a54de0f28414d062..c934de45af6eaf7a35b78326d74e8fafda7b0904 100644
--- a/v3_25_0/CDT-semanticMashupResult-v3_25_0.xsd
+++ b/v3_25_0/CDT-semanticMashupResult-v3_25_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_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-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-serviceSubscribedAppRule-v3_25_0.xsd b/v3_25_0/CDT-serviceSubscribedAppRule-v3_25_0.xsd
index f0d3525ecb1b843a2c0c7b1b477774d908cd7534..f70dab314bda7daaa63dbbc2d192fa669fe39251 100644
--- a/v3_25_0/CDT-serviceSubscribedAppRule-v3_25_0.xsd
+++ b/v3_25_0/CDT-serviceSubscribedAppRule-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-serviceSubscribedNode-v3_25_0.xsd b/v3_25_0/CDT-serviceSubscribedNode-v3_25_0.xsd
index c9b17913470131e471cad59efcac52d2a26d6b79..b9bd7e96532772d19401e9497aa974b3220584b3 100644
--- a/v3_25_0/CDT-serviceSubscribedNode-v3_25_0.xsd
+++ b/v3_25_0/CDT-serviceSubscribedNode-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-software-v3_25_0.xsd b/v3_25_0/CDT-software-v3_25_0.xsd
index 74038d257f38557da51b3a572b97dc76197e55c4..a10bb3e6f95939e4bce3cf9acab7b068c44aef4a 100644
--- a/v3_25_0/CDT-software-v3_25_0.xsd
+++ b/v3_25_0/CDT-software-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-statsCollect-v3_25_0.xsd b/v3_25_0/CDT-statsCollect-v3_25_0.xsd
index 67a73b06b6b1d0d96bc32fc0647e6113a815468b..6416dcbdc5709e1864a2308c90b67a60fdea946f 100644
--- a/v3_25_0/CDT-statsCollect-v3_25_0.xsd
+++ b/v3_25_0/CDT-statsCollect-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-statsConfig-v3_25_0.xsd b/v3_25_0/CDT-statsConfig-v3_25_0.xsd
index 4bf31b3320ee49ad990fac0bab7c2980db642c33..68f8240ce78ce163c589f688a00a916b6b2c2e66 100644
--- a/v3_25_0/CDT-statsConfig-v3_25_0.xsd
+++ b/v3_25_0/CDT-statsConfig-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-subscription-v3_25_0.xsd b/v3_25_0/CDT-subscription-v3_25_0.xsd
index 9f9fee83696fc9040e02337dd984e198b1d0983a..8f1d963fccab22eb373b0e3aa8f1eb350920eb79 100644
--- a/v3_25_0/CDT-subscription-v3_25_0.xsd
+++ b/v3_25_0/CDT-subscription-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-svcFwWrapper-v3_25_0.xsd b/v3_25_0/CDT-svcFwWrapper-v3_25_0.xsd
index 6709bd68018fdd1ea56a5771c058993f810390bb..a877a8ed16edfb3d1c649b11b529bfe9992d5c3c 100644
--- a/v3_25_0/CDT-svcFwWrapper-v3_25_0.xsd
+++ b/v3_25_0/CDT-svcFwWrapper-v3_25_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_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-commonTypes-v3_25_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-svcObjWrapper-v3_25_0.xsd b/v3_25_0/CDT-svcObjWrapper-v3_25_0.xsd
index dc4a95232226ac936012329c9eaa05cc0f1edf97..372c5f5eb54d8be21ab79072d0d29da3c94aa09d 100644
--- a/v3_25_0/CDT-svcObjWrapper-v3_25_0.xsd
+++ b/v3_25_0/CDT-svcObjWrapper-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_25_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-timeSeries-v3_25_0.xsd b/v3_25_0/CDT-timeSeries-v3_25_0.xsd
index 3d79892bbebef8d51d794d154d55be17e3c794b4..5d6b35951714473b45a316c8672b508f1268d807 100644
--- a/v3_25_0/CDT-timeSeries-v3_25_0.xsd
+++ b/v3_25_0/CDT-timeSeries-v3_25_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_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:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_25_0/CDT-timeSeriesInstance-v3_25_0.xsd b/v3_25_0/CDT-timeSeriesInstance-v3_25_0.xsd
index 24a3d05c93ca70df12b3e16910b72526a74f27e5..134863e1951ab0b682bff7a46d8971c7b8413636 100644
--- a/v3_25_0/CDT-timeSeriesInstance-v3_25_0.xsd
+++ b/v3_25_0/CDT-timeSeriesInstance-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_25_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-timeSeriesNotification-v3_25_0.xsd b/v3_25_0/CDT-timeSeriesNotification-v3_25_0.xsd
index 57ada6a7074fd8c324dd78f112a2eaafaf0c8d41..a23b31dbfd8ffd5d3019630390782ef330dc8466 100644
--- a/v3_25_0/CDT-timeSeriesNotification-v3_25_0.xsd
+++ b/v3_25_0/CDT-timeSeriesNotification-v3_25_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_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
 	
 	<xs:element name="timeSeriesNotification">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-token-v3_25_0.xsd b/v3_25_0/CDT-token-v3_25_0.xsd
index 330f2f39331afd26f429a8015dae7260db40ba44..3b286dc02f2fbcbc8516231dcfeb4b95e3f88778 100644
--- a/v3_25_0/CDT-token-v3_25_0.xsd
+++ b/v3_25_0/CDT-token-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_25_0/CDT-transaction-v3_25_0.xsd b/v3_25_0/CDT-transaction-v3_25_0.xsd
index 86817f2dbb78b037c53c10f63260cb96ea56c445..c3baac308b09bfac3795700b6447b7345ec1a8fc 100644
--- a/v3_25_0/CDT-transaction-v3_25_0.xsd
+++ b/v3_25_0/CDT-transaction-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_25_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-transactionMgmt-v3_25_0.xsd b/v3_25_0/CDT-transactionMgmt-v3_25_0.xsd
index 4ae64d58c8e091716aa65fb4ba13f2c06d3f3812..6f2b49f43d0140d2b84326a3373e2fea36266b24 100644
--- a/v3_25_0/CDT-transactionMgmt-v3_25_0.xsd
+++ b/v3_25_0/CDT-transactionMgmt-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_25_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-triggerPayload-v3_25_0.xsd b/v3_25_0/CDT-triggerPayload-v3_25_0.xsd
index aefd81bebeac976b8554d6499ae24d341667e7d3..88f54b41bb537d9a7d1c8d02ce170a486014d0bb 100644
--- a/v3_25_0/CDT-triggerPayload-v3_25_0.xsd
+++ b/v3_25_0/CDT-triggerPayload-v3_25_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_24_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_25_0/CDT-triggerRequest-v3_25_0.xsd b/v3_25_0/CDT-triggerRequest-v3_25_0.xsd
index f09087e8c89557f38fc1150ad1105e502e6b3294..57224f98bb4538640964f3d4824ba67be3b467b6 100644
--- a/v3_25_0/CDT-triggerRequest-v3_25_0.xsd
+++ b/v3_25_0/CDT-triggerRequest-v3_25_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_24_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_24_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_24_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_25_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_25_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>