From d18cfb5f27620ecd19c4d6c77be5bc62feb48db6 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Sat, 7 Oct 2017 17:14:25 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v3_4_0/CDT-AE-v3_4_0.xsd b/v3_4_0/CDT-AE-v3_4_0.xsd
index 902afd1..1fee4e0 100644
--- a/v3_4_0/CDT-AE-v3_4_0.xsd
+++ b/v3_4_0/CDT-AE-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_3_0.xsd" />
+	<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:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-CSEBase-v3_4_0.xsd b/v3_4_0/CDT-CSEBase-v3_4_0.xsd
index 30fe22c..b5f06ae 100644
--- a/v3_4_0/CDT-CSEBase-v3_4_0.xsd
+++ b/v3_4_0/CDT-CSEBase-v3_4_0.xsd
@@ -26,29 +26,29 @@ 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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_3_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_3_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_3_0.xsd" />
+	<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:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-accessControlPolicy-v3_4_0.xsd b/v3_4_0/CDT-accessControlPolicy-v3_4_0.xsd
index da10986..6f0ad4c 100644
--- a/v3_4_0/CDT-accessControlPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-accessControlPolicy-v3_4_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_3_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-activeCmdhPolicy-v3_4_0.xsd b/v3_4_0/CDT-activeCmdhPolicy-v3_4_0.xsd
index 19b1c7b..2ac3463 100644
--- a/v3_4_0/CDT-activeCmdhPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-activeCmdhPolicy-v3_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_4_0/CDT-allJoynApp-v3_4_0.xsd b/v3_4_0/CDT-allJoynApp-v3_4_0.xsd
index 18ceda8..476e793 100644
--- a/v3_4_0/CDT-allJoynApp-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynApp-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_3_0.xsd" />
+	<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:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-allJoynInterface-v3_4_0.xsd b/v3_4_0/CDT-allJoynInterface-v3_4_0.xsd
index 6d890b5..1b247bd 100644
--- a/v3_4_0/CDT-allJoynInterface-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynInterface-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
+	<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:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_4_0/CDT-allJoynMethod-v3_4_0.xsd b/v3_4_0/CDT-allJoynMethod-v3_4_0.xsd
index 3f6caf7..e58437a 100644
--- a/v3_4_0/CDT-allJoynMethod-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynMethod-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_3_0.xsd" />
+	<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:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_4_0/CDT-allJoynMethodCall-v3_4_0.xsd b/v3_4_0/CDT-allJoynMethodCall-v3_4_0.xsd
index eefaa72..16f8cf7 100644
--- a/v3_4_0/CDT-allJoynMethodCall-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynMethodCall-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<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:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-allJoynProperty-v3_4_0.xsd b/v3_4_0/CDT-allJoynProperty-v3_4_0.xsd
index 12eed12..4b184f3 100644
--- a/v3_4_0/CDT-allJoynProperty-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynProperty-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<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:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-allJoynSvcObject-v3_4_0.xsd b/v3_4_0/CDT-allJoynSvcObject-v3_4_0.xsd
index 9778152..39a4962 100644
--- a/v3_4_0/CDT-allJoynSvcObject-v3_4_0.xsd
+++ b/v3_4_0/CDT-allJoynSvcObject-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_3_0.xsd" />
+	<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:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-areaNwkDeviceInfo-v3_4_0.xsd b/v3_4_0/CDT-areaNwkDeviceInfo-v3_4_0.xsd
index 713544a..af5e063 100644
--- a/v3_4_0/CDT-areaNwkDeviceInfo-v3_4_0.xsd
+++ b/v3_4_0/CDT-areaNwkDeviceInfo-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-areaNwkInfo-v3_4_0.xsd b/v3_4_0/CDT-areaNwkInfo-v3_4_0.xsd
index 49cf6c9..94d60e8 100644
--- a/v3_4_0/CDT-areaNwkInfo-v3_4_0.xsd
+++ b/v3_4_0/CDT-areaNwkInfo-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-authorizationDecision-v3_4_0.xsd b/v3_4_0/CDT-authorizationDecision-v3_4_0.xsd
index 1eefb2c..7706d50 100644
--- a/v3_4_0/CDT-authorizationDecision-v3_4_0.xsd
+++ b/v3_4_0/CDT-authorizationDecision-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-authorizationInformation-v3_4_0.xsd b/v3_4_0/CDT-authorizationInformation-v3_4_0.xsd
index 051e131..66eada9 100644
--- a/v3_4_0/CDT-authorizationInformation-v3_4_0.xsd
+++ b/v3_4_0/CDT-authorizationInformation-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_3_0.xsd" />
+	<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:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-authorizationPolicy-v3_4_0.xsd b/v3_4_0/CDT-authorizationPolicy-v3_4_0.xsd
index af4ac9f..5697e78 100644
--- a/v3_4_0/CDT-authorizationPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-authorizationPolicy-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-battery-v3_4_0.xsd b/v3_4_0/CDT-battery-v3_4_0.xsd
index 6d1ee6d..0c4e423 100644
--- a/v3_4_0/CDT-battery-v3_4_0.xsd
+++ b/v3_4_0/CDT-battery-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-cmdhBuffer-v3_4_0.xsd b/v3_4_0/CDT-cmdhBuffer-v3_4_0.xsd
index 5c6b398..48e1c16 100644
--- a/v3_4_0/CDT-cmdhBuffer-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhBuffer-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhDefEcValue-v3_4_0.xsd b/v3_4_0/CDT-cmdhDefEcValue-v3_4_0.xsd
index 1a64717..d96cdc9 100644
--- a/v3_4_0/CDT-cmdhDefEcValue-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhDefEcValue-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhDefaults-v3_4_0.xsd b/v3_4_0/CDT-cmdhDefaults-v3_4_0.xsd
index d4a02e6..9bb78de 100644
--- a/v3_4_0/CDT-cmdhDefaults-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhDefaults-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhEcDefParamValues-v3_4_0.xsd b/v3_4_0/CDT-cmdhEcDefParamValues-v3_4_0.xsd
index 12b27e1..363aef1 100644
--- a/v3_4_0/CDT-cmdhEcDefParamValues-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhEcDefParamValues-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_4_0/CDT-cmdhLimits-v3_4_0.xsd b/v3_4_0/CDT-cmdhLimits-v3_4_0.xsd
index 34f7cdb..2da5676 100644
--- a/v3_4_0/CDT-cmdhLimits-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhLimits-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhNetworkAccessRules-v3_4_0.xsd b/v3_4_0/CDT-cmdhNetworkAccessRules-v3_4_0.xsd
index ea0a73e..ac38410 100644
--- a/v3_4_0/CDT-cmdhNetworkAccessRules-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhNetworkAccessRules-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhNwAccessRule-v3_4_0.xsd b/v3_4_0/CDT-cmdhNwAccessRule-v3_4_0.xsd
index 0506fa5..718c1e1 100644
--- a/v3_4_0/CDT-cmdhNwAccessRule-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhNwAccessRule-v3_4_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_4_0/CDT-cmdhPolicy-v3_4_0.xsd b/v3_4_0/CDT-cmdhPolicy-v3_4_0.xsd
index e1059ac..84ecb93 100644
--- a/v3_4_0/CDT-cmdhPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-cmdhPolicy-v3_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_4_0/CDT-commonTypes-v3_4_0.xsd b/v3_4_0/CDT-commonTypes-v3_4_0.xsd
index d89973d..22ab6f3 100644
--- a/v3_4_0/CDT-commonTypes-v3_4_0.xsd
+++ b/v3_4_0/CDT-commonTypes-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_4_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_4_0/CDT-container-v3_4_0.xsd b/v3_4_0/CDT-container-v3_4_0.xsd
index 04cdbf4..c241f42 100644
--- a/v3_4_0/CDT-container-v3_4_0.xsd
+++ b/v3_4_0/CDT-container-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<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:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_4_0/CDT-contentInstance-v3_4_0.xsd b/v3_4_0/CDT-contentInstance-v3_4_0.xsd
index 4fd66b5..7512f36 100644
--- a/v3_4_0/CDT-contentInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-contentInstance-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-delivery-v3_4_0.xsd b/v3_4_0/CDT-delivery-v3_4_0.xsd
index e37ba09..d07d57a 100644
--- a/v3_4_0/CDT-delivery-v3_4_0.xsd
+++ b/v3_4_0/CDT-delivery-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_4_0/CDT-deviceCapability-v3_4_0.xsd b/v3_4_0/CDT-deviceCapability-v3_4_0.xsd
index c4a1b0b..6f46e34 100644
--- a/v3_4_0/CDT-deviceCapability-v3_4_0.xsd
+++ b/v3_4_0/CDT-deviceCapability-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-deviceInfo-v3_4_0.xsd b/v3_4_0/CDT-deviceInfo-v3_4_0.xsd
index 85597f9..3c4e687 100644
--- a/v3_4_0/CDT-deviceInfo-v3_4_0.xsd
+++ b/v3_4_0/CDT-deviceInfo-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-dynamicAuthorizationConsultation-v3_4_0.xsd b/v3_4_0/CDT-dynamicAuthorizationConsultation-v3_4_0.xsd
index 4945e5e..bbfe29d 100644
--- a/v3_4_0/CDT-dynamicAuthorizationConsultation-v3_4_0.xsd
+++ b/v3_4_0/CDT-dynamicAuthorizationConsultation-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-eventConfig-v3_4_0.xsd b/v3_4_0/CDT-eventConfig-v3_4_0.xsd
index c740383..04bca03 100644
--- a/v3_4_0/CDT-eventConfig-v3_4_0.xsd
+++ b/v3_4_0/CDT-eventConfig-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-eventLog-v3_4_0.xsd b/v3_4_0/CDT-eventLog-v3_4_0.xsd
index 867ba51..24c94e1 100644
--- a/v3_4_0/CDT-eventLog-v3_4_0.xsd
+++ b/v3_4_0/CDT-eventLog-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-execInstance-v3_4_0.xsd b/v3_4_0/CDT-execInstance-v3_4_0.xsd
index 04fad98..6427b4f 100644
--- a/v3_4_0/CDT-execInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-execInstance-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-firmware-v3_4_0.xsd b/v3_4_0/CDT-firmware-v3_4_0.xsd
index 3f1ca74..4638cb3 100644
--- a/v3_4_0/CDT-firmware-v3_4_0.xsd
+++ b/v3_4_0/CDT-firmware-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-genericInterworkingOperationInstance-v3_4_0.xsd b/v3_4_0/CDT-genericInterworkingOperationInstance-v3_4_0.xsd
index 09bbe13..295812c 100644
--- a/v3_4_0/CDT-genericInterworkingOperationInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-genericInterworkingOperationInstance-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<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:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-genericInterworkingService-v3_4_0.xsd b/v3_4_0/CDT-genericInterworkingService-v3_4_0.xsd
index 053a095..bf0b9b4 100644
--- a/v3_4_0/CDT-genericInterworkingService-v3_4_0.xsd
+++ b/v3_4_0/CDT-genericInterworkingService-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_3_0.xsd" />
+	<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:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-group-v3_4_0.xsd b/v3_4_0/CDT-group-v3_4_0.xsd
index 52d62de..1975d82 100644
--- a/v3_4_0/CDT-group-v3_4_0.xsd
+++ b/v3_4_0/CDT-group-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<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:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-locationPolicy-v3_4_0.xsd b/v3_4_0/CDT-locationPolicy-v3_4_0.xsd
index 4c817bb..70b6b8f 100644
--- a/v3_4_0/CDT-locationPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-locationPolicy-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd b/v3_4_0/CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd
index 067966f..c9c72c8 100644
--- a/v3_4_0/CDT-m2mServiceSubscriptionProfile-v3_4_0.xsd
+++ b/v3_4_0/CDT-m2mServiceSubscriptionProfile-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_3_0.xsd" />
+	<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:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-memory-v3_4_0.xsd b/v3_4_0/CDT-memory-v3_4_0.xsd
index 5c47de0..1abb2d8 100644
--- a/v3_4_0/CDT-memory-v3_4_0.xsd
+++ b/v3_4_0/CDT-memory-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-mgmtCmd-v3_4_0.xsd b/v3_4_0/CDT-mgmtCmd-v3_4_0.xsd
index 90fc2cf..5bf2761 100644
--- a/v3_4_0/CDT-mgmtCmd-v3_4_0.xsd
+++ b/v3_4_0/CDT-mgmtCmd-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_3_0.xsd" />
+	<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:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-node-v3_4_0.xsd b/v3_4_0/CDT-node-v3_4_0.xsd
index 4589343..4a5510d 100644
--- a/v3_4_0/CDT-node-v3_4_0.xsd
+++ b/v3_4_0/CDT-node-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_3_0.xsd" />
+	<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:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-notification-v3_4_0.xsd b/v3_4_0/CDT-notification-v3_4_0.xsd
index 0ae6d1c..92c5fac 100644
--- a/v3_4_0/CDT-notification-v3_4_0.xsd
+++ b/v3_4_0/CDT-notification-v3_4_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_3_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_4_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_4_0/CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd b/v3_4_0/CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd
index bbb2b5d..753567b 100644
--- a/v3_4_0/CDT-notificationTargetMgmtPolicyRef-v3_4_0.xsd
+++ b/v3_4_0/CDT-notificationTargetMgmtPolicyRef-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-notificationTargetPolicy-v3_4_0.xsd b/v3_4_0/CDT-notificationTargetPolicy-v3_4_0.xsd
index 5df81c0..1cae66a 100644
--- a/v3_4_0/CDT-notificationTargetPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-notificationTargetPolicy-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<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:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-policyDeletionRules-v3_4_0.xsd b/v3_4_0/CDT-policyDeletionRules-v3_4_0.xsd
index 5714709..c834f99 100644
--- a/v3_4_0/CDT-policyDeletionRules-v3_4_0.xsd
+++ b/v3_4_0/CDT-policyDeletionRules-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-pollingChannel-v3_4_0.xsd b/v3_4_0/CDT-pollingChannel-v3_4_0.xsd
index 5a0463a..55fc006 100644
--- a/v3_4_0/CDT-pollingChannel-v3_4_0.xsd
+++ b/v3_4_0/CDT-pollingChannel-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-reboot-v3_4_0.xsd b/v3_4_0/CDT-reboot-v3_4_0.xsd
index 9e6fe78..72e0036 100644
--- a/v3_4_0/CDT-reboot-v3_4_0.xsd
+++ b/v3_4_0/CDT-reboot-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-remoteCSE-v3_4_0.xsd b/v3_4_0/CDT-remoteCSE-v3_4_0.xsd
index 229f462..c2bab36 100644
--- a/v3_4_0/CDT-remoteCSE-v3_4_0.xsd
+++ b/v3_4_0/CDT-remoteCSE-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
+	<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:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-request-v3_4_0.xsd b/v3_4_0/CDT-request-v3_4_0.xsd
index 6671866..dc61c33 100644
--- a/v3_4_0/CDT-request-v3_4_0.xsd
+++ b/v3_4_0/CDT-request-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd b/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd
index 132aef5..0eee7ca 100644
--- a/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd
+++ b/v3_4_0/CDT-requestPrimitive-v3_4_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd b/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd
index e3d688b..54e6a65 100644
--- a/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd
+++ b/v3_4_0/CDT-responsePrimitive-v3_4_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_3_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_3_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_3_0.xsd" />
+  <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:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_4_0/CDT-role-v3_4_0.xsd b/v3_4_0/CDT-role-v3_4_0.xsd
index d874d1f..1e62533 100644
--- a/v3_4_0/CDT-role-v3_4_0.xsd
+++ b/v3_4_0/CDT-role-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-schedule-v3_4_0.xsd b/v3_4_0/CDT-schedule-v3_4_0.xsd
index d9feab7..99fc8b7 100644
--- a/v3_4_0/CDT-schedule-v3_4_0.xsd
+++ b/v3_4_0/CDT-schedule-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd b/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd
index 0982325..14bd83b 100644
--- a/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd
+++ b/v3_4_0/CDT-semanticDescriptor-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-serviceSubscribedAppRule-v3_4_0.xsd b/v3_4_0/CDT-serviceSubscribedAppRule-v3_4_0.xsd
index d37b64a..5b9f894 100644
--- a/v3_4_0/CDT-serviceSubscribedAppRule-v3_4_0.xsd
+++ b/v3_4_0/CDT-serviceSubscribedAppRule-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-serviceSubscribedNode-v3_4_0.xsd b/v3_4_0/CDT-serviceSubscribedNode-v3_4_0.xsd
index e16598b..a8e59d5 100644
--- a/v3_4_0/CDT-serviceSubscribedNode-v3_4_0.xsd
+++ b/v3_4_0/CDT-serviceSubscribedNode-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-software-v3_4_0.xsd b/v3_4_0/CDT-software-v3_4_0.xsd
index acd62d0..887eaf8 100644
--- a/v3_4_0/CDT-software-v3_4_0.xsd
+++ b/v3_4_0/CDT-software-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-statsCollect-v3_4_0.xsd b/v3_4_0/CDT-statsCollect-v3_4_0.xsd
index 442d51f..e5a2f71 100644
--- a/v3_4_0/CDT-statsCollect-v3_4_0.xsd
+++ b/v3_4_0/CDT-statsCollect-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-statsConfig-v3_4_0.xsd b/v3_4_0/CDT-statsConfig-v3_4_0.xsd
index a24609b..238f7ea 100644
--- a/v3_4_0/CDT-statsConfig-v3_4_0.xsd
+++ b/v3_4_0/CDT-statsConfig-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<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:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-subscription-v3_4_0.xsd b/v3_4_0/CDT-subscription-v3_4_0.xsd
index 40a0519..b7f8208 100644
--- a/v3_4_0/CDT-subscription-v3_4_0.xsd
+++ b/v3_4_0/CDT-subscription-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd" />
+	<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:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-svcFwWrapper-v3_4_0.xsd b/v3_4_0/CDT-svcFwWrapper-v3_4_0.xsd
index 788f54c..2fd9f2d 100644
--- a/v3_4_0/CDT-svcFwWrapper-v3_4_0.xsd
+++ b/v3_4_0/CDT-svcFwWrapper-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<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:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-svcObjWrapper-v3_4_0.xsd b/v3_4_0/CDT-svcObjWrapper-v3_4_0.xsd
index 6b147cc..83f3929 100644
--- a/v3_4_0/CDT-svcObjWrapper-v3_4_0.xsd
+++ b/v3_4_0/CDT-svcObjWrapper-v3_4_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_3_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_3_0.xsd" />
+	<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:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-timeSeries-v3_4_0.xsd b/v3_4_0/CDT-timeSeries-v3_4_0.xsd
index aec8b86..af6cb7c 100644
--- a/v3_4_0/CDT-timeSeries-v3_4_0.xsd
+++ b/v3_4_0/CDT-timeSeries-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<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:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd b/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd
index 2f1982f..1eafb7a 100644
--- a/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-timeSeriesInstance-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_4_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-token-v3_4_0.xsd b/v3_4_0/CDT-token-v3_4_0.xsd
index 1588867..8201a3f 100644
--- a/v3_4_0/CDT-token-v3_4_0.xsd
+++ b/v3_4_0/CDT-token-v3_4_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_4_0/CDT-trafficPattern-v3_4_0.xsd b/v3_4_0/CDT-trafficPattern-v3_4_0.xsd
index 01163eb..12af7f7 100644
--- a/v3_4_0/CDT-trafficPattern-v3_4_0.xsd
+++ b/v3_4_0/CDT-trafficPattern-v3_4_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
+	<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:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab