From eed5d3f8695229e67c2617e85737f3a99914b58b Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Mon, 5 Feb 2024 09:44:00 +0000
Subject: [PATCH] Change include statements to reference 3_31_0

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

diff --git a/v3_31_0/CDT-AE-v3_31_0.xsd b/v3_31_0/CDT-AE-v3_31_0.xsd
index ffe7db6..031f26a 100644
--- a/v3_31_0/CDT-AE-v3_31_0.xsd
+++ b/v3_31_0/CDT-AE-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-AEContactList-v3_31_0.xsd b/v3_31_0/CDT-AEContactList-v3_31_0.xsd
index 33e5f65..6ec583b 100644
--- a/v3_31_0/CDT-AEContactList-v3_31_0.xsd
+++ b/v3_31_0/CDT-AEContactList-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-AEContactListPerCSE-v3_31_0.xsd b/v3_31_0/CDT-AEContactListPerCSE-v3_31_0.xsd
index 3f5ab07..c4c467c 100644
--- a/v3_31_0/CDT-AEContactListPerCSE-v3_31_0.xsd
+++ b/v3_31_0/CDT-AEContactListPerCSE-v3_31_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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-CSEBase-v3_31_0.xsd b/v3_31_0/CDT-CSEBase-v3_31_0.xsd
index 06b148a..23d4077 100644
--- a/v3_31_0/CDT-CSEBase-v3_31_0.xsd
+++ b/v3_31_0/CDT-CSEBase-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_30_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_30_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_30_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_31_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_31_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_31_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_31_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-accessControlPolicy-v3_31_0.xsd b/v3_31_0/CDT-accessControlPolicy-v3_31_0.xsd
index 4a726a5..f7f5301 100644
--- a/v3_31_0/CDT-accessControlPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-accessControlPolicy-v3_31_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_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-activeCmdhPolicy-v3_31_0.xsd b/v3_31_0/CDT-activeCmdhPolicy-v3_31_0.xsd
index d2610ea..0eb73cb 100644
--- a/v3_31_0/CDT-activeCmdhPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-activeCmdhPolicy-v3_31_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_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_31_0/CDT-allJoynApp-v3_31_0.xsd b/v3_31_0/CDT-allJoynApp-v3_31_0.xsd
index 1297667..7b681ff 100644
--- a/v3_31_0/CDT-allJoynApp-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynApp-v3_31_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_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_31_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-allJoynInterface-v3_31_0.xsd b/v3_31_0/CDT-allJoynInterface-v3_31_0.xsd
index 2b891a6..d4cfee9 100644
--- a/v3_31_0/CDT-allJoynInterface-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynInterface-v3_31_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_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_31_0/CDT-allJoynMethod-v3_31_0.xsd b/v3_31_0/CDT-allJoynMethod-v3_31_0.xsd
index 7e71bed..e57e64c 100644
--- a/v3_31_0/CDT-allJoynMethod-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynMethod-v3_31_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_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_31_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_31_0/CDT-allJoynMethodCall-v3_31_0.xsd b/v3_31_0/CDT-allJoynMethodCall-v3_31_0.xsd
index b278790..6ef6003 100644
--- a/v3_31_0/CDT-allJoynMethodCall-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynMethodCall-v3_31_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_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-allJoynProperty-v3_31_0.xsd b/v3_31_0/CDT-allJoynProperty-v3_31_0.xsd
index f99c696..ab22570 100644
--- a/v3_31_0/CDT-allJoynProperty-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynProperty-v3_31_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_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-allJoynSvcObject-v3_31_0.xsd b/v3_31_0/CDT-allJoynSvcObject-v3_31_0.xsd
index 72f30ad..3fa7933 100644
--- a/v3_31_0/CDT-allJoynSvcObject-v3_31_0.xsd
+++ b/v3_31_0/CDT-allJoynSvcObject-v3_31_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_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_31_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-areaNwkDeviceInfo-v3_31_0.xsd b/v3_31_0/CDT-areaNwkDeviceInfo-v3_31_0.xsd
index 48b3eb2..a64dac2 100644
--- a/v3_31_0/CDT-areaNwkDeviceInfo-v3_31_0.xsd
+++ b/v3_31_0/CDT-areaNwkDeviceInfo-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-areaNwkInfo-v3_31_0.xsd b/v3_31_0/CDT-areaNwkInfo-v3_31_0.xsd
index 34915ce..29bd8a2 100644
--- a/v3_31_0/CDT-areaNwkInfo-v3_31_0.xsd
+++ b/v3_31_0/CDT-areaNwkInfo-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-authorizationDecision-v3_31_0.xsd b/v3_31_0/CDT-authorizationDecision-v3_31_0.xsd
index d3be918..63e286a 100644
--- a/v3_31_0/CDT-authorizationDecision-v3_31_0.xsd
+++ b/v3_31_0/CDT-authorizationDecision-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-authorizationInformation-v3_31_0.xsd b/v3_31_0/CDT-authorizationInformation-v3_31_0.xsd
index 93f323f..4391ffe 100644
--- a/v3_31_0/CDT-authorizationInformation-v3_31_0.xsd
+++ b/v3_31_0/CDT-authorizationInformation-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-authorizationPolicy-v3_31_0.xsd b/v3_31_0/CDT-authorizationPolicy-v3_31_0.xsd
index 8fca61c..21beb81 100644
--- a/v3_31_0/CDT-authorizationPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-authorizationPolicy-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-backgroundDataTransfer-v3_31_0.xsd b/v3_31_0/CDT-backgroundDataTransfer-v3_31_0.xsd
index 86b47c4..fdfe77e 100644
--- a/v3_31_0/CDT-backgroundDataTransfer-v3_31_0.xsd
+++ b/v3_31_0/CDT-backgroundDataTransfer-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-battery-v3_31_0.xsd b/v3_31_0/CDT-battery-v3_31_0.xsd
index 67cf984..f0e6b20 100644
--- a/v3_31_0/CDT-battery-v3_31_0.xsd
+++ b/v3_31_0/CDT-battery-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-cmdhBuffer-v3_31_0.xsd b/v3_31_0/CDT-cmdhBuffer-v3_31_0.xsd
index 16bb0de..b97b540 100644
--- a/v3_31_0/CDT-cmdhBuffer-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhBuffer-v3_31_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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhDefEcValue-v3_31_0.xsd b/v3_31_0/CDT-cmdhDefEcValue-v3_31_0.xsd
index d1c7406..743299c 100644
--- a/v3_31_0/CDT-cmdhDefEcValue-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhDefEcValue-v3_31_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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhDefaults-v3_31_0.xsd b/v3_31_0/CDT-cmdhDefaults-v3_31_0.xsd
index c6b7053..8c5438a 100644
--- a/v3_31_0/CDT-cmdhDefaults-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhDefaults-v3_31_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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhEcDefParamValues-v3_31_0.xsd b/v3_31_0/CDT-cmdhEcDefParamValues-v3_31_0.xsd
index d1da40d..143a0f6 100644
--- a/v3_31_0/CDT-cmdhEcDefParamValues-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhEcDefParamValues-v3_31_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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_31_0/CDT-cmdhLimits-v3_31_0.xsd b/v3_31_0/CDT-cmdhLimits-v3_31_0.xsd
index 7f983fc..c16c757 100644
--- a/v3_31_0/CDT-cmdhLimits-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhLimits-v3_31_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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhNetworkAccessRules-v3_31_0.xsd b/v3_31_0/CDT-cmdhNetworkAccessRules-v3_31_0.xsd
index c962d92..10b39ba 100644
--- a/v3_31_0/CDT-cmdhNetworkAccessRules-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhNetworkAccessRules-v3_31_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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhNwAccessRule-v3_31_0.xsd b/v3_31_0/CDT-cmdhNwAccessRule-v3_31_0.xsd
index 7c2ebef..4283e9b 100644
--- a/v3_31_0/CDT-cmdhNwAccessRule-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhNwAccessRule-v3_31_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_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_31_0/CDT-cmdhPolicy-v3_31_0.xsd b/v3_31_0/CDT-cmdhPolicy-v3_31_0.xsd
index 0c084b8..efbdf44 100644
--- a/v3_31_0/CDT-cmdhPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-cmdhPolicy-v3_31_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_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_31_0/CDT-commonTypes-v3_31_0.xsd b/v3_31_0/CDT-commonTypes-v3_31_0.xsd
index 5ee2767..c4bc6e6 100644
--- a/v3_31_0/CDT-commonTypes-v3_31_0.xsd
+++ b/v3_31_0/CDT-commonTypes-v3_31_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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_31_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_31_0/CDT-container-v3_31_0.xsd b/v3_31_0/CDT-container-v3_31_0.xsd
index 41c4ac1..4617ca3 100644
--- a/v3_31_0/CDT-container-v3_31_0.xsd
+++ b/v3_31_0/CDT-container-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-contentInstance-v3_31_0.xsd b/v3_31_0/CDT-contentInstance-v3_31_0.xsd
index 2238700..a03f051 100644
--- a/v3_31_0/CDT-contentInstance-v3_31_0.xsd
+++ b/v3_31_0/CDT-contentInstance-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-crossResourceSubscription-v3_31_0.xsd b/v3_31_0/CDT-crossResourceSubscription-v3_31_0.xsd
index b7a1c63..4d41e69 100644
--- a/v3_31_0/CDT-crossResourceSubscription-v3_31_0.xsd
+++ b/v3_31_0/CDT-crossResourceSubscription-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-delivery-v3_31_0.xsd b/v3_31_0/CDT-delivery-v3_31_0.xsd
index 2fc302c..2939ce6 100644
--- a/v3_31_0/CDT-delivery-v3_31_0.xsd
+++ b/v3_31_0/CDT-delivery-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_31_0/CDT-deviceCapability-v3_31_0.xsd b/v3_31_0/CDT-deviceCapability-v3_31_0.xsd
index d82bc23..3f4a4f9 100644
--- a/v3_31_0/CDT-deviceCapability-v3_31_0.xsd
+++ b/v3_31_0/CDT-deviceCapability-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-deviceInfo-v3_31_0.xsd b/v3_31_0/CDT-deviceInfo-v3_31_0.xsd
index 98ad8c8..f966c18 100644
--- a/v3_31_0/CDT-deviceInfo-v3_31_0.xsd
+++ b/v3_31_0/CDT-deviceInfo-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-dynamicAuthorizationConsultation-v3_31_0.xsd b/v3_31_0/CDT-dynamicAuthorizationConsultation-v3_31_0.xsd
index 4c59aa8..31e8de1 100644
--- a/v3_31_0/CDT-dynamicAuthorizationConsultation-v3_31_0.xsd
+++ b/v3_31_0/CDT-dynamicAuthorizationConsultation-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-eventConfig-v3_31_0.xsd b/v3_31_0/CDT-eventConfig-v3_31_0.xsd
index cfc7a06..7415abc 100644
--- a/v3_31_0/CDT-eventConfig-v3_31_0.xsd
+++ b/v3_31_0/CDT-eventConfig-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-eventLog-v3_31_0.xsd b/v3_31_0/CDT-eventLog-v3_31_0.xsd
index 44c38d9..2d25187 100644
--- a/v3_31_0/CDT-eventLog-v3_31_0.xsd
+++ b/v3_31_0/CDT-eventLog-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-execInstance-v3_31_0.xsd b/v3_31_0/CDT-execInstance-v3_31_0.xsd
index 29af342..7d33544 100644
--- a/v3_31_0/CDT-execInstance-v3_31_0.xsd
+++ b/v3_31_0/CDT-execInstance-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-firmware-v3_31_0.xsd b/v3_31_0/CDT-firmware-v3_31_0.xsd
index 52ce988..9078e63 100644
--- a/v3_31_0/CDT-firmware-v3_31_0.xsd
+++ b/v3_31_0/CDT-firmware-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-group-v3_31_0.xsd b/v3_31_0/CDT-group-v3_31_0.xsd
index ae0a098..7917ff1 100644
--- a/v3_31_0/CDT-group-v3_31_0.xsd
+++ b/v3_31_0/CDT-group-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-localMulticastGroup-v3_31_0.xsd b/v3_31_0/CDT-localMulticastGroup-v3_31_0.xsd
index 62c697d..2cbfb3b 100644
--- a/v3_31_0/CDT-localMulticastGroup-v3_31_0.xsd
+++ b/v3_31_0/CDT-localMulticastGroup-v3_31_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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_31_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_31_0/CDT-locationPolicy-v3_31_0.xsd b/v3_31_0/CDT-locationPolicy-v3_31_0.xsd
index 71f9d91..c12f603 100644
--- a/v3_31_0/CDT-locationPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-locationPolicy-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd b/v3_31_0/CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd
index d3bef09..09f131e 100644
--- a/v3_31_0/CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd
+++ b/v3_31_0/CDT-m2mServiceSubscriptionProfile-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-memory-v3_31_0.xsd b/v3_31_0/CDT-memory-v3_31_0.xsd
index bd75c9e..9af7902 100644
--- a/v3_31_0/CDT-memory-v3_31_0.xsd
+++ b/v3_31_0/CDT-memory-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-mgmtCmd-v3_31_0.xsd b/v3_31_0/CDT-mgmtCmd-v3_31_0.xsd
index e1b5dd9..e34878d 100644
--- a/v3_31_0/CDT-mgmtCmd-v3_31_0.xsd
+++ b/v3_31_0/CDT-mgmtCmd-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-multimediaSession-v3_31_0.xsd b/v3_31_0/CDT-multimediaSession-v3_31_0.xsd
index 0310dc3..a61f4fd 100644
--- a/v3_31_0/CDT-multimediaSession-v3_31_0.xsd
+++ b/v3_31_0/CDT-multimediaSession-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-node-v3_31_0.xsd b/v3_31_0/CDT-node-v3_31_0.xsd
index ef702a9..3557a72 100644
--- a/v3_31_0/CDT-node-v3_31_0.xsd
+++ b/v3_31_0/CDT-node-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_31_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-notification-v3_31_0.xsd b/v3_31_0/CDT-notification-v3_31_0.xsd
index 233d3c3..14cb105 100644
--- a/v3_31_0/CDT-notification-v3_31_0.xsd
+++ b/v3_31_0/CDT-notification-v3_31_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_30_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_31_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_31_0/CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd b/v3_31_0/CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd
index c81b83e..8144f40 100644
--- a/v3_31_0/CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd
+++ b/v3_31_0/CDT-notificationTargetMgmtPolicyRef-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-notificationTargetPolicy-v3_31_0.xsd b/v3_31_0/CDT-notificationTargetPolicy-v3_31_0.xsd
index 39618f6..0d00ad9 100644
--- a/v3_31_0/CDT-notificationTargetPolicy-v3_31_0.xsd
+++ b/v3_31_0/CDT-notificationTargetPolicy-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-ontology-v3_31_0.xsd b/v3_31_0/CDT-ontology-v3_31_0.xsd
index 30922b4..2803324 100644
--- a/v3_31_0/CDT-ontology-v3_31_0.xsd
+++ b/v3_31_0/CDT-ontology-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-ontologyRepository-v3_31_0.xsd b/v3_31_0/CDT-ontologyRepository-v3_31_0.xsd
index caa8377..e5ab9fb 100644
--- a/v3_31_0/CDT-ontologyRepository-v3_31_0.xsd
+++ b/v3_31_0/CDT-ontologyRepository-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-policyDeletionRules-v3_31_0.xsd b/v3_31_0/CDT-policyDeletionRules-v3_31_0.xsd
index 470cff2..1918d26 100644
--- a/v3_31_0/CDT-policyDeletionRules-v3_31_0.xsd
+++ b/v3_31_0/CDT-policyDeletionRules-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-pollingChannel-v3_31_0.xsd b/v3_31_0/CDT-pollingChannel-v3_31_0.xsd
index 63336d7..33306de 100644
--- a/v3_31_0/CDT-pollingChannel-v3_31_0.xsd
+++ b/v3_31_0/CDT-pollingChannel-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-reboot-v3_31_0.xsd b/v3_31_0/CDT-reboot-v3_31_0.xsd
index a934c08..ea6f534 100644
--- a/v3_31_0/CDT-reboot-v3_31_0.xsd
+++ b/v3_31_0/CDT-reboot-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-remoteCSE-v3_31_0.xsd b/v3_31_0/CDT-remoteCSE-v3_31_0.xsd
index aa747f8..25d1a10 100644
--- a/v3_31_0/CDT-remoteCSE-v3_31_0.xsd
+++ b/v3_31_0/CDT-remoteCSE-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-request-v3_31_0.xsd b/v3_31_0/CDT-request-v3_31_0.xsd
index 4e206fb..4decb37 100644
--- a/v3_31_0/CDT-request-v3_31_0.xsd
+++ b/v3_31_0/CDT-request-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-requestPrimitive-v3_31_0.xsd b/v3_31_0/CDT-requestPrimitive-v3_31_0.xsd
index 8c365de..fdf162d 100644
--- a/v3_31_0/CDT-requestPrimitive-v3_31_0.xsd
+++ b/v3_31_0/CDT-requestPrimitive-v3_31_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_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_31_0/CDT-responsePrimitive-v3_31_0.xsd b/v3_31_0/CDT-responsePrimitive-v3_31_0.xsd
index 1c4acd6..01caf7b 100644
--- a/v3_31_0/CDT-responsePrimitive-v3_31_0.xsd
+++ b/v3_31_0/CDT-responsePrimitive-v3_31_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_30_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_30_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_30_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_31_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_31_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_31_0/CDT-role-v3_31_0.xsd b/v3_31_0/CDT-role-v3_31_0.xsd
index c86d51e..8bc1f13 100644
--- a/v3_31_0/CDT-role-v3_31_0.xsd
+++ b/v3_31_0/CDT-role-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-schedule-v3_31_0.xsd b/v3_31_0/CDT-schedule-v3_31_0.xsd
index d26e48b..9456113 100644
--- a/v3_31_0/CDT-schedule-v3_31_0.xsd
+++ b/v3_31_0/CDT-schedule-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-semanticDescriptor-v3_31_0.xsd b/v3_31_0/CDT-semanticDescriptor-v3_31_0.xsd
index 77ff30e..722ff70 100644
--- a/v3_31_0/CDT-semanticDescriptor-v3_31_0.xsd
+++ b/v3_31_0/CDT-semanticDescriptor-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-semanticMashupInstance-v3_31_0.xsd b/v3_31_0/CDT-semanticMashupInstance-v3_31_0.xsd
index 934c63e..594e689 100644
--- a/v3_31_0/CDT-semanticMashupInstance-v3_31_0.xsd
+++ b/v3_31_0/CDT-semanticMashupInstance-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-semanticMashupJobProfile-v3_31_0.xsd b/v3_31_0/CDT-semanticMashupJobProfile-v3_31_0.xsd
index a44666d..0aea4c7 100644
--- a/v3_31_0/CDT-semanticMashupJobProfile-v3_31_0.xsd
+++ b/v3_31_0/CDT-semanticMashupJobProfile-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-semanticMashupResult-v3_31_0.xsd b/v3_31_0/CDT-semanticMashupResult-v3_31_0.xsd
index 8f8da69..21764bf 100644
--- a/v3_31_0/CDT-semanticMashupResult-v3_31_0.xsd
+++ b/v3_31_0/CDT-semanticMashupResult-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-serviceSubscribedAppRule-v3_31_0.xsd b/v3_31_0/CDT-serviceSubscribedAppRule-v3_31_0.xsd
index cc612f1..6aeee49 100644
--- a/v3_31_0/CDT-serviceSubscribedAppRule-v3_31_0.xsd
+++ b/v3_31_0/CDT-serviceSubscribedAppRule-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-serviceSubscribedNode-v3_31_0.xsd b/v3_31_0/CDT-serviceSubscribedNode-v3_31_0.xsd
index cddc370..0230360 100644
--- a/v3_31_0/CDT-serviceSubscribedNode-v3_31_0.xsd
+++ b/v3_31_0/CDT-serviceSubscribedNode-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-software-v3_31_0.xsd b/v3_31_0/CDT-software-v3_31_0.xsd
index cb78941..8b9c88e 100644
--- a/v3_31_0/CDT-software-v3_31_0.xsd
+++ b/v3_31_0/CDT-software-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-statsCollect-v3_31_0.xsd b/v3_31_0/CDT-statsCollect-v3_31_0.xsd
index 7662aad..6426b51 100644
--- a/v3_31_0/CDT-statsCollect-v3_31_0.xsd
+++ b/v3_31_0/CDT-statsCollect-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-statsConfig-v3_31_0.xsd b/v3_31_0/CDT-statsConfig-v3_31_0.xsd
index d463ad9..5cf4ffc 100644
--- a/v3_31_0/CDT-statsConfig-v3_31_0.xsd
+++ b/v3_31_0/CDT-statsConfig-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-subscription-v3_31_0.xsd b/v3_31_0/CDT-subscription-v3_31_0.xsd
index 204f260..c562bf0 100644
--- a/v3_31_0/CDT-subscription-v3_31_0.xsd
+++ b/v3_31_0/CDT-subscription-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-svcFwWrapper-v3_31_0.xsd b/v3_31_0/CDT-svcFwWrapper-v3_31_0.xsd
index 0a72457..559ce5c 100644
--- a/v3_31_0/CDT-svcFwWrapper-v3_31_0.xsd
+++ b/v3_31_0/CDT-svcFwWrapper-v3_31_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_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-svcObjWrapper-v3_31_0.xsd b/v3_31_0/CDT-svcObjWrapper-v3_31_0.xsd
index 1e50398..f24e475 100644
--- a/v3_31_0/CDT-svcObjWrapper-v3_31_0.xsd
+++ b/v3_31_0/CDT-svcObjWrapper-v3_31_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_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_31_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-timeSeries-v3_31_0.xsd b/v3_31_0/CDT-timeSeries-v3_31_0.xsd
index bceb312..e50c59f 100644
--- a/v3_31_0/CDT-timeSeries-v3_31_0.xsd
+++ b/v3_31_0/CDT-timeSeries-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_31_0/CDT-timeSeriesInstance-v3_31_0.xsd b/v3_31_0/CDT-timeSeriesInstance-v3_31_0.xsd
index 9a22c80..f1dacc4 100644
--- a/v3_31_0/CDT-timeSeriesInstance-v3_31_0.xsd
+++ b/v3_31_0/CDT-timeSeriesInstance-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_31_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-timeSeriesNotification-v3_31_0.xsd b/v3_31_0/CDT-timeSeriesNotification-v3_31_0.xsd
index a2ab963..756422f 100644
--- a/v3_31_0/CDT-timeSeriesNotification-v3_31_0.xsd
+++ b/v3_31_0/CDT-timeSeriesNotification-v3_31_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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
 	
 	<xs:element name="timeSeriesNotification" type="m2m:timeSeriesNotificationType" />
 
diff --git a/v3_31_0/CDT-token-v3_31_0.xsd b/v3_31_0/CDT-token-v3_31_0.xsd
index 24aff94..fa1daf2 100644
--- a/v3_31_0/CDT-token-v3_31_0.xsd
+++ b/v3_31_0/CDT-token-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_31_0/CDT-transaction-v3_31_0.xsd b/v3_31_0/CDT-transaction-v3_31_0.xsd
index 3803232..0cb1de8 100644
--- a/v3_31_0/CDT-transaction-v3_31_0.xsd
+++ b/v3_31_0/CDT-transaction-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_31_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-transactionMgmt-v3_31_0.xsd b/v3_31_0/CDT-transactionMgmt-v3_31_0.xsd
index 23e6665..8ba121d 100644
--- a/v3_31_0/CDT-transactionMgmt-v3_31_0.xsd
+++ b/v3_31_0/CDT-transactionMgmt-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_31_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-triggerPayload-v3_31_0.xsd b/v3_31_0/CDT-triggerPayload-v3_31_0.xsd
index fcb00d4..bb3b8be 100644
--- a/v3_31_0/CDT-triggerPayload-v3_31_0.xsd
+++ b/v3_31_0/CDT-triggerPayload-v3_31_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_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_31_0/CDT-triggerRequest-v3_31_0.xsd b/v3_31_0/CDT-triggerRequest-v3_31_0.xsd
index 8950a4d..5d6e3f5 100644
--- a/v3_31_0/CDT-triggerRequest-v3_31_0.xsd
+++ b/v3_31_0/CDT-triggerRequest-v3_31_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_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_30_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_31_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_31_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
-- 
GitLab