diff --git a/v2_8_0/CDT-AE-v2_8_0.xsd b/v2_8_0/CDT-AE-v2_8_0.xsd
index eb5a58fe31634e7e5671889efecdf6e75c2d887d..d36c0016f78a207b8d2fcf2e1488e970de90ffcf 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 97da2d4a0b34e360a8ae2b707681162e6750aad7..40c749471c8f7d2318ad77ff5f57e74f26fc6a5d 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 f14dba493ba5f8be3b9b6524acb49b00005fbbc1..312549abc7e4c0108ed16db035fb89702b3d741c 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 c8f02081cc793e8a9bbe7ccf93d7f39b7d37e002..d43356c5a1e8f4200ddb75c03326896c647a2a60 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 563b0fce1596f5324408eb94f68f54f8355a7e1f..f173fd62ff739c3976cd78c0e22802b5cc949582 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 87fbfb41c38e7895a3321cffa6620717bfdd76b7..c32a457070aa026057b5e94a7c8dac39bb481323 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 e958291d094a34f5eb0a4474ac5579e01e37198b..d3f0c4f7abf58ed4f3b3e89da9bca0601df2197a 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 929dfaaf59d291696217e74160271fb58b6fe517..ba49d38a2b33e3b6e4da8edd039a845238d9f84f 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 81de910d4754ac8e8deae9b5c5286b3cdc01d090..fb356042b39e758a3b5e3b1d06c3d49f0fa1a4b6 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 14b0c49bcfa32331b7d57020cdef5f0b35705fee..f44b45d443f128611cce24c3f57c61aa2d2e5275 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 896e30720ea79c7a8edf1e5dc438e9d5b9be2730..0c8cd291578254a5858db0951f6288cedab99547 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 15f6ad9e0dafb2f550053049cf2eb257b30f4493..090abf095ff9b77eaa42de5cde8c9297c3de79a2 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 f9468950c1a6e2131955eae627a3f7c75617c170..e1fdd6a0a4156c7f10db775793ac02a7191fdbcf 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 0b3d7765fb67a77c8b576f8381749e3962d2408a..0fbf4a82c21732cc32fd6d53c24977df42cdf91e 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 af4704b132c3cda29b768ee050d14556115243c6..68813bb6c3fdd8084190073c5a956a77e40bf4ba 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 379aff5487a758e4ac82c07e8bbe4f5baeb971f1..f94db761cb7eb54b764c9abf40a671464818db96 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 300590bf2c4e265bed526505cb62c05817956891..c0394ff1bd1759c1905dcda4f8ac9c47bf2b6c9e 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 faea10cdf92f2b9b164d0b3203102352db6435ce..c82c680169bd18fd4b85fa974b332cb7afbf58f4 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 249ee4a6191e6633bba3bc259a0bf923943ead4b..d31863a3d82970d258168e762a258fc2160a8e5b 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 f2e1a078b9a8a6f1a3ce6f2e1036ba2e4b2c9a64..022e6fc9912d7531f8f27a2ab81c214fa5842671 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 8464c65a3cf6fc381d886354a4199be027bc90f9..52168b6a3cc0b8285db039bd9f934b80df54800f 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 f3d83256c716c8a0c6553296e733d189b755a0c0..cbe0e24328a31c0c1c32375c066c062e60d96326 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 1e1c460b6854bad45f7429fa121ea5b16675c58d..f68bddc569488ebdb3a387a617b19085884cb5f6 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 166eb5bab78314fe3a198c6b7f474f2a2f075d2d..e71fff27b097aae100d577b77780199418190257 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 88383513305db9ce92e9a0964e017431be2204f7..d0750f542576e834aa24e2ee1d85d93728e3a9af 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 d371906105e2a85a86a2e5b169c697583b867d79..78eea8249267e916a2f37e14c6cc496225067d75 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 19d3ffd706f977b31fafdad2c6d2f1b886ff5eb5..8c39eaf316decfaf2fb22d0505ddd3b6f0bdb0a8 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 5a55bef85eaf0f0028c66710d296219646775281..4848b81db9aab72c646a147ed6fd06a3c6475a10 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 5520c3d9bea542f5a35d80855f53629b47605a30..ed0fc0f8ad63d7565efb4879adc4cd54931a6f62 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 d8fcdfee3d9d989aa0aa912b71c35029bed35b14..ac69167c87da6eeb87337164e5d7ba751773e8ea 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 32b169ce793155bbbca7b2e8ae90412e5973c754..55a6b4bae3a8221424f9cb935901a894da972168 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 4c4260f88eb6ca505a7af7362364b2b7ea59b4ef..9a4d27ef2b5d7b292e73e5e3714671c1578b4fd4 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 c64b74eaf48c4479382c7601d5b5f8e622e0dad5..c611f1f516617fbe824295412edfe6d4678132d9 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 fcd71b8d48cb9135958c04b144f08ba5db393e6f..6fbaa2fbac51f66da51e462b7950c8234c1bbc7e 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 d000c6bdff0dd99bad6d4816172e4f3b0cce1eed..5460bba8abc5a4b91787fe8190c1e537edbd8226 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 3fd4d22f2a6ffff2bbeee75dc70d01f0b5854b1f..28441d483a0beffbb619ecc9b31f87f2dfda61ef 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 b4cc3eaf97cf85d3daebd68e31dfd4bf6f9865f7..fcf93908f4849db6b5168f2e87af669b297b1edc 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 d8acb3d5ff523d77510ff8143ced035a36e25f58..7d1fd42eac9c0922c6bac285dbdf15dfe2d29d1e 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 df3d56a0cbceb0d5fde5697e31e91d098748c738..a16064ac9733a7b0d7050ebfc0b1adc3ba7a3a90 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 58bc6b0a1f3d3aaddeb248273a87907b0a4effc3..5047b0468a38309bfbb2eb097d565ed2ff3d4b2b 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 2b8b2d0d099c21a35898ffef28795457cff28a87..f8d1c49924f0b8b2aae998498ff0bacec322239f 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 da552c4a5aba6a7348d6d6906e9d4b7cf762ed77..371b3a83922cc58180bcd9cf6b206c48f42109e5 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 7ea78634d4328b3e91db4ed2ecf29c1e53d86a47..206dd6a48cfef604f86344cea5ca1490485514b2 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 868ed49064246ab794add637b48b0896fdc2e742..5c06c780c1ba14af7ae703874e633b85dd67b315 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 bf9c402a5b6b884d691b9a756dfea24573e577bb..999b24d04d36868317d959f8e5342873db958877 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 ed6d647c8fa1c00a388f8aab09b1116b68400f30..36d59de0913fa1f94672491c2ae6b43eb1883e14 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 2ae7c45ffd58425dcb80d2f8eb95c1827a4e6967..fe29b36b6588c9667de603dbb3bfc5238c2fcd16 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 22ea8c77ddcd59f7f098ae1b683ff443f07b9d10..0d310baad11f34d7972ab5e2856b76f9dff1b0d6 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 a83d70cac9aa9af53e9dd1451b3bc229808abd12..f779a1ce569bead999e7feb04be685984834ddd0 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 845b6e668b98edf8f6b814cb8f6630a056f7df12..3c00afc0c90769df5690ca633860420b4817c278 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 616b543ad972493283f0b4684397c5e50e737804..556790afd2d15fb5609a53867c3e57e92f3441a0 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 c03609969add20e209cbcf0b5fd08d76cd877369..7b2096f9b0f3d5610c6e01c48a6415c3d5692b79 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 842e23d1c27c8f6685a4b38fa46cc48d7421a465..16e0343ed57b077a73540dde15d4aad359c6c266 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 86b967332f75ed0a13d1025d455c05114a36f0c0..786c41ec1f86faf2ea8597adb07b2ad47596c8bc 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 bf8cd3e578df2f2d4967f37f2d1cf72ebcb7fb63..03d162ad5196678c1025e8c9d90b489b42afd41b 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 4900df80acabbff60af27ec553c357a582cf2ef8..6efc92f3101feba01c915a0c0fbd14f357e75963 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 644ffddadbb93f8a1734830bb8e2307ec6afc47a..0f85515f80b12bb75444fb367107c26057df6203 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 0990cc77a4cedc5a01fbaf6c7c2abf0bb9583069..f79bb2b01476ea15ca949173ff64624fea3a1348 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 e433d5760ef7f51b62d130c1f33f08709ef9cda9..dbaa20b8b79c6d3341be74b8641941b65e0292aa 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 a08a1ac247b5fb8c7c081538031fc535d002b111..16e78111a629abbf79f87c332d5420c4294cc588 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 bd3602e442c607aa3d8b3796a0f2f2c286d47a7b..31a029bd5912154387bc1b7126b0defdd6a37c1e 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 dd6e2b41e68109bf5e9bd1c46dfb06574c3bb06b..a5adddac28d22c37b92bcba238ffc53348f44854 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 f145ffeec1691bc6981060030e3b588c28d131e3..eef4d217a351a1bdf0a5915c29967fc12248abc8 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 2b0b001bf76987afd1b1f4f1b451e8058f27a20f..854db434d179b1f56fee420a5b2d26827b08ea2b 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 180f969a08a2202c2b48470294278222a8d1a0bd..dd3fcc84f6da48d93a5182c7aebd4a6f9d70660c 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 929dfaaf59d291696217e74160271fb58b6fe517..0000000000000000000000000000000000000000
--- 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>