diff --git a/ontology/saref4lift.ttl b/ontology/saref4lift.ttl
index c842a6d89e3116a0fdad1244f18c5bcdf3eedb89..d34f1e60ff857d162124c6d23906151528b3861b 100644
--- a/ontology/saref4lift.ttl
+++ b/ontology/saref4lift.ttl
@@ -1,23 +1,201 @@
 @prefix : <https://saref.etsi.org/saref4lift/> .
-@prefix dcterms: <http://purl.org/dc/terms/> .
 @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> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix saref: <https://saref.etsi.org/core/> .
 @prefix vann: <http://purl.org/vocab/vann/> .
+@prefix saref: <https://saref.etsi.org/core/> .
 @prefix schema: <http://schema.org/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 @base <https://saref.etsi.org/saref4lift/> .
 
 <https://saref.etsi.org/saref4lift/> rdf:type owl:Ontology ;
-  dcterms:title "SAREF extension for Smart Lifts"@en ;
-  dcterms:description "This ontology extends the SAREF ontology for the Smart Lifts domain."@en ;
-  dcterms:publisher <https://www.etsi.org/> ;
-  owl:versionIRI <https://saref.etsi.org/saref4lift/v1.1.1/> ;
-  owl:versionInfo "v1.1.1" ;
-  dcterms:modified "2021-01-11"^^xsd:date ;
-  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
-  dcterms:source <https://saref.etsi.org/sources/saref4lift/> ;
-  vann:preferredNamespacePrefix "s4lift" ;
-  vann:preferredNamespaceUri "https://saref.etsi.org/saref4lift/" .
+                                      owl:versionIRI <https://saref.etsi.org/saref4lift/v1.1.1/> ;
+                                      dcterms:description "This ontology extends the SAREF ontology for the Smart Lifts domain."@en ;
+                                      dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+                                      dcterms:modified "2021-01-11"^^xsd:date ;
+                                      dcterms:publisher <https://www.etsi.org/> ;
+                                      dcterms:source <https://saref.etsi.org/sources/saref4lift/> ;
+                                      dcterms:title "SAREF extension for Smart Lifts"@en ;
+                                      vann:preferredNamespacePrefix "s4lift" ;
+                                      vann:preferredNamespaceUri "https://saref.etsi.org/saref4lift/" ;
+                                      owl:versionInfo "v1.1.1" .
+
+#################################################################
+#    Annotation properties
+#################################################################
+
+###  http://purl.org/dc/terms/description
+dcterms:description rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/license
+dcterms:license rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/modified
+dcterms:modified rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/publisher
+dcterms:publisher rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/source
+dcterms:source rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/title
+dcterms:title rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/vocab/vann/preferredNamespacePrefix
+vann:preferredNamespacePrefix rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/vocab/vann/preferredNamespaceUri
+vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
+
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  https://saref.etsi.org/saref4lift/hasLimitLoad
+:hasLimitLoad rdf:type owl:ObjectProperty ;
+              rdfs:domain :SmartLiftSystem ;
+              rdfs:range :Load .
+
+
+###  https://saref.etsi.org/saref4lift/hasPowerSupply
+:hasPowerSupply rdf:type owl:ObjectProperty ;
+                rdfs:domain :SmartLiftSystem ;
+                rdfs:range :PowerSupply .
+
+
+###  https://saref.etsi.org/saref4lift/hasStandardPowerSupply
+:hasStandardPowerSupply rdf:type owl:ObjectProperty ;
+                        rdfs:domain :SmartLiftSystem ;
+                        rdfs:range :PowerSupply .
+
+
+#################################################################
+#    Data properties
+#################################################################
+
+###  https://saref.etsi.org/saref4lift/hasCarStops
+:hasCarStops rdf:type owl:DatatypeProperty ;
+             rdfs:domain :SmartLiftSystem ;
+             rdfs:range xsd:integer .
+
+
+###  https://saref.etsi.org/saref4lift/hasDoorsStatus
+:hasDoorsStatus rdf:type owl:DatatypeProperty ;
+                rdfs:domain :SmartLiftSystem ;
+                rdfs:range xsd:string .
+
+
+###  https://saref.etsi.org/saref4lift/hasPositionValue
+:hasPositionValue rdf:type owl:DatatypeProperty ;
+                  rdfs:domain :PositionSignal ;
+                  rdfs:range xsd:integer .
+
+
+###  https://saref.etsi.org/saref4lift/hasStatusValue
+:hasStatusValue rdf:type owl:DatatypeProperty ;
+                rdfs:domain :StatusSignal ;
+                rdfs:range xsd:boolean .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  https://saref.etsi.org/saref4lift/CarAlarm
+:CarAlarm rdf:type owl:Class ;
+          rdfs:subClassOf :StatusSignal .
+
+
+###  https://saref.etsi.org/saref4lift/CarInUnlockingZone
+:CarInUnlockingZone rdf:type owl:Class ;
+                    rdfs:subClassOf :StatusSignal .
+
+
+###  https://saref.etsi.org/saref4lift/CarSignal
+:CarSignal rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/saref4lift/CurrentCarStop
+:CurrentCarStop rdf:type owl:Class ;
+                rdfs:subClassOf :PositionSignal .
+
+
+###  https://saref.etsi.org/saref4lift/Fault
+:Fault rdf:type owl:Class ;
+       rdfs:subClassOf :FaultSignal .
+
+
+###  https://saref.etsi.org/saref4lift/FaultSignal
+:FaultSignal rdf:type owl:Class ;
+             rdfs:subClassOf :CarSignal .
+
+
+###  https://saref.etsi.org/saref4lift/FireOperation
+:FireOperation rdf:type owl:Class ;
+               rdfs:subClassOf :StatusSignal .
+
+
+###  https://saref.etsi.org/saref4lift/InspectionOperation
+:InspectionOperation rdf:type owl:Class ;
+                     rdfs:subClassOf :StatusSignal .
+
+
+###  https://saref.etsi.org/saref4lift/Load
+:Load rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/saref4lift/MovingDownwardDirection
+:MovingDownwardDirection rdf:type owl:Class ;
+                         rdfs:subClassOf :StatusSignal .
+
+
+###  https://saref.etsi.org/saref4lift/MovingUpwardDirection
+:MovingUpwardDirection rdf:type owl:Class ;
+                       rdfs:subClassOf :StatusSignal .
+
+
+###  https://saref.etsi.org/saref4lift/OutOfService
+:OutOfService rdf:type owl:Class ;
+              rdfs:subClassOf :StatusSignal .
+
+
+###  https://saref.etsi.org/saref4lift/Overload
+:Overload rdf:type owl:Class ;
+          rdfs:subClassOf :StatusSignal .
+
+
+###  https://saref.etsi.org/saref4lift/PositionSignal
+:PositionSignal rdf:type owl:Class ;
+                rdfs:subClassOf :CarSignal .
+
+
+###  https://saref.etsi.org/saref4lift/PowerSupply
+:PowerSupply rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/saref4lift/SmartLiftSystem
+:SmartLiftSystem rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/saref4lift/StatusSignal
+:StatusSignal rdf:type owl:Class ;
+              rdfs:subClassOf :CarSignal .
+
+
+###  https://saref.etsi.org/saref4lift/TestRide
+:TestRide rdf:type owl:Class ;
+          rdfs:subClassOf :StatusSignal .
+
 
+###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
diff --git a/tests/.~lock.tests.csv# b/tests/.~lock.tests.csv#
new file mode 100644
index 0000000000000000000000000000000000000000..d79733be3a23f3d79a5ced9756e3b35d31b0e4f8
--- /dev/null
+++ b/tests/.~lock.tests.csv#
@@ -0,0 +1 @@
+,drago,drago-notebook,17.02.2021 10:33,file:///home/drago/.config/libreoffice/4;
\ No newline at end of file