From b7d377f3d6ae40d3454f330a7279286de1255ca8 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Mon, 7 Nov 2016 14:51:16 +0100
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_8_0/CDT-AE-v2_8_0.xsd b/v2_8_0/CDT-AE-v2_8_0.xsd
index eb5a58f..d36c001 100644
--- a/v2_8_0/CDT-AE-v2_8_0.xsd
+++ b/v2_8_0/CDT-AE-v2_8_0.xsd
@@ -26,16 +26,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_8_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-CSEBase-v2_8_0.xsd b/v2_8_0/CDT-CSEBase-v2_8_0.xsd
index 97da2d4..40c7494 100644
--- a/v2_8_0/CDT-CSEBase-v2_8_0.xsd
+++ b/v2_8_0/CDT-CSEBase-v2_8_0.xsd
@@ -26,26 +26,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_7_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_7_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_8_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_8_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_8_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-accessControlPolicy-v2_8_0.xsd b/v2_8_0/CDT-accessControlPolicy-v2_8_0.xsd
index f14dba4..312549a 100644
--- a/v2_8_0/CDT-accessControlPolicy-v2_8_0.xsd
+++ b/v2_8_0/CDT-accessControlPolicy-v2_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-v2_7_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-activeCmdhPolicy-v2_8_0.xsd b/v2_8_0/CDT-activeCmdhPolicy-v2_8_0.xsd
index c8f0208..d43356c 100644
--- a/v2_8_0/CDT-activeCmdhPolicy-v2_8_0.xsd
+++ b/v2_8_0/CDT-activeCmdhPolicy-v2_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-v2_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_8_0/CDT-allJoynApp-v2_8_0.xsd b/v2_8_0/CDT-allJoynApp-v2_8_0.xsd
index 563b0fc..f173fd6 100644
--- a/v2_8_0/CDT-allJoynApp-v2_8_0.xsd
+++ b/v2_8_0/CDT-allJoynApp-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_8_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-allJoynInterface-v2_8_0.xsd b/v2_8_0/CDT-allJoynInterface-v2_8_0.xsd
index 87fbfb4..c32a457 100644
--- a/v2_8_0/CDT-allJoynInterface-v2_8_0.xsd
+++ b/v2_8_0/CDT-allJoynInterface-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_8_0/CDT-allJoynMethod-v2_8_0.xsd b/v2_8_0/CDT-allJoynMethod-v2_8_0.xsd
index e958291..d3f0c4f 100644
--- a/v2_8_0/CDT-allJoynMethod-v2_8_0.xsd
+++ b/v2_8_0/CDT-allJoynMethod-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_8_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_8_0/CDT-allJoynMethodCall-v2_8_0.xsd b/v2_8_0/CDT-allJoynMethodCall-v2_8_0.xsd
index 929dfaa..ba49d38 100644
--- a/v2_8_0/CDT-allJoynMethodCall-v2_8_0.xsd
+++ b/v2_8_0/CDT-allJoynMethodCall-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-allJoynProperty-v2_8_0.xsd b/v2_8_0/CDT-allJoynProperty-v2_8_0.xsd
index 81de910..fb35604 100644
--- a/v2_8_0/CDT-allJoynProperty-v2_8_0.xsd
+++ b/v2_8_0/CDT-allJoynProperty-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-allJoynSvcObject-v2_8_0.xsd b/v2_8_0/CDT-allJoynSvcObject-v2_8_0.xsd
index 14b0c49..f44b45d 100644
--- a/v2_8_0/CDT-allJoynSvcObject-v2_8_0.xsd
+++ b/v2_8_0/CDT-allJoynSvcObject-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_8_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-areaNwkDeviceInfo-v2_8_0.xsd b/v2_8_0/CDT-areaNwkDeviceInfo-v2_8_0.xsd
index 896e307..0c8cd29 100644
--- a/v2_8_0/CDT-areaNwkDeviceInfo-v2_8_0.xsd
+++ b/v2_8_0/CDT-areaNwkDeviceInfo-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-areaNwkInfo-v2_8_0.xsd b/v2_8_0/CDT-areaNwkInfo-v2_8_0.xsd
index 15f6ad9..090abf0 100644
--- a/v2_8_0/CDT-areaNwkInfo-v2_8_0.xsd
+++ b/v2_8_0/CDT-areaNwkInfo-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-battery-v2_8_0.xsd b/v2_8_0/CDT-battery-v2_8_0.xsd
index f946895..e1fdd6a 100644
--- a/v2_8_0/CDT-battery-v2_8_0.xsd
+++ b/v2_8_0/CDT-battery-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-cmdhBuffer-v2_8_0.xsd b/v2_8_0/CDT-cmdhBuffer-v2_8_0.xsd
index 0b3d776..0fbf4a8 100644
--- a/v2_8_0/CDT-cmdhBuffer-v2_8_0.xsd
+++ b/v2_8_0/CDT-cmdhBuffer-v2_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-v2_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_8_0/CDT-cmdhDefEcValue-v2_8_0.xsd b/v2_8_0/CDT-cmdhDefEcValue-v2_8_0.xsd
index af4704b..68813bb 100644
--- a/v2_8_0/CDT-cmdhDefEcValue-v2_8_0.xsd
+++ b/v2_8_0/CDT-cmdhDefEcValue-v2_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-v2_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_8_0/CDT-cmdhDefaults-v2_8_0.xsd b/v2_8_0/CDT-cmdhDefaults-v2_8_0.xsd
index 379aff5..f94db76 100644
--- a/v2_8_0/CDT-cmdhDefaults-v2_8_0.xsd
+++ b/v2_8_0/CDT-cmdhDefaults-v2_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-v2_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_8_0/CDT-cmdhEcDefParamValues-v2_8_0.xsd b/v2_8_0/CDT-cmdhEcDefParamValues-v2_8_0.xsd
index 300590b..c0394ff 100644
--- a/v2_8_0/CDT-cmdhEcDefParamValues-v2_8_0.xsd
+++ b/v2_8_0/CDT-cmdhEcDefParamValues-v2_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-v2_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_8_0/CDT-cmdhLimits-v2_8_0.xsd b/v2_8_0/CDT-cmdhLimits-v2_8_0.xsd
index faea10c..c82c680 100644
--- a/v2_8_0/CDT-cmdhLimits-v2_8_0.xsd
+++ b/v2_8_0/CDT-cmdhLimits-v2_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-v2_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_8_0/CDT-cmdhNetworkAccessRules-v2_8_0.xsd b/v2_8_0/CDT-cmdhNetworkAccessRules-v2_8_0.xsd
index 249ee4a..d31863a 100644
--- a/v2_8_0/CDT-cmdhNetworkAccessRules-v2_8_0.xsd
+++ b/v2_8_0/CDT-cmdhNetworkAccessRules-v2_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-v2_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_8_0/CDT-cmdhNwAccessRule-v2_8_0.xsd b/v2_8_0/CDT-cmdhNwAccessRule-v2_8_0.xsd
index f2e1a07..022e6fc 100644
--- a/v2_8_0/CDT-cmdhNwAccessRule-v2_8_0.xsd
+++ b/v2_8_0/CDT-cmdhNwAccessRule-v2_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-v2_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_8_0/CDT-cmdhPolicy-v2_8_0.xsd b/v2_8_0/CDT-cmdhPolicy-v2_8_0.xsd
index 8464c65..52168b6 100644
--- a/v2_8_0/CDT-cmdhPolicy-v2_8_0.xsd
+++ b/v2_8_0/CDT-cmdhPolicy-v2_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-v2_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_8_0/CDT-commonTypes-v2_8_0.xsd b/v2_8_0/CDT-commonTypes-v2_8_0.xsd
index f3d8325..cbe0e24 100644
--- a/v2_8_0/CDT-commonTypes-v2_8_0.xsd
+++ b/v2_8_0/CDT-commonTypes-v2_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-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_8_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_8_0/CDT-container-v2_8_0.xsd b/v2_8_0/CDT-container-v2_8_0.xsd
index 1e1c460..f68bddc 100644
--- a/v2_8_0/CDT-container-v2_8_0.xsd
+++ b/v2_8_0/CDT-container-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_8_0/CDT-contentInstance-v2_8_0.xsd b/v2_8_0/CDT-contentInstance-v2_8_0.xsd
index 166eb5b..e71fff2 100644
--- a/v2_8_0/CDT-contentInstance-v2_8_0.xsd
+++ b/v2_8_0/CDT-contentInstance-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-delivery-v2_8_0.xsd b/v2_8_0/CDT-delivery-v2_8_0.xsd
index 8838351..d0750f5 100644
--- a/v2_8_0/CDT-delivery-v2_8_0.xsd
+++ b/v2_8_0/CDT-delivery-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_8_0/CDT-deviceCapability-v2_8_0.xsd b/v2_8_0/CDT-deviceCapability-v2_8_0.xsd
index d371906..78eea82 100644
--- a/v2_8_0/CDT-deviceCapability-v2_8_0.xsd
+++ b/v2_8_0/CDT-deviceCapability-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-deviceInfo-v2_8_0.xsd b/v2_8_0/CDT-deviceInfo-v2_8_0.xsd
index 19d3ffd..8c39eaf 100644
--- a/v2_8_0/CDT-deviceInfo-v2_8_0.xsd
+++ b/v2_8_0/CDT-deviceInfo-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-dynamicAuthorizationConsultation-v2_8_0.xsd b/v2_8_0/CDT-dynamicAuthorizationConsultation-v2_8_0.xsd
index 5a55bef..4848b81 100644
--- a/v2_8_0/CDT-dynamicAuthorizationConsultation-v2_8_0.xsd
+++ b/v2_8_0/CDT-dynamicAuthorizationConsultation-v2_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-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-eventConfig-v2_8_0.xsd b/v2_8_0/CDT-eventConfig-v2_8_0.xsd
index 5520c3d..ed0fc0f 100644
--- a/v2_8_0/CDT-eventConfig-v2_8_0.xsd
+++ b/v2_8_0/CDT-eventConfig-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-eventLog-v2_8_0.xsd b/v2_8_0/CDT-eventLog-v2_8_0.xsd
index d8fcdfe..ac69167 100644
--- a/v2_8_0/CDT-eventLog-v2_8_0.xsd
+++ b/v2_8_0/CDT-eventLog-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-execInstance-v2_8_0.xsd b/v2_8_0/CDT-execInstance-v2_8_0.xsd
index 32b169c..55a6b4b 100644
--- a/v2_8_0/CDT-execInstance-v2_8_0.xsd
+++ b/v2_8_0/CDT-execInstance-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-firmware-v2_8_0.xsd b/v2_8_0/CDT-firmware-v2_8_0.xsd
index 4c4260f..9a4d27e 100644
--- a/v2_8_0/CDT-firmware-v2_8_0.xsd
+++ b/v2_8_0/CDT-firmware-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-genericInterworkingOperationInstance-v2_8_0.xsd b/v2_8_0/CDT-genericInterworkingOperationInstance-v2_8_0.xsd
index c64b74e..c611f1f 100644
--- a/v2_8_0/CDT-genericInterworkingOperationInstance-v2_8_0.xsd
+++ b/v2_8_0/CDT-genericInterworkingOperationInstance-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-genericInterworkingService-v2_8_0.xsd b/v2_8_0/CDT-genericInterworkingService-v2_8_0.xsd
index fcd71b8..6fbaa2f 100644
--- a/v2_8_0/CDT-genericInterworkingService-v2_8_0.xsd
+++ b/v2_8_0/CDT-genericInterworkingService-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_8_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-group-v2_8_0.xsd b/v2_8_0/CDT-group-v2_8_0.xsd
index d000c6b..5460bba 100644
--- a/v2_8_0/CDT-group-v2_8_0.xsd
+++ b/v2_8_0/CDT-group-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-locationPolicy-v2_8_0.xsd b/v2_8_0/CDT-locationPolicy-v2_8_0.xsd
index 3fd4d22..28441d4 100644
--- a/v2_8_0/CDT-locationPolicy-v2_8_0.xsd
+++ b/v2_8_0/CDT-locationPolicy-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-m2mServiceSubscriptionProfile-v2_8_0.xsd b/v2_8_0/CDT-m2mServiceSubscriptionProfile-v2_8_0.xsd
index b4cc3ea..fcf9390 100644
--- a/v2_8_0/CDT-m2mServiceSubscriptionProfile-v2_8_0.xsd
+++ b/v2_8_0/CDT-m2mServiceSubscriptionProfile-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_8_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-memory-v2_8_0.xsd b/v2_8_0/CDT-memory-v2_8_0.xsd
index d8acb3d..7d1fd42 100644
--- a/v2_8_0/CDT-memory-v2_8_0.xsd
+++ b/v2_8_0/CDT-memory-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-mgmtCmd-v2_8_0.xsd b/v2_8_0/CDT-mgmtCmd-v2_8_0.xsd
index df3d56a..a16064a 100644
--- a/v2_8_0/CDT-mgmtCmd-v2_8_0.xsd
+++ b/v2_8_0/CDT-mgmtCmd-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_8_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-node-v2_8_0.xsd b/v2_8_0/CDT-node-v2_8_0.xsd
index 58bc6b0..5047b04 100644
--- a/v2_8_0/CDT-node-v2_8_0.xsd
+++ b/v2_8_0/CDT-node-v2_8_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_8_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-notification-v2_8_0.xsd b/v2_8_0/CDT-notification-v2_8_0.xsd
index 2b8b2d0..f8d1c49 100644
--- a/v2_8_0/CDT-notification-v2_8_0.xsd
+++ b/v2_8_0/CDT-notification-v2_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-v2_7_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_7_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_8_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_8_0/CDT-notificationTargetMgmtPolicyRef-v2_8_0.xsd b/v2_8_0/CDT-notificationTargetMgmtPolicyRef-v2_8_0.xsd
index da552c4..371b3a8 100644
--- a/v2_8_0/CDT-notificationTargetMgmtPolicyRef-v2_8_0.xsd
+++ b/v2_8_0/CDT-notificationTargetMgmtPolicyRef-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-notificationTargetPolicy-v2_8_0.xsd b/v2_8_0/CDT-notificationTargetPolicy-v2_8_0.xsd
index 7ea7863..206dd6a 100644
--- a/v2_8_0/CDT-notificationTargetPolicy-v2_8_0.xsd
+++ b/v2_8_0/CDT-notificationTargetPolicy-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-policyDeletionRules-v2_8_0.xsd b/v2_8_0/CDT-policyDeletionRules-v2_8_0.xsd
index 868ed49..5c06c78 100644
--- a/v2_8_0/CDT-policyDeletionRules-v2_8_0.xsd
+++ b/v2_8_0/CDT-policyDeletionRules-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-pollingChannel-v2_8_0.xsd b/v2_8_0/CDT-pollingChannel-v2_8_0.xsd
index bf9c402..999b24d 100644
--- a/v2_8_0/CDT-pollingChannel-v2_8_0.xsd
+++ b/v2_8_0/CDT-pollingChannel-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-reboot-v2_8_0.xsd b/v2_8_0/CDT-reboot-v2_8_0.xsd
index ed6d647..36d59de 100644
--- a/v2_8_0/CDT-reboot-v2_8_0.xsd
+++ b/v2_8_0/CDT-reboot-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-remoteCSE-v2_8_0.xsd b/v2_8_0/CDT-remoteCSE-v2_8_0.xsd
index 2ae7c45..fe29b36 100644
--- a/v2_8_0/CDT-remoteCSE-v2_8_0.xsd
+++ b/v2_8_0/CDT-remoteCSE-v2_8_0.xsd
@@ -26,17 +26,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_8_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-request-v2_8_0.xsd b/v2_8_0/CDT-request-v2_8_0.xsd
index 22ea8c7..0d310ba 100644
--- a/v2_8_0/CDT-request-v2_8_0.xsd
+++ b/v2_8_0/CDT-request-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-requestPrimitive-v2_8_0.xsd b/v2_8_0/CDT-requestPrimitive-v2_8_0.xsd
index a83d70c..f779a1c 100644
--- a/v2_8_0/CDT-requestPrimitive-v2_8_0.xsd
+++ b/v2_8_0/CDT-requestPrimitive-v2_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-v2_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_8_0/CDT-responsePrimitive-v2_8_0.xsd b/v2_8_0/CDT-responsePrimitive-v2_8_0.xsd
index 845b6e6..3c00afc 100644
--- a/v2_8_0/CDT-responsePrimitive-v2_8_0.xsd
+++ b/v2_8_0/CDT-responsePrimitive-v2_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-v2_7_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_7_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_7_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_8_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_8_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_8_0/CDT-role-v2_8_0.xsd b/v2_8_0/CDT-role-v2_8_0.xsd
index 616b543..556790a 100644
--- a/v2_8_0/CDT-role-v2_8_0.xsd
+++ b/v2_8_0/CDT-role-v2_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-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-schedule-v2_8_0.xsd b/v2_8_0/CDT-schedule-v2_8_0.xsd
index c036099..7b2096f 100644
--- a/v2_8_0/CDT-schedule-v2_8_0.xsd
+++ b/v2_8_0/CDT-schedule-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-semanticDescriptor-v2_8_0.xsd b/v2_8_0/CDT-semanticDescriptor-v2_8_0.xsd
index 842e23d..16e0343 100644
--- a/v2_8_0/CDT-semanticDescriptor-v2_8_0.xsd
+++ b/v2_8_0/CDT-semanticDescriptor-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-serviceSubscribedAppRule-v2_8_0.xsd b/v2_8_0/CDT-serviceSubscribedAppRule-v2_8_0.xsd
index 86b9673..786c41e 100644
--- a/v2_8_0/CDT-serviceSubscribedAppRule-v2_8_0.xsd
+++ b/v2_8_0/CDT-serviceSubscribedAppRule-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-serviceSubscribedNode-v2_8_0.xsd b/v2_8_0/CDT-serviceSubscribedNode-v2_8_0.xsd
index bf8cd3e..03d162a 100644
--- a/v2_8_0/CDT-serviceSubscribedNode-v2_8_0.xsd
+++ b/v2_8_0/CDT-serviceSubscribedNode-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-software-v2_8_0.xsd b/v2_8_0/CDT-software-v2_8_0.xsd
index 4900df8..6efc92f 100644
--- a/v2_8_0/CDT-software-v2_8_0.xsd
+++ b/v2_8_0/CDT-software-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-statsCollect-v2_8_0.xsd b/v2_8_0/CDT-statsCollect-v2_8_0.xsd
index 644ffdd..0f85515 100644
--- a/v2_8_0/CDT-statsCollect-v2_8_0.xsd
+++ b/v2_8_0/CDT-statsCollect-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-statsConfig-v2_8_0.xsd b/v2_8_0/CDT-statsConfig-v2_8_0.xsd
index 0990cc7..f79bb2b 100644
--- a/v2_8_0/CDT-statsConfig-v2_8_0.xsd
+++ b/v2_8_0/CDT-statsConfig-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-subscription-v2_8_0.xsd b/v2_8_0/CDT-subscription-v2_8_0.xsd
index e433d57..dbaa20b 100644
--- a/v2_8_0/CDT-subscription-v2_8_0.xsd
+++ b/v2_8_0/CDT-subscription-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_8_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-svcFwWrapper-v2_8_0.xsd b/v2_8_0/CDT-svcFwWrapper-v2_8_0.xsd
index a08a1ac..16e7811 100644
--- a/v2_8_0/CDT-svcFwWrapper-v2_8_0.xsd
+++ b/v2_8_0/CDT-svcFwWrapper-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-svcObjWrapper-v2_8_0.xsd b/v2_8_0/CDT-svcObjWrapper-v2_8_0.xsd
index bd3602e..31a029b 100644
--- a/v2_8_0/CDT-svcObjWrapper-v2_8_0.xsd
+++ b/v2_8_0/CDT-svcObjWrapper-v2_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-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_8_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-timeSeries-v2_8_0.xsd b/v2_8_0/CDT-timeSeries-v2_8_0.xsd
index dd6e2b4..a5addda 100644
--- a/v2_8_0/CDT-timeSeries-v2_8_0.xsd
+++ b/v2_8_0/CDT-timeSeries-v2_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-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_8_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_8_0/CDT-timeSeriesInstance-v2_8_0.xsd b/v2_8_0/CDT-timeSeriesInstance-v2_8_0.xsd
index f145ffe..eef4d21 100644
--- a/v2_8_0/CDT-timeSeriesInstance-v2_8_0.xsd
+++ b/v2_8_0/CDT-timeSeriesInstance-v2_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-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-token-v2_8_0.xsd b/v2_8_0/CDT-token-v2_8_0.xsd
index 2b0b001..854db43 100644
--- a/v2_8_0/CDT-token-v2_8_0.xsd
+++ b/v2_8_0/CDT-token-v2_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-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_8_0/CDT-trafficPattern-v2_8_0.xsd b/v2_8_0/CDT-trafficPattern-v2_8_0.xsd
index 180f969..dd3fcc8 100644
--- a/v2_8_0/CDT-trafficPattern-v2_8_0.xsd
+++ b/v2_8_0/CDT-trafficPattern-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_8_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_8_0/allJoynMethodCall-v2_8_0.xsd b/v2_8_0/allJoynMethodCall-v2_8_0.xsd
deleted file mode 100644
index 929dfaa..0000000
--- a/v2_8_0/allJoynMethodCall-v2_8_0.xsd
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<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:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
-	
-	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="input" type="xs:string" minOccurs="0" />
-						<xs:element name="callStatus" type="xs:string" minOccurs="0" />
-						<xs:element name="output" type="xs:string" minOccurs="0" />
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="allJoynMethodCallAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
-- 
GitLab