diff --git a/documentation/diagrams/S4INMA Measurement example.png b/documentation/diagrams/S4INMA Measurement example.png
index 7ef042ce8dce8438b434810d43744ecfb1a35752..b40c67964956b90207edcefd4e539e2be73cfcaa 100644
Binary files a/documentation/diagrams/S4INMA Measurement example.png and b/documentation/diagrams/S4INMA Measurement example.png differ
diff --git a/documentation/diagrams/saref4inma.xml b/documentation/diagrams/saref4inma.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5660ccb77d2887094954e660cd4f7b7fabd23647
--- /dev/null
+++ b/documentation/diagrams/saref4inma.xml
@@ -0,0 +1,1821 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/Factory.ttl b/examples/Factory.ttl
new file mode 100644
index 0000000000000000000000000000000000000000..bf6e93abf32574f0457b74becc76a6148d53322d
--- /dev/null
+++ b/examples/Factory.ttl
@@ -0,0 +1,52 @@
+@prefix dc: .
+@prefix ex: .
+@prefix mod: .
+@prefix owl: .
+@prefix rdfs: .
+@prefix s4bldg: .
+@prefix s4inma: .
+@prefix saref: .
+@prefix dctype: .
+
+
+ a dctype:Dataset ;
+ dc:conformsTo ;
+ dc:description "Factory example"@en ;
+ dc:license ;
+ dc:title "Factory example"@en .
+
+ex:Eindhoven_BIC a owl:NamedIndividual,
+ s4inma:Factory ;
+ s4bldg:hasSpace ex:BIC_Site_A .
+
+ex:BIC_Site_A a owl:NamedIndividual,
+ s4inma:Site ;
+ s4bldg:hasSpace ex:Site_A_Area_19 .
+
+ex:LaserCuttingMachine a owl:Class ;
+ rdfs:label "Laser Cutting Machine" ;
+ rdfs:subClassOf s4inma:ProductionEquipment .
+
+ex:Laser_Cutting_Machine_1 a owl:NamedIndividual,
+ ex:LaserCuttingMachine .
+
+ex:Site_A_Area_19 a owl:NamedIndividual,
+ s4inma:Area ;
+ s4bldg:contains ex:Welding_WorkCenter .
+
+ex:Welding_Machine_1 a owl:NamedIndividual,
+ ex:WeldingMachine .
+
+ex:Welding_Machine_2 a owl:NamedIndividual,
+ ex:WeldingMachine .
+
+ex:Welding_WorkCenter a owl:NamedIndividual,
+ s4inma:WorkCenter ;
+ saref:consistsOf ex:Laser_Cutting_Machine_1,
+ ex:Welding_Machine_1,
+ ex:Welding_Machine_2 .
+
+ex:WeldingMachine a owl:Class ;
+ rdfs:label "Welding Machine" ;
+ rdfs:subClassOf s4inma:ProductionEquipment .
+
diff --git a/examples/Item.ttl b/examples/Item.ttl
new file mode 100644
index 0000000000000000000000000000000000000000..258855451c2acb2b48110d13f1befa4b78d9831f
--- /dev/null
+++ b/examples/Item.ttl
@@ -0,0 +1,45 @@
+@prefix dc: .
+@prefix ex: .
+@prefix mod: .
+@prefix owl: .
+@prefix rdfs: .
+@prefix s4inma: .
+@prefix saref: .
+@prefix xsd: .
+@prefix dctype: .
+
+
+ a dctype:Dataset ;
+ dc:conformsTo ;
+ dc:description "Item example"@en ;
+ dc:license ;
+ dc:title "Item example"@en .
+
+ex:Laser_Cutting_Machine_1 a owl:NamedIndividual,
+ ex:LaserCuttingMachine .
+
+ex:PhilBrau_S40_Premium_Gold_Shaver_ItemBatch392 a owl:NamedIndividual,
+ s4inma:ItemBatch ;
+ s4inma:hasIdentifier ex:nr34275874234908 .
+
+ex:Shaver10023 a owl:NamedIndividual,
+ s4inma:Item ;
+ s4inma:hasSerialNumber "nr7865654345676"^^xsd:string .
+
+ex:hilBrau_S40_Premium_Gold_Shaver_ItemCategory a owl:NamedIndividual,
+ s4inma:ItemCategory ;
+ saref:hasManufacturer "PhilBrau" ;
+ s4inma:hasIdentifier ex:nr98647656 ;
+ s4inma:hasModelNumber "nr98647656"^^xsd:string .
+
+ex:LaserCuttingMachine a owl:Class ;
+ rdfs:label "Laser Cutting Machine" ;
+ rdfs:subClassOf s4inma:ProductionEquipment .
+
+ex:nr34275874234908 a owl:NamedIndividual,
+ s4inma:ID ;
+ s4inma:hasIDValue "nr34275874234908"^^xsd:string .
+
+ex:nr98647656 a owl:NamedIndividual,
+ s4inma:ID ;
+ s4inma:hasIDValue "nr98647656"^^xsd:string .
\ No newline at end of file
diff --git a/examples/Material.ttl b/examples/Material.ttl
new file mode 100644
index 0000000000000000000000000000000000000000..f381fc031bd84b016e6a031a33da4976e163a809
--- /dev/null
+++ b/examples/Material.ttl
@@ -0,0 +1,49 @@
+@prefix dc: .
+@prefix ex: .
+@prefix mod: .
+@prefix owl: .
+@prefix rdfs: .
+@prefix s4inma: .
+@prefix saref: .
+@prefix xsd: .
+@prefix dctype: .
+
+
+
+ a dctype:Dataset ;
+ dc:conformsTo ;
+ dc:description "Material example"@en ;
+ dc:license ;
+ dc:title "Material example"@en .
+
+ex:ABS_Plastic_Role_8mm_MaterialBatch742 a owl:NamedIndividual,
+ s4inma:MaterialBatch ;
+ s4inma:hasModelNumber "ABS High-precision quality"^^xsd:string .
+
+ex:ABS_Plastic_Role_8mm_MaterialCategory a owl:NamedIndividual,
+ ex:Plastic .
+
+ex:PhilBrau_S40-S50_Generic_Body_ItemBatch3290 a owl:NamedIndividual,
+ s4inma:ItemBatch .
+
+ex:Shaver10023 a owl:NamedIndividual,
+ s4inma:Item ;
+ saref:consistsOf ex:ShaverBody9440,
+ ex:ShaverHead3002,
+ ex:StepMotor083 .
+
+ex:Torx_screws_D2mm_L8mm_MaterialBatch323 a owl:NamedIndividual,
+ s4inma:MaterialBatch .
+
+ex:Torx_screws_D2mm_L8mm_MaterialCategory a owl:NamedIndividual,
+ ex:Screw .
+
+ex:ShaverBody9440 a owl:NamedIndividual,
+ s4inma:Item .
+
+ex:ShaverHead3002 a owl:NamedIndividual,
+ s4inma:Item .
+
+ex:StepMotor083 a owl:NamedIndividual,
+ s4inma:Item .
+
diff --git a/examples/Observation.ttl b/examples/Observation.ttl
new file mode 100644
index 0000000000000000000000000000000000000000..0e902e33e88a103bf5d3ecb2d15c9c7502c0b1da
--- /dev/null
+++ b/examples/Observation.ttl
@@ -0,0 +1,67 @@
+@prefix dc: .
+@prefix ex: .
+@prefix mod: .
+@prefix om: .
+@prefix owl: .
+@prefix rdfs: .
+@prefix s4inma: .
+@prefix saref: .
+@prefix xsd: .
+@prefix dctype: .
+
+
+
+ a dctype:Dataset ;
+ dc:conformsTo ;
+ dc:description "Observation example"@en ;
+ dc:license ;
+ dc:title "Observation example"@en .
+
+
+
+ex:WeldingMachineTemperatureSensor1 a owl:NamedIndividual,
+ ex:TemperatureSensor ;
+ saref:madeExecution ex:Welding_Machine_2_Observation_W101520,
+ ex:Welding_Machine_2_Observation_W101521,
+ ex:Welding_Machine_2_Observation_W101522 .
+
+ex:Welding_Machine_2_Observation_W101523 a owl:NamedIndividual,
+ saref:Observation .
+
+om:degreeCelsius a owl:NamedIndividual .
+
+saref:FeatureOfInterest a owl:Class ;
+ rdfs:label "Feature Of Interest" .
+
+saref:Property a owl:Class ;
+ rdfs:label "Property" .
+
+s4inma:Item a owl:Class ;
+ rdfs:label "Item" ;
+ rdfs:subClassOf saref:FeatureOfInterest .
+
+ex:Shaver10023 a owl:NamedIndividual,
+ s4inma:Item .
+
+ex:TemperatureSensor a owl:Class ;
+ rdfs:label "Temperature Sensor" .
+
+ex:Welding_Machine_2_Observation_W101520 a owl:NamedIndividual,
+ saref:Observation ;
+ saref:hasTimestamp "2019-01-28T12:11:10"^^xsd:dateTime ;
+ saref:hasValue 223 ;
+ saref:isMeasuredIn om:degreeCelsius ;
+ saref:observes ex:Shaver10023,
+ ex:WeldingTemperature .
+
+ex:Welding_Machine_2_Observation_W101521 a owl:NamedIndividual,
+ saref:Observation .
+
+ex:Welding_Machine_2_Observation_W101522 a owl:NamedIndividual,
+ saref:Observation .
+
+ex:WeldingTemperature a owl:NamedIndividual,
+ saref:Property .
+
+
+
diff --git a/examples/ProductionEquipment.ttl b/examples/ProductionEquipment.ttl
new file mode 100644
index 0000000000000000000000000000000000000000..d80ca95f21dde2482bc628c6be3236c2bdff2f19
--- /dev/null
+++ b/examples/ProductionEquipment.ttl
@@ -0,0 +1,53 @@
+@prefix dc: .
+@prefix ex: .
+@prefix mod: .
+@prefix owl: .
+@prefix rdfs: .
+@prefix s4inma: .
+@prefix saref: .
+@prefix dctype: .
+
+
+ a dctype:Dataset ;
+ dc:conformsTo ;
+ dc:description "Production equipment example"@en ;
+ dc:license ;
+ dc:title "Production equipment example"@en .
+
+ex:Laser_Cutting_Machine_1 a owl:NamedIndividual,
+ ex:LaserCuttingMachine ;
+ s4inma:belongsToCategory ex:Lazor_Series_8030_ProdEquipCategory .
+
+ex:Welding_Machine_1 a owl:NamedIndividual,
+ ex:WeldingMachine ;
+ s4inma:belongsToCategory ex:WandI_Welding_Series_1000_ProdEquipCategory .
+
+ex:Welding_Machine_2 a owl:NamedIndividual,
+ ex:WeldingMachine ;
+ saref:consistsOf ex:WeldingMachineTemperatureSensor1 ;
+ saref:controlsProperty ex:WeldingTemperature ;
+ saref:hasFunction ex:JoiningFunction ;
+ s4inma:belongsToCategory ex:WandI_Welding_Series_1000_ProdEquipCategory .
+
+ex:JoiningFunction a owl:NamedIndividual,
+ s4inma:ProductionEquipmentFunction .
+
+ex:LaserCuttingMachine a owl:Class ;
+ rdfs:label "Laser Cutting Machine" ;
+ rdfs:subClassOf s4inma:ProductionEquipment .
+
+ex:Lazor_Series_8030_ProdEquipCategory a owl:NamedIndividual,
+ s4inma:ProductionEquipmentCategory .
+
+ex:WeldingMachineTemperatureSensor1 a owl:NamedIndividual .
+
+ex:WeldingTemperature a owl:NamedIndividual,
+ saref:Property .
+
+ex:WandI_Welding_Series_1000_ProdEquipCategory a owl:NamedIndividual,
+ s4inma:ProductionEquipmentCategory .
+
+ex:WeldingMachine a owl:Class ;
+ rdfs:label "Welding Machine" ;
+ rdfs:subClassOf s4inma:ProductionEquipment .
+