From 65af7270be1330f521e239b0a4ba2446000f7388 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Wed, 17 Apr 2019 13:16:02 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v3_11_0/CDT-AE-v3_11_0.xsd b/v3_11_0/CDT-AE-v3_11_0.xsd
index ec3943a..c63634f 100644
--- a/v3_11_0/CDT-AE-v3_11_0.xsd
+++ b/v3_11_0/CDT-AE-v3_11_0.xsd
@@ -26,21 +26,21 @@ 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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-AEContactList-v3_11_0.xsd b/v3_11_0/CDT-AEContactList-v3_11_0.xsd
index 2013fea..4403bf8 100644
--- a/v3_11_0/CDT-AEContactList-v3_11_0.xsd
+++ b/v3_11_0/CDT-AEContactList-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-AEContactListPerCSE-v3_11_0.xsd b/v3_11_0/CDT-AEContactListPerCSE-v3_11_0.xsd
index 7738536..5616680 100644
--- a/v3_11_0/CDT-AEContactListPerCSE-v3_11_0.xsd
+++ b/v3_11_0/CDT-AEContactListPerCSE-v3_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-CSEBase-v3_11_0.xsd b/v3_11_0/CDT-CSEBase-v3_11_0.xsd
index 8603861..9c3df41 100644
--- a/v3_11_0/CDT-CSEBase-v3_11_0.xsd
+++ b/v3_11_0/CDT-CSEBase-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_10_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_10_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_10_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_11_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_11_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_11_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_11_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-accessControlPolicy-v3_11_0.xsd b/v3_11_0/CDT-accessControlPolicy-v3_11_0.xsd
index 8515ec4..f96e849 100644
--- a/v3_11_0/CDT-accessControlPolicy-v3_11_0.xsd
+++ b/v3_11_0/CDT-accessControlPolicy-v3_11_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_10_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-activeCmdhPolicy-v3_11_0.xsd b/v3_11_0/CDT-activeCmdhPolicy-v3_11_0.xsd
index fb9e0b9..3e7ae82 100644
--- a/v3_11_0/CDT-activeCmdhPolicy-v3_11_0.xsd
+++ b/v3_11_0/CDT-activeCmdhPolicy-v3_11_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_11_0/CDT-allJoynApp-v3_11_0.xsd b/v3_11_0/CDT-allJoynApp-v3_11_0.xsd
index 54dd332..537c945 100644
--- a/v3_11_0/CDT-allJoynApp-v3_11_0.xsd
+++ b/v3_11_0/CDT-allJoynApp-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_11_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-allJoynInterface-v3_11_0.xsd b/v3_11_0/CDT-allJoynInterface-v3_11_0.xsd
index dc339e9..0f87db2 100644
--- a/v3_11_0/CDT-allJoynInterface-v3_11_0.xsd
+++ b/v3_11_0/CDT-allJoynInterface-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_11_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_11_0/CDT-allJoynMethod-v3_11_0.xsd b/v3_11_0/CDT-allJoynMethod-v3_11_0.xsd
index 2082ac1..b48ea7f 100644
--- a/v3_11_0/CDT-allJoynMethod-v3_11_0.xsd
+++ b/v3_11_0/CDT-allJoynMethod-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_11_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_11_0/CDT-allJoynMethodCall-v3_11_0.xsd b/v3_11_0/CDT-allJoynMethodCall-v3_11_0.xsd
index 00d0eee..c7eb3d2 100644
--- a/v3_11_0/CDT-allJoynMethodCall-v3_11_0.xsd
+++ b/v3_11_0/CDT-allJoynMethodCall-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-allJoynProperty-v3_11_0.xsd b/v3_11_0/CDT-allJoynProperty-v3_11_0.xsd
index 46caf41..df6bdde 100644
--- a/v3_11_0/CDT-allJoynProperty-v3_11_0.xsd
+++ b/v3_11_0/CDT-allJoynProperty-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-allJoynSvcObject-v3_11_0.xsd b/v3_11_0/CDT-allJoynSvcObject-v3_11_0.xsd
index 92f4be9..56db792 100644
--- a/v3_11_0/CDT-allJoynSvcObject-v3_11_0.xsd
+++ b/v3_11_0/CDT-allJoynSvcObject-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_11_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-areaNwkDeviceInfo-v3_11_0.xsd b/v3_11_0/CDT-areaNwkDeviceInfo-v3_11_0.xsd
index 023f552..f31cc63 100644
--- a/v3_11_0/CDT-areaNwkDeviceInfo-v3_11_0.xsd
+++ b/v3_11_0/CDT-areaNwkDeviceInfo-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-areaNwkInfo-v3_11_0.xsd b/v3_11_0/CDT-areaNwkInfo-v3_11_0.xsd
index ca757c0..6fabb49 100644
--- a/v3_11_0/CDT-areaNwkInfo-v3_11_0.xsd
+++ b/v3_11_0/CDT-areaNwkInfo-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-authorizationDecision-v3_11_0.xsd b/v3_11_0/CDT-authorizationDecision-v3_11_0.xsd
index a77fb66..58e5fca 100644
--- a/v3_11_0/CDT-authorizationDecision-v3_11_0.xsd
+++ b/v3_11_0/CDT-authorizationDecision-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-authorizationInformation-v3_11_0.xsd b/v3_11_0/CDT-authorizationInformation-v3_11_0.xsd
index 009a0fa..6886728 100644
--- a/v3_11_0/CDT-authorizationInformation-v3_11_0.xsd
+++ b/v3_11_0/CDT-authorizationInformation-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-authorizationPolicy-v3_11_0.xsd b/v3_11_0/CDT-authorizationPolicy-v3_11_0.xsd
index caf6e61..5c1c45f 100644
--- a/v3_11_0/CDT-authorizationPolicy-v3_11_0.xsd
+++ b/v3_11_0/CDT-authorizationPolicy-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-backgroundDataTransfer-v3_11_0.xsd b/v3_11_0/CDT-backgroundDataTransfer-v3_11_0.xsd
index 194b35c..1e7bcad 100644
--- a/v3_11_0/CDT-backgroundDataTransfer-v3_11_0.xsd
+++ b/v3_11_0/CDT-backgroundDataTransfer-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-battery-v3_11_0.xsd b/v3_11_0/CDT-battery-v3_11_0.xsd
index 660f4a0..c6c8c6f 100644
--- a/v3_11_0/CDT-battery-v3_11_0.xsd
+++ b/v3_11_0/CDT-battery-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-cmdhBuffer-v3_11_0.xsd b/v3_11_0/CDT-cmdhBuffer-v3_11_0.xsd
index d95eb12..b70d268 100644
--- a/v3_11_0/CDT-cmdhBuffer-v3_11_0.xsd
+++ b/v3_11_0/CDT-cmdhBuffer-v3_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_11_0/CDT-cmdhDefEcValue-v3_11_0.xsd b/v3_11_0/CDT-cmdhDefEcValue-v3_11_0.xsd
index 59261fd..71f2072 100644
--- a/v3_11_0/CDT-cmdhDefEcValue-v3_11_0.xsd
+++ b/v3_11_0/CDT-cmdhDefEcValue-v3_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_11_0/CDT-cmdhDefaults-v3_11_0.xsd b/v3_11_0/CDT-cmdhDefaults-v3_11_0.xsd
index 44c32a4..a42932e 100644
--- a/v3_11_0/CDT-cmdhDefaults-v3_11_0.xsd
+++ b/v3_11_0/CDT-cmdhDefaults-v3_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_11_0/CDT-cmdhEcDefParamValues-v3_11_0.xsd b/v3_11_0/CDT-cmdhEcDefParamValues-v3_11_0.xsd
index 2c94f26..0968727 100644
--- a/v3_11_0/CDT-cmdhEcDefParamValues-v3_11_0.xsd
+++ b/v3_11_0/CDT-cmdhEcDefParamValues-v3_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_11_0/CDT-cmdhLimits-v3_11_0.xsd b/v3_11_0/CDT-cmdhLimits-v3_11_0.xsd
index e9c590b..fbb553d 100644
--- a/v3_11_0/CDT-cmdhLimits-v3_11_0.xsd
+++ b/v3_11_0/CDT-cmdhLimits-v3_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_11_0/CDT-cmdhNetworkAccessRules-v3_11_0.xsd b/v3_11_0/CDT-cmdhNetworkAccessRules-v3_11_0.xsd
index 3a1ece2..822269b 100644
--- a/v3_11_0/CDT-cmdhNetworkAccessRules-v3_11_0.xsd
+++ b/v3_11_0/CDT-cmdhNetworkAccessRules-v3_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_11_0/CDT-cmdhNwAccessRule-v3_11_0.xsd b/v3_11_0/CDT-cmdhNwAccessRule-v3_11_0.xsd
index 13f7fad..83a8f53 100644
--- a/v3_11_0/CDT-cmdhNwAccessRule-v3_11_0.xsd
+++ b/v3_11_0/CDT-cmdhNwAccessRule-v3_11_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_11_0/CDT-cmdhPolicy-v3_11_0.xsd b/v3_11_0/CDT-cmdhPolicy-v3_11_0.xsd
index e5d1ad7..b20edf3 100644
--- a/v3_11_0/CDT-cmdhPolicy-v3_11_0.xsd
+++ b/v3_11_0/CDT-cmdhPolicy-v3_11_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_11_0/CDT-commonTypes-v3_11_0.xsd b/v3_11_0/CDT-commonTypes-v3_11_0.xsd
index 1e9ad7c..12e46a0 100644
--- a/v3_11_0/CDT-commonTypes-v3_11_0.xsd
+++ b/v3_11_0/CDT-commonTypes-v3_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_11_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_11_0/CDT-container-v3_11_0.xsd b/v3_11_0/CDT-container-v3_11_0.xsd
index d24f538..90e29e6 100644
--- a/v3_11_0/CDT-container-v3_11_0.xsd
+++ b/v3_11_0/CDT-container-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_11_0/CDT-contentInstance-v3_11_0.xsd b/v3_11_0/CDT-contentInstance-v3_11_0.xsd
index 396f804..734da60 100644
--- a/v3_11_0/CDT-contentInstance-v3_11_0.xsd
+++ b/v3_11_0/CDT-contentInstance-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-crossResourceSubscription-v3_11_0.xsd b/v3_11_0/CDT-crossResourceSubscription-v3_11_0.xsd
index 9033ea7..f3b77a6 100644
--- a/v3_11_0/CDT-crossResourceSubscription-v3_11_0.xsd
+++ b/v3_11_0/CDT-crossResourceSubscription-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-delivery-v3_11_0.xsd b/v3_11_0/CDT-delivery-v3_11_0.xsd
index 2790146..afb639f 100644
--- a/v3_11_0/CDT-delivery-v3_11_0.xsd
+++ b/v3_11_0/CDT-delivery-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_11_0/CDT-deviceCapability-v3_11_0.xsd b/v3_11_0/CDT-deviceCapability-v3_11_0.xsd
index 17b183b..f1243e3 100644
--- a/v3_11_0/CDT-deviceCapability-v3_11_0.xsd
+++ b/v3_11_0/CDT-deviceCapability-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-deviceInfo-v3_11_0.xsd b/v3_11_0/CDT-deviceInfo-v3_11_0.xsd
index 5bef72b..79882a9 100644
--- a/v3_11_0/CDT-deviceInfo-v3_11_0.xsd
+++ b/v3_11_0/CDT-deviceInfo-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-dynamicAuthorizationConsultation-v3_11_0.xsd b/v3_11_0/CDT-dynamicAuthorizationConsultation-v3_11_0.xsd
index 9840b39..bb54d47 100644
--- a/v3_11_0/CDT-dynamicAuthorizationConsultation-v3_11_0.xsd
+++ b/v3_11_0/CDT-dynamicAuthorizationConsultation-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-eventConfig-v3_11_0.xsd b/v3_11_0/CDT-eventConfig-v3_11_0.xsd
index 6fcdabd..4703726 100644
--- a/v3_11_0/CDT-eventConfig-v3_11_0.xsd
+++ b/v3_11_0/CDT-eventConfig-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-eventLog-v3_11_0.xsd b/v3_11_0/CDT-eventLog-v3_11_0.xsd
index 7d8867f..5290383 100644
--- a/v3_11_0/CDT-eventLog-v3_11_0.xsd
+++ b/v3_11_0/CDT-eventLog-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-execInstance-v3_11_0.xsd b/v3_11_0/CDT-execInstance-v3_11_0.xsd
index b31a64e..fba5a7a 100644
--- a/v3_11_0/CDT-execInstance-v3_11_0.xsd
+++ b/v3_11_0/CDT-execInstance-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-firmware-v3_11_0.xsd b/v3_11_0/CDT-firmware-v3_11_0.xsd
index c5a13b0..0afdc90 100644
--- a/v3_11_0/CDT-firmware-v3_11_0.xsd
+++ b/v3_11_0/CDT-firmware-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-genericInterworkingOperationInstance-v3_11_0.xsd b/v3_11_0/CDT-genericInterworkingOperationInstance-v3_11_0.xsd
index e577fd6..e88377c 100644
--- a/v3_11_0/CDT-genericInterworkingOperationInstance-v3_11_0.xsd
+++ b/v3_11_0/CDT-genericInterworkingOperationInstance-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-genericInterworkingService-v3_11_0.xsd b/v3_11_0/CDT-genericInterworkingService-v3_11_0.xsd
index cb7fd91..8ef332d 100644
--- a/v3_11_0/CDT-genericInterworkingService-v3_11_0.xsd
+++ b/v3_11_0/CDT-genericInterworkingService-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_11_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-group-v3_11_0.xsd b/v3_11_0/CDT-group-v3_11_0.xsd
index ee263bf..cce40d8 100644
--- a/v3_11_0/CDT-group-v3_11_0.xsd
+++ b/v3_11_0/CDT-group-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_11_0/CDT-localMulticastGroup-v3_11_0.xsd b/v3_11_0/CDT-localMulticastGroup-v3_11_0.xsd
index cd95750..f902942 100644
--- a/v3_11_0/CDT-localMulticastGroup-v3_11_0.xsd
+++ b/v3_11_0/CDT-localMulticastGroup-v3_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_10_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_11_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_11_0/CDT-locationPolicy-v3_11_0.xsd b/v3_11_0/CDT-locationPolicy-v3_11_0.xsd
index f0036f1..c2a9626 100644
--- a/v3_11_0/CDT-locationPolicy-v3_11_0.xsd
+++ b/v3_11_0/CDT-locationPolicy-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-m2mServiceSubscriptionProfile-v3_11_0.xsd b/v3_11_0/CDT-m2mServiceSubscriptionProfile-v3_11_0.xsd
index 44570c2..6499b9c 100644
--- a/v3_11_0/CDT-m2mServiceSubscriptionProfile-v3_11_0.xsd
+++ b/v3_11_0/CDT-m2mServiceSubscriptionProfile-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-memory-v3_11_0.xsd b/v3_11_0/CDT-memory-v3_11_0.xsd
index ae88682..e457fd0 100644
--- a/v3_11_0/CDT-memory-v3_11_0.xsd
+++ b/v3_11_0/CDT-memory-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-mgmtCmd-v3_11_0.xsd b/v3_11_0/CDT-mgmtCmd-v3_11_0.xsd
index 8f21915..c007d6f 100644
--- a/v3_11_0/CDT-mgmtCmd-v3_11_0.xsd
+++ b/v3_11_0/CDT-mgmtCmd-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-multimediaSession-v3_11_0.xsd b/v3_11_0/CDT-multimediaSession-v3_11_0.xsd
index 9641b8f..1199f67 100644
--- a/v3_11_0/CDT-multimediaSession-v3_11_0.xsd
+++ b/v3_11_0/CDT-multimediaSession-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-node-v3_11_0.xsd b/v3_11_0/CDT-node-v3_11_0.xsd
index afa9a1b..07a0e9c 100644
--- a/v3_11_0/CDT-node-v3_11_0.xsd
+++ b/v3_11_0/CDT-node-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_11_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-notification-v3_11_0.xsd b/v3_11_0/CDT-notification-v3_11_0.xsd
index a7859fb..cc98bee 100644
--- a/v3_11_0/CDT-notification-v3_11_0.xsd
+++ b/v3_11_0/CDT-notification-v3_11_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_10_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_10_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_11_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_11_0/CDT-notificationTargetMgmtPolicyRef-v3_11_0.xsd b/v3_11_0/CDT-notificationTargetMgmtPolicyRef-v3_11_0.xsd
index f6857ee..a4263f2 100644
--- a/v3_11_0/CDT-notificationTargetMgmtPolicyRef-v3_11_0.xsd
+++ b/v3_11_0/CDT-notificationTargetMgmtPolicyRef-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-notificationTargetPolicy-v3_11_0.xsd b/v3_11_0/CDT-notificationTargetPolicy-v3_11_0.xsd
index 4d2b0c1..ff77900 100644
--- a/v3_11_0/CDT-notificationTargetPolicy-v3_11_0.xsd
+++ b/v3_11_0/CDT-notificationTargetPolicy-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-ontology-v3_11_0.xsd b/v3_11_0/CDT-ontology-v3_11_0.xsd
index 9aef451..5ac6a84 100644
--- a/v3_11_0/CDT-ontology-v3_11_0.xsd
+++ b/v3_11_0/CDT-ontology-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_11_0/CDT-ontologyRepository-v3_11_0.xsd b/v3_11_0/CDT-ontologyRepository-v3_11_0.xsd
index fb247c9..0db58e6 100644
--- a/v3_11_0/CDT-ontologyRepository-v3_11_0.xsd
+++ b/v3_11_0/CDT-ontologyRepository-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_11_0/CDT-policyDeletionRules-v3_11_0.xsd b/v3_11_0/CDT-policyDeletionRules-v3_11_0.xsd
index 7ac41c8..81afd22 100644
--- a/v3_11_0/CDT-policyDeletionRules-v3_11_0.xsd
+++ b/v3_11_0/CDT-policyDeletionRules-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-pollingChannel-v3_11_0.xsd b/v3_11_0/CDT-pollingChannel-v3_11_0.xsd
index f92652f..ff89324 100644
--- a/v3_11_0/CDT-pollingChannel-v3_11_0.xsd
+++ b/v3_11_0/CDT-pollingChannel-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-reboot-v3_11_0.xsd b/v3_11_0/CDT-reboot-v3_11_0.xsd
index bcbbe7d..dca90a9 100644
--- a/v3_11_0/CDT-reboot-v3_11_0.xsd
+++ b/v3_11_0/CDT-reboot-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-remoteCSE-v3_11_0.xsd b/v3_11_0/CDT-remoteCSE-v3_11_0.xsd
index 5391c73..1457880 100644
--- a/v3_11_0/CDT-remoteCSE-v3_11_0.xsd
+++ b/v3_11_0/CDT-remoteCSE-v3_11_0.xsd
@@ -26,23 +26,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-request-v3_11_0.xsd b/v3_11_0/CDT-request-v3_11_0.xsd
index 14d4d6c..fa78a3e 100644
--- a/v3_11_0/CDT-request-v3_11_0.xsd
+++ b/v3_11_0/CDT-request-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-requestPrimitive-v3_11_0.xsd b/v3_11_0/CDT-requestPrimitive-v3_11_0.xsd
index fe2ba12..5563043 100644
--- a/v3_11_0/CDT-requestPrimitive-v3_11_0.xsd
+++ b/v3_11_0/CDT-requestPrimitive-v3_11_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_11_0/CDT-responsePrimitive-v3_11_0.xsd b/v3_11_0/CDT-responsePrimitive-v3_11_0.xsd
index be8664b..e926ae2 100644
--- a/v3_11_0/CDT-responsePrimitive-v3_11_0.xsd
+++ b/v3_11_0/CDT-responsePrimitive-v3_11_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_10_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_10_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_10_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_11_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_11_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_11_0/CDT-role-v3_11_0.xsd b/v3_11_0/CDT-role-v3_11_0.xsd
index f7e0654..5d83104 100644
--- a/v3_11_0/CDT-role-v3_11_0.xsd
+++ b/v3_11_0/CDT-role-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-schedule-v3_11_0.xsd b/v3_11_0/CDT-schedule-v3_11_0.xsd
index dbb91ed..a8d1acb 100644
--- a/v3_11_0/CDT-schedule-v3_11_0.xsd
+++ b/v3_11_0/CDT-schedule-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource ">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-semanticDescriptor-v3_11_0.xsd b/v3_11_0/CDT-semanticDescriptor-v3_11_0.xsd
index d02c4ac..38b09cf 100644
--- a/v3_11_0/CDT-semanticDescriptor-v3_11_0.xsd
+++ b/v3_11_0/CDT-semanticDescriptor-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-semanticMashupInstance-v3_11_0.xsd b/v3_11_0/CDT-semanticMashupInstance-v3_11_0.xsd
index fec6b09..ace863b 100644
--- a/v3_11_0/CDT-semanticMashupInstance-v3_11_0.xsd
+++ b/v3_11_0/CDT-semanticMashupInstance-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-semanticMashupJobProfile-v3_11_0.xsd b/v3_11_0/CDT-semanticMashupJobProfile-v3_11_0.xsd
index ba21ce8..d9cef6b 100644
--- a/v3_11_0/CDT-semanticMashupJobProfile-v3_11_0.xsd
+++ b/v3_11_0/CDT-semanticMashupJobProfile-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-semanticMashupResult-v3_11_0.xsd b/v3_11_0/CDT-semanticMashupResult-v3_11_0.xsd
index 5208d11..743ef2d 100644
--- a/v3_11_0/CDT-semanticMashupResult-v3_11_0.xsd
+++ b/v3_11_0/CDT-semanticMashupResult-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-serviceSubscribedAppRule-v3_11_0.xsd b/v3_11_0/CDT-serviceSubscribedAppRule-v3_11_0.xsd
index a2b9251..82c204a 100644
--- a/v3_11_0/CDT-serviceSubscribedAppRule-v3_11_0.xsd
+++ b/v3_11_0/CDT-serviceSubscribedAppRule-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-serviceSubscribedNode-v3_11_0.xsd b/v3_11_0/CDT-serviceSubscribedNode-v3_11_0.xsd
index f20abb4..8f69146 100644
--- a/v3_11_0/CDT-serviceSubscribedNode-v3_11_0.xsd
+++ b/v3_11_0/CDT-serviceSubscribedNode-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-software-v3_11_0.xsd b/v3_11_0/CDT-software-v3_11_0.xsd
index 0b0474c..21512bc 100644
--- a/v3_11_0/CDT-software-v3_11_0.xsd
+++ b/v3_11_0/CDT-software-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-statsCollect-v3_11_0.xsd b/v3_11_0/CDT-statsCollect-v3_11_0.xsd
index 8ffb3e4..9b7538f 100644
--- a/v3_11_0/CDT-statsCollect-v3_11_0.xsd
+++ b/v3_11_0/CDT-statsCollect-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-statsConfig-v3_11_0.xsd b/v3_11_0/CDT-statsConfig-v3_11_0.xsd
index 3085e73..b5a99f1 100644
--- a/v3_11_0/CDT-statsConfig-v3_11_0.xsd
+++ b/v3_11_0/CDT-statsConfig-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-subscription-v3_11_0.xsd b/v3_11_0/CDT-subscription-v3_11_0.xsd
index 59ac881..d9a3c23 100644
--- a/v3_11_0/CDT-subscription-v3_11_0.xsd
+++ b/v3_11_0/CDT-subscription-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-svcFwWrapper-v3_11_0.xsd b/v3_11_0/CDT-svcFwWrapper-v3_11_0.xsd
index c0c5f3e..18ea6d9 100644
--- a/v3_11_0/CDT-svcFwWrapper-v3_11_0.xsd
+++ b/v3_11_0/CDT-svcFwWrapper-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-svcObjWrapper-v3_11_0.xsd b/v3_11_0/CDT-svcObjWrapper-v3_11_0.xsd
index d038a2e..8be72bd 100644
--- a/v3_11_0/CDT-svcObjWrapper-v3_11_0.xsd
+++ b/v3_11_0/CDT-svcObjWrapper-v3_11_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_11_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-timeSeries-v3_11_0.xsd b/v3_11_0/CDT-timeSeries-v3_11_0.xsd
index dbb710a..8b25c2a 100644
--- a/v3_11_0/CDT-timeSeries-v3_11_0.xsd
+++ b/v3_11_0/CDT-timeSeries-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_11_0/CDT-timeSeriesInstance-v3_11_0.xsd b/v3_11_0/CDT-timeSeriesInstance-v3_11_0.xsd
index 40b05a6..d8723b2 100644
--- a/v3_11_0/CDT-timeSeriesInstance-v3_11_0.xsd
+++ b/v3_11_0/CDT-timeSeriesInstance-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_11_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-token-v3_11_0.xsd b/v3_11_0/CDT-token-v3_11_0.xsd
index 4bca47f..2e2ce00 100644
--- a/v3_11_0/CDT-token-v3_11_0.xsd
+++ b/v3_11_0/CDT-token-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_11_0/CDT-transaction-v3_11_0.xsd b/v3_11_0/CDT-transaction-v3_11_0.xsd
index 448a3ca..6daa44d 100644
--- a/v3_11_0/CDT-transaction-v3_11_0.xsd
+++ b/v3_11_0/CDT-transaction-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_11_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-transactionMgmt-v3_11_0.xsd b/v3_11_0/CDT-transactionMgmt-v3_11_0.xsd
index 4683b7a..cf443fb 100644
--- a/v3_11_0/CDT-transactionMgmt-v3_11_0.xsd
+++ b/v3_11_0/CDT-transactionMgmt-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_11_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-triggerPayload-v3_11_0.xsd b/v3_11_0/CDT-triggerPayload-v3_11_0.xsd
index 2ae884f..c31a3cb 100644
--- a/v3_11_0/CDT-triggerPayload-v3_11_0.xsd
+++ b/v3_11_0/CDT-triggerPayload-v3_11_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_11_0/CDT-triggerRequest-v3_11_0.xsd b/v3_11_0/CDT-triggerRequest-v3_11_0.xsd
index 2f35c7c..136263c 100644
--- a/v3_11_0/CDT-triggerRequest-v3_11_0.xsd
+++ b/v3_11_0/CDT-triggerRequest-v3_11_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_11_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_11_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
-- 
GitLab