From 2cab9daa906319ee53c8b8bfb92deef04e6cf84c Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Fri, 5 Feb 2016 13:20:00 +0100
Subject: [PATCH] updated schemaLocation attribute values

---
 v1_6_0/CDT-AE-v1_6_0.xsd                      | 14 +--
 v1_6_0/CDT-CSEBase-v1_6_0.xsd                 | 34 +++----
 v1_6_0/CDT-accessControlPolicy-v1_6_0.xsd     |  4 +-
 v1_6_0/CDT-activeCmdhPolicy-v1_6_0.xsd        |  2 +-
 v1_6_0/CDT-areaNwkDeviceInfo-v1_6_0.xsd       |  4 +-
 v1_6_0/CDT-areaNwkInfo-v1_6_0.xsd             |  4 +-
 v1_6_0/CDT-battery-v1_6_0.xsd                 |  4 +-
 v1_6_0/CDT-cmdhBuffer-v1_6_0.xsd              |  2 +-
 v1_6_0/CDT-cmdhDefEcValue-v1_6_0.xsd          |  2 +-
 v1_6_0/CDT-cmdhDefaults-v1_6_0.xsd            |  2 +-
 v1_6_0/CDT-cmdhEcDefParamValues-v1_6_0.xsd    |  2 +-
 v1_6_0/CDT-cmdhLimits-v1_6_0.xsd              |  2 +-
 v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_0.xsd  |  2 +-
 v1_6_0/CDT-cmdhNwAccessRule-v1_6_0.xsd        |  2 +-
 v1_6_0/CDT-cmdhPolicy-v1_6_0.xsd              |  2 +-
 v1_6_0/CDT-commonTypes-v1_6_0.xsd             |  2 +-
 v1_6_0/CDT-container-v1_6_0.xsd               |  6 +-
 v1_6_0/CDT-contentInstance-v1_6_0.xsd         |  2 +-
 v1_6_0/CDT-delivery-v1_6_0.xsd                |  4 +-
 v1_6_0/CDT-deviceCapability-v1_6_0.xsd        |  4 +-
 v1_6_0/CDT-deviceInfo-v1_6_0.xsd              |  4 +-
 v1_6_0/CDT-eventConfig-v1_6_0.xsd             |  4 +-
 v1_6_0/CDT-eventLog-v1_6_0.xsd                |  4 +-
 v1_6_0/CDT-execInstance-v1_6_0.xsd            |  4 +-
 v1_6_0/CDT-firmware-v1_6_0.xsd                |  4 +-
 v1_6_0/CDT-group-v1_6_0.xsd                   |  4 +-
 v1_6_0/CDT-locationPolicy-v1_6_0.xsd          |  4 +-
 ...T-m2mServiceSubscriptionProfile-v1_6_0.xsd |  6 +-
 v1_6_0/CDT-memory-v1_6_0.xsd                  |  4 +-
 v1_6_0/CDT-mgmtCmd-v1_6_0.xsd                 |  6 +-
 v1_6_0/CDT-node-v1_6_0.xsd                    | 28 +++---
 v1_6_0/CDT-notification-v1_6_0.xsd            |  4 +-
 v1_6_0/CDT-pollingChannel-v1_6_0.xsd          |  4 +-
 v1_6_0/CDT-reboot-v1_6_0.xsd                  |  4 +-
 v1_6_0/CDT-remoteCSE-v1_6_0.xsd               | 18 ++--
 v1_6_0/CDT-request-v1_6_0.xsd                 |  4 +-
 v1_6_0/CDT-requestPrimitive-v1_6_0.xsd        |  2 +-
 v1_6_0/CDT-responsePrimitive-v1_6_0.xsd       | 90 +++++++++----------
 v1_6_0/CDT-schedule-v1_6_0.xsd                |  4 +-
 .../CDT-serviceSubscribedAppRule-v1_6_0.xsd   |  4 +-
 v1_6_0/CDT-serviceSubscribedNode-v1_6_0.xsd   |  4 +-
 v1_6_0/CDT-software-v1_6_0.xsd                |  4 +-
 v1_6_0/CDT-statsCollect-v1_6_0.xsd            |  4 +-
 v1_6_0/CDT-statsConfig-v1_6_0.xsd             |  6 +-
 v1_6_0/CDT-subscription-v1_6_0.xsd            |  4 +-
 45 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/v1_6_0/CDT-AE-v1_6_0.xsd b/v1_6_0/CDT-AE-v1_6_0.xsd
index c47f986..79ad121 100644
--- a/v1_6_0/CDT-AE-v1_6_0.xsd
+++ b/v1_6_0/CDT-AE-v1_6_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_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-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-CSEBase-v1_6_0.xsd b/v1_6_0/CDT-CSEBase-v1_6_0.xsd
index 13d78c3..afe4111 100644
--- a/v1_6_0/CDT-CSEBase-v1_6_0.xsd
+++ b/v1_6_0/CDT-CSEBase-v1_6_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_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:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_6_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_6_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-accessControlPolicy-v1_6_0.xsd b/v1_6_0/CDT-accessControlPolicy-v1_6_0.xsd
index c67955e..df94e9c 100644
--- a/v1_6_0/CDT-accessControlPolicy-v1_6_0.xsd
+++ b/v1_6_0/CDT-accessControlPolicy-v1_6_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_5_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-activeCmdhPolicy-v1_6_0.xsd b/v1_6_0/CDT-activeCmdhPolicy-v1_6_0.xsd
index dff3e90..fc89785 100644
--- a/v1_6_0/CDT-activeCmdhPolicy-v1_6_0.xsd
+++ b/v1_6_0/CDT-activeCmdhPolicy-v1_6_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_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_6_0/CDT-areaNwkDeviceInfo-v1_6_0.xsd b/v1_6_0/CDT-areaNwkDeviceInfo-v1_6_0.xsd
index cc927c8..348e53c 100644
--- a/v1_6_0/CDT-areaNwkDeviceInfo-v1_6_0.xsd
+++ b/v1_6_0/CDT-areaNwkDeviceInfo-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-areaNwkInfo-v1_6_0.xsd b/v1_6_0/CDT-areaNwkInfo-v1_6_0.xsd
index 71b55e9..e18a7c7 100644
--- a/v1_6_0/CDT-areaNwkInfo-v1_6_0.xsd
+++ b/v1_6_0/CDT-areaNwkInfo-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-battery-v1_6_0.xsd b/v1_6_0/CDT-battery-v1_6_0.xsd
index 3e18a93..8b7bee5 100644
--- a/v1_6_0/CDT-battery-v1_6_0.xsd
+++ b/v1_6_0/CDT-battery-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-cmdhBuffer-v1_6_0.xsd b/v1_6_0/CDT-cmdhBuffer-v1_6_0.xsd
index 55f6954..793d16e 100644
--- a/v1_6_0/CDT-cmdhBuffer-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhBuffer-v1_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhDefEcValue-v1_6_0.xsd b/v1_6_0/CDT-cmdhDefEcValue-v1_6_0.xsd
index 3476ec8..87827f6 100644
--- a/v1_6_0/CDT-cmdhDefEcValue-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhDefEcValue-v1_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhDefaults-v1_6_0.xsd b/v1_6_0/CDT-cmdhDefaults-v1_6_0.xsd
index dab928e..2927c73 100644
--- a/v1_6_0/CDT-cmdhDefaults-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhDefaults-v1_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhEcDefParamValues-v1_6_0.xsd b/v1_6_0/CDT-cmdhEcDefParamValues-v1_6_0.xsd
index c8e2bed..e65ed67 100644
--- a/v1_6_0/CDT-cmdhEcDefParamValues-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhEcDefParamValues-v1_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_6_0/CDT-cmdhLimits-v1_6_0.xsd b/v1_6_0/CDT-cmdhLimits-v1_6_0.xsd
index 1de54ff..84c3d74 100644
--- a/v1_6_0/CDT-cmdhLimits-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhLimits-v1_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_0.xsd b/v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_0.xsd
index 7c0cf21..b9eba3c 100644
--- a/v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhNetworkAccessRules-v1_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhNwAccessRule-v1_6_0.xsd b/v1_6_0/CDT-cmdhNwAccessRule-v1_6_0.xsd
index c029299..974fecc 100644
--- a/v1_6_0/CDT-cmdhNwAccessRule-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhNwAccessRule-v1_6_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_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_6_0/CDT-cmdhPolicy-v1_6_0.xsd b/v1_6_0/CDT-cmdhPolicy-v1_6_0.xsd
index 6551ee7..d519bed 100644
--- a/v1_6_0/CDT-cmdhPolicy-v1_6_0.xsd
+++ b/v1_6_0/CDT-cmdhPolicy-v1_6_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_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_6_0/CDT-commonTypes-v1_6_0.xsd b/v1_6_0/CDT-commonTypes-v1_6_0.xsd
index 5523936..9cea8a7 100644
--- a/v1_6_0/CDT-commonTypes-v1_6_0.xsd
+++ b/v1_6_0/CDT-commonTypes-v1_6_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_5_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_6_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_6_0/CDT-container-v1_6_0.xsd b/v1_6_0/CDT-container-v1_6_0.xsd
index 7e82aff..df5146c 100644
--- a/v1_6_0/CDT-container-v1_6_0.xsd
+++ b/v1_6_0/CDT-container-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-contentInstance-v1_6_0.xsd b/v1_6_0/CDT-contentInstance-v1_6_0.xsd
index 8ae2d7b..73c088c 100644
--- a/v1_6_0/CDT-contentInstance-v1_6_0.xsd
+++ b/v1_6_0/CDT-contentInstance-v1_6_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_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-delivery-v1_6_0.xsd b/v1_6_0/CDT-delivery-v1_6_0.xsd
index a50974b..e7acb3d 100644
--- a/v1_6_0/CDT-delivery-v1_6_0.xsd
+++ b/v1_6_0/CDT-delivery-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_6_0/CDT-deviceCapability-v1_6_0.xsd b/v1_6_0/CDT-deviceCapability-v1_6_0.xsd
index c3da6cf..85dc62e 100644
--- a/v1_6_0/CDT-deviceCapability-v1_6_0.xsd
+++ b/v1_6_0/CDT-deviceCapability-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-deviceInfo-v1_6_0.xsd b/v1_6_0/CDT-deviceInfo-v1_6_0.xsd
index 574d70c..30305fd 100644
--- a/v1_6_0/CDT-deviceInfo-v1_6_0.xsd
+++ b/v1_6_0/CDT-deviceInfo-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-eventConfig-v1_6_0.xsd b/v1_6_0/CDT-eventConfig-v1_6_0.xsd
index 007fc24..3140676 100644
--- a/v1_6_0/CDT-eventConfig-v1_6_0.xsd
+++ b/v1_6_0/CDT-eventConfig-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-eventLog-v1_6_0.xsd b/v1_6_0/CDT-eventLog-v1_6_0.xsd
index 542e18a..7a713f2 100644
--- a/v1_6_0/CDT-eventLog-v1_6_0.xsd
+++ b/v1_6_0/CDT-eventLog-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-execInstance-v1_6_0.xsd b/v1_6_0/CDT-execInstance-v1_6_0.xsd
index 4e41d44..37c790f 100644
--- a/v1_6_0/CDT-execInstance-v1_6_0.xsd
+++ b/v1_6_0/CDT-execInstance-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-firmware-v1_6_0.xsd b/v1_6_0/CDT-firmware-v1_6_0.xsd
index 5ac63a2..47944e2 100644
--- a/v1_6_0/CDT-firmware-v1_6_0.xsd
+++ b/v1_6_0/CDT-firmware-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-group-v1_6_0.xsd b/v1_6_0/CDT-group-v1_6_0.xsd
index d28deba..c2e408c 100644
--- a/v1_6_0/CDT-group-v1_6_0.xsd
+++ b/v1_6_0/CDT-group-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-locationPolicy-v1_6_0.xsd b/v1_6_0/CDT-locationPolicy-v1_6_0.xsd
index 34f0592..3631265 100644
--- a/v1_6_0/CDT-locationPolicy-v1_6_0.xsd
+++ b/v1_6_0/CDT-locationPolicy-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd b/v1_6_0/CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd
index fc99819..1460b01 100644
--- a/v1_6_0/CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd
+++ b/v1_6_0/CDT-m2mServiceSubscriptionProfile-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_6_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-memory-v1_6_0.xsd b/v1_6_0/CDT-memory-v1_6_0.xsd
index d663043..0e7821d 100644
--- a/v1_6_0/CDT-memory-v1_6_0.xsd
+++ b/v1_6_0/CDT-memory-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-mgmtCmd-v1_6_0.xsd b/v1_6_0/CDT-mgmtCmd-v1_6_0.xsd
index 154baac..97ccc0d 100644
--- a/v1_6_0/CDT-mgmtCmd-v1_6_0.xsd
+++ b/v1_6_0/CDT-mgmtCmd-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_6_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-node-v1_6_0.xsd b/v1_6_0/CDT-node-v1_6_0.xsd
index 8145de0..d369c05 100644
--- a/v1_6_0/CDT-node-v1_6_0.xsd
+++ b/v1_6_0/CDT-node-v1_6_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_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:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-notification-v1_6_0.xsd b/v1_6_0/CDT-notification-v1_6_0.xsd
index 6c6dba4..8170b2b 100644
--- a/v1_6_0/CDT-notification-v1_6_0.xsd
+++ b/v1_6_0/CDT-notification-v1_6_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_5_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_5_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_6_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_6_0/CDT-pollingChannel-v1_6_0.xsd b/v1_6_0/CDT-pollingChannel-v1_6_0.xsd
index 983a7df..4f5959f 100644
--- a/v1_6_0/CDT-pollingChannel-v1_6_0.xsd
+++ b/v1_6_0/CDT-pollingChannel-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-reboot-v1_6_0.xsd b/v1_6_0/CDT-reboot-v1_6_0.xsd
index f0904a2..b0375f7 100644
--- a/v1_6_0/CDT-reboot-v1_6_0.xsd
+++ b/v1_6_0/CDT-reboot-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-remoteCSE-v1_6_0.xsd b/v1_6_0/CDT-remoteCSE-v1_6_0.xsd
index 3736a00..c55247e 100644
--- a/v1_6_0/CDT-remoteCSE-v1_6_0.xsd
+++ b/v1_6_0/CDT-remoteCSE-v1_6_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_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:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-request-v1_6_0.xsd b/v1_6_0/CDT-request-v1_6_0.xsd
index 7c7cb6e..af63e0e 100644
--- a/v1_6_0/CDT-request-v1_6_0.xsd
+++ b/v1_6_0/CDT-request-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-requestPrimitive-v1_6_0.xsd b/v1_6_0/CDT-requestPrimitive-v1_6_0.xsd
index a995bba..9bff80a 100644
--- a/v1_6_0/CDT-requestPrimitive-v1_6_0.xsd
+++ b/v1_6_0/CDT-requestPrimitive-v1_6_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_5_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_6_0/CDT-responsePrimitive-v1_6_0.xsd b/v1_6_0/CDT-responsePrimitive-v1_6_0.xsd
index 33608ed..68b232a 100644
--- a/v1_6_0/CDT-responsePrimitive-v1_6_0.xsd
+++ b/v1_6_0/CDT-responsePrimitive-v1_6_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_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:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
   
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_6_0/CDT-schedule-v1_6_0.xsd b/v1_6_0/CDT-schedule-v1_6_0.xsd
index 19bd5f7..bbb0e6c 100644
--- a/v1_6_0/CDT-schedule-v1_6_0.xsd
+++ b/v1_6_0/CDT-schedule-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-serviceSubscribedAppRule-v1_6_0.xsd b/v1_6_0/CDT-serviceSubscribedAppRule-v1_6_0.xsd
index e56e3a2..f0c26f2 100644
--- a/v1_6_0/CDT-serviceSubscribedAppRule-v1_6_0.xsd
+++ b/v1_6_0/CDT-serviceSubscribedAppRule-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-serviceSubscribedNode-v1_6_0.xsd b/v1_6_0/CDT-serviceSubscribedNode-v1_6_0.xsd
index b253f30..acba5e2 100644
--- a/v1_6_0/CDT-serviceSubscribedNode-v1_6_0.xsd
+++ b/v1_6_0/CDT-serviceSubscribedNode-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-software-v1_6_0.xsd b/v1_6_0/CDT-software-v1_6_0.xsd
index c4593a1..9f32958 100644
--- a/v1_6_0/CDT-software-v1_6_0.xsd
+++ b/v1_6_0/CDT-software-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-statsCollect-v1_6_0.xsd b/v1_6_0/CDT-statsCollect-v1_6_0.xsd
index e270bba..d8985c4 100644
--- a/v1_6_0/CDT-statsCollect-v1_6_0.xsd
+++ b/v1_6_0/CDT-statsCollect-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-statsConfig-v1_6_0.xsd b/v1_6_0/CDT-statsConfig-v1_6_0.xsd
index 13772df..2093834 100644
--- a/v1_6_0/CDT-statsConfig-v1_6_0.xsd
+++ b/v1_6_0/CDT-statsConfig-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_5_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_6_0/CDT-subscription-v1_6_0.xsd b/v1_6_0/CDT-subscription-v1_6_0.xsd
index 375d666..4ed60b0 100644
--- a/v1_6_0/CDT-subscription-v1_6_0.xsd
+++ b/v1_6_0/CDT-subscription-v1_6_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_5_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_5_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab