diff --git a/ontology/saref4agri.ttl b/ontology/saref4agri.ttl
index 5d21a68dd5c75065f06420d3db69d99c0bfef92f..7b300ce2a580be0aeae9595d1dd62c436d240564 100644
--- a/ontology/saref4agri.ttl
+++ b/ontology/saref4agri.ttl
@@ -99,30 +99,31 @@ vann:preferredNamespacePrefix rdf:type owl:AnnotationProperty .
 ###  http://purl.org/vocab/vann/preferredNamespaceUri
 vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 
+wgs84:SpatialThing a owl:Class .
 
 ###  http://www.w3.org/2003/01/geo/wgs84_pos#alt
-wgs84:alt rdf:type owl:AnnotationProperty ;
-  rdfs:comment "The WGS84 altitude of a SpatialThing (decimal meters above the local reference ellipsoid)." ;
-  rdfs:label "altitude" ;
+wgs84:alt rdf:type owl:DatatypeProperty ;
+  rdfs:comment "The WGS84 altitude of a SpatialThing (decimal meters above the local reference ellipsoid)."@en ;
+  rdfs:label "altitude"@en ;
   rdfs:domain wgs84:SpatialThing .
 
 
 ###  http://www.w3.org/2003/01/geo/wgs84_pos#lat
-wgs84:lat rdf:type owl:AnnotationProperty ;
-  rdfs:comment "The WGS84 latitude of a SpatialThing (decimal degrees)." ;
-  rdfs:label "latitude" ;
+wgs84:lat rdf:type owl:DatatypeProperty ;
+  rdfs:comment "The WGS84 latitude of a SpatialThing (decimal degrees)."@en ;
+  rdfs:label "latitude"@en ;
   rdfs:domain wgs84:SpatialThing .
 
 
 ###  http://www.w3.org/2003/01/geo/wgs84_pos#location
-wgs84:location rdf:type owl:AnnotationProperty ;
+wgs84:location rdf:type owl:ObjectProperty ;
   rdfs:subPropertyOf foaf:based_near .
 
 
 ###  http://www.w3.org/2003/01/geo/wgs84_pos#long
-wgs84:long rdf:type owl:AnnotationProperty ;
-  rdfs:comment "The WGS84 longitude of a SpatialThing (decimal degrees)." ;
-  rdfs:label "longitude" ;
+wgs84:long rdf:type owl:ObjectProperty ;
+  rdfs:comment "The WGS84 longitude of a SpatialThing (decimal degrees)."@en ;
+  rdfs:label "longitude"@en ;
   rdfs:domain wgs84:SpatialThing .
 
 
@@ -139,7 +140,7 @@ wgs84:long rdf:type owl:AnnotationProperty ;
 
 
 ###  http://xmlns.com/foaf/0.1/based_near
-foaf:based_near rdf:type owl:AnnotationProperty .
+foaf:based_near rdf:type owl:ObjectProperty .
 
 
 #################################################################
@@ -192,10 +193,6 @@ geo:sfWithin rdf:type owl:ObjectProperty ;
   rdfs:label "within"@en .
 
 
-###  http://www.w3.org/2003/01/geo/wgs84_pos#location
-wgs84:location rdf:type owl:ObjectProperty .
-
-
 ###  http://www.w3.org/ns/sosa/hosts
 sosa:hosts rdf:type owl:ObjectProperty ;
       owl:inverseOf sosa:isHostedBy ;
@@ -253,14 +250,16 @@ foaf:member rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/saref4agri/contains
 s4agri:contains rdf:type owl:ObjectProperty ;
+  rdfs:comment "contains"@en ;
+  rdfs:label "contains"@en ;
   rdfs:subPropertyOf geo:sfContains ;
-      owl:inverseOf s4agri:isContainedIn .
+  owl:inverseOf s4agri:isContainedIn .
 
 
 ###  https://saref.etsi.org/saref4agri/generates
 s4agri:generates rdf:type owl:ObjectProperty ;
   rdfs:subPropertyOf saref:hasProperty ;
-  rdfs:comment "A relation to represent the yield generated by a Crop." ;
+  rdfs:comment "A relation to represent the yield generated by a Crop."@en ;
   rdfs:label "generates"@en .
 
 
@@ -268,32 +267,34 @@ s4agri:generates rdf:type owl:ObjectProperty ;
 s4agri:hasDeploymentPeriod rdf:type owl:ObjectProperty ;
   rdfs:comment "Relation to indicate the temporal duration or period of a deployment."@en ,
                                   "has deployment period"@en ;
-  rdfs:label "has deployment period" .
+  rdfs:label "has deployment period"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/hasID
 s4agri:hasID rdf:type owl:ObjectProperty ;
   rdfs:subPropertyOf owl:topObjectProperty ;
   rdfs:range s4agri:ID ;
-  rdfs:comment "A relation to express the unique identifier of an animal." ;
+  rdfs:comment "A relation to express the unique identifier of an animal."@en ;
   rdfs:label "has id"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/hasMember
 s4agri:hasMember rdf:type owl:ObjectProperty ;
       owl:inverseOf s4agri:isMemberOf ;
-  rdfs:comment "A relation to represent  the members of an AnimalGroup." ;
-  rdfs:label "has member" .
+  rdfs:comment "A relation to represent  the members of an AnimalGroup."@en ;
+  rdfs:label "has member"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/hasReceived
 s4agri:hasReceived rdf:type owl:ObjectProperty ;
       owl:inverseOf s4agri:receives ;
-  rdfs:label "has received" .
+  rdfs:comment "has received"@en ;
+  rdfs:label "has received"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/isContainedIn
 s4agri:isContainedIn rdf:type owl:ObjectProperty ;
+  rdfs:comment "is contained in"@en ;
   rdfs:label "is contained in"@en .
 
 
@@ -301,25 +302,26 @@ s4agri:isContainedIn rdf:type owl:ObjectProperty ;
 s4agri:isDeployedAtSpace rdf:type owl:ObjectProperty ;
   rdfs:comment "Relation to indicate the geographical componet of a deployment."@en ,
                                 "is deployed at space"@en ;
-  rdfs:label "is deployed at space" .
+  rdfs:label "is deployed at space"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/isLocatedIn
 s4agri:isLocatedIn rdf:type owl:ObjectProperty ;
       owl:inverseOf s4agri:isLocationOf ;
-  rdfs:comment "A relation to express the physical location of a saref4agri entity (e.g., an animal)" ;
-  rdfs:label "is located in" .
+  rdfs:comment "A relation to express the physical location of a saref4agri entity (e.g., an animal)"@en ;
+  rdfs:label "is located in"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/isLocationOf
 s4agri:isLocationOf rdf:type owl:ObjectProperty ;
-  rdfs:label "is location of" .
+  rdfs:comment "is location of"@en ;
+  rdfs:label "is location of"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/isMemberOf
 s4agri:isMemberOf rdf:type owl:ObjectProperty ;
-  rdfs:comment "A relation to express that an animal can be part of groups." ;
-  rdfs:label "is member of" .
+  rdfs:comment "A relation to express that an animal can be part of groups."@en ;
+  rdfs:label "is member of"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/managesFarm
@@ -331,23 +333,23 @@ s4agri:managesFarm rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/saref4agri/receives
 s4agri:receives rdf:type owl:ObjectProperty ;
   rdfs:subPropertyOf saref:hasProperty ;
-  rdfs:comment "A relation to represent the intake/consumption of certain substances in a Crop." ;
-  rdfs:label "receives" .
+  rdfs:comment "A relation to represent the intake/consumption of certain substances in a Crop."@en ;
+  rdfs:label "receives"@en .
 
 
 ###  https://saref.etsi.org/core/accomplishes
 saref:accomplishes rdf:type owl:ObjectProperty ;
       owl:inverseOf saref:isAccomplishedBy ;
-  rdfs:comment "A relationship between a certain entity (e.g., a device) and the task it accomplishes" ;
+  rdfs:comment "A relationship between a certain entity (e.g., a device) and the task it accomplishes"@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "accomplishes" .
+  rdfs:label "accomplishes"@en .
 
 
 ###  https://saref.etsi.org/core/actsUpon
 saref:actsUpon rdf:type owl:ObjectProperty ;
-  rdfs:comment "A relationship between a command and a state" ;
+  rdfs:comment "A relationship between a command and a state"@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "acts upon" .
+  rdfs:label "acts upon"@en .
 
 
 ###  https://saref.etsi.org/core/controlsProperty
@@ -359,14 +361,14 @@ saref:controlsProperty rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/core/hasCommand
 saref:hasCommand rdf:type owl:ObjectProperty ;
       owl:inverseOf saref:isCommandOf ;
-  rdfs:comment "A relationship between an entity (such as a function) and a command" ;
+  rdfs:comment "A relationship between an entity (such as a function) and a command"@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "has command" .
+  rdfs:label "has command"@en .
 
 
-###  https://saref.etsi.org/core/hasFeatureOfInterest
-saref:hasFeatureOfInterest rdf:type owl:ObjectProperty ;
-      owl:inverseOf saref:isFeatureOfInterestOf ;
+###  https://saref.etsi.org/core/isMeasurementOf
+saref:isMeasurementOf rdf:type owl:ObjectProperty ;
+      owl:inverseOf saref:hasMeasurement ;
   rdfs:comment "Relation between a measurement and the feature of interest being measured."@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
   rdfs:label "has feature of interest"@en .
@@ -374,9 +376,9 @@ saref:hasFeatureOfInterest rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/core/hasFunction
 saref:hasFunction rdf:type owl:ObjectProperty ;
-  rdfs:comment "A relationship identifying the type of function of a device" ;
+  rdfs:comment "A relationship identifying the type of function of a device"@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "has function" .
+  rdfs:label "has function"@en .
 
 
 ###  https://saref.etsi.org/core/hasProperty
@@ -395,16 +397,16 @@ saref:hasState rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/core/isAccomplishedBy
 saref:isAccomplishedBy rdf:type owl:ObjectProperty ;
-  rdfs:comment "A relationship indentifying the task accomplished by a certain entity (e.g., a device)" ;
+  rdfs:comment "A relationship indentifying the task accomplished by a certain entity (e.g., a device)"@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "is accomplished by" .
+  rdfs:label "is accomplished by"@en .
 
 
 ###  https://saref.etsi.org/core/isCommandOf
 saref:isCommandOf rdf:type owl:ObjectProperty ;
-  rdfs:comment "A relationship between a command and a function." ;
+  rdfs:comment "A relationship between a command and a function."@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "is command of" .
+  rdfs:label "is command of"@en .
 
 
 ###  https://saref.etsi.org/core/isControlledByDevice
@@ -413,8 +415,8 @@ saref:isControlledByDevice rdf:type owl:ObjectProperty ;
   rdfs:label "is controlled by device"@en .
 
 
-###  https://saref.etsi.org/core/isFeatureOfInterestOf
-saref:isFeatureOfInterestOf rdf:type owl:ObjectProperty ;
+###  https://saref.etsi.org/core/hasMeasurement
+saref:hasMeasurement rdf:type owl:ObjectProperty ;
   rdfs:comment "Relation betwwen a feature of interest and the measurments that are about it."@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
   rdfs:label "is feature of interest of"@en .
@@ -478,44 +480,44 @@ saref:relatesToProperty rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/saref4agri/hasBirthDate
 s4agri:hasBirthDate rdf:type owl:DatatypeProperty ;
   rdfs:range xsd:dateTime ;
-  rdfs:comment "A relation to express the birth date of an animal." ;
-  rdfs:label "has birth date" .
+  rdfs:comment "A relation to express the birth date of an animal."@en ;
+  rdfs:label "has birth date"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/hasDeathDate
 s4agri:hasDeathDate rdf:type owl:DatatypeProperty ;
   rdfs:range xsd:dateTime ;
-  rdfs:comment "A relation to express the death date of an animal." ;
-  rdfs:label "has death date" .
+  rdfs:comment "A relation to express the death date of an animal."@en ;
+  rdfs:label "has death date"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/hasHarvestDate
 s4agri:hasHarvestDate rdf:type owl:DatatypeProperty ;
   rdfs:subPropertyOf owl:topDataProperty ;
   rdfs:range xsd:dateTime ;
-  rdfs:comment "A relation to express the day the crop is harvested." ;
-  rdfs:label "has harvest date" .
+  rdfs:comment "A relation to express the day the crop is harvested."@en ;
+  rdfs:label "has harvest date"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/hasName
 s4agri:hasName rdf:type owl:DatatypeProperty ;
   rdfs:range xsd:string ;
-  rdfs:label "A relation to express the name of an entity (e.g.,animal)." ,
-                    "has name" .
+  rdfs:comment "A relation to express the name of an entity (e.g.,animal)."@en ;
+  rdfs:label "has name"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/hasPlantDate
 s4agri:hasPlantDate rdf:type owl:DatatypeProperty ;
   rdfs:subPropertyOf owl:topDataProperty ;
   rdfs:range xsd:dateTime ;
-  rdfs:comment "A relation to express the day the crop is planted." ;
-  rdfs:label "has plant date" .
+  rdfs:comment "A relation to express the day the crop is planted."@en ;
+  rdfs:label "has plant date"@en .
 
 
 ###  https://saref.etsi.org/core/hasDescription
 saref:hasDescription rdf:type owl:DatatypeProperty ;
   rdfs:range xsd:string ;
-  rdfs:comment "A relationship providing a description of an entity (e.g., device)" ;
+  rdfs:comment "A relationship providing a description of an entity (e.g., device)"@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
   rdfs:label "has description"@en .
 
@@ -523,23 +525,17 @@ saref:hasDescription rdf:type owl:DatatypeProperty ;
 ###  https://saref.etsi.org/core/hasManufacturer
 saref:hasManufacturer rdf:type owl:DatatypeProperty ;
   rdfs:range xsd:string ;
-  rdfs:comment "A relationship identifying the manufacturer of an entity (e.g., device)" ;
+  rdfs:comment "A relationship identifying the manufacturer of an entity (e.g., device)"@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "has manufacturer" .
+  rdfs:label "has manufacturer"@en .
 
 
 ###  https://saref.etsi.org/core/hasModel
 saref:hasModel rdf:type owl:DatatypeProperty ;
   rdfs:range xsd:string ;
-  rdfs:comment "A relationship identifying the model of an entity (e.g., device)" ;
+  rdfs:comment "A relationship identifying the model of an entity (e.g., device)"@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "has model" .
-
-
-###  https://saref.etsi.org/core/hasName
-saref:hasName rdf:type owl:DatatypeProperty ;
-  rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
-  rdfs:label "has name"@en .
+  rdfs:label "has model"@en .
 
 
 ###  https://saref.etsi.org/core/hasTimestamp
@@ -619,7 +615,7 @@ spaciallyIntersects(P1, P2) :- lat(P1, LAT), long(P1, LONG), alt(P1, ALT),
 
 sameThing(P1, P2) :- type(P1, Point), type(P2, Point), spaciallyIntersects(P1, P2).
   """ ,
-               "A point, typically described using a coordinate system relative to Earth, such as WGS84." ;
+               "A point, typically described using a coordinate system relative to Earth, such as WGS84."@en ;
   rdfs:isDefinedBy <http://www.w3.org/2003/01/geo/wgs84_pos#> ;
   rdfs:label "Point"@en .
 
@@ -724,7 +720,7 @@ s4agri:Animal rdf:type owl:Class ;
       owl:onDataRange xsd:string
     ] ;
   rdfs:comment "An individual and identifiable living organism that feeds on organic matter, typically having specialized sense organs and nervous system and able to respond rapidly to stimuli."@en ;
-  rdfs:label "Animal" .
+  rdfs:label "Animal"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/AnimalGroup
@@ -744,7 +740,7 @@ s4agri:AnimalGroup rdf:type owl:Class ;
       owl:onDataRange xsd:string
     ] ;
   rdfs:comment "A collection of one or multiple animals."@en ;
-  rdfs:label "Animal Group" .
+  rdfs:label "Animal Group"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/Building
@@ -759,7 +755,7 @@ s4agri:Building rdf:type owl:Class ;
       owl:maxCardinality "1"^^xsd:nonNegativeInteger
     ] ;
   rdfs:comment "A building represents a structure that provides shelter for its occupants or contents and stands in one place. The building is also used to provide a basic element within the spatial structure hierarchy for the components of a building project (together with site, storey, and space)."@en ;
-  rdfs:label "Building" .
+  rdfs:label "Building"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/BuildingSpace
@@ -785,7 +781,7 @@ s4agri:Crop rdf:type owl:Class ;
       owl:someValuesFrom xsd:dateTime
     ] ;
   rdfs:comment "A collection of cultivated plants that is grown on a large scale commercially, especially a cereal, fruit, or vegetable."@en ;
-  rdfs:label "Crop" .
+  rdfs:label "Crop"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/Deployment
@@ -815,6 +811,7 @@ s4agri:Deployment rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4agri/EatingActivitySensor
 s4agri:EatingActivitySensor rdf:type owl:Class ;
   rdfs:subClassOf saref:Sensor ;
+  rdfs:comment "Eating activity sensor"@en ;
   rdfs:label "Eating activity sensor"@en .
 
 
@@ -834,7 +831,7 @@ s4agri:Farm rdf:type owl:Class ;
       owl:maxCardinality "1"^^xsd:nonNegativeInteger
     ] ;
   rdfs:comment "A plot of land used for the scope of farming which can contain buildings and parcels."@en ;
-  rdfs:label "Farm" .
+  rdfs:label "Farm"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/FarmHolding
@@ -848,7 +845,7 @@ s4agri:FarmHolding rdf:type owl:Class ;
       owl:onProperty s4agri:hasName ;
       owl:allValuesFrom xsd:string
     ] ;
-  rdfs:comment "A class to decsribe a saref4agri farm holding as subcass of an org:Organization" ;
+  rdfs:comment "A class to decsribe a saref4agri farm holding as subcass of an org:Organization"@en ;
   rdfs:label "Farm holding"@en .
 
 
@@ -863,13 +860,14 @@ s4agri:Farmer rdf:type owl:Class ;
       owl:onProperty s4agri:hasName ;
       owl:allValuesFrom xsd:string
     ] ;
-  rdfs:comment "A class to decsribe a saref4agri farmer as subcass of a foaf:Person" ;
+  rdfs:comment "A class to decsribe a saref4agri farmer as subcass of a foaf:Person"@en ;
   rdfs:label "Farmer"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/ID
 s4agri:ID rdf:type owl:Class ;
-  rdfs:label "ID" .
+  rdfs:comment "ID"@en ;
+  rdfs:label "ID"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/MilkingSensor
@@ -899,13 +897,14 @@ s4agri:Parcel rdf:type owl:Class ;
       owl:onDataRange xsd:string
     ] ;
   rdfs:comment "An area of land, which might be used for grazing animals or planting crops. The parcel is defined as an undividable logical area of land which contains homogeneous items."@en ;
-  rdfs:label "Parcel" .
+  rdfs:label "Parcel"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/Platform
 s4agri:Platform rdf:type owl:Class ;
   rdfs:subClassOf sosa:Platform ;
-  rdfs:label "Platform" .
+  rdfs:comment "Platform"@en ;
+  rdfs:label "Platform"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/Pluviometer
@@ -918,8 +917,8 @@ s4agri:Pluviometer rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4agri/Soil
 s4agri:Soil rdf:type owl:Class ;
   rdfs:subClassOf saref:FeatureOfInterest ;
-  rdfs:comment "Upper layer of the earth in which plants grow." ;
-  rdfs:label "Soil" .
+  rdfs:comment "Upper layer of the earth in which plants grow."@en ;
+  rdfs:label "Soil"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/SoilTensiometer
@@ -932,6 +931,7 @@ s4agri:SoilTensiometer rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4agri/Thermometer
 s4agri:Thermometer rdf:type owl:Class ;
   rdfs:subClassOf saref:Sensor ;
+  rdfs:comment "Thermometer"@en ;
   rdfs:label "Thermometer"@en .
 
 
@@ -945,6 +945,7 @@ s4agri:WateringGun rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4agri/WateringSystem
 s4agri:WateringSystem rdf:type owl:Class ;
   rdfs:subClassOf ssn:System ;
+  rdfs:comment "Watering system"@en ;
   rdfs:label "Watering system"@en .
 
 
@@ -966,6 +967,7 @@ s4agri:WeatherStation rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4agri/WeightSensor
 s4agri:WeightSensor rdf:type owl:Class ;
   rdfs:subClassOf saref:Sensor ;
+  rdfs:comment "Weight sensor"@en ;
   rdfs:label "Weight sensor"@en .
 
 
@@ -991,8 +993,8 @@ saref:Command rdf:type owl:Class ;
       owl:onProperty saref:hasDescription ;
       owl:maxCardinality "1"^^xsd:nonNegativeInteger
     ] ;
-  rdfs:comment "A directive that a device must support to perform a certain function. A command may act upon a state, but does not necessarily act upon a state. For example, the ON command acts upon the ON/OFF state, but the GET command does not act upon any state, it simply gives a directive to retrieve a certain value. We propose here a list of commands that are relevant for the purpose of SAREF, but this list can be extended." ;
-  rdfs:label "Command" .
+  rdfs:comment "A directive that a device must support to perform a certain function. A command may act upon a state, but does not necessarily act upon a state. For example, the ON command acts upon the ON/OFF state, but the GET command does not act upon any state, it simply gives a directive to retrieve a certain value. We propose here a list of commands that are relevant for the purpose of SAREF, but this list can be extended."@en ;
+  rdfs:label "Command"@en .
 
 
 ###  https://saref.etsi.org/core/Device
@@ -1009,7 +1011,7 @@ saref:FeatureOfInterest rdf:type owl:Class ;
       owl:allValuesFrom saref:Property
     ] ,
     [ rdf:type owl:Restriction ;
-      owl:onProperty saref:isFeatureOfInterestOf ;
+      owl:onProperty saref:hasMeasurement ;
       owl:allValuesFrom saref:Measurement
     ] ;
   rdfs:comment <https://saref.etsi.org/core/> ;
@@ -1023,22 +1025,22 @@ saref:Function rdf:type owl:Class ;
       owl:minQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
       owl:onClass saref:Command
     ] ;
-  rdfs:comment "The functionality necessary to accomplish the task for which a Device is designed. A device can be designed to perform more than one function. Functions can be structured in categories (subclasses) that reflect different points of view, for example, considering the specific application area for which a function can be used (e.g., light, temperature, motion, heat, power, etc.), or the capability that a function can support (e.g., receive, reply, notify, etc.), and so forth. " ;
-  rdfs:label "Function" .
+  rdfs:comment "The functionality necessary to accomplish the task for which a Device is designed. A device can be designed to perform more than one function. Functions can be structured in categories (subclasses) that reflect different points of view, for example, considering the specific application area for which a function can be used (e.g., light, temperature, motion, heat, power, etc.), or the capability that a function can support (e.g., receive, reply, notify, etc.), and so forth. "@en ;
+  rdfs:label "Function"@en .
 
 
 ###  https://saref.etsi.org/core/Humidity
 saref:Humidity rdf:type owl:Class ;
   rdfs:subClassOf saref:Property ;
-  rdfs:comment "A saref:Property related to some measurements that are characterized by a certain value that is measured in a humidity unit" ;
+  rdfs:comment "A saref:Property related to some measurements that are characterized by a certain value that is measured in a humidity unit"@en ;
   rdfs:label "Humidiy"@en ,
-       "Humidity" .
+       "Humidity"@en .
 
 
 ###  https://saref.etsi.org/core/Measurement
 saref:Measurement rdf:type owl:Class ;
   rdfs:subClassOf [ rdf:type owl:Restriction ;
-      owl:onProperty saref:hasFeatureOfInterest ;
+      owl:onProperty saref:isMeasurementOf ;
       owl:allValuesFrom saref:FeatureOfInterest
     ] ,
     [ rdf:type owl:Restriction ;
@@ -1099,10 +1101,10 @@ saref:Property rdf:type owl:Class ;
     ] ;
       owl:disjointWith saref:UnitOfMeasure ;
   rdfs:comment "An aspect of an entity that can be observable by a sensor."@en ,
- "Anything that can be sensed, measured or controlled in households, common public buildings or offices. We propose here a list of properties that are relevant for the purpose of SAREF, but this list can be extended." ;
+ "Anything that can be sensed, measured or controlled in households, common public buildings or offices. We propose here a list of properties that are relevant for the purpose of SAREF, but this list can be extended."@en ;
   rdfs:isDefinedBy <https://saref.etsi.org/core/> ;
   rdfs:label "Property"@en ,
-       "Property" .
+       "Property"@en .
 
 
 ###  https://saref.etsi.org/core/Sensor
@@ -1114,8 +1116,8 @@ saref:Sensor rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/core/State
 saref:State rdf:type owl:Class ;
-  rdfs:comment "The state in which a device can be found, e.g, ON/OFF/STANDBY, or ONLINE/OFFLINE. We propose here a list of states that are relevant for the purpose of SAREF, but this list can be extended." ;
-  rdfs:label "State" .
+  rdfs:comment "The state in which a device can be found, e.g, ON/OFF/STANDBY, or ONLINE/OFFLINE. We propose here a list of states that are relevant for the purpose of SAREF, but this list can be extended."@en ;
+  rdfs:label "State"@en .
 
 
 ###  https://saref.etsi.org/core/Task
@@ -1125,29 +1127,29 @@ saref:Task rdf:type owl:Class ;
       owl:minQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
       owl:onClass saref:Device
     ] ;
-  rdfs:comment "The goal for which a device is designed (from a user perspective). For example, a washing machine is designed for the task of washing. We propose here a list of tasks that are relevant for the purpose of SAREF, but this list can be extended." ;
-  rdfs:label "Task" .
+  rdfs:comment "The goal for which a device is designed (from a user perspective). For example, a washing machine is designed for the task of washing. We propose here a list of tasks that are relevant for the purpose of SAREF, but this list can be extended."@en ;
+  rdfs:label "Task"@en .
 
 
 ###  https://saref.etsi.org/core/Temperature
 saref:Temperature rdf:type owl:Class ;
   rdfs:subClassOf saref:Property ;
-  rdfs:comment "A saref:Property related to some measurements that are characterized by a certain value that is measured in a temperature unit (degree_Celsius, degree_Fahrenheit, or degree_kelvin)" ;
+  rdfs:comment "A saref:Property related to some measurements that are characterized by a certain value that is measured in a temperature unit (degree_Celsius, degree_Fahrenheit, or degree_kelvin)"@en ;
   rdfs:label "Temperature"@en ,
-  "Temperature" .
+  "Temperature"@en .
 
 
 ###  https://saref.etsi.org/core/Time
 saref:Time rdf:type owl:Class ;
   rdfs:subClassOf saref:Property ;
-  rdfs:comment "A saref:Property that allows to specify the time concept in terms of instants or intervals according to the imported W3C Time ontology." ;
-  rdfs:label "Time" .
+  rdfs:comment "A saref:Property that allows to specify the time concept in terms of instants or intervals according to the imported W3C Time ontology."@en ;
+  rdfs:label "Time"@en .
 
 
 ###  https://saref.etsi.org/core/UnitOfMeasure
 saref:UnitOfMeasure rdf:type owl:Class ;
   rdfs:comment "The unit of measure is a standard for measurement of a quantity, such as a Property. For example,  Power is a property and Watt is a unit of power that represents a definite predetermined power: when we say 10 Watt, we actually mean 10 times the definite predetermined power called \"watt\". Our definition is based on the definition of unit of measure in the Ontology of units of Measure (OM). We propose here a list of some units of measure that are relevant for the purpose of the Smart Appliances ontology, but this list can be extended."@en ,
-      "The unit of measure is a standard for measurement of a quantity, such as a Property. For example,  Power is a property and Watt is a unit of power that represents a definite predetermined power: when we say 10 Watt, we actually mean 10 times the definite predetermined power called \"watt\". Our definition is based on the definition of unit of measure in the Ontology of units of Measure (OM). We propose here a list of some units of measure that are relevant for the purpose of SAREF, but this list can be extended, also using some other ontologies rather than the Ontology of units of Measure (OM)." ;
+      "The unit of measure is a standard for measurement of a quantity, such as a Property. For example,  Power is a property and Watt is a unit of power that represents a definite predetermined power: when we say 10 Watt, we actually mean 10 times the definite predetermined power called \"watt\". Our definition is based on the definition of unit of measure in the Ontology of units of Measure (OM). We propose here a list of some units of measure that are relevant for the purpose of SAREF, but this list can be extended, also using some other ontologies rather than the Ontology of units of Measure (OM)."@en ;
   rdfs:isDefinedBy <http://www.wurvoc.org/vocabularies/om-1.6/Unit_of_measure> ,
           <https://saref.etsi.org/core/> ;
   rdfs:label "Unit of measure"@en .
@@ -1190,50 +1192,49 @@ saref:UnitOfMeasure rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4agri/AirTemperature
 s4agri:AirTemperature rdf:type owl:NamedIndividual ,
                          saref:Temperature ;
-  rdfs:comment "The degree or intensity of heat present in the air." ;
+  rdfs:comment "The degree or intensity of heat present in the air."@en ;
   rdfs:label "Air temperature"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/AmbientHumidity
 s4agri:AmbientHumidity rdf:type owl:NamedIndividual ,
                           saref:Humidity ;
-  rdfs:comment "The amount of water vapour in the air." ;
-  rdfs:label "Ambient huidity"@en ,
-                            "Ambient humidity"@en .
+  rdfs:comment "The amount of water vapour in the air."@en ;
+  rdfs:label "Ambient humidity"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/IrrigationWater
 s4agri:IrrigationWater rdf:type owl:NamedIndividual ,
                           saref:Property ;
-  rdfs:comment "The amount of water falling in the soil by irrigation methods." ;
+  rdfs:comment "The amount of water falling in the soil by irrigation methods."@en ;
   rdfs:label "Irrigation water"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/PlantGrowthStage
 s4agri:PlantGrowthStage rdf:type owl:NamedIndividual ,
                            saref:Property ;
-  rdfs:comment "The level or stage of growth of the plant." ;
+  rdfs:comment "The level or stage of growth of the plant."@en ;
   rdfs:label "Plant growth stage"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/Precipitation
 s4agri:Precipitation rdf:type owl:NamedIndividual ,
                         saref:Property ;
-  rdfs:comment "The amount of water falling in the soil by natural process (e.g. rain)." ;
+  rdfs:comment "The amount of water falling in the soil by natural process (e.g. rain)."@en ;
   rdfs:label "Precipitation"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/SoilMoisture
 s4agri:SoilMoisture rdf:type owl:NamedIndividual ,
                        saref:Property ;
-  rdfs:comment "The amount of water or humidity contained in the soil." ;
+  rdfs:comment "The amount of water or humidity contained in the soil."@en ;
   rdfs:label "Soil moisture"@en .
 
 
 ###  https://saref.etsi.org/saref4agri/SoilTemperature
 s4agri:SoilTemperature rdf:type owl:NamedIndividual ,
                           saref:Temperature ;
-  rdfs:comment "The degree or intensity of heat present in the soil." ;
+  rdfs:comment "The degree or intensity of heat present in the soil."@en ;
   rdfs:label "Soil temperature"@en .
 
 
@@ -1248,7 +1249,7 @@ wgs84:location rdfs:comment """The relation between something and the point,
  its location as a arc (a sequence of points).
  Clearly in practice there will be limit to the accuracy of any such statement, but one would expect
  an accuracy appropriate for the size of the object and uses such as mapping .
- """ ;
+ """@en ;
   rdfs:label "location"@en .