diff --git a/v3_8_0/CDT-AE-v3_8_0.xsd b/v3_8_0/CDT-AE-v3_8_0.xsd
index 7e01299321b9ac12c4c610d616ead6bc1c126862..4447309205d3969bfdec0b9292b08cfbfbee3945 100644
--- a/v3_8_0/CDT-AE-v3_8_0.xsd
+++ b/v3_8_0/CDT-AE-v3_8_0.xsd
@@ -26,19 +26,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_8_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-AEContactList-v3_8_0.xsd b/v3_8_0/CDT-AEContactList-v3_8_0.xsd
index 8f1e9f67c6cf6bfb5e9c8af82658f9676461b2d2..da03a23ed66780594c57cf276241d8c976d61aa1 100644
--- a/v3_8_0/CDT-AEContactList-v3_8_0.xsd
+++ b/v3_8_0/CDT-AEContactList-v3_8_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_8_0.xsd" />
 
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_8_0/CDT-AEContactListPerCSE-v3_8_0.xsd b/v3_8_0/CDT-AEContactListPerCSE-v3_8_0.xsd
index 625e7ecef95b184e45b6e428d125f6de3a9174a8..026dc1dc7fc1135d820b16d3823130ccfcff774b 100644
--- a/v3_8_0/CDT-AEContactListPerCSE-v3_8_0.xsd
+++ b/v3_8_0/CDT-AEContactListPerCSE-v3_8_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-CSEBase-v3_8_0.xsd b/v3_8_0/CDT-CSEBase-v3_8_0.xsd
index 492c6dee88039d6ca9b3036447d5e19ae94136a7..984c348880d14b2c617def814a6d6d30700272a3 100644
--- a/v3_8_0/CDT-CSEBase-v3_8_0.xsd
+++ b/v3_8_0/CDT-CSEBase-v3_8_0.xsd
@@ -26,35 +26,35 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_7_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_7_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_7_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_8_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_8_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_8_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd b/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd
index 978b42543fccf61ca577230bf306ceca1cfd65a6..6d1175adfa91be80fc99d1568a9196159e3daf9b 100644
--- a/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-activeCmdhPolicy-v3_8_0.xsd b/v3_8_0/CDT-activeCmdhPolicy-v3_8_0.xsd
index 70288f70e782472aecf91b71b45ab2267a1d7112..0b53230461fc1198c600b82d1cfd4f654b47bbbf 100644
--- a/v3_8_0/CDT-activeCmdhPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-activeCmdhPolicy-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_8_0/CDT-allJoynApp-v3_8_0.xsd b/v3_8_0/CDT-allJoynApp-v3_8_0.xsd
index f71a484710230865cd1c3113f55b4746adf5b94c..fe21efe81472ccabd8f217eb3a690d12a21cf70d 100644
--- a/v3_8_0/CDT-allJoynApp-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynApp-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_8_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-allJoynInterface-v3_8_0.xsd b/v3_8_0/CDT-allJoynInterface-v3_8_0.xsd
index 22288e29af67bf29ec490a60646b4ec5b532cd47..5c1cac46afbf6ae009937aceb1318d7d47598506 100644
--- a/v3_8_0/CDT-allJoynInterface-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynInterface-v3_8_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_8_0/CDT-allJoynMethod-v3_8_0.xsd b/v3_8_0/CDT-allJoynMethod-v3_8_0.xsd
index 0053b233923c26b32a3dcedce917eba762a2c8b8..dde96d77bdbb277a17c81b30f5b5e9f019094833 100644
--- a/v3_8_0/CDT-allJoynMethod-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynMethod-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_8_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_8_0/CDT-allJoynMethodCall-v3_8_0.xsd b/v3_8_0/CDT-allJoynMethodCall-v3_8_0.xsd
index ede24868759ef80e3421d1a4a2c148a995d43221..0a783edb37de89910d3b1809fbd2a4db265b33ba 100644
--- a/v3_8_0/CDT-allJoynMethodCall-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynMethodCall-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-allJoynProperty-v3_8_0.xsd b/v3_8_0/CDT-allJoynProperty-v3_8_0.xsd
index 8ec653fe558d0aa3fa0af79132dc95e6a2faa1e4..f70100b7b8e2c3ab7677fbbf95e822c23ee1573e 100644
--- a/v3_8_0/CDT-allJoynProperty-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynProperty-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-allJoynSvcObject-v3_8_0.xsd b/v3_8_0/CDT-allJoynSvcObject-v3_8_0.xsd
index c2704bebcfd644252a01a178f35daba2f76522fb..49bbdc8b95857a047e2f1d390d0032228ddd7820 100644
--- a/v3_8_0/CDT-allJoynSvcObject-v3_8_0.xsd
+++ b/v3_8_0/CDT-allJoynSvcObject-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_8_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-areaNwkDeviceInfo-v3_8_0.xsd b/v3_8_0/CDT-areaNwkDeviceInfo-v3_8_0.xsd
index 63d8d4dc6dc33061d0a63b888122784be6c1a01a..60c8bca3a6b0f478cbbdba8a142bb09f4ee784d6 100644
--- a/v3_8_0/CDT-areaNwkDeviceInfo-v3_8_0.xsd
+++ b/v3_8_0/CDT-areaNwkDeviceInfo-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-areaNwkInfo-v3_8_0.xsd b/v3_8_0/CDT-areaNwkInfo-v3_8_0.xsd
index 55a2f0566f03430e62d8ff6a00242dd87f54465e..1475cace6fe644fbc3d6b3c73674bbbc8118a1aa 100644
--- a/v3_8_0/CDT-areaNwkInfo-v3_8_0.xsd
+++ b/v3_8_0/CDT-areaNwkInfo-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd b/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd
index 3da3fd8c73c4a4bde7a4bdba31775b12c4b1aee8..71bde4434ccb0d242ac80cb3fedf00280edd71b3 100644
--- a/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd
+++ b/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd b/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd
index 6434f0cbdebaa3340388629fab22339c69a9c200..40acf97f880d7942b37f2a176406e1c703572a38 100644
--- a/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd
+++ b/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd b/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd
index 65ab5dcda0ea11fcaae00f71a282d46bea6728a7..9f257f79aebe88e453c0a2ea336f6a75f99d97a4 100644
--- a/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-battery-v3_8_0.xsd b/v3_8_0/CDT-battery-v3_8_0.xsd
index 372cdec7d184e5904c656cc0d45560903a2a4ae9..56f5304b90d2a344cf9c1711e47c0568af64d4d5 100644
--- a/v3_8_0/CDT-battery-v3_8_0.xsd
+++ b/v3_8_0/CDT-battery-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-cmdhBuffer-v3_8_0.xsd b/v3_8_0/CDT-cmdhBuffer-v3_8_0.xsd
index c8956aafa377f13f55167f6a077668d37385e90a..ca3a29c0c7e44073d4fcecc8940f3096b9e97408 100644
--- a/v3_8_0/CDT-cmdhBuffer-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhBuffer-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhDefEcValue-v3_8_0.xsd b/v3_8_0/CDT-cmdhDefEcValue-v3_8_0.xsd
index 9b84a527f6334f419d449de103cbdb86357f6168..83d40d466c624699de6cf3e2db143972a01b5d58 100644
--- a/v3_8_0/CDT-cmdhDefEcValue-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhDefEcValue-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhDefaults-v3_8_0.xsd b/v3_8_0/CDT-cmdhDefaults-v3_8_0.xsd
index ff13c0d8fe5dea9d34f64b5e72b4eebd2eb8706d..3e788d21896d24eef51e7d42f5c90b98aae323de 100644
--- a/v3_8_0/CDT-cmdhDefaults-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhDefaults-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhEcDefParamValues-v3_8_0.xsd b/v3_8_0/CDT-cmdhEcDefParamValues-v3_8_0.xsd
index 7109897850fdce2ecd2d12191d59e562d91c4a36..bcdaf2dbbd4c1e3e10a30052c1564ebdfac56998 100644
--- a/v3_8_0/CDT-cmdhEcDefParamValues-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhEcDefParamValues-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_8_0/CDT-cmdhLimits-v3_8_0.xsd b/v3_8_0/CDT-cmdhLimits-v3_8_0.xsd
index a78a24215c2ca58348eb7429abbc8652adedbf60..f5d72b5baf623a64b93c62df21c13fb1a88f10b9 100644
--- a/v3_8_0/CDT-cmdhLimits-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhLimits-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhNetworkAccessRules-v3_8_0.xsd b/v3_8_0/CDT-cmdhNetworkAccessRules-v3_8_0.xsd
index 1588719abac7be6d948b379cbf45787a80a69a20..9960563a6b1d0d02dbf69fc29dd0da746f273fbe 100644
--- a/v3_8_0/CDT-cmdhNetworkAccessRules-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhNetworkAccessRules-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhNwAccessRule-v3_8_0.xsd b/v3_8_0/CDT-cmdhNwAccessRule-v3_8_0.xsd
index 8d357f0ec361e657ae2257bad8321dee4be3eda6..3bcb3c72f7886f7bda6a7d79b702d742a69df998 100644
--- a/v3_8_0/CDT-cmdhNwAccessRule-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhNwAccessRule-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_8_0/CDT-cmdhPolicy-v3_8_0.xsd b/v3_8_0/CDT-cmdhPolicy-v3_8_0.xsd
index 1bb8700d8d60cf89f12906ce7e4b9bcfa31482e5..b4a26abe9287c4978cd9cabf5665bf122f7d8dcc 100644
--- a/v3_8_0/CDT-cmdhPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-cmdhPolicy-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_8_0/CDT-commonTypes-v3_8_0.xsd b/v3_8_0/CDT-commonTypes-v3_8_0.xsd
index c9a0d3d7db1710dd549798556792740650540e85..77e13792d3be90e1fc851b1ea75659a4eff36ba5 100644
--- a/v3_8_0/CDT-commonTypes-v3_8_0.xsd
+++ b/v3_8_0/CDT-commonTypes-v3_8_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_8_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_8_0/CDT-container-v3_8_0.xsd b/v3_8_0/CDT-container-v3_8_0.xsd
index e1fac0456ebe617483cbca7874bf4732d4d4a4d7..1903315942fce9deb17a89cf1ebb87b9dd7621ab 100644
--- a/v3_8_0/CDT-container-v3_8_0.xsd
+++ b/v3_8_0/CDT-container-v3_8_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_8_0/CDT-contentInstance-v3_8_0.xsd b/v3_8_0/CDT-contentInstance-v3_8_0.xsd
index 171e6dfd13c2a2afd42293bac9e80e91c6da80ce..f1cca43e6e58dcbc958a01fd20ca03cd87845dd3 100644
--- a/v3_8_0/CDT-contentInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-contentInstance-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd b/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd
index 076838c1e6475feb342eed1c263e6b0586dd2d06..652f15d1083da152658204fe77187a1b71fa4694 100644
--- a/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd
+++ b/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-delivery-v3_8_0.xsd b/v3_8_0/CDT-delivery-v3_8_0.xsd
index f5e24ab382a144618ba21d59f58298f31ddcf9b3..588989dcc400ff9b5b6e1a6f5667ee9ad368e83b 100644
--- a/v3_8_0/CDT-delivery-v3_8_0.xsd
+++ b/v3_8_0/CDT-delivery-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_8_0/CDT-deviceCapability-v3_8_0.xsd b/v3_8_0/CDT-deviceCapability-v3_8_0.xsd
index 3a8086f1f3f3e4dfdee31a8e732ddd652d678f64..9b3b64447081e9dad6af119f1e8ab9d09d675f4c 100644
--- a/v3_8_0/CDT-deviceCapability-v3_8_0.xsd
+++ b/v3_8_0/CDT-deviceCapability-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-deviceInfo-v3_8_0.xsd b/v3_8_0/CDT-deviceInfo-v3_8_0.xsd
index 36b7622faf2fa220a82b48dbd47b22075c0afb61..f8a7e6cc00b30b5da94ba5ddaf500d2847923569 100644
--- a/v3_8_0/CDT-deviceInfo-v3_8_0.xsd
+++ b/v3_8_0/CDT-deviceInfo-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd b/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd
index f338c0e00a91b5f71a465e2271b181857c883c4a..825021c3cf4ec23c3750a416ef4555050787e993 100644
--- a/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd
+++ b/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-eventConfig-v3_8_0.xsd b/v3_8_0/CDT-eventConfig-v3_8_0.xsd
index 8fedac61de6464661e0831fa0969f8e47afce0c0..4a65ba27e12f03b5e537023c27f442ee7efd234e 100644
--- a/v3_8_0/CDT-eventConfig-v3_8_0.xsd
+++ b/v3_8_0/CDT-eventConfig-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-eventLog-v3_8_0.xsd b/v3_8_0/CDT-eventLog-v3_8_0.xsd
index 768c3929b05e4703479d85983c38178aedfefc79..f717659f8af57c128993286f691a7606f582069d 100644
--- a/v3_8_0/CDT-eventLog-v3_8_0.xsd
+++ b/v3_8_0/CDT-eventLog-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-execInstance-v3_8_0.xsd b/v3_8_0/CDT-execInstance-v3_8_0.xsd
index 7cfdc347ac43e1ceb0134ba80f3a5ad94daa9c94..e157a6a8dc3443a9eb87ab73b082b94a10451e81 100644
--- a/v3_8_0/CDT-execInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-execInstance-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-firmware-v3_8_0.xsd b/v3_8_0/CDT-firmware-v3_8_0.xsd
index e80fea0e3b16d70b6694f3bb4a7ec850ff3d5943..6ea71a6e5ba4a44c1fc3047307266bae6a28c143 100644
--- a/v3_8_0/CDT-firmware-v3_8_0.xsd
+++ b/v3_8_0/CDT-firmware-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-genericInterworkingOperationInstance-v3_8_0.xsd b/v3_8_0/CDT-genericInterworkingOperationInstance-v3_8_0.xsd
index 83441be6e200480fa6899b12ceaa818926c13c86..ac9b2318f37d6cfaff96f374e0af0a103abbc8a5 100644
--- a/v3_8_0/CDT-genericInterworkingOperationInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-genericInterworkingOperationInstance-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-genericInterworkingService-v3_8_0.xsd b/v3_8_0/CDT-genericInterworkingService-v3_8_0.xsd
index 8262c8d83a530737d1817b837b7c6e2d0eea6814..5a12b2426de3f4b4407d02e626e05504b867d8a0 100644
--- a/v3_8_0/CDT-genericInterworkingService-v3_8_0.xsd
+++ b/v3_8_0/CDT-genericInterworkingService-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_8_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-group-v3_8_0.xsd b/v3_8_0/CDT-group-v3_8_0.xsd
index 2f198e7ee1dd5e820d5e96d61fc94b24cd90a530..f9c8458fd87586e110d4306314ca7eb688cdc9c7 100644
--- a/v3_8_0/CDT-group-v3_8_0.xsd
+++ b/v3_8_0/CDT-group-v3_8_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-localMulticastGroup-v3_8_0.xsd b/v3_8_0/CDT-localMulticastGroup-v3_8_0.xsd
index 9bea85d87482c3045a1941b86473035592f51bbe..98dd2b6daab59bac835af719ecf0379049ba6f42 100644
--- a/v3_8_0/CDT-localMulticastGroup-v3_8_0.xsd
+++ b/v3_8_0/CDT-localMulticastGroup-v3_8_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_7_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_8_0/CDT-locationPolicy-v3_8_0.xsd b/v3_8_0/CDT-locationPolicy-v3_8_0.xsd
index d201f3ebdf74ff4a28e59526a3bb19f1d0f336e4..1cc0942ef3603e166d189497c3755f6e92570ea4 100644
--- a/v3_8_0/CDT-locationPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-locationPolicy-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd b/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd
index 7d5c3aba337976882484d8b0c55632554d942b82..93334934cad2e8df315d34515c984046d3165554 100644
--- a/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd
+++ b/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_8_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-memory-v3_8_0.xsd b/v3_8_0/CDT-memory-v3_8_0.xsd
index ed05045d44c45f7836b70d437f199668d2bead2a..7167f41943519e830496608c8c7060a543b3f55f 100644
--- a/v3_8_0/CDT-memory-v3_8_0.xsd
+++ b/v3_8_0/CDT-memory-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd b/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd
index 81593fefc9cd8683e647b5d0b8e1ce5dd1f9850c..3e7146cd2d7ea66582a4c420482adf1a64d2c43d 100644
--- a/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd
+++ b/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_8_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-multimediaSession-v3_8_0.xsd b/v3_8_0/CDT-multimediaSession-v3_8_0.xsd
index e4efb540ad3190be470badc618bff9e795764e9e..c83eda3875d6d7b0e92f2591640fce35a5f5fc91 100644
--- a/v3_8_0/CDT-multimediaSession-v3_8_0.xsd
+++ b/v3_8_0/CDT-multimediaSession-v3_8_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-node-v3_8_0.xsd b/v3_8_0/CDT-node-v3_8_0.xsd
index f671976e493b67c7b938b2fdccd45ef237f453c1..3828fc8ae3be0eec6ec483f4814f07421ea9c67c 100644
--- a/v3_8_0/CDT-node-v3_8_0.xsd
+++ b/v3_8_0/CDT-node-v3_8_0.xsd
@@ -27,21 +27,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-notification-v3_8_0.xsd b/v3_8_0/CDT-notification-v3_8_0.xsd
index 761498fcff74ea2f51c05964e0997d3dc49c3b4c..85c0799c2e286787d82195caef963db9f6368586 100644
--- a/v3_8_0/CDT-notification-v3_8_0.xsd
+++ b/v3_8_0/CDT-notification-v3_8_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_7_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd b/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd
index 8a63826f42e1dda98d998007e24cf570c88f005a..1f9febdc0a8bb9eab910be2cb5f1ccb4b5416be1 100644
--- a/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd
+++ b/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd b/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd
index 1a104dc7b350ad42ebb145365cd86401b4dd8058..60d4e619117ba7d935ac7925951b804c4985b701 100644
--- a/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd
+++ b/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-ontology-v3_8_0.xsd b/v3_8_0/CDT-ontology-v3_8_0.xsd
index 74dbf617cccd29c0059912c7fcfa8e8310c02448..93edb9a93dd1c01a5255afd12e44c8fb884d8383 100644
--- a/v3_8_0/CDT-ontology-v3_8_0.xsd
+++ b/v3_8_0/CDT-ontology-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd b/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd
index dac8542a01689ab56193b94ee57b46b315acaae6..7919c4b4ada19cb7d41686be0fbdc03f06c20673 100644
--- a/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd
+++ b/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_8_0.xsd" />
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd b/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd
index c2e3e7498ada86208ad028cb1d655256d539117e..0423315bb388af0f2fd21db520d32759e209a8b3 100644
--- a/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd
+++ b/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-pollingChannel-v3_8_0.xsd b/v3_8_0/CDT-pollingChannel-v3_8_0.xsd
index 89d004c51074d099747678cc0798d81fc3529d0b..50315300d749d712635fdc9b55cef67eb4c9f4ae 100644
--- a/v3_8_0/CDT-pollingChannel-v3_8_0.xsd
+++ b/v3_8_0/CDT-pollingChannel-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-reboot-v3_8_0.xsd b/v3_8_0/CDT-reboot-v3_8_0.xsd
index 052f7cea51e685d197e535a5a00b5671039be7cb..1a78ec7f9e59c89cae5fe81f819f992a05daeb6d 100644
--- a/v3_8_0/CDT-reboot-v3_8_0.xsd
+++ b/v3_8_0/CDT-reboot-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-remoteCSE-v3_8_0.xsd b/v3_8_0/CDT-remoteCSE-v3_8_0.xsd
index db95ea1cd0fe2d64db8912af7cfefc8427d43630..c55fd885fc2008bc131a73b14bc79917543dd81d 100644
--- a/v3_8_0/CDT-remoteCSE-v3_8_0.xsd
+++ b/v3_8_0/CDT-remoteCSE-v3_8_0.xsd
@@ -26,21 +26,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-request-v3_8_0.xsd b/v3_8_0/CDT-request-v3_8_0.xsd
index 79c317e7eb4850733dd734b162fa0e534dc2a0ec..9c0f3935bbdf061635eb2c5a9627e0bb38cce403 100644
--- a/v3_8_0/CDT-request-v3_8_0.xsd
+++ b/v3_8_0/CDT-request-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-requestPrimitive-v3_8_0.xsd b/v3_8_0/CDT-requestPrimitive-v3_8_0.xsd
index b9172d8904a965353a3b31e74bc99edc20c2903e..dc60acc2da18c8b20c8b7dd3c140443b97b0d194 100644
--- a/v3_8_0/CDT-requestPrimitive-v3_8_0.xsd
+++ b/v3_8_0/CDT-requestPrimitive-v3_8_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_8_0/CDT-responsePrimitive-v3_8_0.xsd b/v3_8_0/CDT-responsePrimitive-v3_8_0.xsd
index a9a1a5bcf589d22de8c63c8114f063fecc4cf962..4b3607298edcb2e0fd3bd4d238faab7b7ad904c1 100644
--- a/v3_8_0/CDT-responsePrimitive-v3_8_0.xsd
+++ b/v3_8_0/CDT-responsePrimitive-v3_8_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_8_0/CDT-role-v3_8_0.xsd b/v3_8_0/CDT-role-v3_8_0.xsd
index 25fb1dc4bd5575c7a16336e3b9f63521e1af6519..1812ba849fa226554ecb92697cbb2dd2df54fcda 100644
--- a/v3_8_0/CDT-role-v3_8_0.xsd
+++ b/v3_8_0/CDT-role-v3_8_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-schedule-v3_8_0.xsd b/v3_8_0/CDT-schedule-v3_8_0.xsd
index 985a9de2781e31ea6be81ae8a5fbfe5c2841a701..b07fb566bf3ddc474598ded3c339933d7a483cef 100644
--- a/v3_8_0/CDT-schedule-v3_8_0.xsd
+++ b/v3_8_0/CDT-schedule-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd b/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd
index bce13f4cf56f8b667712ab90b22c2fa1a986821a..79df5465f50736e46e04ae79a870edc6d7ece4b2 100644
--- a/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd
+++ b/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd
index a820356a76a97f26c004616b02e5a123baccd884..e41d8b2fde282eb49c03dddfb25ed198167f3e9a 100644
--- a/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd
index e7b3f2a2a641fd731001f972a289e1e8788c4df7..d94745288d696b7a4eba1457dd8df8dfe3fb5d94 100644
--- a/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd
+++ b/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd
index 96e67d86d497914f65951912e39812f3259d6310..df9896c800912027317c5a26130d5022a9876abc 100644
--- a/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd
+++ b/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd b/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd
index 97b2fb0cd31557625a1cf97a918e97d1a673eef1..23808a1f43b572a5c7ca231a8ae28f570af024f6 100644
--- a/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd
+++ b/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd b/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd
index c0afeb5998c69c1b5f3f22fd52a8b65f19fa68f5..0b95b5ff792bfd626a88f6a10411c937e0ef2d41 100644
--- a/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd
+++ b/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-software-v3_8_0.xsd b/v3_8_0/CDT-software-v3_8_0.xsd
index 386785e70eb59f8f835bcb81a8f0afd53ce264fc..2c705616efb094fd6b99d39e8679c664c01899f0 100644
--- a/v3_8_0/CDT-software-v3_8_0.xsd
+++ b/v3_8_0/CDT-software-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-statsCollect-v3_8_0.xsd b/v3_8_0/CDT-statsCollect-v3_8_0.xsd
index ed284023ebba7a60a010f3e2c408eda3142cd451..fab6a24e686d2b72cc15be841636e42aefa65a04 100644
--- a/v3_8_0/CDT-statsCollect-v3_8_0.xsd
+++ b/v3_8_0/CDT-statsCollect-v3_8_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-statsConfig-v3_8_0.xsd b/v3_8_0/CDT-statsConfig-v3_8_0.xsd
index fb872b36ec95cd13b545ae3f23c7eaf85f74256c..84e9b0f034cb7e58a647921865c591e28a4bb695 100644
--- a/v3_8_0/CDT-statsConfig-v3_8_0.xsd
+++ b/v3_8_0/CDT-statsConfig-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-subscription-v3_8_0.xsd b/v3_8_0/CDT-subscription-v3_8_0.xsd
index f9ecbd6f989b087d350200a52c8bce3f1267fc03..7f2422cc02482379c397d1cfe0eb2c89cc9ff110 100644
--- a/v3_8_0/CDT-subscription-v3_8_0.xsd
+++ b/v3_8_0/CDT-subscription-v3_8_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-svcFwWrapper-v3_8_0.xsd b/v3_8_0/CDT-svcFwWrapper-v3_8_0.xsd
index a5f65866f5b86f9daf8516c6e4f98c720c5e9002..b4f8edb9ffeea525ba85d005406d376456b56d8c 100644
--- a/v3_8_0/CDT-svcFwWrapper-v3_8_0.xsd
+++ b/v3_8_0/CDT-svcFwWrapper-v3_8_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-svcObjWrapper-v3_8_0.xsd b/v3_8_0/CDT-svcObjWrapper-v3_8_0.xsd
index a955aaad651bdaf0183017612fe6645ee1e780b9..0c81db5a807dab1126a29e7bd47e38c9672bd113 100644
--- a/v3_8_0/CDT-svcObjWrapper-v3_8_0.xsd
+++ b/v3_8_0/CDT-svcObjWrapper-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_8_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-timeSeries-v3_8_0.xsd b/v3_8_0/CDT-timeSeries-v3_8_0.xsd
index ba18601a5e98cfd9df6ae4e8c307073483225d86..3facab68c188edf43392f49d031c7fa40dcbbf2d 100644
--- a/v3_8_0/CDT-timeSeries-v3_8_0.xsd
+++ b/v3_8_0/CDT-timeSeries-v3_8_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd b/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd
index 9b07c56ebb2b77e91820b5df4c9b8044f8296d40..8572ecf1fcef5e5daff233032d18b2ebdf440ee7 100644
--- a/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd
+++ b/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-token-v3_8_0.xsd b/v3_8_0/CDT-token-v3_8_0.xsd
index 1ed3218d8621bbaaadacbdb101799d2d6c961744..67440f156ee35af6e7dc987147d769724d98d8d9 100644
--- a/v3_8_0/CDT-token-v3_8_0.xsd
+++ b/v3_8_0/CDT-token-v3_8_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_8_0/CDT-triggerRequest-v3_8_0.xsd b/v3_8_0/CDT-triggerRequest-v3_8_0.xsd
index 87b98c8ad72b49569cfd57be04b3f1b13595317b..ba0c0c314239bf1e18fd7a699d0fda061c807a36 100644
--- a/v3_8_0/CDT-triggerRequest-v3_8_0.xsd
+++ b/v3_8_0/CDT-triggerRequest-v3_8_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>