From 9a2368cc21725c4ce52a6034c4a61673af893de9 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Tue, 3 Apr 2018 19:48:41 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v3_7_0/CDT-AE-v3_7_0.xsd b/v3_7_0/CDT-AE-v3_7_0.xsd
index 0c27fc3..505f784 100644
--- a/v3_7_0/CDT-AE-v3_7_0.xsd
+++ b/v3_7_0/CDT-AE-v3_7_0.xsd
@@ -26,18 +26,18 @@ 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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_7_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-AEContactList-v3_7_0.xsd b/v3_7_0/CDT-AEContactList-v3_7_0.xsd
index 7d270de..8f1e9f6 100644
--- a/v3_7_0/CDT-AEContactList-v3_7_0.xsd
+++ b/v3_7_0/CDT-AEContactList-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_7_0.xsd" />
 
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_7_0/CDT-AEContactListPerCSE-v3_7_0.xsd b/v3_7_0/CDT-AEContactListPerCSE-v3_7_0.xsd
index 0f7d030..625e7ec 100644
--- a/v3_7_0/CDT-AEContactListPerCSE-v3_7_0.xsd
+++ b/v3_7_0/CDT-AEContactListPerCSE-v3_7_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-CSEBase-v3_7_0.xsd b/v3_7_0/CDT-CSEBase-v3_7_0.xsd
index 2ff3372..56a1575 100644
--- a/v3_7_0/CDT-CSEBase-v3_7_0.xsd
+++ b/v3_7_0/CDT-CSEBase-v3_7_0.xsd
@@ -26,34 +26,34 @@ 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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_6_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_6_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_7_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_7_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_7_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-accessControlPolicy-v3_7_0.xsd b/v3_7_0/CDT-accessControlPolicy-v3_7_0.xsd
index eebbae9..978b425 100644
--- a/v3_7_0/CDT-accessControlPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-accessControlPolicy-v3_7_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_6_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-activeCmdhPolicy-v3_7_0.xsd b/v3_7_0/CDT-activeCmdhPolicy-v3_7_0.xsd
index db5e856..70288f7 100644
--- a/v3_7_0/CDT-activeCmdhPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-activeCmdhPolicy-v3_7_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_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_7_0/CDT-allJoynApp-v3_7_0.xsd b/v3_7_0/CDT-allJoynApp-v3_7_0.xsd
index d5d9d23..f71a484 100644
--- a/v3_7_0/CDT-allJoynApp-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynApp-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_7_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-allJoynInterface-v3_7_0.xsd b/v3_7_0/CDT-allJoynInterface-v3_7_0.xsd
index 9fa2855..22288e2 100644
--- a/v3_7_0/CDT-allJoynInterface-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynInterface-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_7_0/CDT-allJoynMethod-v3_7_0.xsd b/v3_7_0/CDT-allJoynMethod-v3_7_0.xsd
index 4675091..0053b23 100644
--- a/v3_7_0/CDT-allJoynMethod-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynMethod-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_7_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_7_0/CDT-allJoynMethodCall-v3_7_0.xsd b/v3_7_0/CDT-allJoynMethodCall-v3_7_0.xsd
index cbf3259..ede2486 100644
--- a/v3_7_0/CDT-allJoynMethodCall-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynMethodCall-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-allJoynProperty-v3_7_0.xsd b/v3_7_0/CDT-allJoynProperty-v3_7_0.xsd
index 33e7fb3..8ec653f 100644
--- a/v3_7_0/CDT-allJoynProperty-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynProperty-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-allJoynSvcObject-v3_7_0.xsd b/v3_7_0/CDT-allJoynSvcObject-v3_7_0.xsd
index 6a52618..c2704be 100644
--- a/v3_7_0/CDT-allJoynSvcObject-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynSvcObject-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_7_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-areaNwkDeviceInfo-v3_7_0.xsd b/v3_7_0/CDT-areaNwkDeviceInfo-v3_7_0.xsd
index 643c45b..63d8d4d 100644
--- a/v3_7_0/CDT-areaNwkDeviceInfo-v3_7_0.xsd
+++ b/v3_7_0/CDT-areaNwkDeviceInfo-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-areaNwkInfo-v3_7_0.xsd b/v3_7_0/CDT-areaNwkInfo-v3_7_0.xsd
index 9450463..55a2f05 100644
--- a/v3_7_0/CDT-areaNwkInfo-v3_7_0.xsd
+++ b/v3_7_0/CDT-areaNwkInfo-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-authorizationDecision-v3_7_0.xsd b/v3_7_0/CDT-authorizationDecision-v3_7_0.xsd
index ee39c79..3da3fd8 100644
--- a/v3_7_0/CDT-authorizationDecision-v3_7_0.xsd
+++ b/v3_7_0/CDT-authorizationDecision-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-authorizationInformation-v3_7_0.xsd b/v3_7_0/CDT-authorizationInformation-v3_7_0.xsd
index ddfd47e..6434f0c 100644
--- a/v3_7_0/CDT-authorizationInformation-v3_7_0.xsd
+++ b/v3_7_0/CDT-authorizationInformation-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-authorizationPolicy-v3_7_0.xsd b/v3_7_0/CDT-authorizationPolicy-v3_7_0.xsd
index 7d42614..65ab5dc 100644
--- a/v3_7_0/CDT-authorizationPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-authorizationPolicy-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-battery-v3_7_0.xsd b/v3_7_0/CDT-battery-v3_7_0.xsd
index 588e928..372cdec 100644
--- a/v3_7_0/CDT-battery-v3_7_0.xsd
+++ b/v3_7_0/CDT-battery-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-cmdhBuffer-v3_7_0.xsd b/v3_7_0/CDT-cmdhBuffer-v3_7_0.xsd
index efeb8ac..c8956aa 100644
--- a/v3_7_0/CDT-cmdhBuffer-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhBuffer-v3_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhDefEcValue-v3_7_0.xsd b/v3_7_0/CDT-cmdhDefEcValue-v3_7_0.xsd
index e7a7f2b..9b84a52 100644
--- a/v3_7_0/CDT-cmdhDefEcValue-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhDefEcValue-v3_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhDefaults-v3_7_0.xsd b/v3_7_0/CDT-cmdhDefaults-v3_7_0.xsd
index edc3f6b..ff13c0d 100644
--- a/v3_7_0/CDT-cmdhDefaults-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhDefaults-v3_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhEcDefParamValues-v3_7_0.xsd b/v3_7_0/CDT-cmdhEcDefParamValues-v3_7_0.xsd
index 1c70598..7109897 100644
--- a/v3_7_0/CDT-cmdhEcDefParamValues-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhEcDefParamValues-v3_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_7_0/CDT-cmdhLimits-v3_7_0.xsd b/v3_7_0/CDT-cmdhLimits-v3_7_0.xsd
index 3526d72..a78a242 100644
--- a/v3_7_0/CDT-cmdhLimits-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhLimits-v3_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhNetworkAccessRules-v3_7_0.xsd b/v3_7_0/CDT-cmdhNetworkAccessRules-v3_7_0.xsd
index e2adc6b..1588719 100644
--- a/v3_7_0/CDT-cmdhNetworkAccessRules-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhNetworkAccessRules-v3_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhNwAccessRule-v3_7_0.xsd b/v3_7_0/CDT-cmdhNwAccessRule-v3_7_0.xsd
index 92fbe7f..8d357f0 100644
--- a/v3_7_0/CDT-cmdhNwAccessRule-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhNwAccessRule-v3_7_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_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhPolicy-v3_7_0.xsd b/v3_7_0/CDT-cmdhPolicy-v3_7_0.xsd
index d750a42..1bb8700 100644
--- a/v3_7_0/CDT-cmdhPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhPolicy-v3_7_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_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_7_0/CDT-commonTypes-v3_7_0.xsd b/v3_7_0/CDT-commonTypes-v3_7_0.xsd
index 449162e..0e93ced 100644
--- a/v3_7_0/CDT-commonTypes-v3_7_0.xsd
+++ b/v3_7_0/CDT-commonTypes-v3_7_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_6_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_7_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_7_0/CDT-container-v3_7_0.xsd b/v3_7_0/CDT-container-v3_7_0.xsd
index cd83366..e1fac04 100644
--- a/v3_7_0/CDT-container-v3_7_0.xsd
+++ b/v3_7_0/CDT-container-v3_7_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_7_0/CDT-contentInstance-v3_7_0.xsd b/v3_7_0/CDT-contentInstance-v3_7_0.xsd
index b3bfcc9..171e6df 100644
--- a/v3_7_0/CDT-contentInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-contentInstance-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-delivery-v3_7_0.xsd b/v3_7_0/CDT-delivery-v3_7_0.xsd
index 12b8379..f5e24ab 100644
--- a/v3_7_0/CDT-delivery-v3_7_0.xsd
+++ b/v3_7_0/CDT-delivery-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_7_0/CDT-deviceCapability-v3_7_0.xsd b/v3_7_0/CDT-deviceCapability-v3_7_0.xsd
index 12eb026..3a8086f 100644
--- a/v3_7_0/CDT-deviceCapability-v3_7_0.xsd
+++ b/v3_7_0/CDT-deviceCapability-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-deviceInfo-v3_7_0.xsd b/v3_7_0/CDT-deviceInfo-v3_7_0.xsd
index fa66e73..36b7622 100644
--- a/v3_7_0/CDT-deviceInfo-v3_7_0.xsd
+++ b/v3_7_0/CDT-deviceInfo-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-dynamicAuthorizationConsultation-v3_7_0.xsd b/v3_7_0/CDT-dynamicAuthorizationConsultation-v3_7_0.xsd
index 5bc511b..f338c0e 100644
--- a/v3_7_0/CDT-dynamicAuthorizationConsultation-v3_7_0.xsd
+++ b/v3_7_0/CDT-dynamicAuthorizationConsultation-v3_7_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_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-eventConfig-v3_7_0.xsd b/v3_7_0/CDT-eventConfig-v3_7_0.xsd
index 6a1c08e..8fedac6 100644
--- a/v3_7_0/CDT-eventConfig-v3_7_0.xsd
+++ b/v3_7_0/CDT-eventConfig-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-eventLog-v3_7_0.xsd b/v3_7_0/CDT-eventLog-v3_7_0.xsd
index 52c177a..768c392 100644
--- a/v3_7_0/CDT-eventLog-v3_7_0.xsd
+++ b/v3_7_0/CDT-eventLog-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-execInstance-v3_7_0.xsd b/v3_7_0/CDT-execInstance-v3_7_0.xsd
index 2e03089..7cfdc34 100644
--- a/v3_7_0/CDT-execInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-execInstance-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-firmware-v3_7_0.xsd b/v3_7_0/CDT-firmware-v3_7_0.xsd
index 0d71c47..e80fea0 100644
--- a/v3_7_0/CDT-firmware-v3_7_0.xsd
+++ b/v3_7_0/CDT-firmware-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-genericInterworkingOperationInstance-v3_7_0.xsd b/v3_7_0/CDT-genericInterworkingOperationInstance-v3_7_0.xsd
index b571d03..83441be 100644
--- a/v3_7_0/CDT-genericInterworkingOperationInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-genericInterworkingOperationInstance-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-genericInterworkingService-v3_7_0.xsd b/v3_7_0/CDT-genericInterworkingService-v3_7_0.xsd
index 180f776..8262c8d 100644
--- a/v3_7_0/CDT-genericInterworkingService-v3_7_0.xsd
+++ b/v3_7_0/CDT-genericInterworkingService-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_7_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-group-v3_7_0.xsd b/v3_7_0/CDT-group-v3_7_0.xsd
index ccf4114..2f198e7 100644
--- a/v3_7_0/CDT-group-v3_7_0.xsd
+++ b/v3_7_0/CDT-group-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-localMulticastGroup-v3_7_0.xsd b/v3_7_0/CDT-localMulticastGroup-v3_7_0.xsd
index b9cf39e..9bea85d 100644
--- a/v3_7_0/CDT-localMulticastGroup-v3_7_0.xsd
+++ b/v3_7_0/CDT-localMulticastGroup-v3_7_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_6_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_7_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_7_0/CDT-locationPolicy-v3_7_0.xsd b/v3_7_0/CDT-locationPolicy-v3_7_0.xsd
index 175c325..d201f3e 100644
--- a/v3_7_0/CDT-locationPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-locationPolicy-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd b/v3_7_0/CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd
index 0acf475..7d5c3ab 100644
--- a/v3_7_0/CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd
+++ b/v3_7_0/CDT-m2mServiceSubscriptionProfile-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_7_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-memory-v3_7_0.xsd b/v3_7_0/CDT-memory-v3_7_0.xsd
index 499842d..ed05045 100644
--- a/v3_7_0/CDT-memory-v3_7_0.xsd
+++ b/v3_7_0/CDT-memory-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-mgmtCmd-v3_7_0.xsd b/v3_7_0/CDT-mgmtCmd-v3_7_0.xsd
index 7963216..81593fe 100644
--- a/v3_7_0/CDT-mgmtCmd-v3_7_0.xsd
+++ b/v3_7_0/CDT-mgmtCmd-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_7_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-multimediaSession-v3_7_0.xsd b/v3_7_0/CDT-multimediaSession-v3_7_0.xsd
index 95b5c83..e4efb54 100644
--- a/v3_7_0/CDT-multimediaSession-v3_7_0.xsd
+++ b/v3_7_0/CDT-multimediaSession-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-node-v3_7_0.xsd b/v3_7_0/CDT-node-v3_7_0.xsd
index 2fc9913..995d50d 100644
--- a/v3_7_0/CDT-node-v3_7_0.xsd
+++ b/v3_7_0/CDT-node-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_7_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-notification-v3_7_0.xsd b/v3_7_0/CDT-notification-v3_7_0.xsd
index 0ea36ca..761498f 100644
--- a/v3_7_0/CDT-notification-v3_7_0.xsd
+++ b/v3_7_0/CDT-notification-v3_7_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_6_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_6_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_7_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_7_0/CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd b/v3_7_0/CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd
index bd8b7bb..8a63826 100644
--- a/v3_7_0/CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd
+++ b/v3_7_0/CDT-notificationTargetMgmtPolicyRef-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-notificationTargetPolicy-v3_7_0.xsd b/v3_7_0/CDT-notificationTargetPolicy-v3_7_0.xsd
index ee64718..1a104dc 100644
--- a/v3_7_0/CDT-notificationTargetPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-notificationTargetPolicy-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-ontology-v3_7_0.xsd b/v3_7_0/CDT-ontology-v3_7_0.xsd
index cd7c57c..74dbf61 100644
--- a/v3_7_0/CDT-ontology-v3_7_0.xsd
+++ b/v3_7_0/CDT-ontology-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_7_0/CDT-ontologyRepository-v3_7_0.xsd b/v3_7_0/CDT-ontologyRepository-v3_7_0.xsd
index 885448a..dac8542 100644
--- a/v3_7_0/CDT-ontologyRepository-v3_7_0.xsd
+++ b/v3_7_0/CDT-ontologyRepository-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_7_0.xsd" />
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_7_0/CDT-policyDeletionRules-v3_7_0.xsd b/v3_7_0/CDT-policyDeletionRules-v3_7_0.xsd
index 68949e9..c2e3e74 100644
--- a/v3_7_0/CDT-policyDeletionRules-v3_7_0.xsd
+++ b/v3_7_0/CDT-policyDeletionRules-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-pollingChannel-v3_7_0.xsd b/v3_7_0/CDT-pollingChannel-v3_7_0.xsd
index fbf16fd..89d004c 100644
--- a/v3_7_0/CDT-pollingChannel-v3_7_0.xsd
+++ b/v3_7_0/CDT-pollingChannel-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-reboot-v3_7_0.xsd b/v3_7_0/CDT-reboot-v3_7_0.xsd
index b8b20f3..052f7ce 100644
--- a/v3_7_0/CDT-reboot-v3_7_0.xsd
+++ b/v3_7_0/CDT-reboot-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-remoteCSE-v3_7_0.xsd b/v3_7_0/CDT-remoteCSE-v3_7_0.xsd
index e9a4e21..b489dfd 100644
--- a/v3_7_0/CDT-remoteCSE-v3_7_0.xsd
+++ b/v3_7_0/CDT-remoteCSE-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
 
 
 						
diff --git a/v3_7_0/CDT-request-v3_7_0.xsd b/v3_7_0/CDT-request-v3_7_0.xsd
index ab8794d..79c317e 100644
--- a/v3_7_0/CDT-request-v3_7_0.xsd
+++ b/v3_7_0/CDT-request-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-requestPrimitive-v3_7_0.xsd b/v3_7_0/CDT-requestPrimitive-v3_7_0.xsd
index c12728c..b9172d8 100644
--- a/v3_7_0/CDT-requestPrimitive-v3_7_0.xsd
+++ b/v3_7_0/CDT-requestPrimitive-v3_7_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_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_7_0/CDT-responsePrimitive-v3_7_0.xsd b/v3_7_0/CDT-responsePrimitive-v3_7_0.xsd
index eafc5d2..c1d7277 100644
--- a/v3_7_0/CDT-responsePrimitive-v3_7_0.xsd
+++ b/v3_7_0/CDT-responsePrimitive-v3_7_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_6_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_7_0/CDT-role-v3_7_0.xsd b/v3_7_0/CDT-role-v3_7_0.xsd
index b6ad0c8..25fb1dc 100644
--- a/v3_7_0/CDT-role-v3_7_0.xsd
+++ b/v3_7_0/CDT-role-v3_7_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_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-schedule-v3_7_0.xsd b/v3_7_0/CDT-schedule-v3_7_0.xsd
index 2a5e2bc..985a9de 100644
--- a/v3_7_0/CDT-schedule-v3_7_0.xsd
+++ b/v3_7_0/CDT-schedule-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-semanticDescriptor-v3_7_0.xsd b/v3_7_0/CDT-semanticDescriptor-v3_7_0.xsd
index 7f09add..bce13f4 100644
--- a/v3_7_0/CDT-semanticDescriptor-v3_7_0.xsd
+++ b/v3_7_0/CDT-semanticDescriptor-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-semanticMashupInstance-v3_7_0.xsd b/v3_7_0/CDT-semanticMashupInstance-v3_7_0.xsd
index 9b4a136..a820356 100644
--- a/v3_7_0/CDT-semanticMashupInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-semanticMashupInstance-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-semanticMashupJobProfile-v3_7_0.xsd b/v3_7_0/CDT-semanticMashupJobProfile-v3_7_0.xsd
index ef5ec26..e7b3f2a 100644
--- a/v3_7_0/CDT-semanticMashupJobProfile-v3_7_0.xsd
+++ b/v3_7_0/CDT-semanticMashupJobProfile-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-semanticMashupResult-v3_7_0.xsd b/v3_7_0/CDT-semanticMashupResult-v3_7_0.xsd
index 272411f..96e67d8 100644
--- a/v3_7_0/CDT-semanticMashupResult-v3_7_0.xsd
+++ b/v3_7_0/CDT-semanticMashupResult-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-serviceSubscribedAppRule-v3_7_0.xsd b/v3_7_0/CDT-serviceSubscribedAppRule-v3_7_0.xsd
index 06e357a..97b2fb0 100644
--- a/v3_7_0/CDT-serviceSubscribedAppRule-v3_7_0.xsd
+++ b/v3_7_0/CDT-serviceSubscribedAppRule-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-serviceSubscribedNode-v3_7_0.xsd b/v3_7_0/CDT-serviceSubscribedNode-v3_7_0.xsd
index 81e9da6..c0afeb5 100644
--- a/v3_7_0/CDT-serviceSubscribedNode-v3_7_0.xsd
+++ b/v3_7_0/CDT-serviceSubscribedNode-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-software-v3_7_0.xsd b/v3_7_0/CDT-software-v3_7_0.xsd
index 3d0ceb5..386785e 100644
--- a/v3_7_0/CDT-software-v3_7_0.xsd
+++ b/v3_7_0/CDT-software-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-statsCollect-v3_7_0.xsd b/v3_7_0/CDT-statsCollect-v3_7_0.xsd
index 1a122c0..e0b69b6 100644
--- a/v3_7_0/CDT-statsCollect-v3_7_0.xsd
+++ b/v3_7_0/CDT-statsCollect-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-statsConfig-v3_7_0.xsd b/v3_7_0/CDT-statsConfig-v3_7_0.xsd
index 1eb44a4..fb872b3 100644
--- a/v3_7_0/CDT-statsConfig-v3_7_0.xsd
+++ b/v3_7_0/CDT-statsConfig-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-subscription-v3_7_0.xsd b/v3_7_0/CDT-subscription-v3_7_0.xsd
index 7ab0983..20c5e47 100644
--- a/v3_7_0/CDT-subscription-v3_7_0.xsd
+++ b/v3_7_0/CDT-subscription-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-svcFwWrapper-v3_7_0.xsd b/v3_7_0/CDT-svcFwWrapper-v3_7_0.xsd
index 3f9f8a9..a5f6586 100644
--- a/v3_7_0/CDT-svcFwWrapper-v3_7_0.xsd
+++ b/v3_7_0/CDT-svcFwWrapper-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-svcObjWrapper-v3_7_0.xsd b/v3_7_0/CDT-svcObjWrapper-v3_7_0.xsd
index 422114f..a955aaa 100644
--- a/v3_7_0/CDT-svcObjWrapper-v3_7_0.xsd
+++ b/v3_7_0/CDT-svcObjWrapper-v3_7_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_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_7_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-timeSeries-v3_7_0.xsd b/v3_7_0/CDT-timeSeries-v3_7_0.xsd
index 05d79a3..ba18601 100644
--- a/v3_7_0/CDT-timeSeries-v3_7_0.xsd
+++ b/v3_7_0/CDT-timeSeries-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_7_0/CDT-timeSeriesInstance-v3_7_0.xsd b/v3_7_0/CDT-timeSeriesInstance-v3_7_0.xsd
index c82566f..9b07c56 100644
--- a/v3_7_0/CDT-timeSeriesInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-timeSeriesInstance-v3_7_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_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-token-v3_7_0.xsd b/v3_7_0/CDT-token-v3_7_0.xsd
index c47ad28..1ed3218 100644
--- a/v3_7_0/CDT-token-v3_7_0.xsd
+++ b/v3_7_0/CDT-token-v3_7_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_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-trafficPattern-v3_7_0.xsd b/v3_7_0/CDT-trafficPattern-v3_7_0.xsd
index 79e5f13..ef0961f 100644
--- a/v3_7_0/CDT-trafficPattern-v3_7_0.xsd
+++ b/v3_7_0/CDT-trafficPattern-v3_7_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_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab