diff --git a/v3_7_0/CDT-AE-v3_7_0.xsd b/v3_7_0/CDT-AE-v3_7_0.xsd
index 0c27fc3b7f7f47351ebdccef786b635fb53e67ac..505f784dceac4bf5c1ecb7eb83e9df1b22f430b5 100644
--- a/v3_7_0/CDT-AE-v3_7_0.xsd
+++ b/v3_7_0/CDT-AE-v3_7_0.xsd
@@ -26,18 +26,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_7_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-AEContactList-v3_7_0.xsd b/v3_7_0/CDT-AEContactList-v3_7_0.xsd
index 7d270deea4868fe7c928f7f01179ad302f3304e3..8f1e9f67c6cf6bfb5e9c8af82658f9676461b2d2 100644
--- a/v3_7_0/CDT-AEContactList-v3_7_0.xsd
+++ b/v3_7_0/CDT-AEContactList-v3_7_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_7_0.xsd" />
 
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_7_0/CDT-AEContactListPerCSE-v3_7_0.xsd b/v3_7_0/CDT-AEContactListPerCSE-v3_7_0.xsd
index 0f7d0306900b30dd6127efdc9315553026505c41..625e7ecef95b184e45b6e428d125f6de3a9174a8 100644
--- a/v3_7_0/CDT-AEContactListPerCSE-v3_7_0.xsd
+++ b/v3_7_0/CDT-AEContactListPerCSE-v3_7_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-CSEBase-v3_7_0.xsd b/v3_7_0/CDT-CSEBase-v3_7_0.xsd
index 2ff337281ce0fae582c9ca9752b9cd7cf5cad7bb..56a15752429663e9d8a35347a3b4d92e13266aca 100644
--- a/v3_7_0/CDT-CSEBase-v3_7_0.xsd
+++ b/v3_7_0/CDT-CSEBase-v3_7_0.xsd
@@ -26,34 +26,34 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_6_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_6_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_6_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_7_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_7_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_7_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_7_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-accessControlPolicy-v3_7_0.xsd b/v3_7_0/CDT-accessControlPolicy-v3_7_0.xsd
index eebbae9b4e6731008b40badfc99f91188129fb64..978b42543fccf61ca577230bf306ceca1cfd65a6 100644
--- a/v3_7_0/CDT-accessControlPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-accessControlPolicy-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-activeCmdhPolicy-v3_7_0.xsd b/v3_7_0/CDT-activeCmdhPolicy-v3_7_0.xsd
index db5e856b2d7236aaa9401bf055f0154acb1b6b8a..70288f70e782472aecf91b71b45ab2267a1d7112 100644
--- a/v3_7_0/CDT-activeCmdhPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-activeCmdhPolicy-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_7_0/CDT-allJoynApp-v3_7_0.xsd b/v3_7_0/CDT-allJoynApp-v3_7_0.xsd
index d5d9d233e5f6340887e4ca96f6a113522bd81842..f71a484710230865cd1c3113f55b4746adf5b94c 100644
--- a/v3_7_0/CDT-allJoynApp-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynApp-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_7_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-allJoynInterface-v3_7_0.xsd b/v3_7_0/CDT-allJoynInterface-v3_7_0.xsd
index 9fa28551b5409ce1622de4927b4edcd1c0a129ce..22288e29af67bf29ec490a60646b4ec5b532cd47 100644
--- a/v3_7_0/CDT-allJoynInterface-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynInterface-v3_7_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_7_0/CDT-allJoynMethod-v3_7_0.xsd b/v3_7_0/CDT-allJoynMethod-v3_7_0.xsd
index 46750917c4fb1de61fb3c23aa5a3c02853fe0894..0053b233923c26b32a3dcedce917eba762a2c8b8 100644
--- a/v3_7_0/CDT-allJoynMethod-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynMethod-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_7_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_7_0/CDT-allJoynMethodCall-v3_7_0.xsd b/v3_7_0/CDT-allJoynMethodCall-v3_7_0.xsd
index cbf32599be0d2d84998275b59196118f9bc1f07c..ede24868759ef80e3421d1a4a2c148a995d43221 100644
--- a/v3_7_0/CDT-allJoynMethodCall-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynMethodCall-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-allJoynProperty-v3_7_0.xsd b/v3_7_0/CDT-allJoynProperty-v3_7_0.xsd
index 33e7fb3ec93d11b37dd3322dea8ff2a93505ca66..8ec653fe558d0aa3fa0af79132dc95e6a2faa1e4 100644
--- a/v3_7_0/CDT-allJoynProperty-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynProperty-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-allJoynSvcObject-v3_7_0.xsd b/v3_7_0/CDT-allJoynSvcObject-v3_7_0.xsd
index 6a52618e069881b2600058c8f9dd949dffbea660..c2704bebcfd644252a01a178f35daba2f76522fb 100644
--- a/v3_7_0/CDT-allJoynSvcObject-v3_7_0.xsd
+++ b/v3_7_0/CDT-allJoynSvcObject-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_7_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-areaNwkDeviceInfo-v3_7_0.xsd b/v3_7_0/CDT-areaNwkDeviceInfo-v3_7_0.xsd
index 643c45bfca816716d97c95db6a781da6d442cc6a..63d8d4dc6dc33061d0a63b888122784be6c1a01a 100644
--- a/v3_7_0/CDT-areaNwkDeviceInfo-v3_7_0.xsd
+++ b/v3_7_0/CDT-areaNwkDeviceInfo-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-areaNwkInfo-v3_7_0.xsd b/v3_7_0/CDT-areaNwkInfo-v3_7_0.xsd
index 945046314e41646ccb7cafeb0276f398b1478121..55a2f0566f03430e62d8ff6a00242dd87f54465e 100644
--- a/v3_7_0/CDT-areaNwkInfo-v3_7_0.xsd
+++ b/v3_7_0/CDT-areaNwkInfo-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-authorizationDecision-v3_7_0.xsd b/v3_7_0/CDT-authorizationDecision-v3_7_0.xsd
index ee39c798a00058d9ae59781d9f8a788107ef87b0..3da3fd8c73c4a4bde7a4bdba31775b12c4b1aee8 100644
--- a/v3_7_0/CDT-authorizationDecision-v3_7_0.xsd
+++ b/v3_7_0/CDT-authorizationDecision-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-authorizationInformation-v3_7_0.xsd b/v3_7_0/CDT-authorizationInformation-v3_7_0.xsd
index ddfd47e8c221015c078d1d66513c7e27b0ec5e0f..6434f0cbdebaa3340388629fab22339c69a9c200 100644
--- a/v3_7_0/CDT-authorizationInformation-v3_7_0.xsd
+++ b/v3_7_0/CDT-authorizationInformation-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-authorizationPolicy-v3_7_0.xsd b/v3_7_0/CDT-authorizationPolicy-v3_7_0.xsd
index 7d426148be76420160911c0bfbc9559ab0a3bbea..65ab5dcda0ea11fcaae00f71a282d46bea6728a7 100644
--- a/v3_7_0/CDT-authorizationPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-authorizationPolicy-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-battery-v3_7_0.xsd b/v3_7_0/CDT-battery-v3_7_0.xsd
index 588e928d1c6c0cfd290ffbd2d2c4599357332b82..372cdec7d184e5904c656cc0d45560903a2a4ae9 100644
--- a/v3_7_0/CDT-battery-v3_7_0.xsd
+++ b/v3_7_0/CDT-battery-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-cmdhBuffer-v3_7_0.xsd b/v3_7_0/CDT-cmdhBuffer-v3_7_0.xsd
index efeb8ac3b0f488e2fde06b635b70761be9cffefb..c8956aafa377f13f55167f6a077668d37385e90a 100644
--- a/v3_7_0/CDT-cmdhBuffer-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhBuffer-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhDefEcValue-v3_7_0.xsd b/v3_7_0/CDT-cmdhDefEcValue-v3_7_0.xsd
index e7a7f2b9a28a45abb260d31769c021f60ac47412..9b84a527f6334f419d449de103cbdb86357f6168 100644
--- a/v3_7_0/CDT-cmdhDefEcValue-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhDefEcValue-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhDefaults-v3_7_0.xsd b/v3_7_0/CDT-cmdhDefaults-v3_7_0.xsd
index edc3f6baefb7a6a01d68410a31399b0c725081c7..ff13c0d8fe5dea9d34f64b5e72b4eebd2eb8706d 100644
--- a/v3_7_0/CDT-cmdhDefaults-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhDefaults-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhEcDefParamValues-v3_7_0.xsd b/v3_7_0/CDT-cmdhEcDefParamValues-v3_7_0.xsd
index 1c705980613c3bcc9da6669273ef2156b4216631..7109897850fdce2ecd2d12191d59e562d91c4a36 100644
--- a/v3_7_0/CDT-cmdhEcDefParamValues-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhEcDefParamValues-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_7_0/CDT-cmdhLimits-v3_7_0.xsd b/v3_7_0/CDT-cmdhLimits-v3_7_0.xsd
index 3526d72f1a879fa496c007f620cd1a4c61f6d4d0..a78a24215c2ca58348eb7429abbc8652adedbf60 100644
--- a/v3_7_0/CDT-cmdhLimits-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhLimits-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhNetworkAccessRules-v3_7_0.xsd b/v3_7_0/CDT-cmdhNetworkAccessRules-v3_7_0.xsd
index e2adc6b72e63304e56f72b3a6830031be781400c..1588719abac7be6d948b379cbf45787a80a69a20 100644
--- a/v3_7_0/CDT-cmdhNetworkAccessRules-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhNetworkAccessRules-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhNwAccessRule-v3_7_0.xsd b/v3_7_0/CDT-cmdhNwAccessRule-v3_7_0.xsd
index 92fbe7fa11d411916fc83ae0e47efd7558d47c25..8d357f0ec361e657ae2257bad8321dee4be3eda6 100644
--- a/v3_7_0/CDT-cmdhNwAccessRule-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhNwAccessRule-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_7_0/CDT-cmdhPolicy-v3_7_0.xsd b/v3_7_0/CDT-cmdhPolicy-v3_7_0.xsd
index d750a42d63df6486915f0cb0ac43312ed34cedb4..1bb8700d8d60cf89f12906ce7e4b9bcfa31482e5 100644
--- a/v3_7_0/CDT-cmdhPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-cmdhPolicy-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_7_0/CDT-commonTypes-v3_7_0.xsd b/v3_7_0/CDT-commonTypes-v3_7_0.xsd
index 449162ef4700b707a134f5031a0978af12f62fba..0e93ced7d21e0e1cb3f5e9b13dc49454306e0dd3 100644
--- a/v3_7_0/CDT-commonTypes-v3_7_0.xsd
+++ b/v3_7_0/CDT-commonTypes-v3_7_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_7_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_7_0/CDT-container-v3_7_0.xsd b/v3_7_0/CDT-container-v3_7_0.xsd
index cd833662eb19a7f6c760e8488f277298f0d67a6c..e1fac0456ebe617483cbca7874bf4732d4d4a4d7 100644
--- a/v3_7_0/CDT-container-v3_7_0.xsd
+++ b/v3_7_0/CDT-container-v3_7_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_7_0/CDT-contentInstance-v3_7_0.xsd b/v3_7_0/CDT-contentInstance-v3_7_0.xsd
index b3bfcc95b8a12a352f1a9f176e87c21fa7f695bd..171e6dfd13c2a2afd42293bac9e80e91c6da80ce 100644
--- a/v3_7_0/CDT-contentInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-contentInstance-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-delivery-v3_7_0.xsd b/v3_7_0/CDT-delivery-v3_7_0.xsd
index 12b83797b2484d6d0a5e65bc003ec6f779e15f36..f5e24ab382a144618ba21d59f58298f31ddcf9b3 100644
--- a/v3_7_0/CDT-delivery-v3_7_0.xsd
+++ b/v3_7_0/CDT-delivery-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_7_0/CDT-deviceCapability-v3_7_0.xsd b/v3_7_0/CDT-deviceCapability-v3_7_0.xsd
index 12eb026066dcd37cade1ee0b9c2731862dcfd9bc..3a8086f1f3f3e4dfdee31a8e732ddd652d678f64 100644
--- a/v3_7_0/CDT-deviceCapability-v3_7_0.xsd
+++ b/v3_7_0/CDT-deviceCapability-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-deviceInfo-v3_7_0.xsd b/v3_7_0/CDT-deviceInfo-v3_7_0.xsd
index fa66e7304ffd2870c95a1ed8653c6e5e0295fe57..36b7622faf2fa220a82b48dbd47b22075c0afb61 100644
--- a/v3_7_0/CDT-deviceInfo-v3_7_0.xsd
+++ b/v3_7_0/CDT-deviceInfo-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-dynamicAuthorizationConsultation-v3_7_0.xsd b/v3_7_0/CDT-dynamicAuthorizationConsultation-v3_7_0.xsd
index 5bc511b982d77468cfcac1cc8053d5e0333d3bd6..f338c0e00a91b5f71a465e2271b181857c883c4a 100644
--- a/v3_7_0/CDT-dynamicAuthorizationConsultation-v3_7_0.xsd
+++ b/v3_7_0/CDT-dynamicAuthorizationConsultation-v3_7_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-eventConfig-v3_7_0.xsd b/v3_7_0/CDT-eventConfig-v3_7_0.xsd
index 6a1c08e60d19f0d12191f0048e4c9abcef1e7429..8fedac61de6464661e0831fa0969f8e47afce0c0 100644
--- a/v3_7_0/CDT-eventConfig-v3_7_0.xsd
+++ b/v3_7_0/CDT-eventConfig-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-eventLog-v3_7_0.xsd b/v3_7_0/CDT-eventLog-v3_7_0.xsd
index 52c177a75c769bd104165571e072de16fffa24eb..768c3929b05e4703479d85983c38178aedfefc79 100644
--- a/v3_7_0/CDT-eventLog-v3_7_0.xsd
+++ b/v3_7_0/CDT-eventLog-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-execInstance-v3_7_0.xsd b/v3_7_0/CDT-execInstance-v3_7_0.xsd
index 2e03089ae2252bd8b21bb788e3e32202a986e4a8..7cfdc347ac43e1ceb0134ba80f3a5ad94daa9c94 100644
--- a/v3_7_0/CDT-execInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-execInstance-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-firmware-v3_7_0.xsd b/v3_7_0/CDT-firmware-v3_7_0.xsd
index 0d71c470fade95b80674f3856e806c1038d36c29..e80fea0e3b16d70b6694f3bb4a7ec850ff3d5943 100644
--- a/v3_7_0/CDT-firmware-v3_7_0.xsd
+++ b/v3_7_0/CDT-firmware-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-genericInterworkingOperationInstance-v3_7_0.xsd b/v3_7_0/CDT-genericInterworkingOperationInstance-v3_7_0.xsd
index b571d036cf2bcad8c88666525186ce27f36f6a7f..83441be6e200480fa6899b12ceaa818926c13c86 100644
--- a/v3_7_0/CDT-genericInterworkingOperationInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-genericInterworkingOperationInstance-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-genericInterworkingService-v3_7_0.xsd b/v3_7_0/CDT-genericInterworkingService-v3_7_0.xsd
index 180f776a70fb38147f03e0d81713291dd378ecd2..8262c8d83a530737d1817b837b7c6e2d0eea6814 100644
--- a/v3_7_0/CDT-genericInterworkingService-v3_7_0.xsd
+++ b/v3_7_0/CDT-genericInterworkingService-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_7_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-group-v3_7_0.xsd b/v3_7_0/CDT-group-v3_7_0.xsd
index ccf4114a27075f0ec829333ed867f0a7c8a42e4f..2f198e7ee1dd5e820d5e96d61fc94b24cd90a530 100644
--- a/v3_7_0/CDT-group-v3_7_0.xsd
+++ b/v3_7_0/CDT-group-v3_7_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-localMulticastGroup-v3_7_0.xsd b/v3_7_0/CDT-localMulticastGroup-v3_7_0.xsd
index b9cf39ec9f0bd9627b0ba9def881ede217b1fefd..9bea85d87482c3045a1941b86473035592f51bbe 100644
--- a/v3_7_0/CDT-localMulticastGroup-v3_7_0.xsd
+++ b/v3_7_0/CDT-localMulticastGroup-v3_7_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_6_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_7_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_7_0/CDT-locationPolicy-v3_7_0.xsd b/v3_7_0/CDT-locationPolicy-v3_7_0.xsd
index 175c325c9eec0e29369f4bfbfd85191a81268c3b..d201f3ebdf74ff4a28e59526a3bb19f1d0f336e4 100644
--- a/v3_7_0/CDT-locationPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-locationPolicy-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd b/v3_7_0/CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd
index 0acf475dd51f81faae2ee6a0d8cbe7eac71fc236..7d5c3aba337976882484d8b0c55632554d942b82 100644
--- a/v3_7_0/CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd
+++ b/v3_7_0/CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_7_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-memory-v3_7_0.xsd b/v3_7_0/CDT-memory-v3_7_0.xsd
index 499842d4a3024b168eadb972377ff297ffb5baac..ed05045d44c45f7836b70d437f199668d2bead2a 100644
--- a/v3_7_0/CDT-memory-v3_7_0.xsd
+++ b/v3_7_0/CDT-memory-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-mgmtCmd-v3_7_0.xsd b/v3_7_0/CDT-mgmtCmd-v3_7_0.xsd
index 79632169553e96f01995ddc26cbe80a949a3492a..81593fefc9cd8683e647b5d0b8e1ce5dd1f9850c 100644
--- a/v3_7_0/CDT-mgmtCmd-v3_7_0.xsd
+++ b/v3_7_0/CDT-mgmtCmd-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_7_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-multimediaSession-v3_7_0.xsd b/v3_7_0/CDT-multimediaSession-v3_7_0.xsd
index 95b5c83d1fe27921680f27c15ef05eae56875752..e4efb540ad3190be470badc618bff9e795764e9e 100644
--- a/v3_7_0/CDT-multimediaSession-v3_7_0.xsd
+++ b/v3_7_0/CDT-multimediaSession-v3_7_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-node-v3_7_0.xsd b/v3_7_0/CDT-node-v3_7_0.xsd
index 2fc9913695b32c81ae18c25837b0f48ee828401d..995d50d885c5c24be446184f05799801de22af53 100644
--- a/v3_7_0/CDT-node-v3_7_0.xsd
+++ b/v3_7_0/CDT-node-v3_7_0.xsd
@@ -27,22 +27,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_7_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-notification-v3_7_0.xsd b/v3_7_0/CDT-notification-v3_7_0.xsd
index 0ea36caff9a5884b2bd7086ae1e2a48906cf40ec..761498fcff74ea2f51c05964e0997d3dc49c3b4c 100644
--- a/v3_7_0/CDT-notification-v3_7_0.xsd
+++ b/v3_7_0/CDT-notification-v3_7_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_6_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_7_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_7_0/CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd b/v3_7_0/CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd
index bd8b7bb5cd96bcb23519c37cdd39309d010f38c0..8a63826f42e1dda98d998007e24cf570c88f005a 100644
--- a/v3_7_0/CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd
+++ b/v3_7_0/CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-notificationTargetPolicy-v3_7_0.xsd b/v3_7_0/CDT-notificationTargetPolicy-v3_7_0.xsd
index ee6471891dd7cb7d6325153b1bb22521fd280904..1a104dc7b350ad42ebb145365cd86401b4dd8058 100644
--- a/v3_7_0/CDT-notificationTargetPolicy-v3_7_0.xsd
+++ b/v3_7_0/CDT-notificationTargetPolicy-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-ontology-v3_7_0.xsd b/v3_7_0/CDT-ontology-v3_7_0.xsd
index cd7c57ce93ecdc43996df70b7cb73e300f0f9520..74dbf617cccd29c0059912c7fcfa8e8310c02448 100644
--- a/v3_7_0/CDT-ontology-v3_7_0.xsd
+++ b/v3_7_0/CDT-ontology-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_7_0/CDT-ontologyRepository-v3_7_0.xsd b/v3_7_0/CDT-ontologyRepository-v3_7_0.xsd
index 885448a305873024545dc81658465bb6aa042242..dac8542a01689ab56193b94ee57b46b315acaae6 100644
--- a/v3_7_0/CDT-ontologyRepository-v3_7_0.xsd
+++ b/v3_7_0/CDT-ontologyRepository-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_7_0.xsd" />
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_7_0/CDT-policyDeletionRules-v3_7_0.xsd b/v3_7_0/CDT-policyDeletionRules-v3_7_0.xsd
index 68949e9679455ab39f5a9b4b240c50377bcea4aa..c2e3e7498ada86208ad028cb1d655256d539117e 100644
--- a/v3_7_0/CDT-policyDeletionRules-v3_7_0.xsd
+++ b/v3_7_0/CDT-policyDeletionRules-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-pollingChannel-v3_7_0.xsd b/v3_7_0/CDT-pollingChannel-v3_7_0.xsd
index fbf16fd4e7041d165663c7acfea7cb32c3aae80a..89d004c51074d099747678cc0798d81fc3529d0b 100644
--- a/v3_7_0/CDT-pollingChannel-v3_7_0.xsd
+++ b/v3_7_0/CDT-pollingChannel-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-reboot-v3_7_0.xsd b/v3_7_0/CDT-reboot-v3_7_0.xsd
index b8b20f30e49d7d5a34b589dfb5ffd56d036579bf..052f7cea51e685d197e535a5a00b5671039be7cb 100644
--- a/v3_7_0/CDT-reboot-v3_7_0.xsd
+++ b/v3_7_0/CDT-reboot-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-remoteCSE-v3_7_0.xsd b/v3_7_0/CDT-remoteCSE-v3_7_0.xsd
index e9a4e214d5ea67ff2255a149a11e0ddaeacbd755..b489dfdbc8861fd833f5c04b5964abd68fdea04e 100644
--- a/v3_7_0/CDT-remoteCSE-v3_7_0.xsd
+++ b/v3_7_0/CDT-remoteCSE-v3_7_0.xsd
@@ -26,20 +26,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
 
 
 						
diff --git a/v3_7_0/CDT-request-v3_7_0.xsd b/v3_7_0/CDT-request-v3_7_0.xsd
index ab8794db1d34e60d62e2cb87fe8a4949c5c4fbc0..79c317e7eb4850733dd734b162fa0e534dc2a0ec 100644
--- a/v3_7_0/CDT-request-v3_7_0.xsd
+++ b/v3_7_0/CDT-request-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-requestPrimitive-v3_7_0.xsd b/v3_7_0/CDT-requestPrimitive-v3_7_0.xsd
index c12728cae497635e1019519c825212a299af4ca7..b9172d8904a965353a3b31e74bc99edc20c2903e 100644
--- a/v3_7_0/CDT-requestPrimitive-v3_7_0.xsd
+++ b/v3_7_0/CDT-requestPrimitive-v3_7_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_7_0/CDT-responsePrimitive-v3_7_0.xsd b/v3_7_0/CDT-responsePrimitive-v3_7_0.xsd
index eafc5d24ff57784db35bee88f5574eb26def575d..c1d7277f0c28e8a5a9bb01c3d9e000c473295ab1 100644
--- a/v3_7_0/CDT-responsePrimitive-v3_7_0.xsd
+++ b/v3_7_0/CDT-responsePrimitive-v3_7_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_6_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_6_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_7_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_7_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_7_0/CDT-role-v3_7_0.xsd b/v3_7_0/CDT-role-v3_7_0.xsd
index b6ad0c843a13de65946c4b97836a1d8361e264f1..25fb1dc4bd5575c7a16336e3b9f63521e1af6519 100644
--- a/v3_7_0/CDT-role-v3_7_0.xsd
+++ b/v3_7_0/CDT-role-v3_7_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-schedule-v3_7_0.xsd b/v3_7_0/CDT-schedule-v3_7_0.xsd
index 2a5e2bca4ff4081694d0651ee1da3651e0a0f7bf..985a9de2781e31ea6be81ae8a5fbfe5c2841a701 100644
--- a/v3_7_0/CDT-schedule-v3_7_0.xsd
+++ b/v3_7_0/CDT-schedule-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-semanticDescriptor-v3_7_0.xsd b/v3_7_0/CDT-semanticDescriptor-v3_7_0.xsd
index 7f09add774c116ed8913b433654faf88c42fe0bb..bce13f4cf56f8b667712ab90b22c2fa1a986821a 100644
--- a/v3_7_0/CDT-semanticDescriptor-v3_7_0.xsd
+++ b/v3_7_0/CDT-semanticDescriptor-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-semanticMashupInstance-v3_7_0.xsd b/v3_7_0/CDT-semanticMashupInstance-v3_7_0.xsd
index 9b4a13662fc33c628f31f8a19e55e83fc6d37f7c..a820356a76a97f26c004616b02e5a123baccd884 100644
--- a/v3_7_0/CDT-semanticMashupInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-semanticMashupInstance-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-semanticMashupJobProfile-v3_7_0.xsd b/v3_7_0/CDT-semanticMashupJobProfile-v3_7_0.xsd
index ef5ec2688b71447fb8b6352afcaf25e88be7b127..e7b3f2a2a641fd731001f972a289e1e8788c4df7 100644
--- a/v3_7_0/CDT-semanticMashupJobProfile-v3_7_0.xsd
+++ b/v3_7_0/CDT-semanticMashupJobProfile-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-semanticMashupResult-v3_7_0.xsd b/v3_7_0/CDT-semanticMashupResult-v3_7_0.xsd
index 272411f2bd07cb9b30f45e6d424e4ae83d7e40c9..96e67d86d497914f65951912e39812f3259d6310 100644
--- a/v3_7_0/CDT-semanticMashupResult-v3_7_0.xsd
+++ b/v3_7_0/CDT-semanticMashupResult-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-serviceSubscribedAppRule-v3_7_0.xsd b/v3_7_0/CDT-serviceSubscribedAppRule-v3_7_0.xsd
index 06e357aa330ec9e98c1ac8b2b067638e66019814..97b2fb0cd31557625a1cf97a918e97d1a673eef1 100644
--- a/v3_7_0/CDT-serviceSubscribedAppRule-v3_7_0.xsd
+++ b/v3_7_0/CDT-serviceSubscribedAppRule-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-serviceSubscribedNode-v3_7_0.xsd b/v3_7_0/CDT-serviceSubscribedNode-v3_7_0.xsd
index 81e9da60093b0fa053293e7a94e4cdcc765b6d66..c0afeb5998c69c1b5f3f22fd52a8b65f19fa68f5 100644
--- a/v3_7_0/CDT-serviceSubscribedNode-v3_7_0.xsd
+++ b/v3_7_0/CDT-serviceSubscribedNode-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-software-v3_7_0.xsd b/v3_7_0/CDT-software-v3_7_0.xsd
index 3d0ceb5fc6b6e2d90ebaadf612f5fd4e9e4eef44..386785e70eb59f8f835bcb81a8f0afd53ce264fc 100644
--- a/v3_7_0/CDT-software-v3_7_0.xsd
+++ b/v3_7_0/CDT-software-v3_7_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-statsCollect-v3_7_0.xsd b/v3_7_0/CDT-statsCollect-v3_7_0.xsd
index 1a122c0923cbf864a7d02944cac362d1526a2d07..e0b69b6dd8a8d7b8fd211fadca2c909120312544 100644
--- a/v3_7_0/CDT-statsCollect-v3_7_0.xsd
+++ b/v3_7_0/CDT-statsCollect-v3_7_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-statsConfig-v3_7_0.xsd b/v3_7_0/CDT-statsConfig-v3_7_0.xsd
index 1eb44a42e8b17f4b71a0333956b2fe6139cbb113..fb872b36ec95cd13b545ae3f23c7eaf85f74256c 100644
--- a/v3_7_0/CDT-statsConfig-v3_7_0.xsd
+++ b/v3_7_0/CDT-statsConfig-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-subscription-v3_7_0.xsd b/v3_7_0/CDT-subscription-v3_7_0.xsd
index 7ab098361494280756c3ac392473b58d4a4163cd..20c5e47ed2c61332f6fa3cdbda463cf21513615b 100644
--- a/v3_7_0/CDT-subscription-v3_7_0.xsd
+++ b/v3_7_0/CDT-subscription-v3_7_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-svcFwWrapper-v3_7_0.xsd b/v3_7_0/CDT-svcFwWrapper-v3_7_0.xsd
index 3f9f8a9560e9d557edb7dffdea2662f3293758f2..a5f65866f5b86f9daf8516c6e4f98c720c5e9002 100644
--- a/v3_7_0/CDT-svcFwWrapper-v3_7_0.xsd
+++ b/v3_7_0/CDT-svcFwWrapper-v3_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-svcObjWrapper-v3_7_0.xsd b/v3_7_0/CDT-svcObjWrapper-v3_7_0.xsd
index 422114f9d41f251ab498a3f10efe0a3f87d9863b..a955aaad651bdaf0183017612fe6645ee1e780b9 100644
--- a/v3_7_0/CDT-svcObjWrapper-v3_7_0.xsd
+++ b/v3_7_0/CDT-svcObjWrapper-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_7_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-timeSeries-v3_7_0.xsd b/v3_7_0/CDT-timeSeries-v3_7_0.xsd
index 05d79a37a76d7949eff67c70bb420d66350fbab0..ba18601a5e98cfd9df6ae4e8c307073483225d86 100644
--- a/v3_7_0/CDT-timeSeries-v3_7_0.xsd
+++ b/v3_7_0/CDT-timeSeries-v3_7_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_7_0/CDT-timeSeriesInstance-v3_7_0.xsd b/v3_7_0/CDT-timeSeriesInstance-v3_7_0.xsd
index c82566f1256831b5bbac4c43822b3e8f337995d7..9b07c56ebb2b77e91820b5df4c9b8044f8296d40 100644
--- a/v3_7_0/CDT-timeSeriesInstance-v3_7_0.xsd
+++ b/v3_7_0/CDT-timeSeriesInstance-v3_7_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-token-v3_7_0.xsd b/v3_7_0/CDT-token-v3_7_0.xsd
index c47ad2829fe4a0790a180611ccb897d3e38aa4b7..1ed3218d8621bbaaadacbdb101799d2d6c961744 100644
--- a/v3_7_0/CDT-token-v3_7_0.xsd
+++ b/v3_7_0/CDT-token-v3_7_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_7_0/CDT-trafficPattern-v3_7_0.xsd b/v3_7_0/CDT-trafficPattern-v3_7_0.xsd
index 79e5f13135f6c9364f1459dc2e67a40b2d6eb533..ef0961f07b995db952bb4d0b711bdf5013925078 100644
--- a/v3_7_0/CDT-trafficPattern-v3_7_0.xsd
+++ b/v3_7_0/CDT-trafficPattern-v3_7_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>