From 8629dc08e46eb90a1c16e9ff73230db1d8f4435d Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Tue, 31 Jul 2018 14:27:51 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v3_8_0/CDT-AE-v3_8_0.xsd b/v3_8_0/CDT-AE-v3_8_0.xsd
index 7e01299..4447309 100644
--- a/v3_8_0/CDT-AE-v3_8_0.xsd
+++ b/v3_8_0/CDT-AE-v3_8_0.xsd
@@ -26,19 +26,19 @@ 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_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-semanticMashupInstance-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_8_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-AEContactList-v3_8_0.xsd b/v3_8_0/CDT-AEContactList-v3_8_0.xsd
index 8f1e9f6..da03a23 100644
--- a/v3_8_0/CDT-AEContactList-v3_8_0.xsd
+++ b/v3_8_0/CDT-AEContactList-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_8_0.xsd" />
 
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_8_0/CDT-AEContactListPerCSE-v3_8_0.xsd b/v3_8_0/CDT-AEContactListPerCSE-v3_8_0.xsd
index 625e7ec..026dc1d 100644
--- a/v3_8_0/CDT-AEContactListPerCSE-v3_8_0.xsd
+++ b/v3_8_0/CDT-AEContactListPerCSE-v3_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-CSEBase-v3_8_0.xsd b/v3_8_0/CDT-CSEBase-v3_8_0.xsd
index 492c6de..984c348 100644
--- a/v3_8_0/CDT-CSEBase-v3_8_0.xsd
+++ b/v3_8_0/CDT-CSEBase-v3_8_0.xsd
@@ -26,35 +26,35 @@ 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_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:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_8_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_8_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd b/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd
index 978b425..6d1175a 100644
--- a/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-accessControlPolicy-v3_8_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_7_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-activeCmdhPolicy-v3_8_0.xsd b/v3_8_0/CDT-activeCmdhPolicy-v3_8_0.xsd
index 70288f7..0b53230 100644
--- a/v3_8_0/CDT-activeCmdhPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-activeCmdhPolicy-v3_8_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_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_8_0/CDT-allJoynApp-v3_8_0.xsd b/v3_8_0/CDT-allJoynApp-v3_8_0.xsd
index f71a484..fe21efe 100644
--- a/v3_8_0/CDT-allJoynApp-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynApp-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_8_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-allJoynInterface-v3_8_0.xsd b/v3_8_0/CDT-allJoynInterface-v3_8_0.xsd
index 22288e2..5c1cac4 100644
--- a/v3_8_0/CDT-allJoynInterface-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynInterface-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_8_0/CDT-allJoynMethod-v3_8_0.xsd b/v3_8_0/CDT-allJoynMethod-v3_8_0.xsd
index 0053b23..dde96d7 100644
--- a/v3_8_0/CDT-allJoynMethod-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynMethod-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_8_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_8_0/CDT-allJoynMethodCall-v3_8_0.xsd b/v3_8_0/CDT-allJoynMethodCall-v3_8_0.xsd
index ede2486..0a783ed 100644
--- a/v3_8_0/CDT-allJoynMethodCall-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynMethodCall-v3_8_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_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-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-allJoynProperty-v3_8_0.xsd b/v3_8_0/CDT-allJoynProperty-v3_8_0.xsd
index 8ec653f..f70100b 100644
--- a/v3_8_0/CDT-allJoynProperty-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynProperty-v3_8_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_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-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-allJoynSvcObject-v3_8_0.xsd b/v3_8_0/CDT-allJoynSvcObject-v3_8_0.xsd
index c2704be..49bbdc8 100644
--- a/v3_8_0/CDT-allJoynSvcObject-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynSvcObject-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_8_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-areaNwkDeviceInfo-v3_8_0.xsd b/v3_8_0/CDT-areaNwkDeviceInfo-v3_8_0.xsd
index 63d8d4d..60c8bca 100644
--- a/v3_8_0/CDT-areaNwkDeviceInfo-v3_8_0.xsd
+++ b/v3_8_0/CDT-areaNwkDeviceInfo-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-areaNwkInfo-v3_8_0.xsd b/v3_8_0/CDT-areaNwkInfo-v3_8_0.xsd
index 55a2f05..1475cac 100644
--- a/v3_8_0/CDT-areaNwkInfo-v3_8_0.xsd
+++ b/v3_8_0/CDT-areaNwkInfo-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd b/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd
index 3da3fd8..71bde44 100644
--- a/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd
+++ b/v3_8_0/CDT-authorizationDecision-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd b/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd
index 6434f0c..40acf97 100644
--- a/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd
+++ b/v3_8_0/CDT-authorizationInformation-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd b/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd
index 65ab5dc..9f257f7 100644
--- a/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-authorizationPolicy-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-battery-v3_8_0.xsd b/v3_8_0/CDT-battery-v3_8_0.xsd
index 372cdec..56f5304 100644
--- a/v3_8_0/CDT-battery-v3_8_0.xsd
+++ b/v3_8_0/CDT-battery-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-cmdhBuffer-v3_8_0.xsd b/v3_8_0/CDT-cmdhBuffer-v3_8_0.xsd
index c8956aa..ca3a29c 100644
--- a/v3_8_0/CDT-cmdhBuffer-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhBuffer-v3_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhDefEcValue-v3_8_0.xsd b/v3_8_0/CDT-cmdhDefEcValue-v3_8_0.xsd
index 9b84a52..83d40d4 100644
--- a/v3_8_0/CDT-cmdhDefEcValue-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhDefEcValue-v3_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhDefaults-v3_8_0.xsd b/v3_8_0/CDT-cmdhDefaults-v3_8_0.xsd
index ff13c0d..3e788d2 100644
--- a/v3_8_0/CDT-cmdhDefaults-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhDefaults-v3_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhEcDefParamValues-v3_8_0.xsd b/v3_8_0/CDT-cmdhEcDefParamValues-v3_8_0.xsd
index 7109897..bcdaf2d 100644
--- a/v3_8_0/CDT-cmdhEcDefParamValues-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhEcDefParamValues-v3_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_8_0/CDT-cmdhLimits-v3_8_0.xsd b/v3_8_0/CDT-cmdhLimits-v3_8_0.xsd
index a78a242..f5d72b5 100644
--- a/v3_8_0/CDT-cmdhLimits-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhLimits-v3_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhNetworkAccessRules-v3_8_0.xsd b/v3_8_0/CDT-cmdhNetworkAccessRules-v3_8_0.xsd
index 1588719..9960563 100644
--- a/v3_8_0/CDT-cmdhNetworkAccessRules-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhNetworkAccessRules-v3_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhNwAccessRule-v3_8_0.xsd b/v3_8_0/CDT-cmdhNwAccessRule-v3_8_0.xsd
index 8d357f0..3bcb3c7 100644
--- a/v3_8_0/CDT-cmdhNwAccessRule-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhNwAccessRule-v3_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhPolicy-v3_8_0.xsd b/v3_8_0/CDT-cmdhPolicy-v3_8_0.xsd
index 1bb8700..b4a26ab 100644
--- a/v3_8_0/CDT-cmdhPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhPolicy-v3_8_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_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_8_0/CDT-commonTypes-v3_8_0.xsd b/v3_8_0/CDT-commonTypes-v3_8_0.xsd
index c9a0d3d..77e1379 100644
--- a/v3_8_0/CDT-commonTypes-v3_8_0.xsd
+++ b/v3_8_0/CDT-commonTypes-v3_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_8_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_8_0/CDT-container-v3_8_0.xsd b/v3_8_0/CDT-container-v3_8_0.xsd
index e1fac04..1903315 100644
--- a/v3_8_0/CDT-container-v3_8_0.xsd
+++ b/v3_8_0/CDT-container-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_8_0/CDT-contentInstance-v3_8_0.xsd b/v3_8_0/CDT-contentInstance-v3_8_0.xsd
index 171e6df..f1cca43 100644
--- a/v3_8_0/CDT-contentInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-contentInstance-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd b/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd
index 076838c..652f15d 100644
--- a/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd
+++ b/v3_8_0/CDT-crossResourceSubscription-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-delivery-v3_8_0.xsd b/v3_8_0/CDT-delivery-v3_8_0.xsd
index f5e24ab..588989d 100644
--- a/v3_8_0/CDT-delivery-v3_8_0.xsd
+++ b/v3_8_0/CDT-delivery-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_8_0/CDT-deviceCapability-v3_8_0.xsd b/v3_8_0/CDT-deviceCapability-v3_8_0.xsd
index 3a8086f..9b3b644 100644
--- a/v3_8_0/CDT-deviceCapability-v3_8_0.xsd
+++ b/v3_8_0/CDT-deviceCapability-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-deviceInfo-v3_8_0.xsd b/v3_8_0/CDT-deviceInfo-v3_8_0.xsd
index 36b7622..f8a7e6c 100644
--- a/v3_8_0/CDT-deviceInfo-v3_8_0.xsd
+++ b/v3_8_0/CDT-deviceInfo-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd b/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd
index f338c0e..825021c 100644
--- a/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd
+++ b/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-eventConfig-v3_8_0.xsd b/v3_8_0/CDT-eventConfig-v3_8_0.xsd
index 8fedac6..4a65ba2 100644
--- a/v3_8_0/CDT-eventConfig-v3_8_0.xsd
+++ b/v3_8_0/CDT-eventConfig-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-eventLog-v3_8_0.xsd b/v3_8_0/CDT-eventLog-v3_8_0.xsd
index 768c392..f717659 100644
--- a/v3_8_0/CDT-eventLog-v3_8_0.xsd
+++ b/v3_8_0/CDT-eventLog-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-execInstance-v3_8_0.xsd b/v3_8_0/CDT-execInstance-v3_8_0.xsd
index 7cfdc34..e157a6a 100644
--- a/v3_8_0/CDT-execInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-execInstance-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-firmware-v3_8_0.xsd b/v3_8_0/CDT-firmware-v3_8_0.xsd
index e80fea0..6ea71a6 100644
--- a/v3_8_0/CDT-firmware-v3_8_0.xsd
+++ b/v3_8_0/CDT-firmware-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-genericInterworkingOperationInstance-v3_8_0.xsd b/v3_8_0/CDT-genericInterworkingOperationInstance-v3_8_0.xsd
index 83441be..ac9b231 100644
--- a/v3_8_0/CDT-genericInterworkingOperationInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-genericInterworkingOperationInstance-v3_8_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_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-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-genericInterworkingService-v3_8_0.xsd b/v3_8_0/CDT-genericInterworkingService-v3_8_0.xsd
index 8262c8d..5a12b24 100644
--- a/v3_8_0/CDT-genericInterworkingService-v3_8_0.xsd
+++ b/v3_8_0/CDT-genericInterworkingService-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_8_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-group-v3_8_0.xsd b/v3_8_0/CDT-group-v3_8_0.xsd
index 2f198e7..f9c8458 100644
--- a/v3_8_0/CDT-group-v3_8_0.xsd
+++ b/v3_8_0/CDT-group-v3_8_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_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-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-localMulticastGroup-v3_8_0.xsd b/v3_8_0/CDT-localMulticastGroup-v3_8_0.xsd
index 9bea85d..98dd2b6 100644
--- a/v3_8_0/CDT-localMulticastGroup-v3_8_0.xsd
+++ b/v3_8_0/CDT-localMulticastGroup-v3_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_7_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_8_0/CDT-locationPolicy-v3_8_0.xsd b/v3_8_0/CDT-locationPolicy-v3_8_0.xsd
index d201f3e..1cc0942 100644
--- a/v3_8_0/CDT-locationPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-locationPolicy-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd b/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd
index 7d5c3ab..9333493 100644
--- a/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd
+++ b/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_8_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-memory-v3_8_0.xsd b/v3_8_0/CDT-memory-v3_8_0.xsd
index ed05045..7167f41 100644
--- a/v3_8_0/CDT-memory-v3_8_0.xsd
+++ b/v3_8_0/CDT-memory-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd b/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd
index 81593fe..3e7146c 100644
--- a/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd
+++ b/v3_8_0/CDT-mgmtCmd-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_8_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-multimediaSession-v3_8_0.xsd b/v3_8_0/CDT-multimediaSession-v3_8_0.xsd
index e4efb54..c83eda3 100644
--- a/v3_8_0/CDT-multimediaSession-v3_8_0.xsd
+++ b/v3_8_0/CDT-multimediaSession-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-node-v3_8_0.xsd b/v3_8_0/CDT-node-v3_8_0.xsd
index f671976..3828fc8 100644
--- a/v3_8_0/CDT-node-v3_8_0.xsd
+++ b/v3_8_0/CDT-node-v3_8_0.xsd
@@ -27,21 +27,21 @@ 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_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-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-notification-v3_8_0.xsd b/v3_8_0/CDT-notification-v3_8_0.xsd
index 761498f..85c0799 100644
--- a/v3_8_0/CDT-notification-v3_8_0.xsd
+++ b/v3_8_0/CDT-notification-v3_8_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_7_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_7_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd b/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd
index 8a63826..1f9febd 100644
--- a/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd
+++ b/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd b/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd
index 1a104dc..60d4e61 100644
--- a/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-notificationTargetPolicy-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-ontology-v3_8_0.xsd b/v3_8_0/CDT-ontology-v3_8_0.xsd
index 74dbf61..93edb9a 100644
--- a/v3_8_0/CDT-ontology-v3_8_0.xsd
+++ b/v3_8_0/CDT-ontology-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd b/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd
index dac8542..7919c4b 100644
--- a/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd
+++ b/v3_8_0/CDT-ontologyRepository-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_8_0.xsd" />
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd b/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd
index c2e3e74..0423315 100644
--- a/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd
+++ b/v3_8_0/CDT-policyDeletionRules-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-pollingChannel-v3_8_0.xsd b/v3_8_0/CDT-pollingChannel-v3_8_0.xsd
index 89d004c..5031530 100644
--- a/v3_8_0/CDT-pollingChannel-v3_8_0.xsd
+++ b/v3_8_0/CDT-pollingChannel-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-reboot-v3_8_0.xsd b/v3_8_0/CDT-reboot-v3_8_0.xsd
index 052f7ce..1a78ec7 100644
--- a/v3_8_0/CDT-reboot-v3_8_0.xsd
+++ b/v3_8_0/CDT-reboot-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-remoteCSE-v3_8_0.xsd b/v3_8_0/CDT-remoteCSE-v3_8_0.xsd
index db95ea1..c55fd88 100644
--- a/v3_8_0/CDT-remoteCSE-v3_8_0.xsd
+++ b/v3_8_0/CDT-remoteCSE-v3_8_0.xsd
@@ -26,21 +26,21 @@ 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_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" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-request-v3_8_0.xsd b/v3_8_0/CDT-request-v3_8_0.xsd
index 79c317e..9c0f393 100644
--- a/v3_8_0/CDT-request-v3_8_0.xsd
+++ b/v3_8_0/CDT-request-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-requestPrimitive-v3_8_0.xsd b/v3_8_0/CDT-requestPrimitive-v3_8_0.xsd
index b9172d8..dc60acc 100644
--- a/v3_8_0/CDT-requestPrimitive-v3_8_0.xsd
+++ b/v3_8_0/CDT-requestPrimitive-v3_8_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_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_8_0/CDT-responsePrimitive-v3_8_0.xsd b/v3_8_0/CDT-responsePrimitive-v3_8_0.xsd
index a9a1a5b..4b36072 100644
--- a/v3_8_0/CDT-responsePrimitive-v3_8_0.xsd
+++ b/v3_8_0/CDT-responsePrimitive-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_8_0/CDT-role-v3_8_0.xsd b/v3_8_0/CDT-role-v3_8_0.xsd
index 25fb1dc..1812ba8 100644
--- a/v3_8_0/CDT-role-v3_8_0.xsd
+++ b/v3_8_0/CDT-role-v3_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-schedule-v3_8_0.xsd b/v3_8_0/CDT-schedule-v3_8_0.xsd
index 985a9de..b07fb56 100644
--- a/v3_8_0/CDT-schedule-v3_8_0.xsd
+++ b/v3_8_0/CDT-schedule-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd b/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd
index bce13f4..79df546 100644
--- a/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd
+++ b/v3_8_0/CDT-semanticDescriptor-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd
index a820356..e41d8b2 100644
--- a/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-semanticMashupInstance-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd
index e7b3f2a..d947452 100644
--- a/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd
+++ b/v3_8_0/CDT-semanticMashupJobProfile-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd
index 96e67d8..df9896c 100644
--- a/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd
+++ b/v3_8_0/CDT-semanticMashupResult-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd b/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd
index 97b2fb0..23808a1 100644
--- a/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd
+++ b/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd b/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd
index c0afeb5..0b95b5f 100644
--- a/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd
+++ b/v3_8_0/CDT-serviceSubscribedNode-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-software-v3_8_0.xsd b/v3_8_0/CDT-software-v3_8_0.xsd
index 386785e..2c70561 100644
--- a/v3_8_0/CDT-software-v3_8_0.xsd
+++ b/v3_8_0/CDT-software-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-statsCollect-v3_8_0.xsd b/v3_8_0/CDT-statsCollect-v3_8_0.xsd
index ed28402..fab6a24 100644
--- a/v3_8_0/CDT-statsCollect-v3_8_0.xsd
+++ b/v3_8_0/CDT-statsCollect-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-statsConfig-v3_8_0.xsd b/v3_8_0/CDT-statsConfig-v3_8_0.xsd
index fb872b3..84e9b0f 100644
--- a/v3_8_0/CDT-statsConfig-v3_8_0.xsd
+++ b/v3_8_0/CDT-statsConfig-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-subscription-v3_8_0.xsd b/v3_8_0/CDT-subscription-v3_8_0.xsd
index f9ecbd6..7f2422c 100644
--- a/v3_8_0/CDT-subscription-v3_8_0.xsd
+++ b/v3_8_0/CDT-subscription-v3_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-svcFwWrapper-v3_8_0.xsd b/v3_8_0/CDT-svcFwWrapper-v3_8_0.xsd
index a5f6586..b4f8edb 100644
--- a/v3_8_0/CDT-svcFwWrapper-v3_8_0.xsd
+++ b/v3_8_0/CDT-svcFwWrapper-v3_8_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_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-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-svcObjWrapper-v3_8_0.xsd b/v3_8_0/CDT-svcObjWrapper-v3_8_0.xsd
index a955aaa..0c81db5 100644
--- a/v3_8_0/CDT-svcObjWrapper-v3_8_0.xsd
+++ b/v3_8_0/CDT-svcObjWrapper-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_8_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-timeSeries-v3_8_0.xsd b/v3_8_0/CDT-timeSeries-v3_8_0.xsd
index ba18601..3facab6 100644
--- a/v3_8_0/CDT-timeSeries-v3_8_0.xsd
+++ b/v3_8_0/CDT-timeSeries-v3_8_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_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:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd b/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd
index 9b07c56..8572ecf 100644
--- a/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-timeSeriesInstance-v3_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-token-v3_8_0.xsd b/v3_8_0/CDT-token-v3_8_0.xsd
index 1ed3218..67440f1 100644
--- a/v3_8_0/CDT-token-v3_8_0.xsd
+++ b/v3_8_0/CDT-token-v3_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-triggerRequest-v3_8_0.xsd b/v3_8_0/CDT-triggerRequest-v3_8_0.xsd
index 87b98c8..ba0c0c3 100644
--- a/v3_8_0/CDT-triggerRequest-v3_8_0.xsd
+++ b/v3_8_0/CDT-triggerRequest-v3_8_0.xsd
@@ -27,8 +27,8 @@ 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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
-- 
GitLab