From 2ef64aee6c7c69704ae2443fd9413cefd4fa7d68 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Wed, 6 Dec 2017 11:34:10 +0100
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v3_5_0/CDT-AE-v3_5_0.xsd b/v3_5_0/CDT-AE-v3_5_0.xsd
index d1d969c..756550f 100644
--- a/v3_5_0/CDT-AE-v3_5_0.xsd
+++ b/v3_5_0/CDT-AE-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-CSEBase-v3_5_0.xsd b/v3_5_0/CDT-CSEBase-v3_5_0.xsd
index c277167..c819d12 100644
--- a/v3_5_0/CDT-CSEBase-v3_5_0.xsd
+++ b/v3_5_0/CDT-CSEBase-v3_5_0.xsd
@@ -26,32 +26,32 @@ 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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_4_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_4_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_5_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_5_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_5_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-accessControlPolicy-v3_5_0.xsd b/v3_5_0/CDT-accessControlPolicy-v3_5_0.xsd
index 6f0ad4c..7fd28aa 100644
--- a/v3_5_0/CDT-accessControlPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-accessControlPolicy-v3_5_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_4_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-activeCmdhPolicy-v3_5_0.xsd b/v3_5_0/CDT-activeCmdhPolicy-v3_5_0.xsd
index 2ac3463..b766d2e 100644
--- a/v3_5_0/CDT-activeCmdhPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-activeCmdhPolicy-v3_5_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_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_5_0/CDT-allJoynApp-v3_5_0.xsd b/v3_5_0/CDT-allJoynApp-v3_5_0.xsd
index 476e793..c3517a1 100644
--- a/v3_5_0/CDT-allJoynApp-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynApp-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_5_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-allJoynInterface-v3_5_0.xsd b/v3_5_0/CDT-allJoynInterface-v3_5_0.xsd
index 1b247bd..1c98f96 100644
--- a/v3_5_0/CDT-allJoynInterface-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynInterface-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_5_0/CDT-allJoynMethod-v3_5_0.xsd b/v3_5_0/CDT-allJoynMethod-v3_5_0.xsd
index e58437a..20a22ea 100644
--- a/v3_5_0/CDT-allJoynMethod-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynMethod-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_5_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_5_0/CDT-allJoynMethodCall-v3_5_0.xsd b/v3_5_0/CDT-allJoynMethodCall-v3_5_0.xsd
index 16f8cf7..59c4815 100644
--- a/v3_5_0/CDT-allJoynMethodCall-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynMethodCall-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-allJoynProperty-v3_5_0.xsd b/v3_5_0/CDT-allJoynProperty-v3_5_0.xsd
index 4b184f3..5ee2f8a 100644
--- a/v3_5_0/CDT-allJoynProperty-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynProperty-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-allJoynSvcObject-v3_5_0.xsd b/v3_5_0/CDT-allJoynSvcObject-v3_5_0.xsd
index 39a4962..0820eb7 100644
--- a/v3_5_0/CDT-allJoynSvcObject-v3_5_0.xsd
+++ b/v3_5_0/CDT-allJoynSvcObject-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_5_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-areaNwkDeviceInfo-v3_5_0.xsd b/v3_5_0/CDT-areaNwkDeviceInfo-v3_5_0.xsd
index af5e063..ddbfd0f 100644
--- a/v3_5_0/CDT-areaNwkDeviceInfo-v3_5_0.xsd
+++ b/v3_5_0/CDT-areaNwkDeviceInfo-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-areaNwkInfo-v3_5_0.xsd b/v3_5_0/CDT-areaNwkInfo-v3_5_0.xsd
index 94d60e8..b7d5beb 100644
--- a/v3_5_0/CDT-areaNwkInfo-v3_5_0.xsd
+++ b/v3_5_0/CDT-areaNwkInfo-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-authorizationDecision-v3_5_0.xsd b/v3_5_0/CDT-authorizationDecision-v3_5_0.xsd
index 7706d50..31d3eb3 100644
--- a/v3_5_0/CDT-authorizationDecision-v3_5_0.xsd
+++ b/v3_5_0/CDT-authorizationDecision-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-authorizationInformation-v3_5_0.xsd b/v3_5_0/CDT-authorizationInformation-v3_5_0.xsd
index 66eada9..e374faa 100644
--- a/v3_5_0/CDT-authorizationInformation-v3_5_0.xsd
+++ b/v3_5_0/CDT-authorizationInformation-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_5_0.xsd" />
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-authorizationPolicy-v3_5_0.xsd b/v3_5_0/CDT-authorizationPolicy-v3_5_0.xsd
index 5697e78..9e46e60 100644
--- a/v3_5_0/CDT-authorizationPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-authorizationPolicy-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-battery-v3_5_0.xsd b/v3_5_0/CDT-battery-v3_5_0.xsd
index 0c4e423..e6fe93a 100644
--- a/v3_5_0/CDT-battery-v3_5_0.xsd
+++ b/v3_5_0/CDT-battery-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-cmdhBuffer-v3_5_0.xsd b/v3_5_0/CDT-cmdhBuffer-v3_5_0.xsd
index 48e1c16..534a36f 100644
--- a/v3_5_0/CDT-cmdhBuffer-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhBuffer-v3_5_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_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhDefEcValue-v3_5_0.xsd b/v3_5_0/CDT-cmdhDefEcValue-v3_5_0.xsd
index d96cdc9..3c2dc5f 100644
--- a/v3_5_0/CDT-cmdhDefEcValue-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhDefEcValue-v3_5_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_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhDefaults-v3_5_0.xsd b/v3_5_0/CDT-cmdhDefaults-v3_5_0.xsd
index 9bb78de..04d628d 100644
--- a/v3_5_0/CDT-cmdhDefaults-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhDefaults-v3_5_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_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhEcDefParamValues-v3_5_0.xsd b/v3_5_0/CDT-cmdhEcDefParamValues-v3_5_0.xsd
index 363aef1..8381ccf 100644
--- a/v3_5_0/CDT-cmdhEcDefParamValues-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhEcDefParamValues-v3_5_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_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_5_0/CDT-cmdhLimits-v3_5_0.xsd b/v3_5_0/CDT-cmdhLimits-v3_5_0.xsd
index 2da5676..e0c742f 100644
--- a/v3_5_0/CDT-cmdhLimits-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhLimits-v3_5_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_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhNetworkAccessRules-v3_5_0.xsd b/v3_5_0/CDT-cmdhNetworkAccessRules-v3_5_0.xsd
index ac38410..856d36b 100644
--- a/v3_5_0/CDT-cmdhNetworkAccessRules-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhNetworkAccessRules-v3_5_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_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhNwAccessRule-v3_5_0.xsd b/v3_5_0/CDT-cmdhNwAccessRule-v3_5_0.xsd
index 718c1e1..5b43e87 100644
--- a/v3_5_0/CDT-cmdhNwAccessRule-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhNwAccessRule-v3_5_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_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_5_0/CDT-cmdhPolicy-v3_5_0.xsd b/v3_5_0/CDT-cmdhPolicy-v3_5_0.xsd
index 84ecb93..3ebf05b 100644
--- a/v3_5_0/CDT-cmdhPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-cmdhPolicy-v3_5_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_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_5_0/CDT-commonTypes-v3_5_0.xsd b/v3_5_0/CDT-commonTypes-v3_5_0.xsd
index d7dbee8..37349ea 100644
--- a/v3_5_0/CDT-commonTypes-v3_5_0.xsd
+++ b/v3_5_0/CDT-commonTypes-v3_5_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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_5_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_5_0/CDT-container-v3_5_0.xsd b/v3_5_0/CDT-container-v3_5_0.xsd
index c241f42..3741c02 100644
--- a/v3_5_0/CDT-container-v3_5_0.xsd
+++ b/v3_5_0/CDT-container-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_5_0/CDT-contentInstance-v3_5_0.xsd b/v3_5_0/CDT-contentInstance-v3_5_0.xsd
index 7512f36..7ff1b42 100644
--- a/v3_5_0/CDT-contentInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-contentInstance-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-delivery-v3_5_0.xsd b/v3_5_0/CDT-delivery-v3_5_0.xsd
index d07d57a..cbfe665 100644
--- a/v3_5_0/CDT-delivery-v3_5_0.xsd
+++ b/v3_5_0/CDT-delivery-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_5_0/CDT-deviceCapability-v3_5_0.xsd b/v3_5_0/CDT-deviceCapability-v3_5_0.xsd
index 6f46e34..52ab634 100644
--- a/v3_5_0/CDT-deviceCapability-v3_5_0.xsd
+++ b/v3_5_0/CDT-deviceCapability-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-deviceInfo-v3_5_0.xsd b/v3_5_0/CDT-deviceInfo-v3_5_0.xsd
index c5c2132..2fa555e 100644
--- a/v3_5_0/CDT-deviceInfo-v3_5_0.xsd
+++ b/v3_5_0/CDT-deviceInfo-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-dynamicAuthorizationConsultation-v3_5_0.xsd b/v3_5_0/CDT-dynamicAuthorizationConsultation-v3_5_0.xsd
index bbfe29d..e5d3184 100644
--- a/v3_5_0/CDT-dynamicAuthorizationConsultation-v3_5_0.xsd
+++ b/v3_5_0/CDT-dynamicAuthorizationConsultation-v3_5_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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-eventConfig-v3_5_0.xsd b/v3_5_0/CDT-eventConfig-v3_5_0.xsd
index 04bca03..8836e31 100644
--- a/v3_5_0/CDT-eventConfig-v3_5_0.xsd
+++ b/v3_5_0/CDT-eventConfig-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-eventLog-v3_5_0.xsd b/v3_5_0/CDT-eventLog-v3_5_0.xsd
index 24c94e1..87a6340 100644
--- a/v3_5_0/CDT-eventLog-v3_5_0.xsd
+++ b/v3_5_0/CDT-eventLog-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-execInstance-v3_5_0.xsd b/v3_5_0/CDT-execInstance-v3_5_0.xsd
index 6427b4f..8e72cf9 100644
--- a/v3_5_0/CDT-execInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-execInstance-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-firmware-v3_5_0.xsd b/v3_5_0/CDT-firmware-v3_5_0.xsd
index 4638cb3..cdd303c 100644
--- a/v3_5_0/CDT-firmware-v3_5_0.xsd
+++ b/v3_5_0/CDT-firmware-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-genericInterworkingOperationInstance-v3_5_0.xsd b/v3_5_0/CDT-genericInterworkingOperationInstance-v3_5_0.xsd
index 295812c..c18643b 100644
--- a/v3_5_0/CDT-genericInterworkingOperationInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-genericInterworkingOperationInstance-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-genericInterworkingService-v3_5_0.xsd b/v3_5_0/CDT-genericInterworkingService-v3_5_0.xsd
index bf0b9b4..5201cea 100644
--- a/v3_5_0/CDT-genericInterworkingService-v3_5_0.xsd
+++ b/v3_5_0/CDT-genericInterworkingService-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_5_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-group-v3_5_0.xsd b/v3_5_0/CDT-group-v3_5_0.xsd
index 1975d82..7511d50 100644
--- a/v3_5_0/CDT-group-v3_5_0.xsd
+++ b/v3_5_0/CDT-group-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-locationPolicy-v3_5_0.xsd b/v3_5_0/CDT-locationPolicy-v3_5_0.xsd
index 0741621..3d9ffb7 100644
--- a/v3_5_0/CDT-locationPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-locationPolicy-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd b/v3_5_0/CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd
index c9c72c8..38fe207 100644
--- a/v3_5_0/CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd
+++ b/v3_5_0/CDT-m2mServiceSubscriptionProfile-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_5_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-memory-v3_5_0.xsd b/v3_5_0/CDT-memory-v3_5_0.xsd
index 1abb2d8..cd2a6be 100644
--- a/v3_5_0/CDT-memory-v3_5_0.xsd
+++ b/v3_5_0/CDT-memory-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-mgmtCmd-v3_5_0.xsd b/v3_5_0/CDT-mgmtCmd-v3_5_0.xsd
index 5bf2761..fdf07f5 100644
--- a/v3_5_0/CDT-mgmtCmd-v3_5_0.xsd
+++ b/v3_5_0/CDT-mgmtCmd-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_5_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-node-v3_5_0.xsd b/v3_5_0/CDT-node-v3_5_0.xsd
index 4a5510d..1d56515 100644
--- a/v3_5_0/CDT-node-v3_5_0.xsd
+++ b/v3_5_0/CDT-node-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_5_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-notification-v3_5_0.xsd b/v3_5_0/CDT-notification-v3_5_0.xsd
index 92c5fac..80c362a 100644
--- a/v3_5_0/CDT-notification-v3_5_0.xsd
+++ b/v3_5_0/CDT-notification-v3_5_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_4_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_4_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_5_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_5_0/CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd b/v3_5_0/CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd
index 753567b..a2cec20 100644
--- a/v3_5_0/CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd
+++ b/v3_5_0/CDT-notificationTargetMgmtPolicyRef-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-notificationTargetPolicy-v3_5_0.xsd b/v3_5_0/CDT-notificationTargetPolicy-v3_5_0.xsd
index 1cae66a..c0eaf0d 100644
--- a/v3_5_0/CDT-notificationTargetPolicy-v3_5_0.xsd
+++ b/v3_5_0/CDT-notificationTargetPolicy-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-ontology-v3_5_0.xsd b/v3_5_0/CDT-ontology-v3_5_0.xsd
index 13f5bb0..ba3846d 100644
--- a/v3_5_0/CDT-ontology-v3_5_0.xsd
+++ b/v3_5_0/CDT-ontology-v3_5_0.xsd
@@ -26,8 +26,8 @@ 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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_5_0/CDT-ontologyRepository-v3_5_0.xsd b/v3_5_0/CDT-ontologyRepository-v3_5_0.xsd
index e205237..d520230 100644
--- a/v3_5_0/CDT-ontologyRepository-v3_5_0.xsd
+++ b/v3_5_0/CDT-ontologyRepository-v3_5_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_5_0.xsd" />
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_5_0/CDT-policyDeletionRules-v3_5_0.xsd b/v3_5_0/CDT-policyDeletionRules-v3_5_0.xsd
index c834f99..cebf88e 100644
--- a/v3_5_0/CDT-policyDeletionRules-v3_5_0.xsd
+++ b/v3_5_0/CDT-policyDeletionRules-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-pollingChannel-v3_5_0.xsd b/v3_5_0/CDT-pollingChannel-v3_5_0.xsd
index 55fc006..a6fd5b7 100644
--- a/v3_5_0/CDT-pollingChannel-v3_5_0.xsd
+++ b/v3_5_0/CDT-pollingChannel-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-reboot-v3_5_0.xsd b/v3_5_0/CDT-reboot-v3_5_0.xsd
index 72e0036..6473cf2 100644
--- a/v3_5_0/CDT-reboot-v3_5_0.xsd
+++ b/v3_5_0/CDT-reboot-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-remoteCSE-v3_5_0.xsd b/v3_5_0/CDT-remoteCSE-v3_5_0.xsd
index 498f623..bfdd759 100644
--- a/v3_5_0/CDT-remoteCSE-v3_5_0.xsd
+++ b/v3_5_0/CDT-remoteCSE-v3_5_0.xsd
@@ -26,20 +26,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
 
 
 						
diff --git a/v3_5_0/CDT-request-v3_5_0.xsd b/v3_5_0/CDT-request-v3_5_0.xsd
index 7cf8dd4..b52ab7d 100644
--- a/v3_5_0/CDT-request-v3_5_0.xsd
+++ b/v3_5_0/CDT-request-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-requestPrimitive-v3_5_0.xsd b/v3_5_0/CDT-requestPrimitive-v3_5_0.xsd
index ae5aaa4..2b27e66 100644
--- a/v3_5_0/CDT-requestPrimitive-v3_5_0.xsd
+++ b/v3_5_0/CDT-requestPrimitive-v3_5_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_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_5_0/CDT-responsePrimitive-v3_5_0.xsd b/v3_5_0/CDT-responsePrimitive-v3_5_0.xsd
index 59bd643..d3f6178 100644
--- a/v3_5_0/CDT-responsePrimitive-v3_5_0.xsd
+++ b/v3_5_0/CDT-responsePrimitive-v3_5_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_4_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_4_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_5_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_5_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_5_0/CDT-role-v3_5_0.xsd b/v3_5_0/CDT-role-v3_5_0.xsd
index 1e62533..5bc2f49 100644
--- a/v3_5_0/CDT-role-v3_5_0.xsd
+++ b/v3_5_0/CDT-role-v3_5_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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-schedule-v3_5_0.xsd b/v3_5_0/CDT-schedule-v3_5_0.xsd
index 99fc8b7..39ccf60 100644
--- a/v3_5_0/CDT-schedule-v3_5_0.xsd
+++ b/v3_5_0/CDT-schedule-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-semanticDescriptor-v3_5_0.xsd b/v3_5_0/CDT-semanticDescriptor-v3_5_0.xsd
index 763da76..80ffb8a 100644
--- a/v3_5_0/CDT-semanticDescriptor-v3_5_0.xsd
+++ b/v3_5_0/CDT-semanticDescriptor-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-semanticMashupInstance-v3_5_0.xsd b/v3_5_0/CDT-semanticMashupInstance-v3_5_0.xsd
index 748688b..e498e58 100644
--- a/v3_5_0/CDT-semanticMashupInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-semanticMashupInstance-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd b/v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd
index 7042d40..42790dd 100644
--- a/v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd
+++ b/v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd
@@ -26,8 +26,8 @@ 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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-serviceSubscribedAppRule-v3_5_0.xsd b/v3_5_0/CDT-serviceSubscribedAppRule-v3_5_0.xsd
index 5b9f894..967e9a7 100644
--- a/v3_5_0/CDT-serviceSubscribedAppRule-v3_5_0.xsd
+++ b/v3_5_0/CDT-serviceSubscribedAppRule-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-serviceSubscribedNode-v3_5_0.xsd b/v3_5_0/CDT-serviceSubscribedNode-v3_5_0.xsd
index a8e59d5..9bebed9 100644
--- a/v3_5_0/CDT-serviceSubscribedNode-v3_5_0.xsd
+++ b/v3_5_0/CDT-serviceSubscribedNode-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-software-v3_5_0.xsd b/v3_5_0/CDT-software-v3_5_0.xsd
index 887eaf8..b9c15be 100644
--- a/v3_5_0/CDT-software-v3_5_0.xsd
+++ b/v3_5_0/CDT-software-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-statsCollect-v3_5_0.xsd b/v3_5_0/CDT-statsCollect-v3_5_0.xsd
index e5a2f71..f794406 100644
--- a/v3_5_0/CDT-statsCollect-v3_5_0.xsd
+++ b/v3_5_0/CDT-statsCollect-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-statsConfig-v3_5_0.xsd b/v3_5_0/CDT-statsConfig-v3_5_0.xsd
index 238f7ea..2f2ffdf 100644
--- a/v3_5_0/CDT-statsConfig-v3_5_0.xsd
+++ b/v3_5_0/CDT-statsConfig-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-subscription-v3_5_0.xsd b/v3_5_0/CDT-subscription-v3_5_0.xsd
index 30f5d70..fa97b8b 100644
--- a/v3_5_0/CDT-subscription-v3_5_0.xsd
+++ b/v3_5_0/CDT-subscription-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_5_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-svcFwWrapper-v3_5_0.xsd b/v3_5_0/CDT-svcFwWrapper-v3_5_0.xsd
index 2fd9f2d..8571ea3 100644
--- a/v3_5_0/CDT-svcFwWrapper-v3_5_0.xsd
+++ b/v3_5_0/CDT-svcFwWrapper-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-svcObjWrapper-v3_5_0.xsd b/v3_5_0/CDT-svcObjWrapper-v3_5_0.xsd
index 83f3929..2ddd7d5 100644
--- a/v3_5_0/CDT-svcObjWrapper-v3_5_0.xsd
+++ b/v3_5_0/CDT-svcObjWrapper-v3_5_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_4_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_5_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-timeSeries-v3_5_0.xsd b/v3_5_0/CDT-timeSeries-v3_5_0.xsd
index af6cb7c..a317fbb 100644
--- a/v3_5_0/CDT-timeSeries-v3_5_0.xsd
+++ b/v3_5_0/CDT-timeSeries-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_5_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_5_0/CDT-timeSeriesInstance-v3_5_0.xsd b/v3_5_0/CDT-timeSeriesInstance-v3_5_0.xsd
index a68b61f..02c0580 100644
--- a/v3_5_0/CDT-timeSeriesInstance-v3_5_0.xsd
+++ b/v3_5_0/CDT-timeSeriesInstance-v3_5_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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-token-v3_5_0.xsd b/v3_5_0/CDT-token-v3_5_0.xsd
index ec833bf..f78f6f0 100644
--- a/v3_5_0/CDT-token-v3_5_0.xsd
+++ b/v3_5_0/CDT-token-v3_5_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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_5_0/CDT-trafficPattern-v3_5_0.xsd b/v3_5_0/CDT-trafficPattern-v3_5_0.xsd
index 12af7f7..30b5469 100644
--- a/v3_5_0/CDT-trafficPattern-v3_5_0.xsd
+++ b/v3_5_0/CDT-trafficPattern-v3_5_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_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_5_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab