diff --git a/v3_4_0/CDT-AE-v3_4_0.xsd b/v3_4_0/CDT-AE-v3_4_0.xsd
index 1fee4e085d9ba99bbaba1ea58f07ad7f1a7df19e..d1d969c836f0913ea6e4f36580c3e79a91487913 100644
--- a/v3_4_0/CDT-AE-v3_4_0.xsd
+++ b/v3_4_0/CDT-AE-v3_4_0.xsd
@@ -36,6 +36,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
 	<xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
 	<xs:include schemaLocation="CDT-trafficPattern-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
@@ -68,6 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 								<xs:element ref="m2m:timeSeries" />
 								<xs:element ref="m2m:trafficPattern" />
 								<xs:element ref="m2m:sg_flexContainerResource" />
+								<xs:element ref="m2m:semanticMashupInstance" />    
 							</xs:choice>
 						</xs:choice>
 					</xs:sequence>
@@ -111,6 +113,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 								<xs:element ref="m2m:trafficPatternAnnc" />
 								<xs:element ref="m2m:sg_flexContainerResource" />
 								<xs:element ref="m2m:sg_announcedFlexContainerResource" />
+								<xs:element ref="m2m:semanticMashupInstance" />
+								<xs:element ref="m2m:semanticMashupInstanceAnnc" />
 							</xs:choice>
 						</xs:choice>
 					</xs:sequence>
diff --git a/v3_4_0/CDT-CSEBase-v3_4_0.xsd b/v3_4_0/CDT-CSEBase-v3_4_0.xsd
index b5f06ae191b0e2e4c8b98da2a1f6667bdad7ad2c..c27716799b8830a80af317629a3e12a99758ef55 100644
--- a/v3_4_0/CDT-CSEBase-v3_4_0.xsd
+++ b/v3_4_0/CDT-CSEBase-v3_4_0.xsd
@@ -48,7 +48,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
     <xs:include schemaLocation="CDT-token-v3_4_0.xsd" />
     <xs:include schemaLocation="CDT-authorizationDecision-v3_4_0.xsd" />
     <xs:include schemaLocation="CDT-authorizationPolicy-v3_4_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_4_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_4_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
@@ -97,7 +100,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                                 <xs:element ref="m2m:sg_flexContainerResource" />
                                 <xs:element ref="m2m:authorizationDecision" />
                                 <xs:element ref="m2m:authorizationPolicy" />
-                                <xs:element ref="m2m:authorizationInformation" />
+                                <xs:element ref="m2m:authorizationInformation" />                                
+                                <xs:element ref="m2m:ontologyRepository" />
+                                <xs:element ref="m2m:semanticMashupJobProfile" />
+                                <xs:element ref="m2m:semanticMashupInstance" />                               
                             </xs:choice>
                         </xs:choice>
 					</xs:sequence>
diff --git a/v3_4_0/CDT-commonTypes-v3_4_0.xsd b/v3_4_0/CDT-commonTypes-v3_4_0.xsd
index 22ab6f36c3e3f7444aa9508e023b08dd669d0959..d7dbee8cbc119b9250443c4773a81b5b2fc1302f 100644
--- a/v3_4_0/CDT-commonTypes-v3_4_0.xsd
+++ b/v3_4_0/CDT-commonTypes-v3_4_0.xsd
@@ -409,6 +409,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 	
+	<xs:simpleType name="locationTargetID">
+		<xs:union>
+			<xs:simpleType>
+				<xs:restriction base='m2m:nodeID' />
+			</xs:simpleType>
+			<xs:simpleType>
+				<xs:restriction base='m2m:externalID' />
+			</xs:simpleType>
+			<xs:simpleType>
+				<xs:restriction base="xs:string" >
+					<xs:pattern value="([0-9]*)" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:union>
+	</xs:simpleType>
+	
 	<!--********************** -->
 	<!-- oneM2M Complex Types -->
 	<!--********************** -->
@@ -500,10 +516,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="authorSignIndicator" type="xs:boolean" minOccurs="0"/>
 			<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
 			<xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 
-
 <!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? -->
 	<xs:complexType name="primitiveContent">
 		<xs:choice minOccurs="0" >
@@ -525,12 +541,36 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="labels" type="m2m:labels" minOccurs="0" />
-			<xs:element name="labelsQuery" type="xs:string" minOccurs="0" />
-			<xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />
+			<xs:element name="childLabels" type="m2m:labels" minOccurs="0" />
+			<xs:element name="parentLabels" type="m2m:labels" minOccurs="0" />
+			<xs:element name="labelsQuery" type="xs:string" minOccurs="0" />			
+			<xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />			
+			<xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
+				<xs:simpleType>
+					<xs:restriction> 
+						<xs:simpleType> 
+							<xs:list itemType="m2m:resourceType" /> 
+						</xs:simpleType> 				
+						<xs:minLength value="1" /> 
+					</xs:restriction> 
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="parentResourceType" minOccurs="0" maxOccurs="1" >
+				<xs:simpleType>
+					<xs:restriction> 
+						<xs:simpleType> 
+							<xs:list itemType="m2m:resourceType" /> 
+						</xs:simpleType> 				
+						<xs:minLength value="1" /> 
+					</xs:restriction> 
+				</xs:simpleType>
+			</xs:element>
 			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
 			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
 			<xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" />
 			<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="childAttribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="parentAttribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
 			<xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" />
 			<xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" />
 			<xs:element name="semanticsFilter" type="m2m:sparql" minOccurs="0" maxOccurs="unbounded" />
@@ -539,6 +579,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="contentFilterQuery" type="xs:string" minOccurs="0" />
 			<xs:element name="level" type="xs:positiveInteger" minOccurs="0" />
 			<xs:element name="offset" type="xs:positiveInteger" minOccurs="0" />
+			<xs:element name="applyRelativePath" type="xs:anyURI" minOccurs="0" />
+			
 		</xs:sequence>
 	</xs:complexType>
 	
diff --git a/v3_4_0/CDT-deviceInfo-v3_4_0.xsd b/v3_4_0/CDT-deviceInfo-v3_4_0.xsd
index 3c4e6879e51ff530d8611534ac495b6f62d46e0e..c5c2132392d7775b9be0143d0dbf3eb44aa1dadc 100644
--- a/v3_4_0/CDT-deviceInfo-v3_4_0.xsd
+++ b/v3_4_0/CDT-deviceInfo-v3_4_0.xsd
@@ -39,11 +39,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<!-- Resource Specific Attributes  -->
 						<xs:element name="deviceLabel" type="xs:string" />
 						<xs:element name="manufacturer" type="xs:string" />
+						<xs:element name="manufacturerDetailsLink" type="xs:string" minOccurs="0"/>
+						<xs:element name="manufacturingDate" type="m2m:timestamp" minOccurs="0"/>
 						<xs:element name="model" type="xs:string" />
+						<xs:element name="subModel" type="xs:string" minOccurs="0"/>
 						<xs:element name="deviceType" type="xs:string" />
-						<xs:element name="fwVersion" type="xs:string" />
-						<xs:element name="swVersion" type="xs:string" />
-						<xs:element name="hwVersion" type="xs:string" />
+						<xs:element name="deviceName" type="xs:string" minOccurs="0"/>
+						<xs:element name="fwVersion" type="xs:string" minOccurs="0"/>
+						<xs:element name="swVersion" type="xs:string" minOccurs="0"/>
+						<xs:element name="hwVersion" type="xs:string" minOccurs="0"/>
+						<xs:element name="osVersion" type="xs:string" minOccurs="0"/>
+						<xs:element name="country" type="xs:string" minOccurs="0"/>
+						<xs:element name="location" type="xs:string" minOccurs="0"/>
+						<xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
+						<xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
+						<xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
+						<!-- protocol attribute (multiplicity 0..1(L) ) defined in TS-0001v3_8_0 is missing -->
 			   
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
@@ -65,12 +76,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<!-- Resource Specific Attributes  -->
 						<xs:element name="deviceLabel" type="xs:string" minOccurs="0" />
 						<xs:element name="manufacturer" type="xs:string" minOccurs="0" />
+						<xs:element name="manufacturerDetailsLink" type="xs:string" minOccurs="0"/>
+						<xs:element name="manufacturingDate" type="m2m:timestamp" minOccurs="0"/>
 						<xs:element name="model" type="xs:string" minOccurs="0" />
+						<xs:element name="subModel" type="xs:string" minOccurs="0"/>
 						<xs:element name="deviceType" type="xs:string" minOccurs="0" />
+						<xs:element name="deviceName" type="xs:string" minOccurs="0"/>
 						<xs:element name="fwVersion" type="xs:string" minOccurs="0" />
 						<xs:element name="swVersion" type="xs:string" minOccurs="0" />
 						<xs:element name="hwVersion" type="xs:string" minOccurs="0" />
-			   
+						<xs:element name="osVersion" type="xs:string" minOccurs="0"/>
+						<xs:element name="country" type="xs:string" minOccurs="0"/>
+						<xs:element name="location" type="xs:string" minOccurs="0"/>
+						<xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
+						<xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
+						<xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
+						<!-- protocol attribute (multiplicity 0..1(L) ) defined in TS-0001v3_8_0 is missing -->		
+						
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
 							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
diff --git a/v3_4_0/CDT-enumerationTypes-v3_4_0.xsd b/v3_4_0/CDT-enumerationTypes-v3_4_0.xsd
index d21af2983b976a4ac136e60763c39c968b138dbe..ebe7ad4803b902966d1836a4c2fd2733e727f83c 100644
--- a/v3_4_0/CDT-enumerationTypes-v3_4_0.xsd
+++ b/v3_4_0/CDT-enumerationTypes-v3_4_0.xsd
@@ -105,7 +105,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- authorizationPolicy -->
 			<xs:enumeration value="36" />	
 			<!-- authorizationInformation -->
-			<xs:enumeration value="37" />				
+			<xs:enumeration value="37" />			
+			<!-- ontologyRepository -->
+			<xs:enumeration value="38" />	
+			<!-- ontology -->
+			<xs:enumeration value="39" />	
+			<!-- semanticMashupJobProfile -->
+			<xs:enumeration value="40" />	
+			<!-- semanticMashupInstance -->
+			<xs:enumeration value="41" />	
+			<!-- semanticMashupResult -->
+			<xs:enumeration value="42" />	
 			<!-- accessControlPolicyAnnc -->
 			<xs:enumeration value="10001" />
 			<!-- AEAnnc -->
@@ -137,7 +147,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- trafficPatternAnnc -->
 			<xs:enumeration value="10033" />
 			<!-- dynamicAuthorizationConsultationAnnc -->
-			<xs:enumeration value="10034" />
+			<xs:enumeration value="10034" />			
+			<!-- ontologyRepositoryAnnc -->
+			<xs:enumeration value="10038" />
+			<!-- ontologyAnnc -->
+			<xs:enumeration value="10039" />
+			<!-- semanticMashupJobProfileAnnc -->
+			<xs:enumeration value="10040" />
+			<!-- semanticMashupInstanceAnnc -->
+			<xs:enumeration value="10041" />			
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -245,6 +263,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="8" />
 			<!-- Modified Attributes -->
 			<xs:enumeration value="9" />
+			<!-- semantic content -->
+			<xs:enumeration value="10" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -320,7 +340,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- ESPRIM_IMPERSONATION_ERROR -->
 			<xs:enumeration value="4116" />    
 			<!-- ORIGINATOR_HAS_ALREADY_REGISTERED -->
-			<xs:enumeration value="4117" />    
+			<xs:enumeration value="4117" />    		
+			<!-- ONTOLOGY_NOT_AVAILABLE -->
+			<xs:enumeration value="4118" />    
+			<!-- LINKED_SEMANTICS_NOT_AVAILABLE -->
+			<xs:enumeration value="4119" />    
+			<!-- INVALID_SEMANTICS -->
+			<xs:enumeration value="4120" />    
             <!-- INTERNAL_SERVER_ERROR     -->
             <xs:enumeration value="5000" />              
             <!-- NOT_IMPLEMENTED           -->
@@ -374,7 +400,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <!-- ALREADY_COMPLETE                       -->
             <xs:enumeration value="6028" />               
             <!-- MGMT_COMMAND_NOT_CANCELLABLE           -->
-            <xs:enumeration value="6029" />                
+            <xs:enumeration value="6029" />   		
+			<!-- XTERNAL_OBJECT_NOT_REACHABLE_BEFORE_RQET_TIMEOUT -->
+			<xs:enumeration value="6030" />   
+			<!-- EXTERNAL_OBJECT_NOT_REACHABLE_BEFORE_OET_TIMEOUT -->
+			<xs:enumeration value="6031" />   			
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -474,7 +504,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- authorizationPolicy -->
 			<xs:enumeration value="36" />	
 			<!-- authorizationInformation -->
-			<xs:enumeration value="37" />		
+			<xs:enumeration value="37" />				
+			<!-- ontologyRepository -->
+			<xs:enumeration value="38" />	
+			<!-- ontology -->
+			<xs:enumeration value="39" />	
+			<!-- semanticMashupJobProfile -->
+			<xs:enumeration value="40" />	
+			<!-- semanticMashupInstance -->
+			<xs:enumeration value="41" />	
+			<!-- semanticMashupResult -->
+			<xs:enumeration value="42" />	
 			<!-- accessControlPolicyAnnc -->
 			<xs:enumeration value="10001" />
 			<!-- AEAnnc -->
@@ -506,11 +546,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- trafficPatternAnnc -->
 			<xs:enumeration value="10033" />
 			<!-- dynamicAuthorizationConsultationAnnc -->
-			<xs:enumeration value="10034" />
+			<xs:enumeration value="10034" />			
+			<!-- ontologyRepositoryAnnc -->
+			<xs:enumeration value="10038" />
+			<!-- ontologyAnnc -->
+			<xs:enumeration value="10039" />
+			<!-- semanticMashupJobProfileAnnc -->
+			<xs:enumeration value="10040" />
+			<!-- semanticMashupInstanceAnnc -->
+			<xs:enumeration value="10041" />
 			<!-- oldest -->
 			<xs:enumeration value="20001" />
 			<!-- latest -->
 			<xs:enumeration value="20002" />
+			<!-- mashup -->
+			<xs:enumeration value="20003" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -707,6 +757,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:documentation>This is used for [software], [firmware] resources.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:integer">
+			<!-- Uninitialzed -->
+			<xs:enumeration value="0" />
 			<!-- Successful -->
 			<xs:enumeration value="1" />
 			<!-- Failure -->
@@ -1288,5 +1340,53 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>	
 
+	<xs:simpleType name="ontologyFormat">
+		<xs:annotation>
+			<xs:documentation>Used for ontologyFormat attribute in ontology resourcee</xs:documentation>				
+		</xs:annotation>
+		<xs:restriction base="xs:integer">
+			<!-- IRI -->
+			<xs:enumeration value="1" />
+			<!-- File format: Functional-style -->
+			<xs:enumeration value="2" />
+			<!-- File format: OWL/XML -->
+			<xs:enumeration value="3" />
+			<!-- File format: RDF/XML -->
+			<xs:enumeration value="4" />
+			<!-- File format: RDF/Turtle -->
+			<xs:enumeration value="5" />
+			<!-- File format: Manchester -->
+			<xs:enumeration value="6" />
+		</xs:restriction>
+	</xs:simpleType>	
+
+	<xs:simpleType name="mashupMemberStoreType">
+		<xs:annotation>
+			<xs:documentation>Used for memberStoreType attribute of semanticMashupInstance resource</xs:documentation>				
+		</xs:annotation>
+		<xs:restriction base="xs:integer">
+			<!-- IRI -->
+			<xs:enumeration value="1" />
+			<!-- File format: Functional-style -->
+			<xs:enumeration value="2" />
+		</xs:restriction>
+	</xs:simpleType>	
+	
+	<xs:simpleType name="mashupResultGenType">
+		<xs:annotation>
+			<xs:documentation>Used for resultGenType attribute of semanticMashupInstance resource</xs:documentation>				
+		</xs:annotation>
+		<xs:restriction base="xs:integer">
+			<!-- WHEN_SMI_IS_CREATED -->
+			<xs:enumeration value="1" />
+			<!-- WHEN_MR_REQUESTS -->
+			<xs:enumeration value="2" />
+			<!-- PERIODICALLY -->
+			<xs:enumeration value="3" />
+			<!-- WHEN_A_MASHUP_MEMBER_IS_UPDATED -->
+			<xs:enumeration value="4" />
+		</xs:restriction>
+	</xs:simpleType>	
+
 </xs:schema>
 
diff --git a/v3_4_0/CDT-locationPolicy-v3_4_0.xsd b/v3_4_0/CDT-locationPolicy-v3_4_0.xsd
index 70b6b8f07523b29d6253f07fcb72af0810d49308..0741621a422e06273823f9563acf040386572349 100644
--- a/v3_4_0/CDT-locationPolicy-v3_4_0.xsd
+++ b/v3_4_0/CDT-locationPolicy-v3_4_0.xsd
@@ -39,17 +39,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<!-- Resource Specific Attributes -->
 						<xs:element name="locationSource" type="m2m:locationSource" />
 						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
-						<xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
+						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
 						<xs:element name="locationStatus" type="xs:string" />
+						<xs:element name="authID" type="m2m:externalID" minOccurs="0" />
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
 							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
 							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription"></xs:element>
+								<xs:element ref="m2m:subscription" />
 							</xs:choice>
 						</xs:choice>
 					</xs:sequence>
@@ -67,12 +68,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<!-- Resource Specific Attributes -->
 						<xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
 						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
-						<xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
+						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
 						<xs:element name="locationStatus" type="xs:string" minOccurs="0" />
-
+						<xs:element name="authID" type="m2m:externalID" minOccurs="0" />
+						
 						<!-- No Child Resources -->
 					</xs:sequence>
 				</xs:extension>
diff --git a/v3_4_0/CDT-ontology-v3_4_0.xsd b/v3_4_0/CDT-ontology-v3_4_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..13f5bb00a3221dbab7d40b9b3b75f168dea6c84d
--- /dev/null
+++ b/v3_4_0/CDT-ontology-v3_4_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+	
+<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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	
+	
+	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:announceableResource">
+					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
+							                               <ontologyRepository> and other resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
+						<!-- Resource Specific Attributes -->
+						<xs:element name="description" type="xs:string" minOccurs="0" />
+						<xs:element name="ontologyFormat" type="m2m:ontologyFormat" />
+						<xs:element name="ontologyContent" type="xs:anySimpleType" />
+												
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />																
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="ontologyAnnc" substitutionGroup="m2m:sg_announcedResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:announcedResource">
+					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<!-- Resource Specific Attributes -->
+						<xs:element name="description" type="xs:string" minOccurs="0" />
+						<xs:element name="ontologyFormat" type="m2m:ontologyFormat" minOccurs="0" />
+						<xs:element name="ontologyContent" type="xs:anySimpleType" minOccurs="0" />
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/v3_4_0/CDT-ontologyRepository-v3_4_0.xsd b/v3_4_0/CDT-ontologyRepository-v3_4_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..e205237c1e5480721bde423061d28357209996ce
--- /dev/null
+++ b/v3_4_0/CDT-ontologyRepository-v3_4_0.xsd
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+	
+<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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_4_0.xsd" />
+	
+	
+	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:announceableResource">
+					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
+							                               <ontologyRepository> and other resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
+						<!-- Resource Specific Attributes: none -->
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />
+								<xs:element ref="m2m:ontology" />																
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="ontologyRepositoryAnnc" substitutionGroup="m2m:sg_announcedResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:announcedResource">
+					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<!-- Resource Specific Attributes: none -->
+
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />
+								<xs:element ref="m2m:ontology" />
+								<xs:element ref="m2m:ontologyAnnc" />
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/v3_4_0/CDT-remoteCSE-v3_4_0.xsd b/v3_4_0/CDT-remoteCSE-v3_4_0.xsd
index c2bab36756a4f60fb467aad79c8aa850f6088148..498f6233cff583d09bd8040d4490c82f5ee87417 100644
--- a/v3_4_0/CDT-remoteCSE-v3_4_0.xsd
+++ b/v3_4_0/CDT-remoteCSE-v3_4_0.xsd
@@ -37,7 +37,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:include schemaLocation="CDT-node-v3_4_0.xsd" />
 	<xs:include schemaLocation="CDT-locationPolicy-v3_4_0.xsd" />
 	<xs:include schemaLocation="CDT-timeSeries-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
 
+
+						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
 			<xs:complexContent>
@@ -78,6 +83,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                             	<xs:element ref="m2m:AEAnnc" />
                             	<xs:element ref="m2m:sg_flexContainerResource" />
                             	<xs:element ref="m2m:sg_announcedFlexContainerResource" />
+                            	<xs:element ref="m2m:ontologyRepositoryAnnc" />
+                            	<xs:element ref="m2m:semanticMashupJobProfile" />
+                            	<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
+                            	<xs:element ref="m2m:semanticMashupInstance" />    
+                            	<xs:element ref="m2m:semanticMashupInstanceAnnc" />
                             </xs:choice>
                         </xs:choice>
 					</xs:sequence>
@@ -123,6 +133,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                             	<xs:element ref="m2m:AEAnnc" />
                             	<xs:element ref="m2m:sg_flexContainerResource" />
                             	<xs:element ref="m2m:sg_announcedFlexContainerResource" />
+                            	<xs:element ref="m2m:ontologyRepositoryAnnc" />
+                            	<xs:element ref="m2m:semanticMashupJobProfile" />
+                            	<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
+                            	<xs:element ref="m2m:semanticMashupInstance" />    
+                            	<xs:element ref="m2m:semanticMashupInstanceAnnc" />
                             </xs:choice>
                         </xs:choice>
 					</xs:sequence>
diff --git a/v3_4_0/CDT-request-v3_4_0.xsd b/v3_4_0/CDT-request-v3_4_0.xsd
index dc61c3395cc4671883260fb14f9912ceff71f57c..7cf8dd48541f5b2d556b36992ba4f882c651840a 100644
--- a/v3_4_0/CDT-request-v3_4_0.xsd
+++ b/v3_4_0/CDT-request-v3_4_0.xsd
@@ -44,7 +44,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="originator" type="m2m:ID" />
 						<xs:element name="requestID" type="m2m:requestID" />
 						<xs:element name="metaInformation" type="m2m:metaInformation" />
-						<xs:element name="primitiveContent" type="m2m:primitiveContent" />
+						<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
 						<xs:element name="requestStatus" type="m2m:requestStatus" />
 						<xs:element name="operationResult" type="m2m:operationResult" />
 
diff --git a/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd b/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd
index 0eee7ca8b94daa2e6428868550d4cb69fcd57f63..ae5aaa4026c8108682e6e878103587f3497928da 100644
--- a/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd
+++ b/v3_4_0/CDT-requestPrimitive-v3_4_0.xsd
@@ -124,7 +124,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
           <xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
           <!-- parameter "Authorization Relationship Indicator" -->
           <xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
-         
+          <!-- parameter " Semantic Query Indicator" -->
+          <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
         </xs:sequence> 	       
       </xs:complexType>
     </xs:element>
diff --git a/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd b/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd
index 54e6a65f046cfdcdd67f92b2c04bda80f84c347a..59bd64336544619e5cc82c6a8fadcb37f729e482 100644
--- a/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd
+++ b/v3_4_0/CDT-responsePrimitive-v3_4_0.xsd
@@ -125,6 +125,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   
   <xs:element name="debugInfo" type="xs:string" />
   
+  <xs:element name="queryResult" type="xs:string" />
+  
   <xs:complexType name="resourceWrapper">	
     <xs:sequence>
       <xs:choice minOccurs="1" maxOccurs="1">
diff --git a/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd b/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd
index 14bd83b3138664e792851a3c4715bb447cf4a28e..763da76113f09443446f68bde55cba9cfc822f30 100644
--- a/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd
+++ b/v3_4_0/CDT-semanticDescriptor-v3_4_0.xsd
@@ -42,7 +42,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
 						<xs:element name="descriptor" type="xs:base64Binary" />
 						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />						
+						<xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />		
+						<xs:element name="semanticValidated" type="xs:boolean" minOccurs="0" />
+						<xs:element name="validationEnable" type="xs:boolean" minOccurs="0" />
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
@@ -67,6 +69,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="descriptor" type="xs:base64Binary" minOccurs="0" />
 						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />						
+						<xs:element name="semanticValidated" type="xs:boolean" minOccurs="0" />
+						<xs:element name="validationEnable" type="xs:boolean" minOccurs="0" />
 						
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/v3_4_0/CDT-semanticMashupInstance-v3_4_0.xsd b/v3_4_0/CDT-semanticMashupInstance-v3_4_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..748688b9f6e0794e1e37f9b451a6eb9a5dc68f74
--- /dev/null
+++ b/v3_4_0/CDT-semanticMashupInstance-v3_4_0.xsd
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+	
+<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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	
+	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:announceableResource">
+					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
+							                               <ontology>, and other resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
+						
+						<!-- Resource Specific Attributes -->
+						<xs:element name="smjpID" type="xs:anyURI" />
+						<xs:element name="smjpInputParameter" type="xs:base64Binary" />
+						<xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" />
+						<xs:element name="mashupMember" type="xs:base64Binary" />
+						<xs:element name="resultGenType" type="m2m:mashupResultGenType" />
+						<xs:element name="periodForResultGen" type="xs:duration" minOccurs="0" />
+
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />	
+								<xs:element ref="m2m:semanticMashupResult" />
+								<xs:element ref="m2m:semanticDescriptor" />		
+											
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="semanticMashupInstanceAnnc" substitutionGroup="m2m:sg_announcedResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:announcedResource">
+					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<!-- Resource Specific Attributes -->
+						<xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" />
+						<xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
+						<xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" />
+						<xs:element name="outputDescriptor" type="xs:base64Binary" minOccurs="0" />
+						<xs:element name="functionDescriptor" type="xs:base64Binary" minOccurs="0" />
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />
+								<xs:element ref="m2m:semanticMashupResult" />
+								<!-- conflict between TS-0001 and TS-0004:  
+									 semanticMashupResultAnnc defined as not announceable in TS-0004-->
+								<!-- <xs:element ref="m2m:semanticMashupResultAnnc" /> -->
+								<xs:element ref="m2m:semanticDescriptor" />	
+								<xs:element ref="m2m:semanticDescriptorAnnc" />
+								
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/v3_4_0/CDT-semanticMashupJobProfile-v3_4_0.xsd b/v3_4_0/CDT-semanticMashupJobProfile-v3_4_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..b54ab6216ed1d0c282a0886df065d7c70391ebff
--- /dev/null
+++ b/v3_4_0/CDT-semanticMashupJobProfile-v3_4_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+	
+<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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+	
+	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:announceableResource">
+					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
+							                               <ontology>, and other resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
+						
+						<!-- Resource Specific Attributes -->
+						<xs:element name="memberFilter" type="m2m:sparql" />
+						<xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
+						<xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" />
+						<xs:element name="outputDescriptor" type="xs:base64Binary" />
+						<xs:element name="functionDescriptor" type="xs:base64Binary" />
+
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />	
+								<xs:element ref="m2m:semanticMashupInstance" />
+								<xs:element ref="m2m:semanticDescriptor" />																	
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="semanticMashupJobProfileAnnc" substitutionGroup="m2m:sg_announcedResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:announcedResource">
+					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<!-- Resource Specific Attributes -->
+						<xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" />
+						<xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
+						<xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" />
+						<xs:element name="outputDescriptor" type="xs:base64Binary" minOccurs="0" />
+						<xs:element name="functionDescriptor" type="xs:base64Binary" minOccurs="0" />
+						
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />
+								<xs:element ref="m2m:semanticMashupInstance" />
+								<xs:element ref="m2m:semanticMashupInstanceAnnc" />
+								<xs:element ref="m2m:semanticDescriptor" />	
+								<xs:element ref="m2m:semanticDescriptorAnnc" />
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/v3_4_0/CDT-semanticMashupResult-v3_4_0.xsd b/v3_4_0/CDT-semanticMashupResult-v3_4_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..7042d4004b4c0de91e7484e3d3ad6ca1b6d3ba98
--- /dev/null
+++ b/v3_4_0/CDT-semanticMashupResult-v3_4_0.xsd
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability 
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
+and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+	
+<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_4_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_4_0.xsd" />
+
+	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="m2m:regularResource">
+					<xs:sequence>
+						<!-- Resource Specific Attributes -->
+						<xs:element name="smjpInputParameter" type="xs:base64Binary"  minOccurs="0"/>
+						<xs:element name="mashupResultFormat" type="m2m:serializations" />
+						<xs:element name="mashupResult" type="xs:base64Binary"/>
+
+						<!-- Child Resources -->
+						<xs:choice minOccurs="0" maxOccurs="1">
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription" />
+								<xs:element ref="m2m:semanticDescriptor" />
+							</xs:choice>
+						</xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/v3_4_0/CDT-subscription-v3_4_0.xsd b/v3_4_0/CDT-subscription-v3_4_0.xsd
index b7f8208afb42223d42bcc83c075111744feccf0a..30f5d70ff8c940c20c20a5866a84c64bf8eae31a 100644
--- a/v3_4_0/CDT-subscription-v3_4_0.xsd
+++ b/v3_4_0/CDT-subscription-v3_4_0.xsd
@@ -84,6 +84,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="5" />
 			<xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
 			<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
+			<xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
+				<xs:simpleType>
+					<xs:restriction> 
+						<xs:simpleType> 
+							<xs:list itemType="m2m:resourceType" /> 
+						</xs:simpleType> 				
+						<xs:minLength value="1" /> 
+					</xs:restriction> 
+				</xs:simpleType>
+			</xs:element>
 			<xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
 		</xs:sequence>
 	</xs:complexType>
diff --git a/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd b/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd
index 1eafb7a8149f2bfec00a201269817c7dfb6ded62..a68b61ffa23488c67e90c158609ec2c944c603b4 100644
--- a/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd
+++ b/v3_4_0/CDT-timeSeriesInstance-v3_4_0.xsd
@@ -37,7 +37,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" />
 						<xs:element name="content" type="xs:anySimpleType" />
 						<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
-
+						<xs:element name="contentSize" type="xs:nonNegativeInteger" />
+						
 						<!-- Child Resources -->
 
 					</xs:sequence>
@@ -54,6 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" minOccurs="0" />
 						<xs:element name="content" type="xs:anySimpleType" minOccurs="0" />
 						<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
 
 						<!-- Child Resources -->
 
diff --git a/v3_4_0/CDT-token-v3_4_0.xsd b/v3_4_0/CDT-token-v3_4_0.xsd
index 8201a3f3fdd9610f83a4f59cd269a2df1bdd53cd..ec833bf32bc000f98b0415667ae120e4e2cc6e88 100644
--- a/v3_4_0/CDT-token-v3_4_0.xsd
+++ b/v3_4_0/CDT-token-v3_4_0.xsd
@@ -43,14 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="notAfter" type="m2m:timestamp" minOccurs="0"/>
 						<xs:element name="tokenName" type="xs:string" minOccurs="0" />
 						<xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" /> 
-						
-						<xs:element name="permissions" minOccurs="0">      
-							<xs:complexType>							
-									<xs:sequence> 
-										<xs:element name="permission" type="m2m:tokenPermission" /> 
-									</xs:sequence> 												
-							</xs:complexType>
-						</xs:element>
+						<xs:element name="permissions" type="m2m:tokenPermissions" minOccurs="0" />
 						<xs:element name="extension" type="xs:string" minOccurs="0" />
 
 						<!-- Child Resources -->