From 88c6f55ab82ac6bc0732810253071e4e934303d0 Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Wed, 23 Sep 2020 15:58:05 +0100
Subject: [PATCH] Changed Include statements to reference 3_18_0

---
 v3_18_0/CDT-AE-v3_18_0.xsd                    | 28 +++---
 v3_18_0/CDT-AEContactList-v3_18_0.xsd         |  8 +-
 v3_18_0/CDT-AEContactListPerCSE-v3_18_0.xsd   |  2 +-
 v3_18_0/CDT-CSEBase-v3_18_0.xsd               | 64 ++++++------
 v3_18_0/CDT-accessControlPolicy-v3_18_0.xsd   |  6 +-
 v3_18_0/CDT-activeCmdhPolicy-v3_18_0.xsd      |  2 +-
 v3_18_0/CDT-allJoynApp-v3_18_0.xsd            |  8 +-
 v3_18_0/CDT-allJoynInterface-v3_18_0.xsd      | 12 +--
 v3_18_0/CDT-allJoynMethod-v3_18_0.xsd         |  8 +-
 v3_18_0/CDT-allJoynMethodCall-v3_18_0.xsd     |  6 +-
 v3_18_0/CDT-allJoynProperty-v3_18_0.xsd       |  6 +-
 v3_18_0/CDT-allJoynSvcObject-v3_18_0.xsd      |  8 +-
 v3_18_0/CDT-areaNwkDeviceInfo-v3_18_0.xsd     |  4 +-
 v3_18_0/CDT-areaNwkInfo-v3_18_0.xsd           |  4 +-
 v3_18_0/CDT-authorizationDecision-v3_18_0.xsd |  6 +-
 .../CDT-authorizationInformation-v3_18_0.xsd  | 10 +-
 v3_18_0/CDT-authorizationPolicy-v3_18_0.xsd   |  6 +-
 .../CDT-backgroundDataTransfer-v3_18_0.xsd    |  4 +-
 v3_18_0/CDT-battery-v3_18_0.xsd               |  4 +-
 v3_18_0/CDT-cmdhBuffer-v3_18_0.xsd            |  2 +-
 v3_18_0/CDT-cmdhDefEcValue-v3_18_0.xsd        |  2 +-
 v3_18_0/CDT-cmdhDefaults-v3_18_0.xsd          |  2 +-
 v3_18_0/CDT-cmdhEcDefParamValues-v3_18_0.xsd  |  2 +-
 v3_18_0/CDT-cmdhLimits-v3_18_0.xsd            |  2 +-
 .../CDT-cmdhNetworkAccessRules-v3_18_0.xsd    |  2 +-
 v3_18_0/CDT-cmdhNwAccessRule-v3_18_0.xsd      |  2 +-
 v3_18_0/CDT-cmdhPolicy-v3_18_0.xsd            |  2 +-
 v3_18_0/CDT-commonTypes-v3_18_0.xsd           |  2 +-
 v3_18_0/CDT-container-v3_18_0.xsd             | 12 +--
 v3_18_0/CDT-contentInstance-v3_18_0.xsd       |  6 +-
 .../CDT-crossResourceSubscription-v3_18_0.xsd |  8 +-
 v3_18_0/CDT-delivery-v3_18_0.xsd              |  4 +-
 v3_18_0/CDT-deviceCapability-v3_18_0.xsd      |  4 +-
 v3_18_0/CDT-deviceInfo-v3_18_0.xsd            |  4 +-
 ...namicAuthorizationConsultation-v3_18_0.xsd |  6 +-
 v3_18_0/CDT-eventConfig-v3_18_0.xsd           |  6 +-
 v3_18_0/CDT-eventLog-v3_18_0.xsd              |  4 +-
 v3_18_0/CDT-execInstance-v3_18_0.xsd          |  6 +-
 v3_18_0/CDT-firmware-v3_18_0.xsd              |  4 +-
 ...cInterworkingOperationInstance-v3_18_0.xsd |  6 +-
 ...CDT-genericInterworkingService-v3_18_0.xsd |  8 +-
 v3_18_0/CDT-group-v3_18_0.xsd                 |  8 +-
 v3_18_0/CDT-localMulticastGroup-v3_18_0.xsd   |  4 +-
 v3_18_0/CDT-locationPolicy-v3_18_0.xsd        |  6 +-
 ...-m2mServiceSubscriptionProfile-v3_18_0.xsd |  8 +-
 v3_18_0/CDT-memory-v3_18_0.xsd                |  4 +-
 v3_18_0/CDT-mgmtCmd-v3_18_0.xsd               |  8 +-
 v3_18_0/CDT-multimediaSession-v3_18_0.xsd     |  6 +-
 v3_18_0/CDT-node-v3_18_0.xsd                  | 34 +++----
 v3_18_0/CDT-notification-v3_18_0.xsd          |  4 +-
 ...otificationTargetMgmtPolicyRef-v3_18_0.xsd |  6 +-
 .../CDT-notificationTargetPolicy-v3_18_0.xsd  |  8 +-
 v3_18_0/CDT-ontology-v3_18_0.xsd              |  6 +-
 v3_18_0/CDT-ontologyRepository-v3_18_0.xsd    |  8 +-
 v3_18_0/CDT-policyDeletionRules-v3_18_0.xsd   |  6 +-
 v3_18_0/CDT-pollingChannel-v3_18_0.xsd        |  6 +-
 v3_18_0/CDT-reboot-v3_18_0.xsd                |  4 +-
 v3_18_0/CDT-remoteCSE-v3_18_0.xsd             | 32 +++---
 v3_18_0/CDT-request-v3_18_0.xsd               |  4 +-
 v3_18_0/CDT-requestPrimitive-v3_18_0.xsd      |  2 +-
 v3_18_0/CDT-responsePrimitive-v3_18_0.xsd     | 98 +++++++++----------
 v3_18_0/CDT-role-v3_18_0.xsd                  |  6 +-
 v3_18_0/CDT-schedule-v3_18_0.xsd              |  4 +-
 v3_18_0/CDT-semanticDescriptor-v3_18_0.xsd    |  6 +-
 .../CDT-semanticMashupInstance-v3_18_0.xsd    | 10 +-
 .../CDT-semanticMashupJobProfile-v3_18_0.xsd  | 10 +-
 v3_18_0/CDT-semanticMashupResult-v3_18_0.xsd  |  6 +-
 .../CDT-serviceSubscribedAppRule-v3_18_0.xsd  |  6 +-
 v3_18_0/CDT-serviceSubscribedNode-v3_18_0.xsd |  6 +-
 v3_18_0/CDT-software-v3_18_0.xsd              |  4 +-
 v3_18_0/CDT-statsCollect-v3_18_0.xsd          |  6 +-
 v3_18_0/CDT-statsConfig-v3_18_0.xsd           |  8 +-
 v3_18_0/CDT-subscription-v3_18_0.xsd          |  8 +-
 v3_18_0/CDT-svcFwWrapper-v3_18_0.xsd          |  6 +-
 v3_18_0/CDT-svcObjWrapper-v3_18_0.xsd         |  8 +-
 v3_18_0/CDT-timeSeries-v3_18_0.xsd            | 10 +-
 v3_18_0/CDT-timeSeriesInstance-v3_18_0.xsd    |  6 +-
 v3_18_0/CDT-token-v3_18_0.xsd                 |  6 +-
 v3_18_0/CDT-transaction-v3_18_0.xsd           |  6 +-
 v3_18_0/CDT-transactionMgmt-v3_18_0.xsd       |  6 +-
 v3_18_0/CDT-triggerPayload-v3_18_0.xsd        |  2 +-
 v3_18_0/CDT-triggerRequest-v3_18_0.xsd        |  6 +-
 82 files changed, 345 insertions(+), 345 deletions(-)

diff --git a/v3_18_0/CDT-AE-v3_18_0.xsd b/v3_18_0/CDT-AE-v3_18_0.xsd
index 9f711c9..860dc68 100644
--- a/v3_18_0/CDT-AE-v3_18_0.xsd
+++ b/v3_18_0/CDT-AE-v3_18_0.xsd
@@ -26,20 +26,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-AEContactList-v3_18_0.xsd b/v3_18_0/CDT-AEContactList-v3_18_0.xsd
index eb382f0..cd8b751 100644
--- a/v3_18_0/CDT-AEContactList-v3_18_0.xsd
+++ b/v3_18_0/CDT-AEContactList-v3_18_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-AEContactListPerCSE-v3_18_0.xsd b/v3_18_0/CDT-AEContactListPerCSE-v3_18_0.xsd
index 0dfccf1..d794e3e 100644
--- a/v3_18_0/CDT-AEContactListPerCSE-v3_18_0.xsd
+++ b/v3_18_0/CDT-AEContactListPerCSE-v3_18_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-CSEBase-v3_18_0.xsd b/v3_18_0/CDT-CSEBase-v3_18_0.xsd
index a827121..655a57c 100644
--- a/v3_18_0/CDT-CSEBase-v3_18_0.xsd
+++ b/v3_18_0/CDT-CSEBase-v3_18_0.xsd
@@ -26,38 +26,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_17_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_17_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_17_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_18_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_18_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_18_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_18_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-accessControlPolicy-v3_18_0.xsd b/v3_18_0/CDT-accessControlPolicy-v3_18_0.xsd
index 313789c..4a392f0 100644
--- a/v3_18_0/CDT-accessControlPolicy-v3_18_0.xsd
+++ b/v3_18_0/CDT-accessControlPolicy-v3_18_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:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-activeCmdhPolicy-v3_18_0.xsd b/v3_18_0/CDT-activeCmdhPolicy-v3_18_0.xsd
index b6ce272..0cb821f 100644
--- a/v3_18_0/CDT-activeCmdhPolicy-v3_18_0.xsd
+++ b/v3_18_0/CDT-activeCmdhPolicy-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_18_0/CDT-allJoynApp-v3_18_0.xsd b/v3_18_0/CDT-allJoynApp-v3_18_0.xsd
index 76a8179..723c72b 100644
--- a/v3_18_0/CDT-allJoynApp-v3_18_0.xsd
+++ b/v3_18_0/CDT-allJoynApp-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_18_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-allJoynInterface-v3_18_0.xsd b/v3_18_0/CDT-allJoynInterface-v3_18_0.xsd
index 5d5e12e..a06630a 100644
--- a/v3_18_0/CDT-allJoynInterface-v3_18_0.xsd
+++ b/v3_18_0/CDT-allJoynInterface-v3_18_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_18_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_18_0/CDT-allJoynMethod-v3_18_0.xsd b/v3_18_0/CDT-allJoynMethod-v3_18_0.xsd
index 3aa875d..92ae093 100644
--- a/v3_18_0/CDT-allJoynMethod-v3_18_0.xsd
+++ b/v3_18_0/CDT-allJoynMethod-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_18_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_18_0/CDT-allJoynMethodCall-v3_18_0.xsd b/v3_18_0/CDT-allJoynMethodCall-v3_18_0.xsd
index c342384..d691586 100644
--- a/v3_18_0/CDT-allJoynMethodCall-v3_18_0.xsd
+++ b/v3_18_0/CDT-allJoynMethodCall-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-allJoynProperty-v3_18_0.xsd b/v3_18_0/CDT-allJoynProperty-v3_18_0.xsd
index 1301f11..a501135 100644
--- a/v3_18_0/CDT-allJoynProperty-v3_18_0.xsd
+++ b/v3_18_0/CDT-allJoynProperty-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-allJoynSvcObject-v3_18_0.xsd b/v3_18_0/CDT-allJoynSvcObject-v3_18_0.xsd
index 46acee0..b21894b 100644
--- a/v3_18_0/CDT-allJoynSvcObject-v3_18_0.xsd
+++ b/v3_18_0/CDT-allJoynSvcObject-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_18_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-areaNwkDeviceInfo-v3_18_0.xsd b/v3_18_0/CDT-areaNwkDeviceInfo-v3_18_0.xsd
index 4ed66d1..b816e20 100644
--- a/v3_18_0/CDT-areaNwkDeviceInfo-v3_18_0.xsd
+++ b/v3_18_0/CDT-areaNwkDeviceInfo-v3_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-areaNwkInfo-v3_18_0.xsd b/v3_18_0/CDT-areaNwkInfo-v3_18_0.xsd
index 2f1b79e..db4aeda 100644
--- a/v3_18_0/CDT-areaNwkInfo-v3_18_0.xsd
+++ b/v3_18_0/CDT-areaNwkInfo-v3_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-authorizationDecision-v3_18_0.xsd b/v3_18_0/CDT-authorizationDecision-v3_18_0.xsd
index c76367b..c48dcb9 100644
--- a/v3_18_0/CDT-authorizationDecision-v3_18_0.xsd
+++ b/v3_18_0/CDT-authorizationDecision-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-authorizationInformation-v3_18_0.xsd b/v3_18_0/CDT-authorizationInformation-v3_18_0.xsd
index fa06e79..5e0283e 100644
--- a/v3_18_0/CDT-authorizationInformation-v3_18_0.xsd
+++ b/v3_18_0/CDT-authorizationInformation-v3_18_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-authorizationPolicy-v3_18_0.xsd b/v3_18_0/CDT-authorizationPolicy-v3_18_0.xsd
index 2796975..0a132ec 100644
--- a/v3_18_0/CDT-authorizationPolicy-v3_18_0.xsd
+++ b/v3_18_0/CDT-authorizationPolicy-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-backgroundDataTransfer-v3_18_0.xsd b/v3_18_0/CDT-backgroundDataTransfer-v3_18_0.xsd
index 0eae8b5..f7d3fec 100644
--- a/v3_18_0/CDT-backgroundDataTransfer-v3_18_0.xsd
+++ b/v3_18_0/CDT-backgroundDataTransfer-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-battery-v3_18_0.xsd b/v3_18_0/CDT-battery-v3_18_0.xsd
index 48e9464..1563c31 100644
--- a/v3_18_0/CDT-battery-v3_18_0.xsd
+++ b/v3_18_0/CDT-battery-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-cmdhBuffer-v3_18_0.xsd b/v3_18_0/CDT-cmdhBuffer-v3_18_0.xsd
index 3d65e1d..66e2913 100644
--- a/v3_18_0/CDT-cmdhBuffer-v3_18_0.xsd
+++ b/v3_18_0/CDT-cmdhBuffer-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_18_0/CDT-cmdhDefEcValue-v3_18_0.xsd b/v3_18_0/CDT-cmdhDefEcValue-v3_18_0.xsd
index 0f8d71f..bb6e066 100644
--- a/v3_18_0/CDT-cmdhDefEcValue-v3_18_0.xsd
+++ b/v3_18_0/CDT-cmdhDefEcValue-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_18_0/CDT-cmdhDefaults-v3_18_0.xsd b/v3_18_0/CDT-cmdhDefaults-v3_18_0.xsd
index cf54c69..4b5aab9 100644
--- a/v3_18_0/CDT-cmdhDefaults-v3_18_0.xsd
+++ b/v3_18_0/CDT-cmdhDefaults-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_18_0/CDT-cmdhEcDefParamValues-v3_18_0.xsd b/v3_18_0/CDT-cmdhEcDefParamValues-v3_18_0.xsd
index e9a5d7b..2c41a36 100644
--- a/v3_18_0/CDT-cmdhEcDefParamValues-v3_18_0.xsd
+++ b/v3_18_0/CDT-cmdhEcDefParamValues-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_18_0/CDT-cmdhLimits-v3_18_0.xsd b/v3_18_0/CDT-cmdhLimits-v3_18_0.xsd
index bbb4d59..a9f92fb 100644
--- a/v3_18_0/CDT-cmdhLimits-v3_18_0.xsd
+++ b/v3_18_0/CDT-cmdhLimits-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_18_0/CDT-cmdhNetworkAccessRules-v3_18_0.xsd b/v3_18_0/CDT-cmdhNetworkAccessRules-v3_18_0.xsd
index 5701572..4b0d090 100644
--- a/v3_18_0/CDT-cmdhNetworkAccessRules-v3_18_0.xsd
+++ b/v3_18_0/CDT-cmdhNetworkAccessRules-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_18_0/CDT-cmdhNwAccessRule-v3_18_0.xsd b/v3_18_0/CDT-cmdhNwAccessRule-v3_18_0.xsd
index 3995694..0dd9426 100644
--- a/v3_18_0/CDT-cmdhNwAccessRule-v3_18_0.xsd
+++ b/v3_18_0/CDT-cmdhNwAccessRule-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_18_0/CDT-cmdhPolicy-v3_18_0.xsd b/v3_18_0/CDT-cmdhPolicy-v3_18_0.xsd
index 9221b30..41d82fc 100644
--- a/v3_18_0/CDT-cmdhPolicy-v3_18_0.xsd
+++ b/v3_18_0/CDT-cmdhPolicy-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_18_0/CDT-commonTypes-v3_18_0.xsd b/v3_18_0/CDT-commonTypes-v3_18_0.xsd
index 4b94979..e1cfa9d 100644
--- a/v3_18_0/CDT-commonTypes-v3_18_0.xsd
+++ b/v3_18_0/CDT-commonTypes-v3_18_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_18_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_18_0/CDT-container-v3_18_0.xsd b/v3_18_0/CDT-container-v3_18_0.xsd
index 599051e..0ba50db 100644
--- a/v3_18_0/CDT-container-v3_18_0.xsd
+++ b/v3_18_0/CDT-container-v3_18_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_18_0/CDT-contentInstance-v3_18_0.xsd b/v3_18_0/CDT-contentInstance-v3_18_0.xsd
index 5268540..f3b6863 100644
--- a/v3_18_0/CDT-contentInstance-v3_18_0.xsd
+++ b/v3_18_0/CDT-contentInstance-v3_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-crossResourceSubscription-v3_18_0.xsd b/v3_18_0/CDT-crossResourceSubscription-v3_18_0.xsd
index 03565d5..69f18c1 100644
--- a/v3_18_0/CDT-crossResourceSubscription-v3_18_0.xsd
+++ b/v3_18_0/CDT-crossResourceSubscription-v3_18_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-delivery-v3_18_0.xsd b/v3_18_0/CDT-delivery-v3_18_0.xsd
index 9634394..64302dd 100644
--- a/v3_18_0/CDT-delivery-v3_18_0.xsd
+++ b/v3_18_0/CDT-delivery-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_18_0/CDT-deviceCapability-v3_18_0.xsd b/v3_18_0/CDT-deviceCapability-v3_18_0.xsd
index 299c4f6..8c876de 100644
--- a/v3_18_0/CDT-deviceCapability-v3_18_0.xsd
+++ b/v3_18_0/CDT-deviceCapability-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-deviceInfo-v3_18_0.xsd b/v3_18_0/CDT-deviceInfo-v3_18_0.xsd
index b3adf14..5bfa130 100644
--- a/v3_18_0/CDT-deviceInfo-v3_18_0.xsd
+++ b/v3_18_0/CDT-deviceInfo-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-dynamicAuthorizationConsultation-v3_18_0.xsd b/v3_18_0/CDT-dynamicAuthorizationConsultation-v3_18_0.xsd
index ab0287d..a531db2 100644
--- a/v3_18_0/CDT-dynamicAuthorizationConsultation-v3_18_0.xsd
+++ b/v3_18_0/CDT-dynamicAuthorizationConsultation-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-eventConfig-v3_18_0.xsd b/v3_18_0/CDT-eventConfig-v3_18_0.xsd
index bc82dda..d9f4b89 100644
--- a/v3_18_0/CDT-eventConfig-v3_18_0.xsd
+++ b/v3_18_0/CDT-eventConfig-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-eventLog-v3_18_0.xsd b/v3_18_0/CDT-eventLog-v3_18_0.xsd
index 7c0884e..1b49737 100644
--- a/v3_18_0/CDT-eventLog-v3_18_0.xsd
+++ b/v3_18_0/CDT-eventLog-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-execInstance-v3_18_0.xsd b/v3_18_0/CDT-execInstance-v3_18_0.xsd
index 555d140..f174082 100644
--- a/v3_18_0/CDT-execInstance-v3_18_0.xsd
+++ b/v3_18_0/CDT-execInstance-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-firmware-v3_18_0.xsd b/v3_18_0/CDT-firmware-v3_18_0.xsd
index fe54203..b5d8462 100644
--- a/v3_18_0/CDT-firmware-v3_18_0.xsd
+++ b/v3_18_0/CDT-firmware-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-genericInterworkingOperationInstance-v3_18_0.xsd b/v3_18_0/CDT-genericInterworkingOperationInstance-v3_18_0.xsd
index b3f5c84..baeabdb 100644
--- a/v3_18_0/CDT-genericInterworkingOperationInstance-v3_18_0.xsd
+++ b/v3_18_0/CDT-genericInterworkingOperationInstance-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-genericInterworkingService-v3_18_0.xsd b/v3_18_0/CDT-genericInterworkingService-v3_18_0.xsd
index 6cbfab0..6223b95 100644
--- a/v3_18_0/CDT-genericInterworkingService-v3_18_0.xsd
+++ b/v3_18_0/CDT-genericInterworkingService-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_18_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-group-v3_18_0.xsd b/v3_18_0/CDT-group-v3_18_0.xsd
index 580b5b2..5a8e937 100644
--- a/v3_18_0/CDT-group-v3_18_0.xsd
+++ b/v3_18_0/CDT-group-v3_18_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_18_0/CDT-localMulticastGroup-v3_18_0.xsd b/v3_18_0/CDT-localMulticastGroup-v3_18_0.xsd
index 9da5748..54bdda4 100644
--- a/v3_18_0/CDT-localMulticastGroup-v3_18_0.xsd
+++ b/v3_18_0/CDT-localMulticastGroup-v3_18_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_17_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_18_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_18_0/CDT-locationPolicy-v3_18_0.xsd b/v3_18_0/CDT-locationPolicy-v3_18_0.xsd
index dc136ca..46eb878 100644
--- a/v3_18_0/CDT-locationPolicy-v3_18_0.xsd
+++ b/v3_18_0/CDT-locationPolicy-v3_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-m2mServiceSubscriptionProfile-v3_18_0.xsd b/v3_18_0/CDT-m2mServiceSubscriptionProfile-v3_18_0.xsd
index cbeeb97..e9bea14 100644
--- a/v3_18_0/CDT-m2mServiceSubscriptionProfile-v3_18_0.xsd
+++ b/v3_18_0/CDT-m2mServiceSubscriptionProfile-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-memory-v3_18_0.xsd b/v3_18_0/CDT-memory-v3_18_0.xsd
index 22b1507..4537783 100644
--- a/v3_18_0/CDT-memory-v3_18_0.xsd
+++ b/v3_18_0/CDT-memory-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-mgmtCmd-v3_18_0.xsd b/v3_18_0/CDT-mgmtCmd-v3_18_0.xsd
index cf5d087..097232c 100644
--- a/v3_18_0/CDT-mgmtCmd-v3_18_0.xsd
+++ b/v3_18_0/CDT-mgmtCmd-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-multimediaSession-v3_18_0.xsd b/v3_18_0/CDT-multimediaSession-v3_18_0.xsd
index 29f4ee3..914dd17 100644
--- a/v3_18_0/CDT-multimediaSession-v3_18_0.xsd
+++ b/v3_18_0/CDT-multimediaSession-v3_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-node-v3_18_0.xsd b/v3_18_0/CDT-node-v3_18_0.xsd
index ceaae2f..c96fa74 100644
--- a/v3_18_0/CDT-node-v3_18_0.xsd
+++ b/v3_18_0/CDT-node-v3_18_0.xsd
@@ -27,23 +27,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_18_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-notification-v3_18_0.xsd b/v3_18_0/CDT-notification-v3_18_0.xsd
index 4d4bf82..201b6fc 100644
--- a/v3_18_0/CDT-notification-v3_18_0.xsd
+++ b/v3_18_0/CDT-notification-v3_18_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_17_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_18_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_18_0/CDT-notificationTargetMgmtPolicyRef-v3_18_0.xsd b/v3_18_0/CDT-notificationTargetMgmtPolicyRef-v3_18_0.xsd
index 8fbce9d..86258a3 100644
--- a/v3_18_0/CDT-notificationTargetMgmtPolicyRef-v3_18_0.xsd
+++ b/v3_18_0/CDT-notificationTargetMgmtPolicyRef-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-notificationTargetPolicy-v3_18_0.xsd b/v3_18_0/CDT-notificationTargetPolicy-v3_18_0.xsd
index 3a6a1c0..75a4ce7 100644
--- a/v3_18_0/CDT-notificationTargetPolicy-v3_18_0.xsd
+++ b/v3_18_0/CDT-notificationTargetPolicy-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-ontology-v3_18_0.xsd b/v3_18_0/CDT-ontology-v3_18_0.xsd
index ecb5c3e..f22a496 100644
--- a/v3_18_0/CDT-ontology-v3_18_0.xsd
+++ b/v3_18_0/CDT-ontology-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_18_0/CDT-ontologyRepository-v3_18_0.xsd b/v3_18_0/CDT-ontologyRepository-v3_18_0.xsd
index 2895ce0..b56f750 100644
--- a/v3_18_0/CDT-ontologyRepository-v3_18_0.xsd
+++ b/v3_18_0/CDT-ontologyRepository-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_18_0/CDT-policyDeletionRules-v3_18_0.xsd b/v3_18_0/CDT-policyDeletionRules-v3_18_0.xsd
index 806c061..f8008ca 100644
--- a/v3_18_0/CDT-policyDeletionRules-v3_18_0.xsd
+++ b/v3_18_0/CDT-policyDeletionRules-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-pollingChannel-v3_18_0.xsd b/v3_18_0/CDT-pollingChannel-v3_18_0.xsd
index 3d2b8dd..c1e4aa7 100644
--- a/v3_18_0/CDT-pollingChannel-v3_18_0.xsd
+++ b/v3_18_0/CDT-pollingChannel-v3_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-reboot-v3_18_0.xsd b/v3_18_0/CDT-reboot-v3_18_0.xsd
index 3dcacfb..a5c19b5 100644
--- a/v3_18_0/CDT-reboot-v3_18_0.xsd
+++ b/v3_18_0/CDT-reboot-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-remoteCSE-v3_18_0.xsd b/v3_18_0/CDT-remoteCSE-v3_18_0.xsd
index d6c7148..ada8052 100644
--- a/v3_18_0/CDT-remoteCSE-v3_18_0.xsd
+++ b/v3_18_0/CDT-remoteCSE-v3_18_0.xsd
@@ -26,22 +26,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-request-v3_18_0.xsd b/v3_18_0/CDT-request-v3_18_0.xsd
index 77b7ca0..c98d3ad 100644
--- a/v3_18_0/CDT-request-v3_18_0.xsd
+++ b/v3_18_0/CDT-request-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-requestPrimitive-v3_18_0.xsd b/v3_18_0/CDT-requestPrimitive-v3_18_0.xsd
index c9731b7..d704810 100644
--- a/v3_18_0/CDT-requestPrimitive-v3_18_0.xsd
+++ b/v3_18_0/CDT-requestPrimitive-v3_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_18_0/CDT-responsePrimitive-v3_18_0.xsd b/v3_18_0/CDT-responsePrimitive-v3_18_0.xsd
index 7f632f1..0875bdf 100644
--- a/v3_18_0/CDT-responsePrimitive-v3_18_0.xsd
+++ b/v3_18_0/CDT-responsePrimitive-v3_18_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_17_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_18_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_18_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_18_0/CDT-role-v3_18_0.xsd b/v3_18_0/CDT-role-v3_18_0.xsd
index 0554280..41014e0 100644
--- a/v3_18_0/CDT-role-v3_18_0.xsd
+++ b/v3_18_0/CDT-role-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-schedule-v3_18_0.xsd b/v3_18_0/CDT-schedule-v3_18_0.xsd
index 81e16f0..7901a75 100644
--- a/v3_18_0/CDT-schedule-v3_18_0.xsd
+++ b/v3_18_0/CDT-schedule-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource ">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-semanticDescriptor-v3_18_0.xsd b/v3_18_0/CDT-semanticDescriptor-v3_18_0.xsd
index fcf48ef..37841e1 100644
--- a/v3_18_0/CDT-semanticDescriptor-v3_18_0.xsd
+++ b/v3_18_0/CDT-semanticDescriptor-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-semanticMashupInstance-v3_18_0.xsd b/v3_18_0/CDT-semanticMashupInstance-v3_18_0.xsd
index e8ccf2e..e5da16e 100644
--- a/v3_18_0/CDT-semanticMashupInstance-v3_18_0.xsd
+++ b/v3_18_0/CDT-semanticMashupInstance-v3_18_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-semanticMashupJobProfile-v3_18_0.xsd b/v3_18_0/CDT-semanticMashupJobProfile-v3_18_0.xsd
index c858527..a73ac35 100644
--- a/v3_18_0/CDT-semanticMashupJobProfile-v3_18_0.xsd
+++ b/v3_18_0/CDT-semanticMashupJobProfile-v3_18_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-semanticMashupResult-v3_18_0.xsd b/v3_18_0/CDT-semanticMashupResult-v3_18_0.xsd
index 3c4964e..769ff3b 100644
--- a/v3_18_0/CDT-semanticMashupResult-v3_18_0.xsd
+++ b/v3_18_0/CDT-semanticMashupResult-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-serviceSubscribedAppRule-v3_18_0.xsd b/v3_18_0/CDT-serviceSubscribedAppRule-v3_18_0.xsd
index ff0b913..a3e8d28 100644
--- a/v3_18_0/CDT-serviceSubscribedAppRule-v3_18_0.xsd
+++ b/v3_18_0/CDT-serviceSubscribedAppRule-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-serviceSubscribedNode-v3_18_0.xsd b/v3_18_0/CDT-serviceSubscribedNode-v3_18_0.xsd
index a5ca55b..8bea847 100644
--- a/v3_18_0/CDT-serviceSubscribedNode-v3_18_0.xsd
+++ b/v3_18_0/CDT-serviceSubscribedNode-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-software-v3_18_0.xsd b/v3_18_0/CDT-software-v3_18_0.xsd
index ab500e3..b681eb0 100644
--- a/v3_18_0/CDT-software-v3_18_0.xsd
+++ b/v3_18_0/CDT-software-v3_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-statsCollect-v3_18_0.xsd b/v3_18_0/CDT-statsCollect-v3_18_0.xsd
index cfbf0e6..17414e1 100644
--- a/v3_18_0/CDT-statsCollect-v3_18_0.xsd
+++ b/v3_18_0/CDT-statsCollect-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-statsConfig-v3_18_0.xsd b/v3_18_0/CDT-statsConfig-v3_18_0.xsd
index 0f05022..8d1450f 100644
--- a/v3_18_0/CDT-statsConfig-v3_18_0.xsd
+++ b/v3_18_0/CDT-statsConfig-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-subscription-v3_18_0.xsd b/v3_18_0/CDT-subscription-v3_18_0.xsd
index ef25622..f5fb93f 100644
--- a/v3_18_0/CDT-subscription-v3_18_0.xsd
+++ b/v3_18_0/CDT-subscription-v3_18_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-svcFwWrapper-v3_18_0.xsd b/v3_18_0/CDT-svcFwWrapper-v3_18_0.xsd
index b439dc4..085d4bc 100644
--- a/v3_18_0/CDT-svcFwWrapper-v3_18_0.xsd
+++ b/v3_18_0/CDT-svcFwWrapper-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-svcObjWrapper-v3_18_0.xsd b/v3_18_0/CDT-svcObjWrapper-v3_18_0.xsd
index 8717576..56d2a0f 100644
--- a/v3_18_0/CDT-svcObjWrapper-v3_18_0.xsd
+++ b/v3_18_0/CDT-svcObjWrapper-v3_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_18_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-timeSeries-v3_18_0.xsd b/v3_18_0/CDT-timeSeries-v3_18_0.xsd
index 40593c2..24d09a1 100644
--- a/v3_18_0/CDT-timeSeries-v3_18_0.xsd
+++ b/v3_18_0/CDT-timeSeries-v3_18_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_18_0/CDT-timeSeriesInstance-v3_18_0.xsd b/v3_18_0/CDT-timeSeriesInstance-v3_18_0.xsd
index 2c9a26d..2e7e340 100644
--- a/v3_18_0/CDT-timeSeriesInstance-v3_18_0.xsd
+++ b/v3_18_0/CDT-timeSeriesInstance-v3_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_18_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-token-v3_18_0.xsd b/v3_18_0/CDT-token-v3_18_0.xsd
index 59e9c31..c91a95a 100644
--- a/v3_18_0/CDT-token-v3_18_0.xsd
+++ b/v3_18_0/CDT-token-v3_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_18_0/CDT-transaction-v3_18_0.xsd b/v3_18_0/CDT-transaction-v3_18_0.xsd
index a69fde0..435b83d 100644
--- a/v3_18_0/CDT-transaction-v3_18_0.xsd
+++ b/v3_18_0/CDT-transaction-v3_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_18_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-transactionMgmt-v3_18_0.xsd b/v3_18_0/CDT-transactionMgmt-v3_18_0.xsd
index 8e43c48..9acb944 100644
--- a/v3_18_0/CDT-transactionMgmt-v3_18_0.xsd
+++ b/v3_18_0/CDT-transactionMgmt-v3_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_18_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-triggerPayload-v3_18_0.xsd b/v3_18_0/CDT-triggerPayload-v3_18_0.xsd
index e02b9d5..6a1758f 100644
--- a/v3_18_0/CDT-triggerPayload-v3_18_0.xsd
+++ b/v3_18_0/CDT-triggerPayload-v3_18_0.xsd
@@ -27,7 +27,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" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_18_0/CDT-triggerRequest-v3_18_0.xsd b/v3_18_0/CDT-triggerRequest-v3_18_0.xsd
index 0831437..7d2e256 100644
--- a/v3_18_0/CDT-triggerRequest-v3_18_0.xsd
+++ b/v3_18_0/CDT-triggerRequest-v3_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_18_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_18_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
-- 
GitLab