diff --git a/ontology/catalog-v001.xml b/ontology/catalog-v001.xml
index 062908d4e744b7e9e3fb2e33731300883fa741b7..72a2a15167195ea540f18b8943c0aaf9910ea4b0 100644
--- a/ontology/catalog-v001.xml
+++ b/ontology/catalog-v001.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <uri id="Imports Wizard Entry" name="https://saref.etsi.org/saref4city/v1.1.1/saref4city#" uri="https://saref.etsi.org/saref4city/latest/saref4city.ttl"/>
     <uri id="Imports Wizard Entry" name="https://w3id.org/saref" uri="https://ontology.tno.nl/saref.ttl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base=""/>
 </catalog>
diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl
index 5077547a610672326d6486545755dda1c53f78b7..088c21bc58e6940f6ce532aff2cfa3e38bb18688 100644
--- a/ontology/saref4wear.ttl
+++ b/ontology/saref4wear.ttl
@@ -1,4 +1,5 @@
-@prefix : <https://saref.etsi.org/s4wear#> .
+@prefix : <https://saref.etsi.org/saref4wear#> .
+@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
@@ -8,13 +9,15 @@
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix vann: <http://purl.org/vocab/vann/> .
 @prefix voaf: <http://purl.org/vocommons/voaf#> .
-@prefix s4wear: <https://saref.etsi.org/s4wear#> .
+@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
+@prefix saref: <https://saref.etsi.org/saref#> .
+@prefix s4city: <https://saref.etsi.org/saref4city#> .
+@prefix s4wear: <https://saref.etsi.org/saref4wear#> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @base <https://saref.etsi.org/saref4wear#> .
 
 <https://saref.etsi.org/saref4wear#> rdf:type owl:Ontology ;
                                       owl:versionIRI <https://saref.etsi.org/saref4wear/v0.1.2/saref4wear#> ;
-                                      owl:imports <https://w3id.org/saref> ;
                                       dcterms:contributor <https://www.linkedin.com/in/maurodragoni/MauroDragoni> ;
                                       dcterms:created "start date of the STF 2019-01-01"^^xsd:date ;
                                       dcterms:description "SAREF4WEAR is an extension of SAREF for Wearables"@en ;
@@ -80,86 +83,181 @@ vann:preferredNamespacePrefix rdf:type owl:AnnotationProperty .
 vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 
 
+###  http://xmlns.com/foaf/0.1/name
+foaf:name rdf:type owl:AnnotationProperty .
+
+
 #################################################################
 #    Object Properties
 #################################################################
 
-###  https://saref.etsi.org/s4wear#actsOn
+###  http://www.opengis.net/ont/geosparql#hasGeometry
+geosp:hasGeometry rdf:type owl:ObjectProperty ;
+                  rdfs:isDefinedBy geosp: ;
+                  rdfs:label "hasGeometry"@en .
+
+
+###  http://www.opengis.net/ont/geosparql#sfContains
+geosp:sfContains rdf:type owl:ObjectProperty ;
+                 rdfs:isDefinedBy geosp: ;
+                 rdfs:label "sfContains"@en .
+
+
+###  http://www.opengis.net/ont/geosparql#sfWithin
+geosp:sfWithin rdf:type owl:ObjectProperty ;
+               rdfs:isDefinedBy geosp: ;
+               rdfs:label "sfWithin"@en .
+
+
+###  http://www.w3.org/2003/01/geo/wgs84_pos#location
+geo:location rdf:type owl:ObjectProperty ;
+             rdfs:isDefinedBy geo: ;
+             rdfs:label "location" .
+
+
+###  https://saref.etsi.org/saref#controlsProperty
+saref:controlsProperty rdf:type owl:ObjectProperty ;
+                       rdfs:isDefinedBy saref: ;
+                       rdfs:label "controls property"@en .
+
+
+###  https://saref.etsi.org/saref#isControlledByDevice
+saref:isControlledByDevice rdf:type owl:ObjectProperty ;
+                           rdfs:isDefinedBy saref: ;
+                           rdfs:label "is controlled by device"@en .
+
+
+###  https://saref.etsi.org/saref#isMeasuredByDevice
+saref:isMeasuredByDevice rdf:type owl:ObjectProperty ;
+                         rdfs:isDefinedBy saref: ;
+                         rdfs:label "is measured by device"@en .
+
+
+###  https://saref.etsi.org/saref#isMeasuredIn
+saref:isMeasuredIn rdf:type owl:ObjectProperty ;
+                   rdfs:isDefinedBy saref: ;
+                   rdfs:label "is measured in"@en .
+
+
+###  https://saref.etsi.org/saref#makesMeasurement
+saref:makesMeasurement rdf:type owl:ObjectProperty ;
+                       owl:inverseOf saref:measurementMadeBy ;
+                       rdfs:isDefinedBy saref: ;
+                       rdfs:label "makes measurement"@en .
+
+
+###  https://saref.etsi.org/saref#measurementMadeBy
+saref:measurementMadeBy rdf:type owl:ObjectProperty ;
+                        rdfs:isDefinedBy saref: ;
+                        rdfs:label "measurement made by"@en .
+
+
+###  https://saref.etsi.org/saref#measuresProperty
+saref:measuresProperty rdf:type owl:ObjectProperty ;
+                       rdfs:isDefinedBy saref: ;
+                       rdfs:label "measures property"@en .
+
+
+###  https://saref.etsi.org/saref#relatesToMeasurement
+saref:relatesToMeasurement rdf:type owl:ObjectProperty ;
+                           rdfs:isDefinedBy saref: ;
+                           rdfs:label "relates to measurement"@en .
+
+
+###  https://saref.etsi.org/saref#relatesToProperty
+saref:relatesToProperty rdf:type owl:ObjectProperty ;
+                        rdfs:isDefinedBy saref: ;
+                        rdfs:label "relates to property"@en .
+
+
+###  https://saref.etsi.org/saref4city#takesPlaceAtFacility
+s4city:takesPlaceAtFacility rdf:type owl:ObjectProperty ;
+                            rdfs:isDefinedBy s4city: ;
+                            rdfs:label "takes place at facility"@en .
+
+
+###  https://saref.etsi.org/saref4wear#actsOn
 s4wear:actsOn rdf:type owl:ObjectProperty ;
               rdfs:domain s4wear:Action ;
               rdfs:range s4wear:ActuableObject .
 
 
-###  https://saref.etsi.org/s4wear#hasInterface
+###  https://saref.etsi.org/saref4wear#canSendInformationTo
+s4wear:canSendInformationTo rdf:type owl:ObjectProperty ;
+                            rdfs:domain s4wear:Wearable ;
+                            rdfs:range s4wear:Wearable .
+
+
+###  https://saref.etsi.org/saref4wear#hasInterface
 s4wear:hasInterface rdf:type owl:ObjectProperty ;
                     rdfs:domain s4wear:Wearable ;
                     rdfs:range s4wear:Interface .
 
 
-###  https://saref.etsi.org/s4wear#hasLocation
+###  https://saref.etsi.org/saref4wear#hasLocation
 s4wear:hasLocation rdf:type owl:ObjectProperty ;
                    rdfs:domain owl:Thing ;
                    rdfs:range s4wear:Location .
 
 
-###  https://saref.etsi.org/s4wear#hasPowerSupply
+###  https://saref.etsi.org/saref4wear#hasPowerSupply
 s4wear:hasPowerSupply rdf:type owl:ObjectProperty ;
                       rdfs:domain s4wear:Wearable ;
                       rdfs:range s4wear:PowerSupply .
 
 
-###  https://saref.etsi.org/s4wear#hasSensor
+###  https://saref.etsi.org/saref4wear#hasSensor
 s4wear:hasSensor rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range s4wear:Sensor .
 
 
-###  https://saref.etsi.org/s4wear#interactsWith
+###  https://saref.etsi.org/saref4wear#interactsWith
 s4wear:interactsWith rdf:type owl:ObjectProperty ;
                      rdfs:domain s4wear:User ;
                      rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#isActedBy
+###  https://saref.etsi.org/saref4wear#isActedBy
 s4wear:isActedBy rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearer ;
                  rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#isActuatedBy
+###  https://saref.etsi.org/saref4wear#isActuatedBy
 s4wear:isActuatedBy rdf:type owl:ObjectProperty ;
                     rdfs:domain s4wear:Wearable ;
                     rdfs:range s4wear:Actuator .
 
 
-###  https://saref.etsi.org/s4wear#isLocated
+###  https://saref.etsi.org/saref4wear#isLocated
 s4wear:isLocated rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#isLocatedIn
+###  https://saref.etsi.org/saref4wear#isLocatedIn
 s4wear:isLocatedIn rdf:type owl:ObjectProperty ;
                    rdfs:subPropertyOf s4wear:isLocated ;
                    rdfs:domain s4wear:Wearable ;
                    rdfs:range s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#isLocatedNear
+###  https://saref.etsi.org/saref4wear#isLocatedNear
 s4wear:isLocatedNear rdf:type owl:ObjectProperty ;
                      rdfs:subPropertyOf s4wear:isLocated ;
                      rdfs:domain s4wear:Wearable ;
                      rdfs:range s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#isLocatedOn
+###  https://saref.etsi.org/saref4wear#isLocatedOn
 s4wear:isLocatedOn rdf:type owl:ObjectProperty ;
                    rdfs:subPropertyOf s4wear:isLocated ;
                    rdfs:domain s4wear:Wearable ;
                    rdfs:range s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#isSensedBy
+###  https://saref.etsi.org/saref4wear#isSensedBy
 s4wear:isSensedBy rdf:type owl:ObjectProperty ;
                   rdfs:domain s4wear:Wearer ;
                   rdfs:range s4wear:Wearable ;
@@ -168,25 +266,25 @@ The definition of this object property satisfies the requirement WEAR-2.""" ;
                   rdfs:label "is sensed by"@en .
 
 
-###  https://saref.etsi.org/s4wear#isTriggeredBy
+###  https://saref.etsi.org/saref4wear#isTriggeredBy
 s4wear:isTriggeredBy rdf:type owl:ObjectProperty ;
                      rdfs:domain s4wear:Action ;
                      rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#monitors
+###  https://saref.etsi.org/saref4wear#monitors
 s4wear:monitors rdf:type owl:ObjectProperty ;
                 rdfs:domain s4wear:Wearable ;
                 rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#sendsInformationTo
+###  https://saref.etsi.org/saref4wear#sendsInformationTo
 s4wear:sendsInformationTo rdf:type owl:ObjectProperty ;
                           rdfs:domain s4wear:Wearable ;
                           rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#sendsNotificationsTo
+###  https://saref.etsi.org/saref4wear#sendsNotificationsTo
 s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
                             rdfs:domain s4wear:Wearable ;
                             rdfs:range s4wear:Wearer .
@@ -196,114 +294,117 @@ s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
 #    Data properties
 #################################################################
 
-###  http://xmlns.com/foaf/0.1/name
-foaf:name rdf:type owl:DatatypeProperty .
+###  https://saref.etsi.org/saref#hasTimestamp
+saref:hasTimestamp rdf:type owl:DatatypeProperty ;
+                   rdfs:isDefinedBy saref: ;
+                   rdfs:label "has timestamp"@en .
+
+
+###  https://saref.etsi.org/saref#hasValue
+saref:hasValue rdf:type owl:DatatypeProperty ;
+               rdfs:isDefinedBy saref: ;
+               rdfs:label "has value"@en .
 
 
-###  https://saref.etsi.org/s4wear#emittedNoise
+###  https://saref.etsi.org/saref4wear#emittedNoise
 s4wear:emittedNoise rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4wear:Wearable ;
                     rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#emittedTemperature
+###  https://saref.etsi.org/saref4wear#emittedTemperature
 s4wear:emittedTemperature rdf:type owl:DatatypeProperty ;
                           rdfs:domain s4wear:Wearable ;
                           rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#eventType
+###  https://saref.etsi.org/saref4wear#eventType
 s4wear:eventType rdf:type owl:DatatypeProperty ;
-                 rdfs:domain s4wear:Event ;
+                 rdfs:domain s4city:Event ;
                  rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/s4wear#followsPolicies
+###  https://saref.etsi.org/saref4wear#followsPolicies
 s4wear:followsPolicies rdf:type owl:DatatypeProperty ;
                        rdfs:domain s4wear:Wearable ;
                        rdfs:range xsd:anyURI .
 
 
-###  https://saref.etsi.org/s4wear#hasCapacity
+###  https://saref.etsi.org/saref4wear#hasCapacity
 s4wear:hasCapacity rdf:type owl:DatatypeProperty ;
-                   rdfs:domain s4wear:Area ;
+                   rdfs:domain s4city:Facility ,
+                               s4wear:Area ;
                    rdfs:range xsd:long .
 
 
-###  https://saref.etsi.org/s4wear#hasCommand
+###  https://saref.etsi.org/saref4wear#hasCommand
 s4wear:hasCommand rdf:type owl:DatatypeProperty ;
                   rdfs:domain s4wear:Action ;
                   rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/s4wear#hasDataTransmissionRate
+###  https://saref.etsi.org/saref4wear#hasDataTransmissionRate
 s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
                                rdfs:domain s4wear:Wearable ;
                                rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#hasDeep
+###  https://saref.etsi.org/saref4wear#hasDeep
 s4wear:hasDeep rdf:type owl:DatatypeProperty ;
                rdfs:domain s4wear:Wearable ;
                rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#hasHeight
+###  https://saref.etsi.org/saref4wear#hasHeight
 s4wear:hasHeight rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#hasLength
+###  https://saref.etsi.org/saref4wear#hasLength
 s4wear:hasLength rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#hasOperatingTemperature
+###  https://saref.etsi.org/saref4wear#hasOperatingTemperature
 s4wear:hasOperatingTemperature rdf:type owl:DatatypeProperty ;
                                rdfs:domain s4wear:Wearable ;
                                rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#hasStorage
+###  https://saref.etsi.org/saref4wear#hasStorage
 s4wear:hasStorage rdf:type owl:DatatypeProperty ;
                   rdfs:subPropertyOf owl:topDataProperty ;
                   rdfs:domain s4wear:Wearable ;
                   rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#hasWeight
+###  https://saref.etsi.org/saref4wear#hasWeight
 s4wear:hasWeight rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#latitude
+###  https://saref.etsi.org/saref4wear#latitude
 s4wear:latitude rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4wear:Location ;
                 rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/s4wear#longitude
-s4wear:longitude rdf:type owl:DatatypeProperty ;
-                 rdfs:domain s4wear:Location ;
-                 rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/s4wear#meansOfTransport
+###  https://saref.etsi.org/saref4wear#meansOfTransport
 s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;
                         rdfs:domain s4wear:Wearer ;
                         rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/s4wear#wearerRangeAge
+###  https://saref.etsi.org/saref4wear#wearerRangeAge
 s4wear:wearerRangeAge rdf:type owl:DatatypeProperty ;
                       rdfs:domain s4wear:Wearer ;
                       rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/s4wear#wearerStatus
+###  https://saref.etsi.org/saref4wear#wearerStatus
 s4wear:wearerStatus rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4wear:Wearer ;
                     rdfs:range xsd:string .
@@ -317,82 +418,244 @@ s4wear:wearerStatus rdf:type owl:DatatypeProperty ;
 voaf:Vocabulary rdf:type owl:Class .
 
 
+###  http://www.opengis.net/ont/geosparql#Feature
+geosp:Feature rdf:type owl:Class ;
+              rdfs:subClassOf geosp:SpatialObject ;
+              rdfs:isDefinedBy geosp: ;
+              rdfs:label "Feature"@en .
+
+
+###  http://www.opengis.net/ont/geosparql#Geometry
+geosp:Geometry rdf:type owl:Class ;
+               rdfs:subClassOf geosp:SpatialObject ;
+               rdfs:isDefinedBy geosp: ;
+               rdfs:label "Geometry"@en .
+
+
+###  http://www.opengis.net/ont/geosparql#SpatialObject
+geosp:SpatialObject rdf:type owl:Class ;
+                    rdfs:subClassOf [ rdf:type owl:Restriction ;
+                                      owl:onProperty geosp:hasGeometry ;
+                                      owl:allValuesFrom geosp:Geometry
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty geosp:sfContains ;
+                                      owl:allValuesFrom geosp:SpatialObject
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty geosp:sfWithin ;
+                                      owl:allValuesFrom geosp:SpatialObject
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty geo:location ;
+                                      owl:allValuesFrom geo:Point
+                                    ] ;
+                    rdfs:isDefinedBy geosp: ;
+                    rdfs:label "Spatial object"@en .
+
+
+###  http://www.w3.org/2003/01/geo/wgs84_pos#Point
+geo:Point rdf:type owl:Class ;
+          rdfs:subClassOf geosp:Geometry ;
+          rdfs:isDefinedBy geo: ;
+          rdfs:label "Point"@en .
+
+
 ###  http://xmlns.com/foaf/0.1/Person
 foaf:Person rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Action
+###  https://saref.etsi.org/saref#Device
+saref:Device rdf:type owl:Class ;
+             rdfs:subClassOf s4wear:PhysicalObject ,
+                             [ rdf:type owl:Restriction ;
+                               owl:onProperty saref:controlsProperty ;
+                               owl:allValuesFrom saref:Property
+                             ] ,
+                             [ rdf:type owl:Restriction ;
+                               owl:onProperty saref:makesMeasurement ;
+                               owl:allValuesFrom saref:Measurement
+                             ] ,
+                             [ rdf:type owl:Restriction ;
+                               owl:onProperty saref:measuresProperty ;
+                               owl:allValuesFrom saref:Property
+                             ] ;
+             rdfs:isDefinedBy saref: ;
+             rdfs:label "Device"@en .
+
+
+###  https://saref.etsi.org/saref#Measurement
+saref:Measurement rdf:type owl:Class ;
+                  rdfs:subClassOf [ rdf:type owl:Restriction ;
+                                    owl:onProperty saref:isMeasuredIn ;
+                                    owl:allValuesFrom saref:UnitOfMeasure
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty saref:relatesToProperty ;
+                                    owl:allValuesFrom saref:Property
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty saref:isMeasuredIn ;
+                                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                                    owl:onClass saref:UnitOfMeasure
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty saref:relatesToProperty ;
+                                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                                    owl:onClass saref:Property
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty saref:hasTimestamp ;
+                                    owl:allValuesFrom xsd:dateTime
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty saref:hasValue ;
+                                    owl:cardinality "1"^^xsd:nonNegativeInteger
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty saref:hasValue ;
+                                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                                    owl:onDataRange xsd:float
+                                  ] ;
+                  rdfs:isDefinedBy saref: ;
+                  rdfs:label "Measurement"@en .
+
+
+###  https://saref.etsi.org/saref#Property
+saref:Property rdf:type owl:Class ;
+               rdfs:subClassOf [ rdf:type owl:Restriction ;
+                                 owl:onProperty saref:isControlledByDevice ;
+                                 owl:allValuesFrom saref:Device
+                               ] ,
+                               [ rdf:type owl:Restriction ;
+                                 owl:onProperty saref:isMeasuredByDevice ;
+                                 owl:allValuesFrom saref:Device
+                               ] ,
+                               [ rdf:type owl:Restriction ;
+                                 owl:onProperty saref:relatesToMeasurement ;
+                                 owl:allValuesFrom saref:Measurement
+                               ] ;
+               rdfs:isDefinedBy saref: ;
+               rdfs:label "Property"@en .
+
+
+###  https://saref.etsi.org/saref#Sensor
+saref:Sensor rdf:type owl:Class ;
+             rdfs:subClassOf saref:Device ;
+             rdfs:isDefinedBy saref: ;
+             rdfs:label "Sensor"@en .
+
+
+###  https://saref.etsi.org/saref#UnitOfMeasure
+saref:UnitOfMeasure rdf:type owl:Class ;
+                    rdfs:isDefinedBy saref: ;
+                    rdfs:label "Unit of measure"@en .
+
+
+###  https://saref.etsi.org/saref4city#AdministrativeArea
+s4city:AdministrativeArea rdf:type owl:Class ;
+                          rdfs:subClassOf geosp:Feature ;
+                          rdfs:isDefinedBy s4city: ;
+                          rdfs:label "Administrative area"@en .
+
+
+###  https://saref.etsi.org/saref4city#CityObject
+s4city:CityObject rdf:type owl:Class ;
+                  rdfs:subClassOf geosp:Feature ,
+                                  s4wear:PhysicalObject ;
+                  rdfs:isDefinedBy s4city: ;
+                  rdfs:label "City object"@en .
+
+
+###  https://saref.etsi.org/saref4city#Event
+s4city:Event rdf:type owl:Class ;
+             rdfs:subClassOf [ rdf:type owl:Restriction ;
+                               owl:onProperty s4city:takesPlaceAtFacility ;
+                               owl:allValuesFrom s4city:Facility
+                             ] ;
+             rdfs:isDefinedBy s4city: ;
+             rdfs:label "Event"@en .
+
+
+###  https://saref.etsi.org/saref4city#Facility
+s4city:Facility rdf:type owl:Class ;
+                rdfs:subClassOf geosp:Feature ;
+                rdfs:isDefinedBy s4city: ;
+                rdfs:label "Facility"@en .
+
+
+###  https://saref.etsi.org/saref4wear#Action
 s4wear:Action rdf:type owl:Class ;
               rdfs:subClassOf s4wear:Capability .
 
 
-###  https://saref.etsi.org/s4wear#ActuableObject
+###  https://saref.etsi.org/saref4wear#ActuableObject
 s4wear:ActuableObject rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Actuator
+###  https://saref.etsi.org/saref4wear#Actuator
 s4wear:Actuator rdf:type owl:Class ;
                 owl:equivalentClass <https://w3id.org/saref#Actuator> ;
                 rdfs:subClassOf s4wear:WearableComponent .
 
 
-###  https://saref.etsi.org/s4wear#Area
+###  https://saref.etsi.org/saref4wear#Area
 s4wear:Area rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Biometric
+###  https://saref.etsi.org/saref4wear#Biometric
 s4wear:Biometric rdf:type owl:Class ;
                  rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/s4wear#Capability
+###  https://saref.etsi.org/saref4wear#Capability
 s4wear:Capability rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Child
+###  https://saref.etsi.org/saref4wear#Child
 s4wear:Child rdf:type owl:Class ;
              rdfs:subClassOf s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#Communication
+###  https://saref.etsi.org/saref4wear#Communication
 s4wear:Communication rdf:type owl:Class ;
                      rdfs:subClassOf s4wear:Capability .
 
 
-###  https://saref.etsi.org/s4wear#Control
+###  https://saref.etsi.org/saref4wear#Control
 s4wear:Control rdf:type owl:Class ;
                rdfs:subClassOf s4wear:Capability .
 
 
-###  https://saref.etsi.org/s4wear#Device
-s4wear:Device rdf:type owl:Class ;
-              owl:equivalentClass <https://w3id.org/saref#Device> .
+###  https://saref.etsi.org/saref4wear#Device
+s4wear:Device rdf:type owl:Class .
+
 
+###  https://saref.etsi.org/saref4wear#ElecticalSafety
+s4wear:ElecticalSafety rdf:type owl:Class ;
+                       rdfs:subClassOf s4wear:Information .
 
-###  https://saref.etsi.org/s4wear#ElectricalSafety
+
+###  https://saref.etsi.org/saref4wear#ElectricalSafety
 s4wear:ElectricalSafety rdf:type owl:Class ;
                         rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/s4wear#Emission
+###  https://saref.etsi.org/saref4wear#Emission
 s4wear:Emission rdf:type owl:Class ;
                 rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/s4wear#Entity
+###  https://saref.etsi.org/saref4wear#Entity
 s4wear:Entity rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Event
-s4wear:Event rdf:type owl:Class .
-
-
-###  https://saref.etsi.org/s4wear#Fabric
+###  https://saref.etsi.org/saref4wear#Fabric
 s4wear:Fabric rdf:type owl:Class ;
               rdfs:subClassOf s4wear:TextileBasedWearable .
 
 
-###  https://saref.etsi.org/s4wear#InBodyWearable
+###  https://saref.etsi.org/saref4wear#InBodyWearable
 s4wear:InBodyWearable rdf:type owl:Class ;
                       rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                              [ rdf:type owl:Restriction ;
@@ -404,24 +667,25 @@ s4wear:InBodyWearable rdf:type owl:Class ;
                                       ] .
 
 
-###  https://saref.etsi.org/s4wear#Information
+###  https://saref.etsi.org/saref4wear#Information
 s4wear:Information rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Interface
+###  https://saref.etsi.org/saref4wear#Interface
 s4wear:Interface rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#LivingOrganism
+###  https://saref.etsi.org/saref4wear#LivingOrganism
 s4wear:LivingOrganism rdf:type owl:Class ;
-                      rdfs:subClassOf s4wear:Entity .
+                      rdfs:subClassOf geosp:Feature ,
+                                      s4wear:Entity .
 
 
-###  https://saref.etsi.org/s4wear#Location
+###  https://saref.etsi.org/saref4wear#Location
 s4wear:Location rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#NearBodyWearable
+###  https://saref.etsi.org/saref4wear#NearBodyWearable
 s4wear:NearBodyWearable rdf:type owl:Class ;
                         rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                                [ rdf:type owl:Restriction ;
@@ -433,7 +697,7 @@ s4wear:NearBodyWearable rdf:type owl:Class ;
                                         ] .
 
 
-###  https://saref.etsi.org/s4wear#OnBodyWearable
+###  https://saref.etsi.org/saref4wear#OnBodyWearable
 s4wear:OnBodyWearable rdf:type owl:Class ;
                       rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                              [ rdf:type owl:Restriction ;
@@ -445,70 +709,76 @@ s4wear:OnBodyWearable rdf:type owl:Class ;
                                       ] .
 
 
-###  https://saref.etsi.org/s4wear#Parent
+###  https://saref.etsi.org/saref4wear#Parent
 s4wear:Parent rdf:type owl:Class ;
               rdfs:subClassOf s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#PhysicalObject
+###  https://saref.etsi.org/saref4wear#PhysicalObject
 s4wear:PhysicalObject rdf:type owl:Class ;
-                      rdfs:subClassOf s4wear:Entity .
+                      rdfs:subClassOf geosp:Feature ,
+                                      s4wear:Entity .
 
 
-###  https://saref.etsi.org/s4wear#PositionedWearable
+###  https://saref.etsi.org/saref4wear#PositionedWearable
 s4wear:PositionedWearable rdf:type owl:Class ;
                           rdfs:subClassOf s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#PowerSupply
+###  https://saref.etsi.org/saref4wear#PowerSupply
 s4wear:PowerSupply rdf:type owl:Class ;
                    rdfs:subClassOf s4wear:Device .
 
 
-###  https://saref.etsi.org/s4wear#Sensing
+###  https://saref.etsi.org/saref4wear#Sensing
 s4wear:Sensing rdf:type owl:Class ;
                rdfs:subClassOf s4wear:Capability .
 
 
-###  https://saref.etsi.org/s4wear#Sensor
+###  https://saref.etsi.org/saref4wear#Sensor
 s4wear:Sensor rdf:type owl:Class ;
               owl:equivalentClass <https://w3id.org/saref#Sensor> ;
               rdfs:subClassOf s4wear:WearableComponent .
 
 
-###  https://saref.etsi.org/s4wear#Software
+###  https://saref.etsi.org/saref4wear#Software
 s4wear:Software rdf:type owl:Class ;
                 rdfs:subClassOf s4wear:Entity .
 
 
-###  https://saref.etsi.org/s4wear#StaffMember
+###  https://saref.etsi.org/saref4wear#SportEvents
+s4wear:SportEvents rdf:type owl:Class ;
+                   rdfs:subClassOf s4city:Event .
+
+
+###  https://saref.etsi.org/saref4wear#StaffMember
 s4wear:StaffMember rdf:type owl:Class ;
                    rdfs:subClassOf s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#Storage
+###  https://saref.etsi.org/saref4wear#Storage
 s4wear:Storage rdf:type owl:Class ;
                rdfs:subClassOf s4wear:WearableComponent .
 
 
-###  https://saref.etsi.org/s4wear#TextileBasedComponent
+###  https://saref.etsi.org/saref4wear#TextileBasedComponent
 s4wear:TextileBasedComponent rdf:type owl:Class ;
                              rdfs:subClassOf s4wear:TextileBasedWearable .
 
 
-###  https://saref.etsi.org/s4wear#TextileBasedDevice
+###  https://saref.etsi.org/saref4wear#TextileBasedDevice
 s4wear:TextileBasedDevice rdf:type owl:Class ;
                           rdfs:subClassOf s4wear:TextileBasedWearable .
 
 
-###  https://saref.etsi.org/s4wear#TextileBasedWearable
+###  https://saref.etsi.org/saref4wear#TextileBasedWearable
 s4wear:TextileBasedWearable rdf:type owl:Class ;
                             rdfs:subClassOf s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#User
+###  https://saref.etsi.org/saref4wear#User
 s4wear:User rdf:type owl:Class ;
-            rdfs:subClassOf [ owl:intersectionOf ( s4wear:Entity
+            rdfs:subClassOf [ owl:intersectionOf ( s4wear:LivingOrganism
                                                    [ rdf:type owl:Restriction ;
                                                      owl:onProperty s4wear:interactsWith ;
                                                      owl:someValuesFrom s4wear:Wearable
@@ -518,19 +788,19 @@ s4wear:User rdf:type owl:Class ;
                             ] .
 
 
-###  https://saref.etsi.org/s4wear#Wearable
+###  https://saref.etsi.org/saref4wear#Wearable
 s4wear:Wearable rdf:type owl:Class ;
-                rdfs:subClassOf s4wear:Device ;
+                rdfs:subClassOf saref:Device ;
                 rdfs:comment """A wearable device is a device that is intended to be located near, on or in an organism.
 The definition of this concept satisfies the requirement WEAR-1."""@en ;
                 rdfs:label "Wearable device"@en .
 
 
-###  https://saref.etsi.org/s4wear#WearableComponent
+###  https://saref.etsi.org/saref4wear#WearableComponent
 s4wear:WearableComponent rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Wearer
+###  https://saref.etsi.org/saref4wear#Wearer
 s4wear:Wearer rdf:type owl:Class ;
               rdfs:subClassOf [ owl:intersectionOf ( s4wear:Entity
                                                      [ rdf:type owl:Restriction ;
@@ -546,10 +816,12 @@ The definition of this concept satisfies the requirement WEAR-2."""@en ;
 
 
 ###  https://w3id.org/saref#Actuator
+<https://w3id.org/saref#Actuator> rdf:type owl:Class .
 
-###  https://w3id.org/saref#Device
 
 ###  https://w3id.org/saref#Sensor
+<https://w3id.org/saref#Sensor> rdf:type owl:Class .
+
 
 #################################################################
 #    Individuals