From f759fb1e8abb594ac3b2733c44115a08132d68ea Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Mon, 26 Nov 2018 16:18:53 +0100
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_19_0/CDT-AE-v2_19_0.xsd b/v2_19_0/CDT-AE-v2_19_0.xsd
index f3de8d5..6d63ef9 100644
--- a/v2_19_0/CDT-AE-v2_19_0.xsd
+++ b/v2_19_0/CDT-AE-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_19_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-CSEBase-v2_19_0.xsd b/v2_19_0/CDT-CSEBase-v2_19_0.xsd
index 9e20555..a69010a 100644
--- a/v2_19_0/CDT-CSEBase-v2_19_0.xsd
+++ b/v2_19_0/CDT-CSEBase-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_18_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_18_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_19_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_19_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_19_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-accessControlPolicy-v2_19_0.xsd b/v2_19_0/CDT-accessControlPolicy-v2_19_0.xsd
index 35fb346..3af76d7 100644
--- a/v2_19_0/CDT-accessControlPolicy-v2_19_0.xsd
+++ b/v2_19_0/CDT-accessControlPolicy-v2_19_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_18_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-activeCmdhPolicy-v2_19_0.xsd b/v2_19_0/CDT-activeCmdhPolicy-v2_19_0.xsd
index f4e1afa..e152245 100644
--- a/v2_19_0/CDT-activeCmdhPolicy-v2_19_0.xsd
+++ b/v2_19_0/CDT-activeCmdhPolicy-v2_19_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_18_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_19_0/CDT-allJoynApp-v2_19_0.xsd b/v2_19_0/CDT-allJoynApp-v2_19_0.xsd
index 7579d49..ba56f7b 100644
--- a/v2_19_0/CDT-allJoynApp-v2_19_0.xsd
+++ b/v2_19_0/CDT-allJoynApp-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_19_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-allJoynInterface-v2_19_0.xsd b/v2_19_0/CDT-allJoynInterface-v2_19_0.xsd
index eaf0004..d8355de 100644
--- a/v2_19_0/CDT-allJoynInterface-v2_19_0.xsd
+++ b/v2_19_0/CDT-allJoynInterface-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_19_0/CDT-allJoynMethod-v2_19_0.xsd b/v2_19_0/CDT-allJoynMethod-v2_19_0.xsd
index 9ca7235..79f57af 100644
--- a/v2_19_0/CDT-allJoynMethod-v2_19_0.xsd
+++ b/v2_19_0/CDT-allJoynMethod-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_19_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_19_0/CDT-allJoynMethodCall-v2_19_0.xsd b/v2_19_0/CDT-allJoynMethodCall-v2_19_0.xsd
index 09c37a4..a9797c7 100644
--- a/v2_19_0/CDT-allJoynMethodCall-v2_19_0.xsd
+++ b/v2_19_0/CDT-allJoynMethodCall-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-allJoynProperty-v2_19_0.xsd b/v2_19_0/CDT-allJoynProperty-v2_19_0.xsd
index 8998d23..cb066ab 100644
--- a/v2_19_0/CDT-allJoynProperty-v2_19_0.xsd
+++ b/v2_19_0/CDT-allJoynProperty-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-allJoynSvcObject-v2_19_0.xsd b/v2_19_0/CDT-allJoynSvcObject-v2_19_0.xsd
index 2c3ad1a..a54da6b 100644
--- a/v2_19_0/CDT-allJoynSvcObject-v2_19_0.xsd
+++ b/v2_19_0/CDT-allJoynSvcObject-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_19_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-areaNwkDeviceInfo-v2_19_0.xsd b/v2_19_0/CDT-areaNwkDeviceInfo-v2_19_0.xsd
index 310308d..5b7e6c2 100644
--- a/v2_19_0/CDT-areaNwkDeviceInfo-v2_19_0.xsd
+++ b/v2_19_0/CDT-areaNwkDeviceInfo-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-areaNwkInfo-v2_19_0.xsd b/v2_19_0/CDT-areaNwkInfo-v2_19_0.xsd
index 0453fef..a6bb6f3 100644
--- a/v2_19_0/CDT-areaNwkInfo-v2_19_0.xsd
+++ b/v2_19_0/CDT-areaNwkInfo-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-battery-v2_19_0.xsd b/v2_19_0/CDT-battery-v2_19_0.xsd
index dd4850b..79360f2 100644
--- a/v2_19_0/CDT-battery-v2_19_0.xsd
+++ b/v2_19_0/CDT-battery-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-cmdhBuffer-v2_19_0.xsd b/v2_19_0/CDT-cmdhBuffer-v2_19_0.xsd
index c12287c..3245ed6 100644
--- a/v2_19_0/CDT-cmdhBuffer-v2_19_0.xsd
+++ b/v2_19_0/CDT-cmdhBuffer-v2_19_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_18_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_19_0/CDT-cmdhDefEcValue-v2_19_0.xsd b/v2_19_0/CDT-cmdhDefEcValue-v2_19_0.xsd
index d7fb4a8..609f0c2 100644
--- a/v2_19_0/CDT-cmdhDefEcValue-v2_19_0.xsd
+++ b/v2_19_0/CDT-cmdhDefEcValue-v2_19_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_18_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_19_0/CDT-cmdhDefaults-v2_19_0.xsd b/v2_19_0/CDT-cmdhDefaults-v2_19_0.xsd
index 37b1772..6c1c5ad 100644
--- a/v2_19_0/CDT-cmdhDefaults-v2_19_0.xsd
+++ b/v2_19_0/CDT-cmdhDefaults-v2_19_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_18_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_19_0/CDT-cmdhEcDefParamValues-v2_19_0.xsd b/v2_19_0/CDT-cmdhEcDefParamValues-v2_19_0.xsd
index d053c1f..88e8021 100644
--- a/v2_19_0/CDT-cmdhEcDefParamValues-v2_19_0.xsd
+++ b/v2_19_0/CDT-cmdhEcDefParamValues-v2_19_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_18_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_19_0/CDT-cmdhLimits-v2_19_0.xsd b/v2_19_0/CDT-cmdhLimits-v2_19_0.xsd
index 0ac6b01..f4a203a 100644
--- a/v2_19_0/CDT-cmdhLimits-v2_19_0.xsd
+++ b/v2_19_0/CDT-cmdhLimits-v2_19_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_18_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_19_0/CDT-cmdhNetworkAccessRules-v2_19_0.xsd b/v2_19_0/CDT-cmdhNetworkAccessRules-v2_19_0.xsd
index 46f50c5..af32dce 100644
--- a/v2_19_0/CDT-cmdhNetworkAccessRules-v2_19_0.xsd
+++ b/v2_19_0/CDT-cmdhNetworkAccessRules-v2_19_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_18_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_19_0/CDT-cmdhNwAccessRule-v2_19_0.xsd b/v2_19_0/CDT-cmdhNwAccessRule-v2_19_0.xsd
index 21eb1d6..7dc719a 100644
--- a/v2_19_0/CDT-cmdhNwAccessRule-v2_19_0.xsd
+++ b/v2_19_0/CDT-cmdhNwAccessRule-v2_19_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_18_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_19_0/CDT-cmdhPolicy-v2_19_0.xsd b/v2_19_0/CDT-cmdhPolicy-v2_19_0.xsd
index d6d1a7e..96009a6 100644
--- a/v2_19_0/CDT-cmdhPolicy-v2_19_0.xsd
+++ b/v2_19_0/CDT-cmdhPolicy-v2_19_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_18_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_19_0/CDT-commonTypes-v2_19_0.xsd b/v2_19_0/CDT-commonTypes-v2_19_0.xsd
index b2194b7..0dbefd0 100644
--- a/v2_19_0/CDT-commonTypes-v2_19_0.xsd
+++ b/v2_19_0/CDT-commonTypes-v2_19_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_18_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_19_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_19_0/CDT-container-v2_19_0.xsd b/v2_19_0/CDT-container-v2_19_0.xsd
index ae686de..f721502 100644
--- a/v2_19_0/CDT-container-v2_19_0.xsd
+++ b/v2_19_0/CDT-container-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_19_0/CDT-contentInstance-v2_19_0.xsd b/v2_19_0/CDT-contentInstance-v2_19_0.xsd
index 90ce381..0051ea0 100644
--- a/v2_19_0/CDT-contentInstance-v2_19_0.xsd
+++ b/v2_19_0/CDT-contentInstance-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-delivery-v2_19_0.xsd b/v2_19_0/CDT-delivery-v2_19_0.xsd
index 6e55e5b..0d8f9a9 100644
--- a/v2_19_0/CDT-delivery-v2_19_0.xsd
+++ b/v2_19_0/CDT-delivery-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_19_0/CDT-deviceCapability-v2_19_0.xsd b/v2_19_0/CDT-deviceCapability-v2_19_0.xsd
index f4172c3..85af7d8 100644
--- a/v2_19_0/CDT-deviceCapability-v2_19_0.xsd
+++ b/v2_19_0/CDT-deviceCapability-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-deviceInfo-v2_19_0.xsd b/v2_19_0/CDT-deviceInfo-v2_19_0.xsd
index 771c02d..a959551 100644
--- a/v2_19_0/CDT-deviceInfo-v2_19_0.xsd
+++ b/v2_19_0/CDT-deviceInfo-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-dynamicAuthorizationConsultation-v2_19_0.xsd b/v2_19_0/CDT-dynamicAuthorizationConsultation-v2_19_0.xsd
index e516826..fb8f278 100644
--- a/v2_19_0/CDT-dynamicAuthorizationConsultation-v2_19_0.xsd
+++ b/v2_19_0/CDT-dynamicAuthorizationConsultation-v2_19_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_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-eventConfig-v2_19_0.xsd b/v2_19_0/CDT-eventConfig-v2_19_0.xsd
index 7ca6a83..0f6c586 100644
--- a/v2_19_0/CDT-eventConfig-v2_19_0.xsd
+++ b/v2_19_0/CDT-eventConfig-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-eventLog-v2_19_0.xsd b/v2_19_0/CDT-eventLog-v2_19_0.xsd
index a3868a9..7488a41 100644
--- a/v2_19_0/CDT-eventLog-v2_19_0.xsd
+++ b/v2_19_0/CDT-eventLog-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-execInstance-v2_19_0.xsd b/v2_19_0/CDT-execInstance-v2_19_0.xsd
index 531bf63..81807e2 100644
--- a/v2_19_0/CDT-execInstance-v2_19_0.xsd
+++ b/v2_19_0/CDT-execInstance-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-firmware-v2_19_0.xsd b/v2_19_0/CDT-firmware-v2_19_0.xsd
index c340433..8e613dc 100644
--- a/v2_19_0/CDT-firmware-v2_19_0.xsd
+++ b/v2_19_0/CDT-firmware-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-genericInterworkingOperationInstance-v2_19_0.xsd b/v2_19_0/CDT-genericInterworkingOperationInstance-v2_19_0.xsd
index e0a12ce..3f1588b 100644
--- a/v2_19_0/CDT-genericInterworkingOperationInstance-v2_19_0.xsd
+++ b/v2_19_0/CDT-genericInterworkingOperationInstance-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-genericInterworkingService-v2_19_0.xsd b/v2_19_0/CDT-genericInterworkingService-v2_19_0.xsd
index a7e8cbb..8e263af 100644
--- a/v2_19_0/CDT-genericInterworkingService-v2_19_0.xsd
+++ b/v2_19_0/CDT-genericInterworkingService-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_19_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-group-v2_19_0.xsd b/v2_19_0/CDT-group-v2_19_0.xsd
index 8bc0975..dc77dce 100644
--- a/v2_19_0/CDT-group-v2_19_0.xsd
+++ b/v2_19_0/CDT-group-v2_19_0.xsd
@@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	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_18_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd"/>
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-locationPolicy-v2_19_0.xsd b/v2_19_0/CDT-locationPolicy-v2_19_0.xsd
index f79652d..0eb304a 100644
--- a/v2_19_0/CDT-locationPolicy-v2_19_0.xsd
+++ b/v2_19_0/CDT-locationPolicy-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-m2mServiceSubscriptionProfile-v2_19_0.xsd b/v2_19_0/CDT-m2mServiceSubscriptionProfile-v2_19_0.xsd
index 46e58a1..b2af2d0 100644
--- a/v2_19_0/CDT-m2mServiceSubscriptionProfile-v2_19_0.xsd
+++ b/v2_19_0/CDT-m2mServiceSubscriptionProfile-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_19_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-memory-v2_19_0.xsd b/v2_19_0/CDT-memory-v2_19_0.xsd
index 700c660..9258608 100644
--- a/v2_19_0/CDT-memory-v2_19_0.xsd
+++ b/v2_19_0/CDT-memory-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-mgmtCmd-v2_19_0.xsd b/v2_19_0/CDT-mgmtCmd-v2_19_0.xsd
index 6544159..d33283f 100644
--- a/v2_19_0/CDT-mgmtCmd-v2_19_0.xsd
+++ b/v2_19_0/CDT-mgmtCmd-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_19_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-node-v2_19_0.xsd b/v2_19_0/CDT-node-v2_19_0.xsd
index be5d952..8e20303 100644
--- a/v2_19_0/CDT-node-v2_19_0.xsd
+++ b/v2_19_0/CDT-node-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_19_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-notification-v2_19_0.xsd b/v2_19_0/CDT-notification-v2_19_0.xsd
index 67e4ed2..19720c5 100644
--- a/v2_19_0/CDT-notification-v2_19_0.xsd
+++ b/v2_19_0/CDT-notification-v2_19_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_18_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_18_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_19_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_19_0/CDT-notificationTargetMgmtPolicyRef-v2_19_0.xsd b/v2_19_0/CDT-notificationTargetMgmtPolicyRef-v2_19_0.xsd
index 624f964..d2c39c9 100644
--- a/v2_19_0/CDT-notificationTargetMgmtPolicyRef-v2_19_0.xsd
+++ b/v2_19_0/CDT-notificationTargetMgmtPolicyRef-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-notificationTargetPolicy-v2_19_0.xsd b/v2_19_0/CDT-notificationTargetPolicy-v2_19_0.xsd
index 755b343..81e9613 100644
--- a/v2_19_0/CDT-notificationTargetPolicy-v2_19_0.xsd
+++ b/v2_19_0/CDT-notificationTargetPolicy-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-policyDeletionRules-v2_19_0.xsd b/v2_19_0/CDT-policyDeletionRules-v2_19_0.xsd
index fe58a38..fe45e31 100644
--- a/v2_19_0/CDT-policyDeletionRules-v2_19_0.xsd
+++ b/v2_19_0/CDT-policyDeletionRules-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-pollingChannel-v2_19_0.xsd b/v2_19_0/CDT-pollingChannel-v2_19_0.xsd
index b7b0c50..7ae4ce3 100644
--- a/v2_19_0/CDT-pollingChannel-v2_19_0.xsd
+++ b/v2_19_0/CDT-pollingChannel-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-reboot-v2_19_0.xsd b/v2_19_0/CDT-reboot-v2_19_0.xsd
index 27ce962..763d89b 100644
--- a/v2_19_0/CDT-reboot-v2_19_0.xsd
+++ b/v2_19_0/CDT-reboot-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-remoteCSE-v2_19_0.xsd b/v2_19_0/CDT-remoteCSE-v2_19_0.xsd
index 8a028ec..d999126 100644
--- a/v2_19_0/CDT-remoteCSE-v2_19_0.xsd
+++ b/v2_19_0/CDT-remoteCSE-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_19_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-request-v2_19_0.xsd b/v2_19_0/CDT-request-v2_19_0.xsd
index a9f9781..ce2cfe4 100644
--- a/v2_19_0/CDT-request-v2_19_0.xsd
+++ b/v2_19_0/CDT-request-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-requestPrimitive-v2_19_0.xsd b/v2_19_0/CDT-requestPrimitive-v2_19_0.xsd
index dda8cfa..34a8057 100644
--- a/v2_19_0/CDT-requestPrimitive-v2_19_0.xsd
+++ b/v2_19_0/CDT-requestPrimitive-v2_19_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_18_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_19_0/CDT-responsePrimitive-v2_19_0.xsd b/v2_19_0/CDT-responsePrimitive-v2_19_0.xsd
index e8527c1..778ce5e 100644
--- a/v2_19_0/CDT-responsePrimitive-v2_19_0.xsd
+++ b/v2_19_0/CDT-responsePrimitive-v2_19_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_18_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_18_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_18_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_19_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_19_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_19_0/CDT-role-v2_19_0.xsd b/v2_19_0/CDT-role-v2_19_0.xsd
index 4337f6c..c0ef6eb 100644
--- a/v2_19_0/CDT-role-v2_19_0.xsd
+++ b/v2_19_0/CDT-role-v2_19_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_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-schedule-v2_19_0.xsd b/v2_19_0/CDT-schedule-v2_19_0.xsd
index 3a8c1fa..75ec6f9 100644
--- a/v2_19_0/CDT-schedule-v2_19_0.xsd
+++ b/v2_19_0/CDT-schedule-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-semanticDescriptor-v2_19_0.xsd b/v2_19_0/CDT-semanticDescriptor-v2_19_0.xsd
index f54ba5d..c12dd00 100644
--- a/v2_19_0/CDT-semanticDescriptor-v2_19_0.xsd
+++ b/v2_19_0/CDT-semanticDescriptor-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-serviceSubscribedAppRule-v2_19_0.xsd b/v2_19_0/CDT-serviceSubscribedAppRule-v2_19_0.xsd
index c2d71ba..e4d86e7 100644
--- a/v2_19_0/CDT-serviceSubscribedAppRule-v2_19_0.xsd
+++ b/v2_19_0/CDT-serviceSubscribedAppRule-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-serviceSubscribedNode-v2_19_0.xsd b/v2_19_0/CDT-serviceSubscribedNode-v2_19_0.xsd
index 171ce8e..1cd3211 100644
--- a/v2_19_0/CDT-serviceSubscribedNode-v2_19_0.xsd
+++ b/v2_19_0/CDT-serviceSubscribedNode-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-software-v2_19_0.xsd b/v2_19_0/CDT-software-v2_19_0.xsd
index ea48bbb..4d507b0 100644
--- a/v2_19_0/CDT-software-v2_19_0.xsd
+++ b/v2_19_0/CDT-software-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-statsCollect-v2_19_0.xsd b/v2_19_0/CDT-statsCollect-v2_19_0.xsd
index 6aa0357..e65d9db 100644
--- a/v2_19_0/CDT-statsCollect-v2_19_0.xsd
+++ b/v2_19_0/CDT-statsCollect-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-statsConfig-v2_19_0.xsd b/v2_19_0/CDT-statsConfig-v2_19_0.xsd
index 3083b69..74138a4 100644
--- a/v2_19_0/CDT-statsConfig-v2_19_0.xsd
+++ b/v2_19_0/CDT-statsConfig-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-subscription-v2_19_0.xsd b/v2_19_0/CDT-subscription-v2_19_0.xsd
index d00b4bf..49d08d7 100644
--- a/v2_19_0/CDT-subscription-v2_19_0.xsd
+++ b/v2_19_0/CDT-subscription-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_19_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-svcFwWrapper-v2_19_0.xsd b/v2_19_0/CDT-svcFwWrapper-v2_19_0.xsd
index 36f6dd7..0fafd74 100644
--- a/v2_19_0/CDT-svcFwWrapper-v2_19_0.xsd
+++ b/v2_19_0/CDT-svcFwWrapper-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-svcObjWrapper-v2_19_0.xsd b/v2_19_0/CDT-svcObjWrapper-v2_19_0.xsd
index 23b785a..ed7fe53 100644
--- a/v2_19_0/CDT-svcObjWrapper-v2_19_0.xsd
+++ b/v2_19_0/CDT-svcObjWrapper-v2_19_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_18_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_19_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-timeSeries-v2_19_0.xsd b/v2_19_0/CDT-timeSeries-v2_19_0.xsd
index 3bc6333..ad92849 100644
--- a/v2_19_0/CDT-timeSeries-v2_19_0.xsd
+++ b/v2_19_0/CDT-timeSeries-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_19_0/CDT-timeSeriesInstance-v2_19_0.xsd b/v2_19_0/CDT-timeSeriesInstance-v2_19_0.xsd
index 1146969..d1111be 100644
--- a/v2_19_0/CDT-timeSeriesInstance-v2_19_0.xsd
+++ b/v2_19_0/CDT-timeSeriesInstance-v2_19_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_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-token-v2_19_0.xsd b/v2_19_0/CDT-token-v2_19_0.xsd
index 188146f..944b291 100644
--- a/v2_19_0/CDT-token-v2_19_0.xsd
+++ b/v2_19_0/CDT-token-v2_19_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_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_19_0/CDT-trafficPattern-v2_19_0.xsd b/v2_19_0/CDT-trafficPattern-v2_19_0.xsd
index 9877e7e..26febaf 100644
--- a/v2_19_0/CDT-trafficPattern-v2_19_0.xsd
+++ b/v2_19_0/CDT-trafficPattern-v2_19_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_18_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab