From 54826e59176802df8a2bd101a8a6c2e294a93bd1 Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Tue, 12 Jul 2022 15:26:24 +0100
Subject: [PATCH]  Peter Niblett's avatar Change include statements to
 reference 3_25_0

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

diff --git a/v3_25_0/CDT-AE-v3_25_0.xsd b/v3_25_0/CDT-AE-v3_25_0.xsd
index 48bb78b..2371822 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 df8a2e5..87eaa22 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 c58ce60..9b2f248 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 778ab58..4504906 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 a185777..534f52f 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 a12aad9..3a7612d 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 f21e39a..d5359f5 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 9f90311..5d39af2 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 286b684..2e52f10 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 146b50e..34c7a39 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 b83c119..11fc707 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 aff18e1..f391111 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 dac03f9..d046e92 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 7610e0b..cdade82 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 3d33018..d0f7e21 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 ea7f815..965604a 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 f69b601..d00682e 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 187569d..955ddc2 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 eb45f3f..f79b9bb 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 87402bb..7576e1b 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 1080411..62cb208 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 f80c165..ca13a87 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 f9f4161..c92bdb1 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 dcb9940..4011561 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 258b763..dababe0 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 47818a2..410e4f2 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 af54021..f7050d8 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 bb1bd47..60aef37 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 a24201a..76d88c8 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 6639a64..edd0d98 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 d973e0c..4394d2a 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 b240369..63bc7ae 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 e6c45c6..8ece81e 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 26c8525..66b3e79 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 ce6e3aa..6d4b210 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 0939742..195611b 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 f6120a8..e641afc 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 5d7eedd..160354b 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 bb2032a..dd12909 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 c9badd4..4f1f835 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 e1e38fd..51598e0 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 ced6579..a6e5434 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 4513f28..3f8938d 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 5654895..020c613 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 eeea261..33b14b2 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 17359dd..5f2f856 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 f8485f9..5174f5c 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 54aed35..bf2470a 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 d9b6616..c60afbe 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 8ae801d..2444979 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 e87c892..c57c5bb 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 7d76fea..6b4cf50 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 40ed1be..3cc319e 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 fe8cd7d..9f83135 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 5b68388..3fc704f 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 77c792d..cdfbcc6 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 e7f079e..089a95f 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 d0767b5..de99308 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 1bd0425..895bc30 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 ff28bce..38cee81 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 7970430..925f414 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 f503884..1e45be8 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 e510e6b..cab611c 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 1d37443..7e976c4 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 61650ca..c934de4 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 f0d3525..f70dab3 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 c9b1791..b9bd7e9 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 74038d2..a10bb3e 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 67a73b0..6416dcb 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 4bf31b3..68f8240 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 9f9fee8..8f1d963 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 6709bd6..a877a8e 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 dc4a952..372c5f5 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 3d79892..5d6b359 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 24a3d05..134863e 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 57ada6a..a23b31d 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 330f2f3..3b286dc 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 86817f2..c3baac3 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 4ae64d5..6f2b49f 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 aefd81b..88f54b4 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 f09087e..57224f9 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>
-- 
GitLab