diff --git a/v1_5_0/CDT-AE-v1_5_0.xsd b/v1_5_0/CDT-AE-v1_5_0.xsd
index 85983b0ca8e2544e25ce52673cfc62b2f66a097c..07e3faf0e80c82b67426420dc1f99c3a13dfee2c 100644
--- a/v1_5_0/CDT-AE-v1_5_0.xsd
+++ b/v1_5_0/CDT-AE-v1_5_0.xsd
@@ -26,13 +26,13 @@ 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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-CSEBase-v1_5_0.xsd b/v1_5_0/CDT-CSEBase-v1_5_0.xsd
index d00211ccef9654f564994fe7cb16459aba8df72e..13d78c36d5d3ba6888d105a53d439fe89cfd508d 100644
--- a/v1_5_0/CDT-CSEBase-v1_5_0.xsd
+++ b/v1_5_0/CDT-CSEBase-v1_5_0.xsd
@@ -26,23 +26,23 @@ 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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_4_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_4_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_5_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_5_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_5_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-accessControlPolicy-v1_5_0.xsd b/v1_5_0/CDT-accessControlPolicy-v1_5_0.xsd
index 81e775c9ea7eb0dd67084842e790249b7c837248..c67955e9e9fbed835407fd42eaee9f8b9c9a81ff 100644
--- a/v1_5_0/CDT-accessControlPolicy-v1_5_0.xsd
+++ b/v1_5_0/CDT-accessControlPolicy-v1_5_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-v1_4_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-activeCmdhPolicy-v1_5_0.xsd b/v1_5_0/CDT-activeCmdhPolicy-v1_5_0.xsd
index f6e7c2da7ac57be3f4467d38ae0f8be0427d22a6..dff3e900a4f37c83f844af1e81da4183fd9ad1cc 100644
--- a/v1_5_0/CDT-activeCmdhPolicy-v1_5_0.xsd
+++ b/v1_5_0/CDT-activeCmdhPolicy-v1_5_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-v1_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_5_0/CDT-areaNwkDeviceInfo-v1_5_0.xsd b/v1_5_0/CDT-areaNwkDeviceInfo-v1_5_0.xsd
index 5bbe982b4b41c3806c22e559e31c0ae801b86d66..cc927c87e2ab0c63e22eb7e2b2e7c53268c281be 100644
--- a/v1_5_0/CDT-areaNwkDeviceInfo-v1_5_0.xsd
+++ b/v1_5_0/CDT-areaNwkDeviceInfo-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-areaNwkInfo-v1_5_0.xsd b/v1_5_0/CDT-areaNwkInfo-v1_5_0.xsd
index 8520d2ddd5081c362cfe500f32e6b0c36704d1a3..71b55e9c257b0fa829daf903da15a78661449b63 100644
--- a/v1_5_0/CDT-areaNwkInfo-v1_5_0.xsd
+++ b/v1_5_0/CDT-areaNwkInfo-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-battery-v1_5_0.xsd b/v1_5_0/CDT-battery-v1_5_0.xsd
index bd66be08b0756b57f59a9c05f4d3ac5290fff3a3..3e18a9357346a3ea58d1c988c1d87b72476dca5d 100644
--- a/v1_5_0/CDT-battery-v1_5_0.xsd
+++ b/v1_5_0/CDT-battery-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-cmdhBuffer-v1_5_0.xsd b/v1_5_0/CDT-cmdhBuffer-v1_5_0.xsd
index 39a203cc0627151821d1278b3115b7f50764c708..55f695464e8ac0ad3c9b3ef039b102990528ad39 100644
--- a/v1_5_0/CDT-cmdhBuffer-v1_5_0.xsd
+++ b/v1_5_0/CDT-cmdhBuffer-v1_5_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-v1_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_5_0/CDT-cmdhDefEcValue-v1_5_0.xsd b/v1_5_0/CDT-cmdhDefEcValue-v1_5_0.xsd
index 71a26b7841279ac1cf7d0ce7f40b637ef9cc1f26..3476ec87d7e0147cd69b1a8de5ce8fd2b5e617b3 100644
--- a/v1_5_0/CDT-cmdhDefEcValue-v1_5_0.xsd
+++ b/v1_5_0/CDT-cmdhDefEcValue-v1_5_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-v1_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_5_0/CDT-cmdhDefaults-v1_5_0.xsd b/v1_5_0/CDT-cmdhDefaults-v1_5_0.xsd
index 868d0fd1603bc3caebc0e138521bfe6c85856f41..dab928e58954fe9bd40dbd7d772bd1a1753b2530 100644
--- a/v1_5_0/CDT-cmdhDefaults-v1_5_0.xsd
+++ b/v1_5_0/CDT-cmdhDefaults-v1_5_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-v1_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_5_0/CDT-cmdhEcDefParamValues-v1_5_0.xsd b/v1_5_0/CDT-cmdhEcDefParamValues-v1_5_0.xsd
index a243e8df49555c292984f79dff329cbe6fdfa35e..c8e2bed510af91de25eb1f1080efcdad60e1bfa4 100644
--- a/v1_5_0/CDT-cmdhEcDefParamValues-v1_5_0.xsd
+++ b/v1_5_0/CDT-cmdhEcDefParamValues-v1_5_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-v1_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_5_0/CDT-cmdhLimits-v1_5_0.xsd b/v1_5_0/CDT-cmdhLimits-v1_5_0.xsd
index f8f20ab448bc2d6870ef35362bc4ec473ac9a854..1de54ffa510daa3a2331fab80ab8ce5ce292d413 100644
--- a/v1_5_0/CDT-cmdhLimits-v1_5_0.xsd
+++ b/v1_5_0/CDT-cmdhLimits-v1_5_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-v1_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_5_0/CDT-cmdhNetworkAccessRules-v1_5_0.xsd b/v1_5_0/CDT-cmdhNetworkAccessRules-v1_5_0.xsd
index 21d112a12bc9b26f42017ac418f47d00e0ac648a..7c0cf21bf2dc246146f3e2520a77b08b060fe82a 100644
--- a/v1_5_0/CDT-cmdhNetworkAccessRules-v1_5_0.xsd
+++ b/v1_5_0/CDT-cmdhNetworkAccessRules-v1_5_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-v1_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_5_0/CDT-cmdhNwAccessRule-v1_5_0.xsd b/v1_5_0/CDT-cmdhNwAccessRule-v1_5_0.xsd
index 802bb4b077166aedaa9ef8bc8239a9d7ba5ee2fe..c029299a99f48b4b7ccca4bc8899924d79fe48c0 100644
--- a/v1_5_0/CDT-cmdhNwAccessRule-v1_5_0.xsd
+++ b/v1_5_0/CDT-cmdhNwAccessRule-v1_5_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-v1_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_5_0/CDT-cmdhPolicy-v1_5_0.xsd b/v1_5_0/CDT-cmdhPolicy-v1_5_0.xsd
index 005712721ad8d8d4d31a365dacde270f19753662..6551ee7b9b5452d7dd91100ac92fc6c017cb3d73 100644
--- a/v1_5_0/CDT-cmdhPolicy-v1_5_0.xsd
+++ b/v1_5_0/CDT-cmdhPolicy-v1_5_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-v1_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_5_0/CDT-commonTypes-v1_5_0.xsd b/v1_5_0/CDT-commonTypes-v1_5_0.xsd
index 63f9a30728927a12f0a203a8d30bcc1c843ec4fb..bd8ecb59d378e6c46bb932cd13fb73696d6a717e 100644
--- a/v1_5_0/CDT-commonTypes-v1_5_0.xsd
+++ b/v1_5_0/CDT-commonTypes-v1_5_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-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_5_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_5_0/CDT-container-v1_5_0.xsd b/v1_5_0/CDT-container-v1_5_0.xsd
index 2e5ff807e80cdcdea3226989da3eb1906c57652d..7e82affcb9aa081f34047cada74ec03f72122a79 100644
--- a/v1_5_0/CDT-container-v1_5_0.xsd
+++ b/v1_5_0/CDT-container-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-contentInstance-v1_5_0.xsd b/v1_5_0/CDT-contentInstance-v1_5_0.xsd
index 88682f224cf0e3407d38621e789e65f948567fa8..8ae2d7b84e3f1d3955ac3f81ac8822f271cbda4f 100644
--- a/v1_5_0/CDT-contentInstance-v1_5_0.xsd
+++ b/v1_5_0/CDT-contentInstance-v1_5_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-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-delivery-v1_5_0.xsd b/v1_5_0/CDT-delivery-v1_5_0.xsd
index 761e5fe4676a0292d516754bd6b2c22de96f6d34..a50974bb0d15ffcc0003a466ca3393c6693e4887 100644
--- a/v1_5_0/CDT-delivery-v1_5_0.xsd
+++ b/v1_5_0/CDT-delivery-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_5_0/CDT-deviceCapability-v1_5_0.xsd b/v1_5_0/CDT-deviceCapability-v1_5_0.xsd
index 0200d4b85eaeb175f898f4463d174b1ea6f88511..c3da6cfe44c9214e2c90ae865496f07ca5ab0fde 100644
--- a/v1_5_0/CDT-deviceCapability-v1_5_0.xsd
+++ b/v1_5_0/CDT-deviceCapability-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-deviceInfo-v1_5_0.xsd b/v1_5_0/CDT-deviceInfo-v1_5_0.xsd
index 1a51d07dad34f111247c63ad69c65f3c581e4136..574d70c2ad25e6e6727399b56493ce400c1bf08e 100644
--- a/v1_5_0/CDT-deviceInfo-v1_5_0.xsd
+++ b/v1_5_0/CDT-deviceInfo-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-eventConfig-v1_5_0.xsd b/v1_5_0/CDT-eventConfig-v1_5_0.xsd
index bb208d54f595c737d4d76996573584abe93c31e9..007fc247d168f648934732e940a45ab769d73bca 100644
--- a/v1_5_0/CDT-eventConfig-v1_5_0.xsd
+++ b/v1_5_0/CDT-eventConfig-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-eventLog-v1_5_0.xsd b/v1_5_0/CDT-eventLog-v1_5_0.xsd
index 2a398824ca6c54273753ed1ce0b11ddba8d4187b..542e18aa7d3024db7156c54ffe217be1011ee747 100644
--- a/v1_5_0/CDT-eventLog-v1_5_0.xsd
+++ b/v1_5_0/CDT-eventLog-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-execInstance-v1_5_0.xsd b/v1_5_0/CDT-execInstance-v1_5_0.xsd
index cfd4cc563b5b2fb347059f7a91af58149914d41a..4e41d4409cc636f1b37dc22f4c418bd37bf4a102 100644
--- a/v1_5_0/CDT-execInstance-v1_5_0.xsd
+++ b/v1_5_0/CDT-execInstance-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-firmware-v1_5_0.xsd b/v1_5_0/CDT-firmware-v1_5_0.xsd
index 6f193999c088780ee0225749be1e0b08858ee0c5..5ac63a2300de10c0fbb3a667beaf4a1b7f058285 100644
--- a/v1_5_0/CDT-firmware-v1_5_0.xsd
+++ b/v1_5_0/CDT-firmware-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-group-v1_5_0.xsd b/v1_5_0/CDT-group-v1_5_0.xsd
index e5c61c9169625f66d5465b0431edf8f6cd275e37..8fdd673e293751eec99495438a1005ce62b19581 100644
--- a/v1_5_0/CDT-group-v1_5_0.xsd
+++ b/v1_5_0/CDT-group-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-locationPolicy-v1_5_0.xsd b/v1_5_0/CDT-locationPolicy-v1_5_0.xsd
index ae3a8f868bce0b7a4574475ba550f86f93d3e2c3..34f0592d7c4d096a5c817d2a8441c8f9ac4686db 100644
--- a/v1_5_0/CDT-locationPolicy-v1_5_0.xsd
+++ b/v1_5_0/CDT-locationPolicy-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-m2mServiceSubscriptionProfile-v1_5_0.xsd b/v1_5_0/CDT-m2mServiceSubscriptionProfile-v1_5_0.xsd
index 0bbec963ac3de37d39d1dbf12bec3bdcb45feb09..fc998190d7561b4226e9fe1b5c858cff2e671a6c 100644
--- a/v1_5_0/CDT-m2mServiceSubscriptionProfile-v1_5_0.xsd
+++ b/v1_5_0/CDT-m2mServiceSubscriptionProfile-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_5_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-memory-v1_5_0.xsd b/v1_5_0/CDT-memory-v1_5_0.xsd
index 6d3191aef65b1c7bdc4732d547dbf98933bb88a0..d6630434f3bb653bbb788c9278f3586efe10bf53 100644
--- a/v1_5_0/CDT-memory-v1_5_0.xsd
+++ b/v1_5_0/CDT-memory-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-mgmtCmd-v1_5_0.xsd b/v1_5_0/CDT-mgmtCmd-v1_5_0.xsd
index db72add16b7db7fcdc27b9feed1edccedd8aaec6..154baac56f0e0cab8f021804491a1ed4bc729447 100644
--- a/v1_5_0/CDT-mgmtCmd-v1_5_0.xsd
+++ b/v1_5_0/CDT-mgmtCmd-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_5_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-node-v1_5_0.xsd b/v1_5_0/CDT-node-v1_5_0.xsd
index 185fb00201ffcea69d9094800d99d1e2bf6bc592..8145de09065708ceb8934266f0376a852e425506 100644
--- a/v1_5_0/CDT-node-v1_5_0.xsd
+++ b/v1_5_0/CDT-node-v1_5_0.xsd
@@ -27,20 +27,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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-notification-v1_5_0.xsd b/v1_5_0/CDT-notification-v1_5_0.xsd
index 2a0186aa05a163c9b1a195b8c24b614c34e8ddc0..f511d5e95d8bc4c7245d219f71c0f28ac6d36cf3 100644
--- a/v1_5_0/CDT-notification-v1_5_0.xsd
+++ b/v1_5_0/CDT-notification-v1_5_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-v1_4_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_4_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_5_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_5_0/CDT-pollingChannel-v1_5_0.xsd b/v1_5_0/CDT-pollingChannel-v1_5_0.xsd
index 1e20b5e807c9716e2cabaad5e1399f009c50f022..983a7dff6c6ecc3ea8ce233057aa759658d84aa7 100644
--- a/v1_5_0/CDT-pollingChannel-v1_5_0.xsd
+++ b/v1_5_0/CDT-pollingChannel-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-reboot-v1_5_0.xsd b/v1_5_0/CDT-reboot-v1_5_0.xsd
index 941b97f8c1ae0266142cc0748263a6f2ffdf8eb8..f0904a2ced414ca2459e9c2d61bc11aa6301a08a 100644
--- a/v1_5_0/CDT-reboot-v1_5_0.xsd
+++ b/v1_5_0/CDT-reboot-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-remoteCSE-v1_5_0.xsd b/v1_5_0/CDT-remoteCSE-v1_5_0.xsd
index 9eaaf3c934e051233f3fcd647c319a6ef43fd05d..3736a00b632f1275471371ea6d9f464f24bb8af7 100644
--- a/v1_5_0/CDT-remoteCSE-v1_5_0.xsd
+++ b/v1_5_0/CDT-remoteCSE-v1_5_0.xsd
@@ -26,15 +26,15 @@ 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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_5_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-request-v1_5_0.xsd b/v1_5_0/CDT-request-v1_5_0.xsd
index 324da8b2d4310142a0b2576e1b6f60c148e2e9a9..7c7cb6e51a42f2ff9960b3d2935db70db5bf7dfd 100644
--- a/v1_5_0/CDT-request-v1_5_0.xsd
+++ b/v1_5_0/CDT-request-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-requestPrimitive-v1_5_0.xsd b/v1_5_0/CDT-requestPrimitive-v1_5_0.xsd
index bd8aee08e90694d36e4bda8733fc5bec4972abb0..7a3558df3d99290d7bbd717ea546b119148a765c 100644
--- a/v1_5_0/CDT-requestPrimitive-v1_5_0.xsd
+++ b/v1_5_0/CDT-requestPrimitive-v1_5_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-v1_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_5_0/CDT-responsePrimitive-v1_5_0.xsd b/v1_5_0/CDT-responsePrimitive-v1_5_0.xsd
index 3e7ce68389da592eb5e83178d45bd08239a6eda2..33608ed92e12f10a08531a405f189962d090be32 100644
--- a/v1_5_0/CDT-responsePrimitive-v1_5_0.xsd
+++ b/v1_5_0/CDT-responsePrimitive-v1_5_0.xsd
@@ -28,51 +28,51 @@ 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-v1_4_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v1_4_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v1_5_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
   
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_5_0/CDT-schedule-v1_5_0.xsd b/v1_5_0/CDT-schedule-v1_5_0.xsd
index af2a61e5c0061a070cfcab6bbdb12bcf51484d2c..19bd5f7a606f5a5809241864023721be4fe4b826 100644
--- a/v1_5_0/CDT-schedule-v1_5_0.xsd
+++ b/v1_5_0/CDT-schedule-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-serviceSubscribedAppRule-v1_5_0.xsd b/v1_5_0/CDT-serviceSubscribedAppRule-v1_5_0.xsd
index 236fe69cd7d956c213a6bb6ada535df80d23e388..e56e3a25636701c46554833438be528adf674e9a 100644
--- a/v1_5_0/CDT-serviceSubscribedAppRule-v1_5_0.xsd
+++ b/v1_5_0/CDT-serviceSubscribedAppRule-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-serviceSubscribedNode-v1_5_0.xsd b/v1_5_0/CDT-serviceSubscribedNode-v1_5_0.xsd
index bdd5a8233debbf604aa166c219636c18e8788f2d..b253f303892d67fb7f3c772d7728d94204ccac9a 100644
--- a/v1_5_0/CDT-serviceSubscribedNode-v1_5_0.xsd
+++ b/v1_5_0/CDT-serviceSubscribedNode-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-software-v1_5_0.xsd b/v1_5_0/CDT-software-v1_5_0.xsd
index f8903ba5d96f70b2f431314dda731ab8c43a7b8e..c4593a1329f667e38eb500dea334df7d979363da 100644
--- a/v1_5_0/CDT-software-v1_5_0.xsd
+++ b/v1_5_0/CDT-software-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-statsCollect-v1_5_0.xsd b/v1_5_0/CDT-statsCollect-v1_5_0.xsd
index 5e7ee9821512c188318a852736c99d6cbdb6a05e..e270bbafa58f4853438f3e9ee8c62125b6c6bb5b 100644
--- a/v1_5_0/CDT-statsCollect-v1_5_0.xsd
+++ b/v1_5_0/CDT-statsCollect-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-statsConfig-v1_5_0.xsd b/v1_5_0/CDT-statsConfig-v1_5_0.xsd
index d88f48e80ba7da94f96003ee95a13fdb46684644..13772df13271e6d63fbd1b9c31c8638c98d806bd 100644
--- a/v1_5_0/CDT-statsConfig-v1_5_0.xsd
+++ b/v1_5_0/CDT-statsConfig-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_5_0/CDT-subscription-v1_5_0.xsd b/v1_5_0/CDT-subscription-v1_5_0.xsd
index 5ceb73143d4b91e2a663e502d1142fe8e8c8e3ec..375d66683745fecc2ef96f3dc05d4d1e1fb6eb86 100644
--- a/v1_5_0/CDT-subscription-v1_5_0.xsd
+++ b/v1_5_0/CDT-subscription-v1_5_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-v1_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>