From dff91b3ddff43c3892f88ec11a1f19d6ca82b1e5 Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Mon, 9 May 2022 11:14:16 +0100
Subject: [PATCH] Change include statements to reference 2_31_0

---
 v2_31_0/CDT-AE-v2_31_0.xsd                    | 20 ++--
 v2_31_0/CDT-CSEBase-v2_31_0.xsd               | 40 ++++----
 v2_31_0/CDT-accessControlPolicy-v2_31_0.xsd   |  4 +-
 v2_31_0/CDT-activeCmdhPolicy-v2_31_0.xsd      |  2 +-
 v2_31_0/CDT-allJoynApp-v2_31_0.xsd            |  8 +-
 v2_31_0/CDT-allJoynInterface-v2_31_0.xsd      | 12 +--
 v2_31_0/CDT-allJoynMethod-v2_31_0.xsd         |  8 +-
 v2_31_0/CDT-allJoynMethodCall-v2_31_0.xsd     |  6 +-
 v2_31_0/CDT-allJoynProperty-v2_31_0.xsd       |  6 +-
 v2_31_0/CDT-allJoynSvcObject-v2_31_0.xsd      |  8 +-
 v2_31_0/CDT-areaNwkDeviceInfo-v2_31_0.xsd     |  4 +-
 v2_31_0/CDT-areaNwkInfo-v2_31_0.xsd           |  4 +-
 v2_31_0/CDT-battery-v2_31_0.xsd               |  4 +-
 v2_31_0/CDT-cmdhBuffer-v2_31_0.xsd            |  2 +-
 v2_31_0/CDT-cmdhDefEcValue-v2_31_0.xsd        |  2 +-
 v2_31_0/CDT-cmdhDefaults-v2_31_0.xsd          |  2 +-
 v2_31_0/CDT-cmdhEcDefParamValues-v2_31_0.xsd  |  2 +-
 v2_31_0/CDT-cmdhLimits-v2_31_0.xsd            |  2 +-
 .../CDT-cmdhNetworkAccessRules-v2_31_0.xsd    |  2 +-
 v2_31_0/CDT-cmdhNwAccessRule-v2_31_0.xsd      |  2 +-
 v2_31_0/CDT-cmdhPolicy-v2_31_0.xsd            |  2 +-
 v2_31_0/CDT-commonTypes-v2_31_0.xsd           |  2 +-
 v2_31_0/CDT-container-v2_31_0.xsd             |  8 +-
 v2_31_0/CDT-contentInstance-v2_31_0.xsd       |  4 +-
 v2_31_0/CDT-delivery-v2_31_0.xsd              |  4 +-
 v2_31_0/CDT-deviceCapability-v2_31_0.xsd      |  4 +-
 v2_31_0/CDT-deviceInfo-v2_31_0.xsd            |  4 +-
 ...namicAuthorizationConsultation-v2_31_0.xsd |  2 +-
 v2_31_0/CDT-eventConfig-v2_31_0.xsd           |  4 +-
 v2_31_0/CDT-eventLog-v2_31_0.xsd              |  4 +-
 v2_31_0/CDT-execInstance-v2_31_0.xsd          |  4 +-
 v2_31_0/CDT-firmware-v2_31_0.xsd              |  4 +-
 ...cInterworkingOperationInstance-v2_31_0.xsd |  6 +-
 ...CDT-genericInterworkingService-v2_31_0.xsd |  8 +-
 v2_31_0/CDT-group-v2_31_0.xsd                 |  6 +-
 v2_31_0/CDT-locationPolicy-v2_31_0.xsd        |  4 +-
 ...-m2mServiceSubscriptionProfile-v2_31_0.xsd |  6 +-
 v2_31_0/CDT-memory-v2_31_0.xsd                |  4 +-
 v2_31_0/CDT-mgmtCmd-v2_31_0.xsd               |  6 +-
 v2_31_0/CDT-node-v2_31_0.xsd                  | 32 +++----
 v2_31_0/CDT-notification-v2_31_0.xsd          |  4 +-
 ...otificationTargetMgmtPolicyRef-v2_31_0.xsd |  4 +-
 .../CDT-notificationTargetPolicy-v2_31_0.xsd  |  6 +-
 v2_31_0/CDT-policyDeletionRules-v2_31_0.xsd   |  4 +-
 v2_31_0/CDT-pollingChannel-v2_31_0.xsd        |  4 +-
 v2_31_0/CDT-reboot-v2_31_0.xsd                |  4 +-
 v2_31_0/CDT-remoteCSE-v2_31_0.xsd             | 22 ++---
 v2_31_0/CDT-request-v2_31_0.xsd               |  4 +-
 v2_31_0/CDT-requestPrimitive-v2_31_0.xsd      |  2 +-
 v2_31_0/CDT-responsePrimitive-v2_31_0.xsd     | 96 +++++++++----------
 v2_31_0/CDT-role-v2_31_0.xsd                  |  2 +-
 v2_31_0/CDT-schedule-v2_31_0.xsd              |  4 +-
 v2_31_0/CDT-semanticDescriptor-v2_31_0.xsd    |  4 +-
 .../CDT-serviceSubscribedAppRule-v2_31_0.xsd  |  4 +-
 v2_31_0/CDT-serviceSubscribedNode-v2_31_0.xsd |  4 +-
 v2_31_0/CDT-software-v2_31_0.xsd              |  4 +-
 v2_31_0/CDT-statsCollect-v2_31_0.xsd          |  4 +-
 v2_31_0/CDT-statsConfig-v2_31_0.xsd           |  6 +-
 v2_31_0/CDT-subscription-v2_31_0.xsd          |  6 +-
 v2_31_0/CDT-svcFwWrapper-v2_31_0.xsd          |  6 +-
 v2_31_0/CDT-svcObjWrapper-v2_31_0.xsd         |  8 +-
 v2_31_0/CDT-timeSeries-v2_31_0.xsd            |  8 +-
 v2_31_0/CDT-timeSeriesInstance-v2_31_0.xsd    |  2 +-
 v2_31_0/CDT-token-v2_31_0.xsd                 |  2 +-
 v2_31_0/CDT-trafficPattern-v2_31_0.xsd        |  6 +-
 65 files changed, 239 insertions(+), 239 deletions(-)

diff --git a/v2_31_0/CDT-AE-v2_31_0.xsd b/v2_31_0/CDT-AE-v2_31_0.xsd
index 4fa834a..d6d4596 100644
--- a/v2_31_0/CDT-AE-v2_31_0.xsd
+++ b/v2_31_0/CDT-AE-v2_31_0.xsd
@@ -26,16 +26,16 @@ 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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_31_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-CSEBase-v2_31_0.xsd b/v2_31_0/CDT-CSEBase-v2_31_0.xsd
index 8166785..8011c10 100644
--- a/v2_31_0/CDT-CSEBase-v2_31_0.xsd
+++ b/v2_31_0/CDT-CSEBase-v2_31_0.xsd
@@ -26,26 +26,26 @@ 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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_30_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_30_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_31_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_31_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_31_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-accessControlPolicy-v2_31_0.xsd b/v2_31_0/CDT-accessControlPolicy-v2_31_0.xsd
index 0cf5c83..845e48c 100644
--- a/v2_31_0/CDT-accessControlPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-accessControlPolicy-v2_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:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-activeCmdhPolicy-v2_31_0.xsd b/v2_31_0/CDT-activeCmdhPolicy-v2_31_0.xsd
index b872381..89bae74 100644
--- a/v2_31_0/CDT-activeCmdhPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-activeCmdhPolicy-v2_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-v2_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_31_0/CDT-allJoynApp-v2_31_0.xsd b/v2_31_0/CDT-allJoynApp-v2_31_0.xsd
index 45a2f62..a13a74f 100644
--- a/v2_31_0/CDT-allJoynApp-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynApp-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_31_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-allJoynInterface-v2_31_0.xsd b/v2_31_0/CDT-allJoynInterface-v2_31_0.xsd
index 6aa8f64..d125d0c 100644
--- a/v2_31_0/CDT-allJoynInterface-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynInterface-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_31_0/CDT-allJoynMethod-v2_31_0.xsd b/v2_31_0/CDT-allJoynMethod-v2_31_0.xsd
index 0d50c39..68457e9 100644
--- a/v2_31_0/CDT-allJoynMethod-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynMethod-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_31_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_31_0/CDT-allJoynMethodCall-v2_31_0.xsd b/v2_31_0/CDT-allJoynMethodCall-v2_31_0.xsd
index a708c0e..7692660 100644
--- a/v2_31_0/CDT-allJoynMethodCall-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynMethodCall-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-allJoynProperty-v2_31_0.xsd b/v2_31_0/CDT-allJoynProperty-v2_31_0.xsd
index c553286..d3b25c3 100644
--- a/v2_31_0/CDT-allJoynProperty-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynProperty-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-allJoynSvcObject-v2_31_0.xsd b/v2_31_0/CDT-allJoynSvcObject-v2_31_0.xsd
index 0b003c0..eb57c3c 100644
--- a/v2_31_0/CDT-allJoynSvcObject-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynSvcObject-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_31_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-areaNwkDeviceInfo-v2_31_0.xsd b/v2_31_0/CDT-areaNwkDeviceInfo-v2_31_0.xsd
index fc3193a..a29a39d 100644
--- a/v2_31_0/CDT-areaNwkDeviceInfo-v2_31_0.xsd
+++ b/v2_31_0/CDT-areaNwkDeviceInfo-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-areaNwkInfo-v2_31_0.xsd b/v2_31_0/CDT-areaNwkInfo-v2_31_0.xsd
index 130f07a..fd9e873 100644
--- a/v2_31_0/CDT-areaNwkInfo-v2_31_0.xsd
+++ b/v2_31_0/CDT-areaNwkInfo-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-battery-v2_31_0.xsd b/v2_31_0/CDT-battery-v2_31_0.xsd
index 969eef8..de10b28 100644
--- a/v2_31_0/CDT-battery-v2_31_0.xsd
+++ b/v2_31_0/CDT-battery-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhBuffer-v2_31_0.xsd b/v2_31_0/CDT-cmdhBuffer-v2_31_0.xsd
index f1b37ca..1a21b5a 100644
--- a/v2_31_0/CDT-cmdhBuffer-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhBuffer-v2_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-v2_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_31_0/CDT-cmdhDefEcValue-v2_31_0.xsd b/v2_31_0/CDT-cmdhDefEcValue-v2_31_0.xsd
index 61d1f92..7cebe18 100644
--- a/v2_31_0/CDT-cmdhDefEcValue-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhDefEcValue-v2_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-v2_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_31_0/CDT-cmdhDefaults-v2_31_0.xsd b/v2_31_0/CDT-cmdhDefaults-v2_31_0.xsd
index a4d7dfd..ebe16d8 100644
--- a/v2_31_0/CDT-cmdhDefaults-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhDefaults-v2_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-v2_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_31_0/CDT-cmdhEcDefParamValues-v2_31_0.xsd b/v2_31_0/CDT-cmdhEcDefParamValues-v2_31_0.xsd
index 09e0df1..a8883fe 100644
--- a/v2_31_0/CDT-cmdhEcDefParamValues-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhEcDefParamValues-v2_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-v2_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_31_0/CDT-cmdhLimits-v2_31_0.xsd b/v2_31_0/CDT-cmdhLimits-v2_31_0.xsd
index c9a7cb9..1added4 100644
--- a/v2_31_0/CDT-cmdhLimits-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhLimits-v2_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-v2_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_31_0/CDT-cmdhNetworkAccessRules-v2_31_0.xsd b/v2_31_0/CDT-cmdhNetworkAccessRules-v2_31_0.xsd
index 48e7388..a73659e 100644
--- a/v2_31_0/CDT-cmdhNetworkAccessRules-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhNetworkAccessRules-v2_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-v2_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_31_0/CDT-cmdhNwAccessRule-v2_31_0.xsd b/v2_31_0/CDT-cmdhNwAccessRule-v2_31_0.xsd
index 793fe80..9083ffe 100644
--- a/v2_31_0/CDT-cmdhNwAccessRule-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhNwAccessRule-v2_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-v2_30_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_31_0/CDT-cmdhPolicy-v2_31_0.xsd b/v2_31_0/CDT-cmdhPolicy-v2_31_0.xsd
index 177f6c8..826f3fa 100644
--- a/v2_31_0/CDT-cmdhPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhPolicy-v2_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-v2_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_31_0/CDT-commonTypes-v2_31_0.xsd b/v2_31_0/CDT-commonTypes-v2_31_0.xsd
index 49196a1..da0704c 100644
--- a/v2_31_0/CDT-commonTypes-v2_31_0.xsd
+++ b/v2_31_0/CDT-commonTypes-v2_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-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_31_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_31_0/CDT-container-v2_31_0.xsd b/v2_31_0/CDT-container-v2_31_0.xsd
index 78e35a4..59d3d66 100644
--- a/v2_31_0/CDT-container-v2_31_0.xsd
+++ b/v2_31_0/CDT-container-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_31_0/CDT-contentInstance-v2_31_0.xsd b/v2_31_0/CDT-contentInstance-v2_31_0.xsd
index 8988686..43d554c 100644
--- a/v2_31_0/CDT-contentInstance-v2_31_0.xsd
+++ b/v2_31_0/CDT-contentInstance-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-delivery-v2_31_0.xsd b/v2_31_0/CDT-delivery-v2_31_0.xsd
index 4af2241..e7bc63f 100644
--- a/v2_31_0/CDT-delivery-v2_31_0.xsd
+++ b/v2_31_0/CDT-delivery-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_31_0/CDT-deviceCapability-v2_31_0.xsd b/v2_31_0/CDT-deviceCapability-v2_31_0.xsd
index 9e79a5b..61f5065 100644
--- a/v2_31_0/CDT-deviceCapability-v2_31_0.xsd
+++ b/v2_31_0/CDT-deviceCapability-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-deviceInfo-v2_31_0.xsd b/v2_31_0/CDT-deviceInfo-v2_31_0.xsd
index e960a27..700ba2d 100644
--- a/v2_31_0/CDT-deviceInfo-v2_31_0.xsd
+++ b/v2_31_0/CDT-deviceInfo-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-dynamicAuthorizationConsultation-v2_31_0.xsd b/v2_31_0/CDT-dynamicAuthorizationConsultation-v2_31_0.xsd
index 71ec0cc..5956187 100644
--- a/v2_31_0/CDT-dynamicAuthorizationConsultation-v2_31_0.xsd
+++ b/v2_31_0/CDT-dynamicAuthorizationConsultation-v2_31_0.xsd
@@ -26,7 +26,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-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-eventConfig-v2_31_0.xsd b/v2_31_0/CDT-eventConfig-v2_31_0.xsd
index 546d5ae..9969568 100644
--- a/v2_31_0/CDT-eventConfig-v2_31_0.xsd
+++ b/v2_31_0/CDT-eventConfig-v2_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-eventLog-v2_31_0.xsd b/v2_31_0/CDT-eventLog-v2_31_0.xsd
index f940a39..91275cd 100644
--- a/v2_31_0/CDT-eventLog-v2_31_0.xsd
+++ b/v2_31_0/CDT-eventLog-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-execInstance-v2_31_0.xsd b/v2_31_0/CDT-execInstance-v2_31_0.xsd
index 9a08f5d..cef77e5 100644
--- a/v2_31_0/CDT-execInstance-v2_31_0.xsd
+++ b/v2_31_0/CDT-execInstance-v2_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-firmware-v2_31_0.xsd b/v2_31_0/CDT-firmware-v2_31_0.xsd
index 9386867..79c7ffc 100644
--- a/v2_31_0/CDT-firmware-v2_31_0.xsd
+++ b/v2_31_0/CDT-firmware-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-genericInterworkingOperationInstance-v2_31_0.xsd b/v2_31_0/CDT-genericInterworkingOperationInstance-v2_31_0.xsd
index fded479..54e284f 100644
--- a/v2_31_0/CDT-genericInterworkingOperationInstance-v2_31_0.xsd
+++ b/v2_31_0/CDT-genericInterworkingOperationInstance-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-genericInterworkingService-v2_31_0.xsd b/v2_31_0/CDT-genericInterworkingService-v2_31_0.xsd
index 08898b2..12bb139 100644
--- a/v2_31_0/CDT-genericInterworkingService-v2_31_0.xsd
+++ b/v2_31_0/CDT-genericInterworkingService-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_31_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-group-v2_31_0.xsd b/v2_31_0/CDT-group-v2_31_0.xsd
index 1d8eb08..75716e1 100644
--- a/v2_31_0/CDT-group-v2_31_0.xsd
+++ b/v2_31_0/CDT-group-v2_31_0.xsd
@@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd"/>
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-locationPolicy-v2_31_0.xsd b/v2_31_0/CDT-locationPolicy-v2_31_0.xsd
index eca47cc..4e5ec06 100644
--- a/v2_31_0/CDT-locationPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-locationPolicy-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd b/v2_31_0/CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd
index 18f1183..26e6afe 100644
--- a/v2_31_0/CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd
+++ b/v2_31_0/CDT-m2mServiceSubscriptionProfile-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_31_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-memory-v2_31_0.xsd b/v2_31_0/CDT-memory-v2_31_0.xsd
index 1d2df42..e4577ea 100644
--- a/v2_31_0/CDT-memory-v2_31_0.xsd
+++ b/v2_31_0/CDT-memory-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-mgmtCmd-v2_31_0.xsd b/v2_31_0/CDT-mgmtCmd-v2_31_0.xsd
index 9096a55..797d32c 100644
--- a/v2_31_0/CDT-mgmtCmd-v2_31_0.xsd
+++ b/v2_31_0/CDT-mgmtCmd-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_31_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-node-v2_31_0.xsd b/v2_31_0/CDT-node-v2_31_0.xsd
index 3809b16..9a42449 100644
--- a/v2_31_0/CDT-node-v2_31_0.xsd
+++ b/v2_31_0/CDT-node-v2_31_0.xsd
@@ -27,22 +27,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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_31_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-notification-v2_31_0.xsd b/v2_31_0/CDT-notification-v2_31_0.xsd
index 442ec9b..fe04ffe 100644
--- a/v2_31_0/CDT-notification-v2_31_0.xsd
+++ b/v2_31_0/CDT-notification-v2_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-v2_30_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_30_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_31_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_31_0/CDT-notificationTargetMgmtPolicyRef-v2_31_0.xsd b/v2_31_0/CDT-notificationTargetMgmtPolicyRef-v2_31_0.xsd
index 8f42f0d..6d96fa3 100644
--- a/v2_31_0/CDT-notificationTargetMgmtPolicyRef-v2_31_0.xsd
+++ b/v2_31_0/CDT-notificationTargetMgmtPolicyRef-v2_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-notificationTargetPolicy-v2_31_0.xsd b/v2_31_0/CDT-notificationTargetPolicy-v2_31_0.xsd
index f07741d..fe9b99a 100644
--- a/v2_31_0/CDT-notificationTargetPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-notificationTargetPolicy-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-policyDeletionRules-v2_31_0.xsd b/v2_31_0/CDT-policyDeletionRules-v2_31_0.xsd
index a8821c4..96e7e02 100644
--- a/v2_31_0/CDT-policyDeletionRules-v2_31_0.xsd
+++ b/v2_31_0/CDT-policyDeletionRules-v2_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-pollingChannel-v2_31_0.xsd b/v2_31_0/CDT-pollingChannel-v2_31_0.xsd
index 6b95fc0..31b86be 100644
--- a/v2_31_0/CDT-pollingChannel-v2_31_0.xsd
+++ b/v2_31_0/CDT-pollingChannel-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-reboot-v2_31_0.xsd b/v2_31_0/CDT-reboot-v2_31_0.xsd
index 0756c96..514e7af 100644
--- a/v2_31_0/CDT-reboot-v2_31_0.xsd
+++ b/v2_31_0/CDT-reboot-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-remoteCSE-v2_31_0.xsd b/v2_31_0/CDT-remoteCSE-v2_31_0.xsd
index 77f429b..5ef4f00 100644
--- a/v2_31_0/CDT-remoteCSE-v2_31_0.xsd
+++ b/v2_31_0/CDT-remoteCSE-v2_31_0.xsd
@@ -26,17 +26,17 @@ 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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_31_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-request-v2_31_0.xsd b/v2_31_0/CDT-request-v2_31_0.xsd
index ef38fd7..47cf53b 100644
--- a/v2_31_0/CDT-request-v2_31_0.xsd
+++ b/v2_31_0/CDT-request-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-requestPrimitive-v2_31_0.xsd b/v2_31_0/CDT-requestPrimitive-v2_31_0.xsd
index a6db705..659af07 100644
--- a/v2_31_0/CDT-requestPrimitive-v2_31_0.xsd
+++ b/v2_31_0/CDT-requestPrimitive-v2_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-v2_30_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_31_0/CDT-responsePrimitive-v2_31_0.xsd b/v2_31_0/CDT-responsePrimitive-v2_31_0.xsd
index 635a1ab..e5fc64e 100644
--- a/v2_31_0/CDT-responsePrimitive-v2_31_0.xsd
+++ b/v2_31_0/CDT-responsePrimitive-v2_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-v2_30_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_30_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_30_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_31_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_31_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_31_0/CDT-role-v2_31_0.xsd b/v2_31_0/CDT-role-v2_31_0.xsd
index 0362227..715a12d 100644
--- a/v2_31_0/CDT-role-v2_31_0.xsd
+++ b/v2_31_0/CDT-role-v2_31_0.xsd
@@ -26,7 +26,7 @@ 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-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-schedule-v2_31_0.xsd b/v2_31_0/CDT-schedule-v2_31_0.xsd
index f65ba33..f2a888e 100644
--- a/v2_31_0/CDT-schedule-v2_31_0.xsd
+++ b/v2_31_0/CDT-schedule-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-semanticDescriptor-v2_31_0.xsd b/v2_31_0/CDT-semanticDescriptor-v2_31_0.xsd
index f2586b9..73064fb 100644
--- a/v2_31_0/CDT-semanticDescriptor-v2_31_0.xsd
+++ b/v2_31_0/CDT-semanticDescriptor-v2_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-serviceSubscribedAppRule-v2_31_0.xsd b/v2_31_0/CDT-serviceSubscribedAppRule-v2_31_0.xsd
index a6c715f..f8cc1bf 100644
--- a/v2_31_0/CDT-serviceSubscribedAppRule-v2_31_0.xsd
+++ b/v2_31_0/CDT-serviceSubscribedAppRule-v2_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-serviceSubscribedNode-v2_31_0.xsd b/v2_31_0/CDT-serviceSubscribedNode-v2_31_0.xsd
index fde53bd..2e81786 100644
--- a/v2_31_0/CDT-serviceSubscribedNode-v2_31_0.xsd
+++ b/v2_31_0/CDT-serviceSubscribedNode-v2_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-software-v2_31_0.xsd b/v2_31_0/CDT-software-v2_31_0.xsd
index 3b3be66..faca06d 100644
--- a/v2_31_0/CDT-software-v2_31_0.xsd
+++ b/v2_31_0/CDT-software-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-statsCollect-v2_31_0.xsd b/v2_31_0/CDT-statsCollect-v2_31_0.xsd
index c2e3319..cc71af3 100644
--- a/v2_31_0/CDT-statsCollect-v2_31_0.xsd
+++ b/v2_31_0/CDT-statsCollect-v2_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-statsConfig-v2_31_0.xsd b/v2_31_0/CDT-statsConfig-v2_31_0.xsd
index 2e22aaa..55e83fb 100644
--- a/v2_31_0/CDT-statsConfig-v2_31_0.xsd
+++ b/v2_31_0/CDT-statsConfig-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-subscription-v2_31_0.xsd b/v2_31_0/CDT-subscription-v2_31_0.xsd
index a478fb8..8664125 100644
--- a/v2_31_0/CDT-subscription-v2_31_0.xsd
+++ b/v2_31_0/CDT-subscription-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_31_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-svcFwWrapper-v2_31_0.xsd b/v2_31_0/CDT-svcFwWrapper-v2_31_0.xsd
index 1f0fd10..916cf55 100644
--- a/v2_31_0/CDT-svcFwWrapper-v2_31_0.xsd
+++ b/v2_31_0/CDT-svcFwWrapper-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-svcObjWrapper-v2_31_0.xsd b/v2_31_0/CDT-svcObjWrapper-v2_31_0.xsd
index a4a5c6e..589f37d 100644
--- a/v2_31_0/CDT-svcObjWrapper-v2_31_0.xsd
+++ b/v2_31_0/CDT-svcObjWrapper-v2_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-v2_30_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_31_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-timeSeries-v2_31_0.xsd b/v2_31_0/CDT-timeSeries-v2_31_0.xsd
index 0b7c118..c3c1c2e 100644
--- a/v2_31_0/CDT-timeSeries-v2_31_0.xsd
+++ b/v2_31_0/CDT-timeSeries-v2_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-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_31_0/CDT-timeSeriesInstance-v2_31_0.xsd b/v2_31_0/CDT-timeSeriesInstance-v2_31_0.xsd
index 35635c7..05bd576 100644
--- a/v2_31_0/CDT-timeSeriesInstance-v2_31_0.xsd
+++ b/v2_31_0/CDT-timeSeriesInstance-v2_31_0.xsd
@@ -26,7 +26,7 @@ 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-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-token-v2_31_0.xsd b/v2_31_0/CDT-token-v2_31_0.xsd
index e262f06..f248cf4 100644
--- a/v2_31_0/CDT-token-v2_31_0.xsd
+++ b/v2_31_0/CDT-token-v2_31_0.xsd
@@ -26,7 +26,7 @@ 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-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_31_0/CDT-trafficPattern-v2_31_0.xsd b/v2_31_0/CDT-trafficPattern-v2_31_0.xsd
index 553f112..f1ea72b 100644
--- a/v2_31_0/CDT-trafficPattern-v2_31_0.xsd
+++ b/v2_31_0/CDT-trafficPattern-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab