From 9d8f96575c04ac4763219652bb32d59604ccfe40 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Mon, 15 Jan 2018 22:11:22 +0100
Subject: [PATCH] updated schemaLocation attribute values

---
 v2_16_0/CDT-AE-v2_16_0.xsd                    | 20 ++--
 v2_16_0/CDT-CSEBase-v2_16_0.xsd               | 40 ++++----
 v2_16_0/CDT-accessControlPolicy-v2_16_0.xsd   |  4 +-
 v2_16_0/CDT-activeCmdhPolicy-v2_16_0.xsd      |  2 +-
 v2_16_0/CDT-allJoynApp-v2_16_0.xsd            |  8 +-
 v2_16_0/CDT-allJoynInterface-v2_16_0.xsd      | 12 +--
 v2_16_0/CDT-allJoynMethod-v2_16_0.xsd         |  8 +-
 v2_16_0/CDT-allJoynMethodCall-v2_16_0.xsd     |  6 +-
 v2_16_0/CDT-allJoynProperty-v2_16_0.xsd       |  6 +-
 v2_16_0/CDT-allJoynSvcObject-v2_16_0.xsd      |  8 +-
 v2_16_0/CDT-areaNwkDeviceInfo-v2_16_0.xsd     |  4 +-
 v2_16_0/CDT-areaNwkInfo-v2_16_0.xsd           |  4 +-
 v2_16_0/CDT-battery-v2_16_0.xsd               |  4 +-
 v2_16_0/CDT-cmdhBuffer-v2_16_0.xsd            |  2 +-
 v2_16_0/CDT-cmdhDefEcValue-v2_16_0.xsd        |  2 +-
 v2_16_0/CDT-cmdhDefaults-v2_16_0.xsd          |  2 +-
 v2_16_0/CDT-cmdhEcDefParamValues-v2_16_0.xsd  |  2 +-
 v2_16_0/CDT-cmdhLimits-v2_16_0.xsd            |  2 +-
 .../CDT-cmdhNetworkAccessRules-v2_16_0.xsd    |  2 +-
 v2_16_0/CDT-cmdhNwAccessRule-v2_16_0.xsd      |  2 +-
 v2_16_0/CDT-cmdhPolicy-v2_16_0.xsd            |  2 +-
 v2_16_0/CDT-commonTypes-v2_16_0.xsd           |  2 +-
 v2_16_0/CDT-container-v2_16_0.xsd             |  8 +-
 v2_16_0/CDT-contentInstance-v2_16_0.xsd       |  4 +-
 v2_16_0/CDT-delivery-v2_16_0.xsd              |  4 +-
 v2_16_0/CDT-deviceCapability-v2_16_0.xsd      |  4 +-
 v2_16_0/CDT-deviceInfo-v2_16_0.xsd            |  4 +-
 ...namicAuthorizationConsultation-v2_16_0.xsd |  2 +-
 v2_16_0/CDT-eventConfig-v2_16_0.xsd           |  4 +-
 v2_16_0/CDT-eventLog-v2_16_0.xsd              |  4 +-
 v2_16_0/CDT-execInstance-v2_16_0.xsd          |  4 +-
 v2_16_0/CDT-firmware-v2_16_0.xsd              |  4 +-
 ...cInterworkingOperationInstance-v2_16_0.xsd |  6 +-
 ...CDT-genericInterworkingService-v2_16_0.xsd |  8 +-
 v2_16_0/CDT-group-v2_16_0.xsd                 |  6 +-
 v2_16_0/CDT-locationPolicy-v2_16_0.xsd        |  4 +-
 ...-m2mServiceSubscriptionProfile-v2_16_0.xsd |  6 +-
 v2_16_0/CDT-memory-v2_16_0.xsd                |  4 +-
 v2_16_0/CDT-mgmtCmd-v2_16_0.xsd               |  6 +-
 v2_16_0/CDT-node-v2_16_0.xsd                  | 32 +++---
 v2_16_0/CDT-notification-v2_16_0.xsd          |  4 +-
 ...otificationTargetMgmtPolicyRef-v2_16_0.xsd |  4 +-
 .../CDT-notificationTargetPolicy-v2_16_0.xsd  |  6 +-
 v2_16_0/CDT-policyDeletionRules-v2_16_0.xsd   |  4 +-
 v2_16_0/CDT-pollingChannel-v2_16_0.xsd        |  4 +-
 v2_16_0/CDT-reboot-v2_16_0.xsd                |  4 +-
 v2_16_0/CDT-remoteCSE-v2_16_0.xsd             | 22 ++---
 v2_16_0/CDT-request-v2_16_0.xsd               |  4 +-
 v2_16_0/CDT-requestPrimitive-v2_16_0.xsd      |  2 +-
 v2_16_0/CDT-responsePrimitive-v2_16_0.xsd     | 98 +++++++++----------
 v2_16_0/CDT-role-v2_16_0.xsd                  |  2 +-
 v2_16_0/CDT-schedule-v2_16_0.xsd              |  4 +-
 v2_16_0/CDT-semanticDescriptor-v2_16_0.xsd    |  4 +-
 .../CDT-serviceSubscribedAppRule-v2_16_0.xsd  |  4 +-
 v2_16_0/CDT-serviceSubscribedNode-v2_16_0.xsd |  4 +-
 v2_16_0/CDT-software-v2_16_0.xsd              |  4 +-
 v2_16_0/CDT-statsCollect-v2_16_0.xsd          |  4 +-
 v2_16_0/CDT-statsConfig-v2_16_0.xsd           |  6 +-
 v2_16_0/CDT-subscription-v2_16_0.xsd          |  6 +-
 v2_16_0/CDT-svcFwWrapper-v2_16_0.xsd          |  6 +-
 v2_16_0/CDT-svcObjWrapper-v2_16_0.xsd         |  8 +-
 v2_16_0/CDT-timeSeries-v2_16_0.xsd            |  8 +-
 v2_16_0/CDT-timeSeriesInstance-v2_16_0.xsd    |  2 +-
 v2_16_0/CDT-token-v2_16_0.xsd                 |  2 +-
 v2_16_0/CDT-trafficPattern-v2_16_0.xsd        |  6 +-
 65 files changed, 240 insertions(+), 240 deletions(-)

diff --git a/v2_16_0/CDT-AE-v2_16_0.xsd b/v2_16_0/CDT-AE-v2_16_0.xsd
index 808a68d..a034623 100644
--- a/v2_16_0/CDT-AE-v2_16_0.xsd
+++ b/v2_16_0/CDT-AE-v2_16_0.xsd
@@ -26,16 +26,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_16_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-CSEBase-v2_16_0.xsd b/v2_16_0/CDT-CSEBase-v2_16_0.xsd
index 281689f..3fb77eb 100644
--- a/v2_16_0/CDT-CSEBase-v2_16_0.xsd
+++ b/v2_16_0/CDT-CSEBase-v2_16_0.xsd
@@ -26,26 +26,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_15_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_15_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_16_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_16_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_16_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-accessControlPolicy-v2_16_0.xsd b/v2_16_0/CDT-accessControlPolicy-v2_16_0.xsd
index f5ed44c..f61d45a 100644
--- a/v2_16_0/CDT-accessControlPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-accessControlPolicy-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-activeCmdhPolicy-v2_16_0.xsd b/v2_16_0/CDT-activeCmdhPolicy-v2_16_0.xsd
index e029d17..2fbaf0b 100644
--- a/v2_16_0/CDT-activeCmdhPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-activeCmdhPolicy-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_16_0/CDT-allJoynApp-v2_16_0.xsd b/v2_16_0/CDT-allJoynApp-v2_16_0.xsd
index e3ffdc7..49d5322 100644
--- a/v2_16_0/CDT-allJoynApp-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynApp-v2_16_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_16_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-allJoynInterface-v2_16_0.xsd b/v2_16_0/CDT-allJoynInterface-v2_16_0.xsd
index 5fcde68..915fdf5 100644
--- a/v2_16_0/CDT-allJoynInterface-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynInterface-v2_16_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_16_0/CDT-allJoynMethod-v2_16_0.xsd b/v2_16_0/CDT-allJoynMethod-v2_16_0.xsd
index c00069e..f9869f8 100644
--- a/v2_16_0/CDT-allJoynMethod-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynMethod-v2_16_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_16_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_16_0/CDT-allJoynMethodCall-v2_16_0.xsd b/v2_16_0/CDT-allJoynMethodCall-v2_16_0.xsd
index 3870c4b..7803cb5 100644
--- a/v2_16_0/CDT-allJoynMethodCall-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynMethodCall-v2_16_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-allJoynProperty-v2_16_0.xsd b/v2_16_0/CDT-allJoynProperty-v2_16_0.xsd
index c1bdcd5..848db17 100644
--- a/v2_16_0/CDT-allJoynProperty-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynProperty-v2_16_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-allJoynSvcObject-v2_16_0.xsd b/v2_16_0/CDT-allJoynSvcObject-v2_16_0.xsd
index ba1e3c7..f4821b7 100644
--- a/v2_16_0/CDT-allJoynSvcObject-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynSvcObject-v2_16_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_16_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-areaNwkDeviceInfo-v2_16_0.xsd b/v2_16_0/CDT-areaNwkDeviceInfo-v2_16_0.xsd
index ff695fa..234fd02 100644
--- a/v2_16_0/CDT-areaNwkDeviceInfo-v2_16_0.xsd
+++ b/v2_16_0/CDT-areaNwkDeviceInfo-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-areaNwkInfo-v2_16_0.xsd b/v2_16_0/CDT-areaNwkInfo-v2_16_0.xsd
index fceb369..2e74195 100644
--- a/v2_16_0/CDT-areaNwkInfo-v2_16_0.xsd
+++ b/v2_16_0/CDT-areaNwkInfo-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-battery-v2_16_0.xsd b/v2_16_0/CDT-battery-v2_16_0.xsd
index a1c2875..a106587 100644
--- a/v2_16_0/CDT-battery-v2_16_0.xsd
+++ b/v2_16_0/CDT-battery-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhBuffer-v2_16_0.xsd b/v2_16_0/CDT-cmdhBuffer-v2_16_0.xsd
index 20c5aaa..7fbec2e 100644
--- a/v2_16_0/CDT-cmdhBuffer-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhBuffer-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_16_0/CDT-cmdhDefEcValue-v2_16_0.xsd b/v2_16_0/CDT-cmdhDefEcValue-v2_16_0.xsd
index 503ef4a..2d69246 100644
--- a/v2_16_0/CDT-cmdhDefEcValue-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhDefEcValue-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_16_0/CDT-cmdhDefaults-v2_16_0.xsd b/v2_16_0/CDT-cmdhDefaults-v2_16_0.xsd
index b98a61e..44e692a 100644
--- a/v2_16_0/CDT-cmdhDefaults-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhDefaults-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_16_0/CDT-cmdhEcDefParamValues-v2_16_0.xsd b/v2_16_0/CDT-cmdhEcDefParamValues-v2_16_0.xsd
index 524c7e5..20adb3c 100644
--- a/v2_16_0/CDT-cmdhEcDefParamValues-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhEcDefParamValues-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_16_0/CDT-cmdhLimits-v2_16_0.xsd b/v2_16_0/CDT-cmdhLimits-v2_16_0.xsd
index 2146ec7..d3d2966 100644
--- a/v2_16_0/CDT-cmdhLimits-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhLimits-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_16_0/CDT-cmdhNetworkAccessRules-v2_16_0.xsd b/v2_16_0/CDT-cmdhNetworkAccessRules-v2_16_0.xsd
index 71524ac..87b4837 100644
--- a/v2_16_0/CDT-cmdhNetworkAccessRules-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhNetworkAccessRules-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_16_0/CDT-cmdhNwAccessRule-v2_16_0.xsd b/v2_16_0/CDT-cmdhNwAccessRule-v2_16_0.xsd
index 137fcc3..103162c 100644
--- a/v2_16_0/CDT-cmdhNwAccessRule-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhNwAccessRule-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_16_0/CDT-cmdhPolicy-v2_16_0.xsd b/v2_16_0/CDT-cmdhPolicy-v2_16_0.xsd
index 99f81a2..446fb39 100644
--- a/v2_16_0/CDT-cmdhPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhPolicy-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_16_0/CDT-commonTypes-v2_16_0.xsd b/v2_16_0/CDT-commonTypes-v2_16_0.xsd
index 5966aeb..dc4a93c 100644
--- a/v2_16_0/CDT-commonTypes-v2_16_0.xsd
+++ b/v2_16_0/CDT-commonTypes-v2_16_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_16_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_16_0/CDT-container-v2_16_0.xsd b/v2_16_0/CDT-container-v2_16_0.xsd
index 3b654a0..1af6423 100644
--- a/v2_16_0/CDT-container-v2_16_0.xsd
+++ b/v2_16_0/CDT-container-v2_16_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_16_0/CDT-contentInstance-v2_16_0.xsd b/v2_16_0/CDT-contentInstance-v2_16_0.xsd
index 0b7c1d1..5f6776d 100644
--- a/v2_16_0/CDT-contentInstance-v2_16_0.xsd
+++ b/v2_16_0/CDT-contentInstance-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-delivery-v2_16_0.xsd b/v2_16_0/CDT-delivery-v2_16_0.xsd
index bf2401e..b1e7985 100644
--- a/v2_16_0/CDT-delivery-v2_16_0.xsd
+++ b/v2_16_0/CDT-delivery-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_16_0/CDT-deviceCapability-v2_16_0.xsd b/v2_16_0/CDT-deviceCapability-v2_16_0.xsd
index 7d51a08..bb76961 100644
--- a/v2_16_0/CDT-deviceCapability-v2_16_0.xsd
+++ b/v2_16_0/CDT-deviceCapability-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-deviceInfo-v2_16_0.xsd b/v2_16_0/CDT-deviceInfo-v2_16_0.xsd
index 0f11a16..5f008e1 100644
--- a/v2_16_0/CDT-deviceInfo-v2_16_0.xsd
+++ b/v2_16_0/CDT-deviceInfo-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-dynamicAuthorizationConsultation-v2_16_0.xsd b/v2_16_0/CDT-dynamicAuthorizationConsultation-v2_16_0.xsd
index afca605..dcc9b2a 100644
--- a/v2_16_0/CDT-dynamicAuthorizationConsultation-v2_16_0.xsd
+++ b/v2_16_0/CDT-dynamicAuthorizationConsultation-v2_16_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-eventConfig-v2_16_0.xsd b/v2_16_0/CDT-eventConfig-v2_16_0.xsd
index 126234e..83b41fc 100644
--- a/v2_16_0/CDT-eventConfig-v2_16_0.xsd
+++ b/v2_16_0/CDT-eventConfig-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-eventLog-v2_16_0.xsd b/v2_16_0/CDT-eventLog-v2_16_0.xsd
index c40e465..52ee318 100644
--- a/v2_16_0/CDT-eventLog-v2_16_0.xsd
+++ b/v2_16_0/CDT-eventLog-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-execInstance-v2_16_0.xsd b/v2_16_0/CDT-execInstance-v2_16_0.xsd
index b705400..16c59f4 100644
--- a/v2_16_0/CDT-execInstance-v2_16_0.xsd
+++ b/v2_16_0/CDT-execInstance-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-firmware-v2_16_0.xsd b/v2_16_0/CDT-firmware-v2_16_0.xsd
index b8d5e4f..1ad968a 100644
--- a/v2_16_0/CDT-firmware-v2_16_0.xsd
+++ b/v2_16_0/CDT-firmware-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-genericInterworkingOperationInstance-v2_16_0.xsd b/v2_16_0/CDT-genericInterworkingOperationInstance-v2_16_0.xsd
index a0dcdec..c5c6288 100644
--- a/v2_16_0/CDT-genericInterworkingOperationInstance-v2_16_0.xsd
+++ b/v2_16_0/CDT-genericInterworkingOperationInstance-v2_16_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-genericInterworkingService-v2_16_0.xsd b/v2_16_0/CDT-genericInterworkingService-v2_16_0.xsd
index af0be10..04b721d 100644
--- a/v2_16_0/CDT-genericInterworkingService-v2_16_0.xsd
+++ b/v2_16_0/CDT-genericInterworkingService-v2_16_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_16_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-group-v2_16_0.xsd b/v2_16_0/CDT-group-v2_16_0.xsd
index 6605284..15d782a 100644
--- a/v2_16_0/CDT-group-v2_16_0.xsd
+++ b/v2_16_0/CDT-group-v2_16_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-locationPolicy-v2_16_0.xsd b/v2_16_0/CDT-locationPolicy-v2_16_0.xsd
index 9ce06da..921dfdf 100644
--- a/v2_16_0/CDT-locationPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-locationPolicy-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd b/v2_16_0/CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd
index 7deab48..00337a2 100644
--- a/v2_16_0/CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd
+++ b/v2_16_0/CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_16_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-memory-v2_16_0.xsd b/v2_16_0/CDT-memory-v2_16_0.xsd
index 3cbdded..e6feb72 100644
--- a/v2_16_0/CDT-memory-v2_16_0.xsd
+++ b/v2_16_0/CDT-memory-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-mgmtCmd-v2_16_0.xsd b/v2_16_0/CDT-mgmtCmd-v2_16_0.xsd
index 376790c..3111e17 100644
--- a/v2_16_0/CDT-mgmtCmd-v2_16_0.xsd
+++ b/v2_16_0/CDT-mgmtCmd-v2_16_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_16_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-node-v2_16_0.xsd b/v2_16_0/CDT-node-v2_16_0.xsd
index f2bff82..1a236a5 100644
--- a/v2_16_0/CDT-node-v2_16_0.xsd
+++ b/v2_16_0/CDT-node-v2_16_0.xsd
@@ -27,22 +27,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_16_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-notification-v2_16_0.xsd b/v2_16_0/CDT-notification-v2_16_0.xsd
index 97ac3fe..7bfb30e 100644
--- a/v2_16_0/CDT-notification-v2_16_0.xsd
+++ b/v2_16_0/CDT-notification-v2_16_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_15_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_16_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_16_0/CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd b/v2_16_0/CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd
index 252c7d5..27005f9 100644
--- a/v2_16_0/CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd
+++ b/v2_16_0/CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-notificationTargetPolicy-v2_16_0.xsd b/v2_16_0/CDT-notificationTargetPolicy-v2_16_0.xsd
index 9b1ca6d..1b102de 100644
--- a/v2_16_0/CDT-notificationTargetPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-notificationTargetPolicy-v2_16_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-policyDeletionRules-v2_16_0.xsd b/v2_16_0/CDT-policyDeletionRules-v2_16_0.xsd
index b54f2ff..1907b0a 100644
--- a/v2_16_0/CDT-policyDeletionRules-v2_16_0.xsd
+++ b/v2_16_0/CDT-policyDeletionRules-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-pollingChannel-v2_16_0.xsd b/v2_16_0/CDT-pollingChannel-v2_16_0.xsd
index e2ed9be..745209c 100644
--- a/v2_16_0/CDT-pollingChannel-v2_16_0.xsd
+++ b/v2_16_0/CDT-pollingChannel-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-reboot-v2_16_0.xsd b/v2_16_0/CDT-reboot-v2_16_0.xsd
index 4eb7cb4..f9ebdb4 100644
--- a/v2_16_0/CDT-reboot-v2_16_0.xsd
+++ b/v2_16_0/CDT-reboot-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-remoteCSE-v2_16_0.xsd b/v2_16_0/CDT-remoteCSE-v2_16_0.xsd
index b1d213d..943bbde 100644
--- a/v2_16_0/CDT-remoteCSE-v2_16_0.xsd
+++ b/v2_16_0/CDT-remoteCSE-v2_16_0.xsd
@@ -26,17 +26,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_16_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-request-v2_16_0.xsd b/v2_16_0/CDT-request-v2_16_0.xsd
index d2d5fa1..cc1f020 100644
--- a/v2_16_0/CDT-request-v2_16_0.xsd
+++ b/v2_16_0/CDT-request-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd b/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd
index 7bc93dd..8b875b6 100644
--- a/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd
+++ b/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd b/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd
index 833910d..68a715e 100644
--- a/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd
+++ b/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_15_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_16_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_16_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_16_0/CDT-role-v2_16_0.xsd b/v2_16_0/CDT-role-v2_16_0.xsd
index 690e6ae..6b1a7da 100644
--- a/v2_16_0/CDT-role-v2_16_0.xsd
+++ b/v2_16_0/CDT-role-v2_16_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-schedule-v2_16_0.xsd b/v2_16_0/CDT-schedule-v2_16_0.xsd
index 611449d..b1bbf79 100644
--- a/v2_16_0/CDT-schedule-v2_16_0.xsd
+++ b/v2_16_0/CDT-schedule-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-semanticDescriptor-v2_16_0.xsd b/v2_16_0/CDT-semanticDescriptor-v2_16_0.xsd
index 55f7cff..231ef6d 100644
--- a/v2_16_0/CDT-semanticDescriptor-v2_16_0.xsd
+++ b/v2_16_0/CDT-semanticDescriptor-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-serviceSubscribedAppRule-v2_16_0.xsd b/v2_16_0/CDT-serviceSubscribedAppRule-v2_16_0.xsd
index 842de73..bbb28be 100644
--- a/v2_16_0/CDT-serviceSubscribedAppRule-v2_16_0.xsd
+++ b/v2_16_0/CDT-serviceSubscribedAppRule-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-serviceSubscribedNode-v2_16_0.xsd b/v2_16_0/CDT-serviceSubscribedNode-v2_16_0.xsd
index 1711921..464f86e 100644
--- a/v2_16_0/CDT-serviceSubscribedNode-v2_16_0.xsd
+++ b/v2_16_0/CDT-serviceSubscribedNode-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-software-v2_16_0.xsd b/v2_16_0/CDT-software-v2_16_0.xsd
index 7bf20c9..b97bc0c 100644
--- a/v2_16_0/CDT-software-v2_16_0.xsd
+++ b/v2_16_0/CDT-software-v2_16_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-statsCollect-v2_16_0.xsd b/v2_16_0/CDT-statsCollect-v2_16_0.xsd
index 6eee2af..84ab4ed 100644
--- a/v2_16_0/CDT-statsCollect-v2_16_0.xsd
+++ b/v2_16_0/CDT-statsCollect-v2_16_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-statsConfig-v2_16_0.xsd b/v2_16_0/CDT-statsConfig-v2_16_0.xsd
index db0d3dc..b5d6b9b 100644
--- a/v2_16_0/CDT-statsConfig-v2_16_0.xsd
+++ b/v2_16_0/CDT-statsConfig-v2_16_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-subscription-v2_16_0.xsd b/v2_16_0/CDT-subscription-v2_16_0.xsd
index 1f04f75..ce403ad 100644
--- a/v2_16_0/CDT-subscription-v2_16_0.xsd
+++ b/v2_16_0/CDT-subscription-v2_16_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-svcFwWrapper-v2_16_0.xsd b/v2_16_0/CDT-svcFwWrapper-v2_16_0.xsd
index d5c7f05..4086755 100644
--- a/v2_16_0/CDT-svcFwWrapper-v2_16_0.xsd
+++ b/v2_16_0/CDT-svcFwWrapper-v2_16_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-svcObjWrapper-v2_16_0.xsd b/v2_16_0/CDT-svcObjWrapper-v2_16_0.xsd
index 32d80e6..9deb02e 100644
--- a/v2_16_0/CDT-svcObjWrapper-v2_16_0.xsd
+++ b/v2_16_0/CDT-svcObjWrapper-v2_16_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_16_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-timeSeries-v2_16_0.xsd b/v2_16_0/CDT-timeSeries-v2_16_0.xsd
index dbf6560..464ae68 100644
--- a/v2_16_0/CDT-timeSeries-v2_16_0.xsd
+++ b/v2_16_0/CDT-timeSeries-v2_16_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_16_0/CDT-timeSeriesInstance-v2_16_0.xsd b/v2_16_0/CDT-timeSeriesInstance-v2_16_0.xsd
index 90c705d..278b3ad 100644
--- a/v2_16_0/CDT-timeSeriesInstance-v2_16_0.xsd
+++ b/v2_16_0/CDT-timeSeriesInstance-v2_16_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-token-v2_16_0.xsd b/v2_16_0/CDT-token-v2_16_0.xsd
index 0c7994b..2b1431f 100644
--- a/v2_16_0/CDT-token-v2_16_0.xsd
+++ b/v2_16_0/CDT-token-v2_16_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_16_0/CDT-trafficPattern-v2_16_0.xsd b/v2_16_0/CDT-trafficPattern-v2_16_0.xsd
index da43f41..e30782f 100644
--- a/v2_16_0/CDT-trafficPattern-v2_16_0.xsd
+++ b/v2_16_0/CDT-trafficPattern-v2_16_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab