diff --git a/v3_18_0/CDT-AE-v3_18_0.xsd b/v3_18_0/CDT-AE-v3_18_0.xsd
index 9f711c9c7f3966b967fa4bf138fc1cbdbe8e565f..860dc68ed8c6a1b9de2342f286bf26697cef1a97 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 eb382f041077cb0ef66f2ec3f5416ff18d301c02..cd8b751d813de9afe3651e0064e3da18271cd048 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 0dfccf1c434dc338e30373fbe1a804a030e6cf10..d794e3e170de538f7033cd89bf4b86498c0d552e 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 a827121be3b885236a7c2d6c4999b2579310a614..655a57c07de6bf8cedecced87f07581f8fd3350c 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 313789c90a3fce95077e4a8ec7501be3a3acbb01..4a392f0e34ab1392b8331c96175520dae3ffc27b 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 b6ce2729f0487980bac8f9b365b5e7a0b11bcf6e..0cb821fc49d0dc1aa5da447e82fbd5e6966fdc0e 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 76a81790d1d358dbd469bad14573b8c7a590133e..723c72b1a77939d2c0d5959830113ed94171c96a 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 5d5e12ee25abe077628221220c802564150e1faa..a06630acafb2d03f0a27f653cd78e9860d75355b 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 3aa875d91581cdd8eda144d6ac3180e5d93ff5fa..92ae093556088579684f36e93551efa0bd28a46f 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 c3423841816d659228d1688b900bfff9455f9dba..d691586fac7dee2fdc2447c01c2a11812208913f 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 1301f111b64039e8f048360cc89e102ff6d5e5e6..a501135aa3009163531d56e7217439ff76454747 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 46acee083cc34a199a9240a7fb4d2be7fd707a41..b21894b66b8ce58bfafa4e9c9b2b5e3e6dcb34a6 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 4ed66d186338704541a472a0a0df599f20ced715..b816e20119eb719152a04b2b7b091a9cf1c63946 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 2f1b79ebe46f65013279bf49f85ba78e50c4db42..db4aeda9c50f0b02c4faf72bc900ba848081875d 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 c76367bb3f18f8f9e7b02071aba2c00389d8ca8c..c48dcb9fbdcaa3e46bd322307a5c5ee6f9bb44bd 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 fa06e793fd90e0b0e5999d2d6c63174fa40e90c8..5e0283e38eda85bbb04b088f4e4ce3a1a66849fe 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 27969753dc50735b4c79c6ff7c6ea4014c7ba1b5..0a132ec3af5267fb7066cd860154084fee40ccee 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 0eae8b571d99ffb48de76ccde3c50be52dea5472..f7d3fec14a492258e97ea7ab615aa11dd28c7d51 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 48e946409d19a14f631ab334a63fdc50b623862a..1563c316bfdb5e08807cd9dc2c2ae13b5d6bb254 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 3d65e1d8f4e2007c412ecd52b84ec700070ae46b..66e29134b651da2ba764ce6866fba87371ea5f90 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 0f8d71f3626c93002f6eae46d990956bf9e44fdc..bb6e0669333c2123dc9d23aa8737053167fabfb4 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 cf54c694b0cc98f965ab0f3b45831f7a8d753ac5..4b5aab9ddebfb8656f7728c6b11e008e718b20d5 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 e9a5d7b434190b0e6709de692ff74d7808f6e703..2c41a36076a69e9d428d2e842cb75e46ceda3cf8 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 bbb4d593519ff8d8bc079dc0f26e8102d8649a0a..a9f92fb3dc07a841c84e1c35368c7a02c14a56ba 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 5701572d0ca4939540b42575c42dae8438506b77..4b0d090eb372ba0cf6c1d67f7c943eb26286e191 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 3995694d86c4b4a07a0ed50966817446db0b2c6b..0dd9426fbff86508cde0d6a7a74a93ae7d8c930f 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 9221b30432fd2b9eae192912d9547442a9d5b21c..41d82fcc24fa0ddf9ae4c0d7172a62975fc38dcb 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 4b949794155fab818b701abab1320a840d15c484..e1cfa9d5299a74d2df8cad1ec209e950ffa98fc2 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 599051e5e2139cf3d18d5600d2803dfb854e83a5..0ba50dbbf72ddc32e580c73f9dd156d7dc8bbd0f 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 5268540c485255f4e0225fea7ab619a962c2f204..f3b68635613c5a8f81fe20d7b455f64765f94487 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 03565d562506019ddbd7df665179fadc9c407937..69f18c1dbe3e3f446733b3297b832b218e945176 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 96343949bb932bb3a93b8c7976649c361650f509..64302dd851c5247b9e8719f166b88a75225fe8cd 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 299c4f6b5ee9db640f4aaf9e885246e488c44154..8c876ded75945495dda821b88b78a407d1c79a98 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 b3adf147e9ab0dbd785d046f5f90cb60d49da8e4..5bfa130040fd9843492727e06b7391cbf788b5c3 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 ab0287d2eb1c3c89c2f0ecf873e85426c7a67df9..a531db2c901b9b2e3c75c8c778048ffbf1cfd3b8 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 bc82ddac33ab580d3690b200ee54592993c245c6..d9f4b890b65d2f0855c264c07becc05455a57d11 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 7c0884e84301ed8a001d6bb156b1cc6ff19f9d8b..1b49737054a3376ee7d72ad5447963af41a1b4ca 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 555d14020c490251f989d817784bd40a7d41bfd3..f174082f323c26ea011694fbb87bbec817c65511 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 fe542033513cad43f7447de6a2c24537b242b4ad..b5d846227d308b81d0eeb78e87249fabc37bef32 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 b3f5c841437a3391726a9a7b43b3c8f915604cb9..baeabdb701b855399ccaae1f940344e1a7ec7177 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 6cbfab056a07d3550d50f8a9283144fc6c629430..6223b95b33488f539812c3740568f0bcd2a10d0b 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 580b5b2d43fac6321212ef7ca22402fb7435117d..5a8e9374f0d6d2bff6a2ef4432530809f80b237c 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 9da57481f8f771c3b76a740e34a6ccd55c4b43a4..54bdda4ba1d3d33a49416140772eeedb6ed3f8b2 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 dc136caa88d1e2d66104f8ff94ffc5b4b3804bbd..46eb87863c5e69d1baea9c1e1e53c061a4597007 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 cbeeb975decbf7d1310b3160f84739625139107d..e9bea14cf6c7bbf9feed2d9f493ee6bfe77db730 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 22b1507ecc0ccb8b4131bcd8b2c6c545ddd29aed..453778303383dcd4205c24214d1417b41ab95d1d 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 cf5d0872c9350f3bcfba0250d8e3043e880b531e..097232c5342bca9a7a86a0af39f5af33a65a4cdd 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 29f4ee3431676a64c7080d68cf54b32e356e00ab..914dd1704b4bc0ffddb5c5c0b35c1984dade919e 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 ceaae2f19354ee77c082d5307d5b5721f04f6f9b..c96fa7450e311a432904ce53c6ae0b4b1bee0138 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 4d4bf823cfc5439fc56a8b8baea6dbaf420f45e2..201b6fcb51b5d43b4a52ee236d2070ee89c6a9da 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 8fbce9d00175acff270217cdf67af8b2b33653ef..86258a321de93ffeb77dbff14c7b38c59affa7c8 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 3a6a1c02c710a9230b964ffd77e20084506b42cd..75a4ce73b34168fea2e8a1643307e4f301d69c2d 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 ecb5c3e7b357f38893d058dfc3fe138cca5f2ce1..f22a49635bf7d9bfcfac2af6d93ef8b7a0d6feed 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 2895ce0c8a766ba7037aba5ea5de21f7d309fb20..b56f7508792d26ee4b86ffeec88be627e61798ee 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 806c06170e4b7690cfc1204d8acafa54b750570b..f8008ca0e81fbe0281852fc947c7a2b68ed17402 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 3d2b8ddf8ed21aa51448a166622e7161e25a61cb..c1e4aa7268b100746bc7b642cf1e740f6483d707 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 3dcacfb49ed3844a2d937e8a6abba69900f35f2d..a5c19b5b1d529359184a9498eda3295a4e1fe8e7 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 d6c71481e0aa8751ac22f381eebe2f83ed2aef2c..ada8052dffe0bafc51542cbd05b51d9453df8718 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 77b7ca0ba95713748e91ee7f4bb9270fe3aaaf3d..c98d3adc8a55857bef5f2c9d39b24d4919d1d01e 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 c9731b74d8840691a5123dd939c18e942234a988..d7048102c48b0de9b6d75fd252a73b07517a55b3 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 7f632f14ad8527ee5325a05a269ed6116f1839b6..0875bdfde755a8003c8321dd1998a130451ca003 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 05542802c9cbfaebc90cf10fde0908da3913fcf5..41014e0c055b4852691ec8419290d223579ca084 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 81e16f0d1ec890f50e91122780717443bc04b490..7901a75ccfb90e7aefc6c5b4644c88823cea6429 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 fcf48ef9ed8f06693a0136675769500d6de980cb..37841e14cb7224ccb79e655101241aa3c3fe2759 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 e8ccf2ecf52628036e6db07f785cb480087ea084..e5da16ea50fda398e7073edbda934765e7e658bc 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 c8585272294626351a57cbe6d44a5c9dbde33f4a..a73ac352f253e2352d6315124fa7c566c137fe6d 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 3c4964e063512df95d3961d454777438e0d7d294..769ff3bf7e27616fd3d403e52687b0a83406f9c1 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 ff0b913c69846beebbde3615a87a855f36e31f03..a3e8d28b86048b4a71985a43b183f2aa85ef8867 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 a5ca55b87474221dea8b5edc34c09ac8f4222cb6..8bea847ca7520eb6bfb1c82e18d7c0cf7590c402 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 ab500e3236fd468f9462f28776334937483f20a2..b681eb0f9ee49928b49d124e5005a8339568734a 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 cfbf0e61cb0ff144461457f08eab0d015fcda867..17414e1a917967b7ca08d538b5396b4f9f8e994c 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 0f05022b317ea281e10ac13ad892e80fd6d6fe01..8d1450fe14256f4e382bb86a3a317b8c7bbec42d 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 ef256223506c1b6f95138e470fbb71f38b049dd8..f5fb93f8e5ed640365276f60557b7196e3f26158 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 b439dc453a36fc7cd88b7d4e3819253cf665788e..085d4bc99e602b5cba94ddca07b2e6a95d92d020 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 8717576f0b28e59fcb1a30c5bb2889742b325af4..56d2a0f6d9a2db062ebf6207bd77df1294266863 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 40593c27e9463663091a7e995874ba36e8a8fff2..24d09a1a275b9fb732402a79aaf0bec59bf9821f 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 2c9a26d4ae390030170395d20f27448b744611d1..2e7e340b362d1efa4a3e4e4ac0dda41466c6ad56 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 59e9c31778523d3d11839b08b6cecde12d9fc010..c91a95ae3d9337ce7d077c49dace8386b37eec55 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 a69fde045dbf97af00d0d057328560541644fb1f..435b83d6af79726ec7d999661b817626ef0ccb0b 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 8e43c482f59981c0e00817c8d8a0ea519511e93b..9acb94485485d4b668b2a95da30e5c527be9f69b 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 e02b9d50f54713840571425fe2c960118622916e..6a1758fe827e7e408d8ae8693db0a7dbcacd34f1 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 08314372a6f665c654d127b777ea6e76516e05ef..7d2e256c886949b4d0f53a9f33315bb17d3f3bf3 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>