diff --git a/v3_11_0/CDT-AE-v3_11_0.xsd b/v3_11_0/CDT-AE-v3_11_0.xsd
index ec3943a41d6ff8c3efc0c2abe9fc906ab5773b5a..c63634f93f30c4cef705e26341bb56318fdf4221 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 2013fea8d2aeee9f5b107429ae246b29ff2424c1..4403bf86011a8d09db9861dd2307bd08a37b2243 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 7738536e60c339e3b7d56cd2350bfdab052cce6b..561668073e6c37d240db0ceac424fc2b6daca75f 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 860386192f2d69ee4f9e2deb6b31a8b7ecaaaa5f..9c3df41c01090a7753c9b20a3ed119cc1dc551f1 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 8515ec471353d1dd9a2f825fbc1fa6353f0a1a65..f96e849a7a7a56af14a7e59cbb793eee20bff6b6 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 fb9e0b9609dc346ab1ee1f957b7a4d9c5c7a14f0..3e7ae82ed301effd736dad74043a8b79adbd37cd 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 54dd332ded7262391034cbdc8207ba5b82f8b119..537c945e3f1b2b340731ccf525b8846eba208c0a 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 dc339e97980ddb7743e0fdc69bdf063c7ecdfd43..0f87db20e3f3bb51698e713cd4f81a1e4bfcf8b2 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 2082ac10a2f4c5f2fedc26d558b4836facb8a07a..b48ea7f5f60987937a58406e5451fa5af646d3f9 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 00d0eee9ae1f8246c1d86e6679c5d0321f51c3dc..c7eb3d24fe33c9e77b6d1b045ad7f3bed1de31fe 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 46caf41bb9d61171754ee79fedaf38b1b7f3e4e7..df6bdde907a3f77b01b31bd3e31887acd8143e68 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 92f4be9212ba6711e6b6a79f9d7b924035f31d67..56db792a1ed4461cc77be09a0a1e30d59574211b 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 023f552da132f4ecce810f592e130d8f8b6893fc..f31cc63bba8cff69a70f4c9f925f3e6b14f40636 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 ca757c0277f4878a68d4bac7ba74347a4ad2f7f6..6fabb4918e59b236327b4f1b914d9eefa76a1dff 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 a77fb663dc8f686c5083856465fad39469e9b5f2..58e5fca78c08b9ccd14c353ddd6eff6c94742071 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 009a0fae9652e22c0b105155e82640bf99043c72..68867285b374252a957b2094eca077dc4d0d8e1b 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 caf6e6173151f901e40179672902d1aa875194ec..5c1c45f1adac6bd6bde783f4882076d7ae954170 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 194b35cfd3065f86be438ab17080f071aa67df27..1e7bcada38dea90ed9b90a41c6c75694b5c5a410 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 660f4a0da533806a0a989b904d3d3d9806f3dd4a..c6c8c6f38f35084e3709b493afc41b17e3d955a2 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 d95eb12f51c1e53cb4f121d3ee39b27d11d8c431..b70d268e13ea6a8ce34852d8ee73d3a95fd9ccc1 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 59261fd80f8f7751fb14fce054a2d5710585c01b..71f2072ff11785d21da8c252217acbd9fb815147 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 44c32a485ff60d6d8704e8fa2ae8a0bb4bbef75f..a42932e86d8403adfadafa0107a145486d701bfb 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 2c94f26418d83860a78b4a473ff29f8592bc5d4f..0968727ccd80df8f5b0053d98c2fcf623b05d0ad 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 e9c590b0ee6c79383776eb1cb583b1319cc3273a..fbb553dcb1e6d010c05cece212a7c4f52b389a82 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 3a1ece2635bf335b79dd6146ef4bdb79a6dd6830..822269bc599e43fa9f91546c4b2e308f6e5fe3e2 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 13f7fad5832653c0afd3dc6a1b5398b93f26555c..83a8f53992b9930cabed29176867129c1f2bffbd 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 e5d1ad76bc20092ddfba3bed3d05c63e890e9617..b20edf3532b5e23a635cf4194a86ff5ce05e47d9 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 1e9ad7cc780bd2077c9e71816bbb9c10647791a0..12e46a0c4a5581903ef4a2d482cb897182b29371 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 d24f538b6d51ccfa37ff100a818463d649cf5bde..90e29e6e5cc3e036d6f84317f03ae21f4a741f0f 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 396f804971ce4b695ab9ce7070120de8067b41b6..734da60807cf73eaa9e254f10b8d14f21ec7e2ce 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 9033ea75f790cefa55da7a0a39f13930ced4ac09..f3b77a6dfcd65d392219adfee63d53938733aace 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 2790146f9b2078b2431db645a65890321feaf07e..afb639f829d452f62ae3d4ea6e5e7d88f015a537 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 17b183b3084cdc0ea5f1a47af6decae938d4c525..f1243e3363b6af61a298f31eb7abef7bbce3131d 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 5bef72b1951a593c341ee4f2e3aa175ccc7bc551..79882a9c0d4a6dc62df21f648f0532f403b17666 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 9840b39a6f3088a76fe71bbeced5e223ea358552..bb54d47cb6853be565698cfc2b8b0870b4b5d3db 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 6fcdabdc8d6b8021b473ceeec0833ca0f09467ff..4703726ca37333fe2ff23c4d9f0c07e511091f52 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 7d8867f96588fccc9b57a8134a84f61022f12fb6..5290383f6cc5acd99a306bc78ff059655449b46d 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 b31a64e1ea934f1d6747fd792c182b4635bc9211..fba5a7ae6390de47a835c2a9ff05ded4f30c40de 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 c5a13b0ca6bd37ee1673153d77f63374ea5561e5..0afdc90f924ec4e9f34b31c2560f071e1f6f0764 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 e577fd675c2b80214439a8dcfe1f8b109148ff44..e88377c8b17ab0e123e201ad5c06fd448d1b6a4b 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 cb7fd9109c4ebb549178712eba625191de77288f..8ef332d8ca3f74661d6ded28043558b33043eb4e 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 ee263bf2ed56ba4ab07be3463631a35ebaabba14..cce40d8584f6a1341bf7123daf95be2c28e2cec6 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 cd95750cf7382a6c828675d2c93244040c13e5b2..f902942ae4a3b48e84562fcab8a9c63c57db243e 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 f0036f1d456f042df13dc804179326fcd6463c15..c2a9626efc49cbbc0ca8b2804fbc883d4eedf486 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 44570c2cadf5f860cb2d686e24c2597e8306d133..6499b9cccfbace5ca243c0e174574449c3d67290 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 ae88682686489ea397124776dc40eaf8131b3e7d..e457fd0e6b3c63400a2fa3bb539e20060b66036d 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 8f21915ed7336ee2dfe2069b29f070bed6689d0b..c007d6fb86c19d4c80c47c86d619b35f65344574 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 9641b8f63de31fcf09033de0e7a9f6e0294603bb..1199f6722443d8f1a7f80322a33f4fa046e01b08 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 afa9a1bbaf3530b7352ef68e854768166dbb5971..07a0e9c2679c620ed4d10ba787f207b21833a448 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 a7859fb71f7f32a5c82e2dec60759fe3d650fe55..cc98bee51aa1bc13ffa5d8d372a222e3d99d71cf 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 f6857ee335005584ca959afdf13e11dcf2ce9af0..a4263f25ffcfb26d3d5d9e3cedbecacd8a85e3c8 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 4d2b0c1fc71a28ef52df8efa73109ca85101283e..ff779000b14049ecea1dbe50597dfd4cfd15dc06 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 9aef451a8fe5c064e1010a123c3b512d7b2d8bc0..5ac6a84b9725b4ef36f83859165a0d194f7ccf57 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 fb247c972cce3a8bcd4992a9e53154a206f3b793..0db58e60bb2a538959df08ccda7dea34f130c7db 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 7ac41c851483b9c0a67b8d6d1a16a091c246a85a..81afd22184b82f4872e85768f10adb7b65803da0 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 f92652f62d894c5a540f24a1c752d5b0e45bf8b4..ff8932446c2dd0669e7588b21afdaee96270ddcf 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 bcbbe7dccf487e82256ba7ae05ca40995e73ff4d..dca90a9569cc0957eb33b4c1de972e8b67e73fc9 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 5391c7337613b33eb4f52b9946b086e17479b0ce..1457880b20cbe7778c0e8540b0a5718326e6de30 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 14d4d6c92bd526d044190b51373ec5856d5e5758..fa78a3e5b518feaa8f6bbb34b0e9d07453059697 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 fe2ba12b8b67f26b8914ea7ab9dbf7f09386088f..5563043240ca984bd669c98d4b8e14edeb85bc14 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 be8664bd5825963cb3d7e69f0711bedc0c6ad089..e926ae29b67831dfdf99f6f3a9d63c6231f0d774 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 f7e06544a11989d153d93e0b09cefd3a97218619..5d831048d4b2d7bf5cd01ec292cd6fd5d479c8b1 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 dbb91edb044a7263fed30c98c89f806614cce043..a8d1acb19bef86cfca7dea2500e06534c6b0bc88 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 d02c4ac07e6e959c127dc4c6189d9b3866052523..38b09cf824cca3cee109fafbb5c0cc6cc94e649c 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 fec6b09121e6e4de600a7262b1548157131ba98e..ace863b9fcc42ec0b898ac6f11c507ba77678793 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 ba21ce8a1539e1d79248b3e629e623526731ef9a..d9cef6b166ad42b9ba806b01080171a378927769 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 5208d115d740aacb284948cee5f2bae6bf44b048..743ef2de9ae8d671dcae46efd31c715b3b028d3e 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 a2b92513c9635fd38bf94b22bf9874395bab6637..82c204a97750e1f5c5a8df7d0e7f1b249d2affe2 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 f20abb43e529872b8e590ba62308dc17d4f64571..8f69146127dbea233e00e92b6e418b8fd33d5f66 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 0b0474ccb1f2fa6134d21f2fbc037bc2ea57922a..21512bc442098d74b6543a01dee3e68c41224ff5 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 8ffb3e4c77e0485312b6861bce4fa0bca7865172..9b7538f213dc5d0fba260a1953c07cfcd09dd7d4 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 3085e73a636ca86751dc7ba8e5ae7a11fc126c48..b5a99f1f8310079fa649ad37070d9507a33c509d 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 59ac881ebb635321db5a14de18fec1fc6c315d79..d9a3c2358c6002cedad3912fe29c2b7a09fb8f21 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 c0c5f3e25104a1c884504949142309bff74a91d7..18ea6d91bea57398315f7305a9078cbb17d08b55 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 d038a2e7e046bb20a560741142459e9c9758d080..8be72bdde605df00032ea8b18d2a2f99cd79e06d 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 dbb710a3141041306f2566e46989708c33dd0cd8..8b25c2a18ef9fc21ae299a06af4b61712846997b 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 40b05a6320a62dc2413c883ed37722c99eb02041..d8723b2d874f62d776cedf8bb82ce6ba558df9ce 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 4bca47f952e5fa536744df8f39634e8706923962..2e2ce00bf171cf46a4fa2309907ef633e1cdcef3 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 448a3ca193bb8fba57bc70309c24d2b50f0e5a22..6daa44d19bdf9b173f1dbebacbb8c17fdb86eee0 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 4683b7af04fb46ba8d3da458e198edfa27213848..cf443fb79885c45632ebd9b27da34fde707b9b51 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 2ae884f82262c57eac0844d1eb0eebea0da7c8fb..c31a3cba7fcabe1fae99444f32d7f8be221b44c8 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 2f35c7c4663a4c7681f52c48491d12501035f03a..136263c0529e2365c2485e63c212cafea79a32ee 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>