diff --git a/base_ontology.owl b/base_ontology.owl
index 6088b4a93168bb0feb6e5cb429f1c54d474f0524..e0a297f47f66bc8ab012108dca7b3834c0ed0850 100644
--- a/base_ontology.owl
+++ b/base_ontology.owl
@@ -8,7 +8,7 @@
      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
      xmlns:BO="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#">
     <Ontology rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology">
-        <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_4_0"/>
+        <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_5_0"/>
         <rdfs:comment>This file contains the Base Ontology of oneM2M as specified in TS-0012
 
 =========================================
@@ -98,7 +98,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
     <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#exposesCommand -->
 
     <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#exposesCommand">
-        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
+        <rdfs:domain>
+            <Class>
+                <unionOf rdf:parseType="Collection">
+                    <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#InputDataPoint"/>
+                    <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
+                    <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint"/>
+                </unionOf>
+            </Class>
+        </rdfs:domain>
         <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Command"/>
         <rdfs:comment>A –machine interpretable- Operation or an Input/OutputDataPoint of a Service exposes a –human understandable- Command to a network</rdfs:comment>
     </ObjectProperty>
@@ -263,7 +271,7 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
     <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubStructure -->
 
     <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubStructure">
-        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable"/>
         <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
         <rdfs:comment>A structured Variable can be composed of (sub-)Variables</rdfs:comment>
     </ObjectProperty>
@@ -1002,13 +1010,6 @@ NOTE: While a Functionality  describes the – human understandable – meaning
 
     <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable">
         <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
-        <rdfs:subClassOf>
-            <Restriction>
-                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubStructure"/>
-                <qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">0</qualifiedCardinality>
-                <onClass rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
-            </Restriction>
-        </rdfs:subClassOf>
         <rdfs:subClassOf>
             <Restriction>
                 <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>