From 396620db2e349df686275f0e4b745036e9524799 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Mon, 10 Apr 2017 19:54:15 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v3_1_0/CDT-AE-v3_1_0.xsd b/v3_1_0/CDT-AE-v3_1_0.xsd
index 0914108..e142163 100644
--- a/v3_1_0/CDT-AE-v3_1_0.xsd
+++ b/v3_1_0/CDT-AE-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_1_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-CSEBase-v3_1_0.xsd b/v3_1_0/CDT-CSEBase-v3_1_0.xsd
index 7283a2a..ed39c46 100644
--- a/v3_1_0/CDT-CSEBase-v3_1_0.xsd
+++ b/v3_1_0/CDT-CSEBase-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_0_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_0_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_1_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_1_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_1_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-accessControlPolicy-v3_1_0.xsd b/v3_1_0/CDT-accessControlPolicy-v3_1_0.xsd
index fa3ee59..64598ca 100644
--- a/v3_1_0/CDT-accessControlPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-accessControlPolicy-v3_1_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-v3_0_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-activeCmdhPolicy-v3_1_0.xsd b/v3_1_0/CDT-activeCmdhPolicy-v3_1_0.xsd
index 0846d2d..ca4e584 100644
--- a/v3_1_0/CDT-activeCmdhPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-activeCmdhPolicy-v3_1_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_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_1_0/CDT-allJoynApp-v3_1_0.xsd b/v3_1_0/CDT-allJoynApp-v3_1_0.xsd
index b92b177..cfb6286 100644
--- a/v3_1_0/CDT-allJoynApp-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynApp-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_1_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-allJoynInterface-v3_1_0.xsd b/v3_1_0/CDT-allJoynInterface-v3_1_0.xsd
index 1b829b6..b577379 100644
--- a/v3_1_0/CDT-allJoynInterface-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynInterface-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_1_0/CDT-allJoynMethod-v3_1_0.xsd b/v3_1_0/CDT-allJoynMethod-v3_1_0.xsd
index 88bfce7..69f859c 100644
--- a/v3_1_0/CDT-allJoynMethod-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynMethod-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_1_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_1_0/CDT-allJoynMethodCall-v3_1_0.xsd b/v3_1_0/CDT-allJoynMethodCall-v3_1_0.xsd
index 2a86735..68765ce 100644
--- a/v3_1_0/CDT-allJoynMethodCall-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynMethodCall-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-allJoynProperty-v3_1_0.xsd b/v3_1_0/CDT-allJoynProperty-v3_1_0.xsd
index 233503f..6a2c84a 100644
--- a/v3_1_0/CDT-allJoynProperty-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynProperty-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-allJoynSvcObject-v3_1_0.xsd b/v3_1_0/CDT-allJoynSvcObject-v3_1_0.xsd
index c7a93a7..c84b2ae 100644
--- a/v3_1_0/CDT-allJoynSvcObject-v3_1_0.xsd
+++ b/v3_1_0/CDT-allJoynSvcObject-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_1_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-areaNwkDeviceInfo-v3_1_0.xsd b/v3_1_0/CDT-areaNwkDeviceInfo-v3_1_0.xsd
index 9eba7bc..b9e14b1 100644
--- a/v3_1_0/CDT-areaNwkDeviceInfo-v3_1_0.xsd
+++ b/v3_1_0/CDT-areaNwkDeviceInfo-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-areaNwkInfo-v3_1_0.xsd b/v3_1_0/CDT-areaNwkInfo-v3_1_0.xsd
index 1252401..b57ee33 100644
--- a/v3_1_0/CDT-areaNwkInfo-v3_1_0.xsd
+++ b/v3_1_0/CDT-areaNwkInfo-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-battery-v3_1_0.xsd b/v3_1_0/CDT-battery-v3_1_0.xsd
index 8d6770d..3b14cff 100644
--- a/v3_1_0/CDT-battery-v3_1_0.xsd
+++ b/v3_1_0/CDT-battery-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-cmdhBuffer-v3_1_0.xsd b/v3_1_0/CDT-cmdhBuffer-v3_1_0.xsd
index 4c4821a..72c3661 100644
--- a/v3_1_0/CDT-cmdhBuffer-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhBuffer-v3_1_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_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhDefEcValue-v3_1_0.xsd b/v3_1_0/CDT-cmdhDefEcValue-v3_1_0.xsd
index b85cc45..1dd6a77 100644
--- a/v3_1_0/CDT-cmdhDefEcValue-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhDefEcValue-v3_1_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_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhDefaults-v3_1_0.xsd b/v3_1_0/CDT-cmdhDefaults-v3_1_0.xsd
index 64a89fb..0279336 100644
--- a/v3_1_0/CDT-cmdhDefaults-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhDefaults-v3_1_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_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhEcDefParamValues-v3_1_0.xsd b/v3_1_0/CDT-cmdhEcDefParamValues-v3_1_0.xsd
index 37a7369..d6ba56e 100644
--- a/v3_1_0/CDT-cmdhEcDefParamValues-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhEcDefParamValues-v3_1_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_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_1_0/CDT-cmdhLimits-v3_1_0.xsd b/v3_1_0/CDT-cmdhLimits-v3_1_0.xsd
index fdb3e86..9e4cef6 100644
--- a/v3_1_0/CDT-cmdhLimits-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhLimits-v3_1_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_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhNetworkAccessRules-v3_1_0.xsd b/v3_1_0/CDT-cmdhNetworkAccessRules-v3_1_0.xsd
index d79c6b1..dcd9572 100644
--- a/v3_1_0/CDT-cmdhNetworkAccessRules-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhNetworkAccessRules-v3_1_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_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhNwAccessRule-v3_1_0.xsd b/v3_1_0/CDT-cmdhNwAccessRule-v3_1_0.xsd
index 5d43bf1..7c50fb1 100644
--- a/v3_1_0/CDT-cmdhNwAccessRule-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhNwAccessRule-v3_1_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_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_1_0/CDT-cmdhPolicy-v3_1_0.xsd b/v3_1_0/CDT-cmdhPolicy-v3_1_0.xsd
index f3a91b5..c4d0482 100644
--- a/v3_1_0/CDT-cmdhPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-cmdhPolicy-v3_1_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_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_1_0/CDT-commonTypes-v3_1_0.xsd b/v3_1_0/CDT-commonTypes-v3_1_0.xsd
index 9050a1d..4295a02 100644
--- a/v3_1_0/CDT-commonTypes-v3_1_0.xsd
+++ b/v3_1_0/CDT-commonTypes-v3_1_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_0_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_1_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_1_0/CDT-container-v3_1_0.xsd b/v3_1_0/CDT-container-v3_1_0.xsd
index 1758331..32c0525 100644
--- a/v3_1_0/CDT-container-v3_1_0.xsd
+++ b/v3_1_0/CDT-container-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_1_0/CDT-contentInstance-v3_1_0.xsd b/v3_1_0/CDT-contentInstance-v3_1_0.xsd
index b04a3f0..d876dae 100644
--- a/v3_1_0/CDT-contentInstance-v3_1_0.xsd
+++ b/v3_1_0/CDT-contentInstance-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-delivery-v3_1_0.xsd b/v3_1_0/CDT-delivery-v3_1_0.xsd
index 9a55e5c..57382b4 100644
--- a/v3_1_0/CDT-delivery-v3_1_0.xsd
+++ b/v3_1_0/CDT-delivery-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_1_0/CDT-deviceCapability-v3_1_0.xsd b/v3_1_0/CDT-deviceCapability-v3_1_0.xsd
index 91e862a..9f3364f 100644
--- a/v3_1_0/CDT-deviceCapability-v3_1_0.xsd
+++ b/v3_1_0/CDT-deviceCapability-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-deviceInfo-v3_1_0.xsd b/v3_1_0/CDT-deviceInfo-v3_1_0.xsd
index 943210f..46afdd8 100644
--- a/v3_1_0/CDT-deviceInfo-v3_1_0.xsd
+++ b/v3_1_0/CDT-deviceInfo-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-dynamicAuthorizationConsultation-v3_1_0.xsd b/v3_1_0/CDT-dynamicAuthorizationConsultation-v3_1_0.xsd
index b32c144..f41809a 100644
--- a/v3_1_0/CDT-dynamicAuthorizationConsultation-v3_1_0.xsd
+++ b/v3_1_0/CDT-dynamicAuthorizationConsultation-v3_1_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-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-eventConfig-v3_1_0.xsd b/v3_1_0/CDT-eventConfig-v3_1_0.xsd
index 4c911ce..273f46b 100644
--- a/v3_1_0/CDT-eventConfig-v3_1_0.xsd
+++ b/v3_1_0/CDT-eventConfig-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-eventLog-v3_1_0.xsd b/v3_1_0/CDT-eventLog-v3_1_0.xsd
index 3574d57..b8c9883 100644
--- a/v3_1_0/CDT-eventLog-v3_1_0.xsd
+++ b/v3_1_0/CDT-eventLog-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-execInstance-v3_1_0.xsd b/v3_1_0/CDT-execInstance-v3_1_0.xsd
index 02f51a9..ec4ee31 100644
--- a/v3_1_0/CDT-execInstance-v3_1_0.xsd
+++ b/v3_1_0/CDT-execInstance-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-firmware-v3_1_0.xsd b/v3_1_0/CDT-firmware-v3_1_0.xsd
index c3525e6..10a3c06 100644
--- a/v3_1_0/CDT-firmware-v3_1_0.xsd
+++ b/v3_1_0/CDT-firmware-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-genericInterworkingOperationInstance-v3_1_0.xsd b/v3_1_0/CDT-genericInterworkingOperationInstance-v3_1_0.xsd
index 506d019..d6864d9 100644
--- a/v3_1_0/CDT-genericInterworkingOperationInstance-v3_1_0.xsd
+++ b/v3_1_0/CDT-genericInterworkingOperationInstance-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-genericInterworkingService-v3_1_0.xsd b/v3_1_0/CDT-genericInterworkingService-v3_1_0.xsd
index 2601eeb..589530c 100644
--- a/v3_1_0/CDT-genericInterworkingService-v3_1_0.xsd
+++ b/v3_1_0/CDT-genericInterworkingService-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_1_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-group-v3_1_0.xsd b/v3_1_0/CDT-group-v3_1_0.xsd
index 4c85f80..f4a4a0c 100644
--- a/v3_1_0/CDT-group-v3_1_0.xsd
+++ b/v3_1_0/CDT-group-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-locationPolicy-v3_1_0.xsd b/v3_1_0/CDT-locationPolicy-v3_1_0.xsd
index 23797db..098530a 100644
--- a/v3_1_0/CDT-locationPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-locationPolicy-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd b/v3_1_0/CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd
index 72a0009..c9ce59c 100644
--- a/v3_1_0/CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd
+++ b/v3_1_0/CDT-m2mServiceSubscriptionProfile-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_1_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-memory-v3_1_0.xsd b/v3_1_0/CDT-memory-v3_1_0.xsd
index 15376be..43ef25b 100644
--- a/v3_1_0/CDT-memory-v3_1_0.xsd
+++ b/v3_1_0/CDT-memory-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-mgmtCmd-v3_1_0.xsd b/v3_1_0/CDT-mgmtCmd-v3_1_0.xsd
index e4f687f..67c3c7a 100644
--- a/v3_1_0/CDT-mgmtCmd-v3_1_0.xsd
+++ b/v3_1_0/CDT-mgmtCmd-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_1_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-node-v3_1_0.xsd b/v3_1_0/CDT-node-v3_1_0.xsd
index 85cb504..85d04a2 100644
--- a/v3_1_0/CDT-node-v3_1_0.xsd
+++ b/v3_1_0/CDT-node-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_1_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-notification-v3_1_0.xsd b/v3_1_0/CDT-notification-v3_1_0.xsd
index f4f2a84..7708d01 100644
--- a/v3_1_0/CDT-notification-v3_1_0.xsd
+++ b/v3_1_0/CDT-notification-v3_1_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_0_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_0_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_1_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_1_0/CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd b/v3_1_0/CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd
index ff8c5f5..ef96023 100644
--- a/v3_1_0/CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd
+++ b/v3_1_0/CDT-notificationTargetMgmtPolicyRef-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-notificationTargetPolicy-v3_1_0.xsd b/v3_1_0/CDT-notificationTargetPolicy-v3_1_0.xsd
index e5fc851..9d5b497 100644
--- a/v3_1_0/CDT-notificationTargetPolicy-v3_1_0.xsd
+++ b/v3_1_0/CDT-notificationTargetPolicy-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-policyDeletionRules-v3_1_0.xsd b/v3_1_0/CDT-policyDeletionRules-v3_1_0.xsd
index 25c55b8..99f65f0 100644
--- a/v3_1_0/CDT-policyDeletionRules-v3_1_0.xsd
+++ b/v3_1_0/CDT-policyDeletionRules-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-pollingChannel-v3_1_0.xsd b/v3_1_0/CDT-pollingChannel-v3_1_0.xsd
index 43f73f9..c22bc4f 100644
--- a/v3_1_0/CDT-pollingChannel-v3_1_0.xsd
+++ b/v3_1_0/CDT-pollingChannel-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-reboot-v3_1_0.xsd b/v3_1_0/CDT-reboot-v3_1_0.xsd
index 382ea95..caa3810 100644
--- a/v3_1_0/CDT-reboot-v3_1_0.xsd
+++ b/v3_1_0/CDT-reboot-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-remoteCSE-v3_1_0.xsd b/v3_1_0/CDT-remoteCSE-v3_1_0.xsd
index 24073b7..d8883e6 100644
--- a/v3_1_0/CDT-remoteCSE-v3_1_0.xsd
+++ b/v3_1_0/CDT-remoteCSE-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-request-v3_1_0.xsd b/v3_1_0/CDT-request-v3_1_0.xsd
index 99c2700..c637e4b 100644
--- a/v3_1_0/CDT-request-v3_1_0.xsd
+++ b/v3_1_0/CDT-request-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-requestPrimitive-v3_1_0.xsd b/v3_1_0/CDT-requestPrimitive-v3_1_0.xsd
index fcdb8f0..c907f3b 100644
--- a/v3_1_0/CDT-requestPrimitive-v3_1_0.xsd
+++ b/v3_1_0/CDT-requestPrimitive-v3_1_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_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_1_0/CDT-responsePrimitive-v3_1_0.xsd b/v3_1_0/CDT-responsePrimitive-v3_1_0.xsd
index 470d408..1e6913c 100644
--- a/v3_1_0/CDT-responsePrimitive-v3_1_0.xsd
+++ b/v3_1_0/CDT-responsePrimitive-v3_1_0.xsd
@@ -28,55 +28,55 @@ 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_0_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_0_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_0_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_1_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_1_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_1_0/CDT-role-v3_1_0.xsd b/v3_1_0/CDT-role-v3_1_0.xsd
index 0b65e0d..7232079 100644
--- a/v3_1_0/CDT-role-v3_1_0.xsd
+++ b/v3_1_0/CDT-role-v3_1_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-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-schedule-v3_1_0.xsd b/v3_1_0/CDT-schedule-v3_1_0.xsd
index 95e3f9c..17bb691 100644
--- a/v3_1_0/CDT-schedule-v3_1_0.xsd
+++ b/v3_1_0/CDT-schedule-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-semanticDescriptor-v3_1_0.xsd b/v3_1_0/CDT-semanticDescriptor-v3_1_0.xsd
index a1bac6d..3973249 100644
--- a/v3_1_0/CDT-semanticDescriptor-v3_1_0.xsd
+++ b/v3_1_0/CDT-semanticDescriptor-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-serviceSubscribedAppRule-v3_1_0.xsd b/v3_1_0/CDT-serviceSubscribedAppRule-v3_1_0.xsd
index dac20e5..ddea8d1 100644
--- a/v3_1_0/CDT-serviceSubscribedAppRule-v3_1_0.xsd
+++ b/v3_1_0/CDT-serviceSubscribedAppRule-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-serviceSubscribedNode-v3_1_0.xsd b/v3_1_0/CDT-serviceSubscribedNode-v3_1_0.xsd
index b2d8786..a4c5ef3 100644
--- a/v3_1_0/CDT-serviceSubscribedNode-v3_1_0.xsd
+++ b/v3_1_0/CDT-serviceSubscribedNode-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-software-v3_1_0.xsd b/v3_1_0/CDT-software-v3_1_0.xsd
index 0e01a29..24eec1c 100644
--- a/v3_1_0/CDT-software-v3_1_0.xsd
+++ b/v3_1_0/CDT-software-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-statsCollect-v3_1_0.xsd b/v3_1_0/CDT-statsCollect-v3_1_0.xsd
index 5101e4f..fe51452 100644
--- a/v3_1_0/CDT-statsCollect-v3_1_0.xsd
+++ b/v3_1_0/CDT-statsCollect-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-statsConfig-v3_1_0.xsd b/v3_1_0/CDT-statsConfig-v3_1_0.xsd
index 84805cc..dec5df5 100644
--- a/v3_1_0/CDT-statsConfig-v3_1_0.xsd
+++ b/v3_1_0/CDT-statsConfig-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-subscription-v3_1_0.xsd b/v3_1_0/CDT-subscription-v3_1_0.xsd
index 063d3cd..9b6f38c 100644
--- a/v3_1_0/CDT-subscription-v3_1_0.xsd
+++ b/v3_1_0/CDT-subscription-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_1_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-svcFwWrapper-v3_1_0.xsd b/v3_1_0/CDT-svcFwWrapper-v3_1_0.xsd
index 084e18e..dd2acf6 100644
--- a/v3_1_0/CDT-svcFwWrapper-v3_1_0.xsd
+++ b/v3_1_0/CDT-svcFwWrapper-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-svcObjWrapper-v3_1_0.xsd b/v3_1_0/CDT-svcObjWrapper-v3_1_0.xsd
index ee61b78..562223d 100644
--- a/v3_1_0/CDT-svcObjWrapper-v3_1_0.xsd
+++ b/v3_1_0/CDT-svcObjWrapper-v3_1_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_0_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_1_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-timeSeries-v3_1_0.xsd b/v3_1_0/CDT-timeSeries-v3_1_0.xsd
index b1949cb..23c5dba 100644
--- a/v3_1_0/CDT-timeSeries-v3_1_0.xsd
+++ b/v3_1_0/CDT-timeSeries-v3_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_1_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_1_0/CDT-timeSeriesInstance-v3_1_0.xsd b/v3_1_0/CDT-timeSeriesInstance-v3_1_0.xsd
index 4faa91b..7919310 100644
--- a/v3_1_0/CDT-timeSeriesInstance-v3_1_0.xsd
+++ b/v3_1_0/CDT-timeSeriesInstance-v3_1_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-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-token-v3_1_0.xsd b/v3_1_0/CDT-token-v3_1_0.xsd
index 4300b9c..0a2f6bd 100644
--- a/v3_1_0/CDT-token-v3_1_0.xsd
+++ b/v3_1_0/CDT-token-v3_1_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-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_1_0/CDT-trafficPattern-v3_1_0.xsd b/v3_1_0/CDT-trafficPattern-v3_1_0.xsd
index d463acb..05fda4a 100644
--- a/v3_1_0/CDT-trafficPattern-v3_1_0.xsd
+++ b/v3_1_0/CDT-trafficPattern-v3_1_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-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_1_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_1_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab