diff --git a/examples/demandDrivenProfile.ttl b/examples/demandDrivenProfile.ttl
index 53c6e80daeb91a1b08bf1c05067caff4e9dc5f0e..ae95888b08de814c097eece6bc46a82d56674079 100644
--- a/examples/demandDrivenProfile.ttl
+++ b/examples/demandDrivenProfile.ttl
@@ -53,18 +53,18 @@
 
 :NumberRange_1
   a s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_1 ; 
-  s4ener:startOfRange :Measurement_2 ; 
+  s4ener:endOfRange :Observation_1 ; 
+  s4ener:startOfRange :Observation_2 ; 
   rdfs:label "Number range 1" ;
 . 
-:Measurement_1
-  a saref:Measurement ;
+:Observation_1
+  a saref:Observation ;
   saref:hasValue "2500"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ; 
 .
-:Measurement_2
-  a saref:Measurement ;
+:Observation_2
+  a saref:Observation ;
   saref:hasValue "2000"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
@@ -78,11 +78,11 @@
   rdfs:label "off" ;
   s4ener:hasPowerRange :PowerRange_1 ;
   s4ener:hasSupplyRange :NumberRange_2 ;
-  s4ener:hasRunningCosts :Measurement_7 ;
+  s4ener:hasRunningCosts :Observation_7 ;
   s4ener:abnormalConditionOnly "false"^^xsd:boolean ;
 .
 
-:Measurement_7 rdf:type saref:Measurement ;
+:Observation_7 rdf:type saref:Observation ;
   saref:hasValue "0"^^xsd:decimal ;
   saref:relatesToProperty :Price_1 ;
   saref:isMeasuredIn <https://spec.edmcouncil.org/fibo/ontology/FND/Accounting/ISO4217-CurrencyCodes/EUR> ;
@@ -94,18 +94,18 @@
 .
 
 :NumberRange_3 rdf:type s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_5 ;
-  s4ener:startOfRange :Measurement_6 ;
+  s4ener:endOfRange :Observation_5 ;
+  s4ener:startOfRange :Observation_6 ;
   rdfs:label "Number range 3" ;
 .
 
-:Measurement_5 rdf:type saref:Measurement ;
+:Observation_5 rdf:type saref:Observation ;
   saref:hasValue "0"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ; 
 .
 
-:Measurement_6 rdf:type saref:Measurement ;
+:Observation_6 rdf:type saref:Observation ;
   saref:hasValue "0"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ; 
@@ -113,18 +113,18 @@
 
 :NumberRange_2 rdf:type s4ener:NumberRange ;
   rdfs:label "Supply range";
-  s4ener:endOfRange :Measurement_3 ; 
-  s4ener:startOfRange :Measurement_4 ; 
+  s4ener:endOfRange :Observation_3 ; 
+  s4ener:startOfRange :Observation_4 ; 
   rdfs:label "Number range 2" ;
 .
 
-:Measurement_3 rdf:type saref:Measurement ;
+:Observation_3 rdf:type saref:Observation ;
   saref:hasValue "0"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ; 
 .
 
-:Measurement_4 rdf:type saref:Measurement ;
+:Observation_4 rdf:type saref:Observation ;
   saref:hasValue "0"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ; 
diff --git a/examples/fillRateProfile.ttl b/examples/fillRateProfile.ttl
index 977ec18cf81aefa9ef6efb157e177bd684f4d71c..dadfc3ae58ed3cf86a545a41408e63bf5fd9b0f3 100644
--- a/examples/fillRateProfile.ttl
+++ b/examples/fillRateProfile.ttl
@@ -37,7 +37,7 @@
 .
 
 :PresentFillLevel_1
-  a saref:Measurement ;
+  a saref:Observation ;
   saref:hasValue "60"^^xsd:decimal ;
   saref:isMeasuredIn unit:PERCENT ;
   saref:relatesToProperty :Energy_1 ;
@@ -85,49 +85,49 @@
 :LeakageBehaviourElement_1
   a s4ener:LeakageBehaviourElement ;
   s4ener:hasFillLevelRange :NumberRange_1 ;
-  s4ener:leakageRate :DataPoint_11 ; #"10"^^xsd:decimal ; # todo: make measurement
+  s4ener:leakageRate :DataPoint_11 ; #"10"^^xsd:decimal ; # todo: make Observation
   rdfs:label "Leakage behaviour element 1" ;
 .
 :DataPoint_11 rdf:type s4ener:DataPoint . # todo: extend
 :LeakageBehaviourElement_2
   a s4ener:LeakageBehaviourElement ;
   s4ener:hasFillLevelRange :NumberRange_2 ;
-  s4ener:leakageRate :DataPoint_12 ; # "20"^^xsd:decimal ; # todo: make measurement
+  s4ener:leakageRate :DataPoint_12 ; # "20"^^xsd:decimal ; # todo: make Observation
   rdfs:label "Leakage behaviour element 2" ;
 .
 :DataPoint_12 rdf:type s4ener:DataPoint .
 :NumberRange_1
   a s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_1 ; #"25"^^xsd:decimal ;
-  s4ener:startOfRange :Measurement_2 ; #"15"^^xsd:decimal ;
+  s4ener:endOfRange :Observation_1 ; #"25"^^xsd:decimal ;
+  s4ener:startOfRange :Observation_2 ; #"15"^^xsd:decimal ;
   rdfs:label "Number range 1" ;
 .
-:Measurement_1
-  a saref:Measurement ;
+:Observation_1
+  a saref:Observation ;
   saref:relatesToProperty :Energy_1 ;
   saref:hasValue "25"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_2
-  a saref:Measurement ;
+:Observation_2
+  a saref:Observation ;
   saref:relatesToProperty :Energy_1 ;
   saref:hasValue "15"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
 .
 :NumberRange_2
   a s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_3 ; #"35"^^xsd:decimal ;
-  s4ener:startOfRange :Measurement_4 ; #"25"^^xsd:decimal ;
+  s4ener:endOfRange :Observation_3 ; #"35"^^xsd:decimal ;
+  s4ener:startOfRange :Observation_4 ; #"25"^^xsd:decimal ;
   rdfs:label "Number range 2" ;
 .
-:Measurement_3
-  a saref:Measurement ;
+:Observation_3
+  a saref:Observation ;
   saref:relatesToProperty :Energy_1 ;
   saref:hasValue "35"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_4
-  a saref:Measurement ;
+:Observation_4
+  a saref:Observation ;
   saref:relatesToProperty :Energy_1 ;
   saref:hasValue "25"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
diff --git a/examples/flexOfferExample.ttl b/examples/flexOfferExample.ttl
new file mode 100644
index 0000000000000000000000000000000000000000..c99cb81ba03f7dc554ff7bffb70de506fbb3e337
--- /dev/null
+++ b/examples/flexOfferExample.ttl
@@ -0,0 +1,721 @@
+@prefix : <https://saref.etsi.org/saref4ener/v2.1.1/example/flexOfferExample/>.
+@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 dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix s4ener: <https://saref.etsi.org/saref4ener/> .
+@prefix saref: <https://saref.etsi.org/core/> .
+
+@base <https://saref.etsi.org/saref4ener/v2.1.1/example/flexOfferExample/> .
+
+<https://saref.etsi.org/saref4ener/v2.1.1/example/flexOfferExample#> 
+  rdf:type dctype:Dataset ;
+  dctype:conformsTo <https://saref.etsi.org/saref4ener/v2.1.1/> ;
+  dcterms:title "SAREF4ENER Flexibility Offer Examples"@en ;
+  dcterms:conformsTo saref:, s4ener: ;
+  dcterms:abstract "This example file exemplifies how to model a Flexibility Offer in the SAREF4ENER extension." ;
+  dcterms:description "This example file exemplifies how to model a Flexibility Offer in the SAREF4ENER extension." ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+.
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  https://saref.etsi.org/saref4tsrs/containsQuantity
+<https://saref.etsi.org/saref4tsrs/containsQuantity> rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4tsrs/hasCreationTime
+<https://saref.etsi.org/saref4tsrs/hasCreationTime> rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4tsrs/hasDataPoint
+<https://saref.etsi.org/saref4tsrs/hasDataPoint> rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4tsrs/hasEffectivePeriod
+<https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4tsrs/hasTemporalResolution
+<https://saref.etsi.org/saref4tsrs/hasTemporalResolution> rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4tsrs/hasUpdateRate
+<https://saref.etsi.org/saref4tsrs/hasUpdateRate> rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4tsrs/hasUsage
+<https://saref.etsi.org/saref4tsrs/hasUsage> rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4tsrs/producedBy
+<https://saref.etsi.org/saref4tsrs/producedBy> rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4flex/includes
+<https://saref.etsi.org/saref4flex/includes> rdf:type owl:ObjectProperty .
+
+
+###  http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation
+<http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> rdf:type owl:ObjectProperty .
+
+
+###  http://ontology.tno.nl/interconnect/topology#isToplogicalAssociationOf
+<http://ontology.tno.nl/interconnect/topology#isToplogicalAssociationOf> rdf:type owl:ObjectProperty .
+
+
+###  http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit
+<http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> rdf:type owl:ObjectProperty .
+
+
+###  http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue
+<http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> rdf:type owl:ObjectProperty .
+
+
+###  http://www.w3.org/2006/time#hasBeginning
+<http://www.w3.org/2006/time#hasBeginning> rdf:type owl:ObjectProperty .
+
+
+###  http://www.w3.org/2006/time#hasEnd
+<http://www.w3.org/2006/time#hasEnd> rdf:type owl:ObjectProperty .
+
+
+###  http://www.w3.org/2006/time#unitType
+<http://www.w3.org/2006/time#unitType> rdf:type owl:ObjectProperty .
+
+
+#################################################################
+#    Data properties
+#################################################################
+
+###  http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue
+<http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> rdf:type owl:DatatypeProperty .
+
+
+###  http://www.w3.org/2006/time#hours
+<http://www.w3.org/2006/time#hours> rdf:type owl:DatatypeProperty .
+
+
+###  http://www.w3.org/2006/time#inXSDDateTimeStamp
+<http://www.w3.org/2006/time#inXSDDateTimeStamp> rdf:type owl:DatatypeProperty .
+
+
+###  http://www.w3.org/2006/time#minutes
+<http://www.w3.org/2006/time#minutes> rdf:type owl:DatatypeProperty .
+
+
+###  http://www.w3.org/2006/time#numericDuration
+<http://www.w3.org/2006/time#numericDuration> rdf:type owl:DatatypeProperty .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  https://saref.etsi.org/saref4tsrs/DataPoint
+<https://saref.etsi.org/saref4tsrs/DataPoint> rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/saref4tsrs/TimeSeries
+<https://saref.etsi.org/saref4tsrs/TimeSeries> rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/saref4flex/FlexOffer
+<https://saref.etsi.org/saref4flex/FlexOffer> rdf:type owl:Class .
+
+
+###  http://ontology.tno.nl/interconnect/topology#TopologicalLocation
+<http://ontology.tno.nl/interconnect/topology#TopologicalLocation> rdf:type owl:Class .
+
+
+###  http://ontology.tno.nl/interconnect/units#ActivePower
+<http://ontology.tno.nl/interconnect/units#ActivePower> rdf:type owl:Class ;
+                                                        rdfs:subClassOf <http://www.ontology-of-units-of-measure.org/resource/om-2/Quantity> .
+
+
+###  http://ontology.tno.nl/interconnect/units#AmountOfMoneyPerEnergy
+<http://ontology.tno.nl/interconnect/units#AmountOfMoneyPerEnergy> rdf:type owl:Class .
+
+
+###  http://www.ontology-of-units-of-measure.org/resource/om-2/Measure
+<http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> rdf:type owl:Class .
+
+
+###  http://www.ontology-of-units-of-measure.org/resource/om-2/Quantity
+<http://www.ontology-of-units-of-measure.org/resource/om-2/Quantity> rdf:type owl:Class .
+
+
+###  http://www.w3.org/2006/time#Duration
+<http://www.w3.org/2006/time#Duration> rdf:type owl:Class .
+
+
+###  http://www.w3.org/2006/time#DurationDescription
+<http://www.w3.org/2006/time#DurationDescription> rdf:type owl:Class .
+
+
+###  http://www.w3.org/2006/time#Instant
+<http://www.w3.org/2006/time#Instant> rdf:type owl:Class .
+
+
+###  http://www.w3.org/2006/time#Interval
+<http://www.w3.org/2006/time#Interval> rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/core/Device
+<https://saref.etsi.org/core/Device> rdf:type owl:Class .
+
+
+#################################################################
+#    Individuals
+#################################################################
+
+###  https://saref.etsi.org/saref4tsrs/baseLine
+<https://saref.etsi.org/saref4tsrs/baseLine> rdf:type owl:NamedIndividual .
+
+
+###  https://saref.etsi.org/saref4tsrs/lowerLimit
+<https://saref.etsi.org/saref4tsrs/lowerLimit> rdf:type owl:NamedIndividual .
+
+
+###  https://saref.etsi.org/saref4tsrs/upperLimit
+<https://saref.etsi.org/saref4tsrs/upperLimit> rdf:type owl:NamedIndividual .
+
+
+###  http://ontology.tno.nl/interconnect/units#euroPerKilowattHour
+<http://ontology.tno.nl/interconnect/units#euroPerKilowattHour> rdf:type owl:NamedIndividual .
+
+
+###  http://ontology.tno.nl/interconnect/units#price1qv
+<http://ontology.tno.nl/interconnect/units#price1qv> rdf:type owl:NamedIndividual ,
+                                                              <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                                     <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://ontology.tno.nl/interconnect/units#euroPerKilowattHour> ;
+                                                     <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> 2 .
+
+
+###  http://www.example.org/asset1
+<http://www.example.org/asset1> rdf:type owl:NamedIndividual ,
+                                         <https://saref.etsi.org/core/Device> ;
+                                <http://ontology.tno.nl/interconnect/topology#isToplogicalAssociationOf> <http://www.example.org/asset1> .
+
+
+###  http://www.example.org/dpbs1beg
+<http://www.example.org/dpbs1beg> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:00:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpbs1qv
+<http://www.example.org/dpbs1qv> rdf:type owl:NamedIndividual ,
+                                          <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "2000.0"^^xsd:double .
+
+
+###  http://www.example.org/dpbs2beg
+<http://www.example.org/dpbs2beg> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:15:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpbs2end
+<http://www.example.org/dpbs2end> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpbs2q> ;
+                                  <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                  <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/baseLine> ;
+                                  <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                  <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:30:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpbs2ep
+<http://www.example.org/dpbs2ep> rdf:type owl:NamedIndividual ,
+                                          <http://www.w3.org/2006/time#Interval> ;
+                                 <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpbs2beg> ;
+                                 <http://www.w3.org/2006/time#hasEnd> <http://www.example.org/dpbs2end> .
+
+
+###  http://www.example.org/dpbs2q
+<http://www.example.org/dpbs2q> rdf:type owl:NamedIndividual ,
+                                         <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpbs2qv> .
+
+
+###  http://www.example.org/dpbs2qv
+<http://www.example.org/dpbs2qv> rdf:type owl:NamedIndividual ,
+                                          <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "2500.0"^^xsd:double .
+
+
+###  http://www.example.org/dpbs96beg
+<http://www.example.org/dpbs96beg> rdf:type owl:NamedIndividual ,
+                                            <http://www.w3.org/2006/time#Instant> ;
+                                   <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:23:45Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpbs96end
+<http://www.example.org/dpbs96end> rdf:type owl:NamedIndividual ,
+                                            <http://www.w3.org/2006/time#Instant> ;
+                                   <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-31T00:00:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpbs96ep
+<http://www.example.org/dpbs96ep> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Interval> ;
+                                  <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpbs96beg> ;
+                                  <http://www.w3.org/2006/time#hasEnd> <http://www.example.org/dpbs96end> .
+
+
+###  http://www.example.org/dpbs96q
+<http://www.example.org/dpbs96q> rdf:type owl:NamedIndividual ,
+                                          <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpbs96qv> .
+
+
+###  http://www.example.org/dpbs96qv
+<http://www.example.org/dpbs96qv> rdf:type owl:NamedIndividual ,
+                                           <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                  <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                  <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "2200.0"^^xsd:double .
+
+
+###  http://www.example.org/dpll1
+<http://www.example.org/dpll1> rdf:type owl:NamedIndividual ,
+                                        <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                               <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpll1q> ;
+                               <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <http://www.example.org/dpll1ep> ;
+                               <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                               <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/lowerLimit> ;
+                               <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                               <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  http://www.example.org/dpll1beg
+<http://www.example.org/dpll1beg> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:00:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpll1end
+<http://www.example.org/dpll1end> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:15:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpll1ep
+<http://www.example.org/dpll1ep> rdf:type owl:NamedIndividual ,
+                                          <http://www.w3.org/2006/time#Interval> ;
+                                 <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpll1beg> ;
+                                 <http://www.w3.org/2006/time#hasEnd> <http://www.example.org/dpll1end> .
+
+
+###  http://www.example.org/dpll1q
+<http://www.example.org/dpll1q> rdf:type owl:NamedIndividual ,
+                                         <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpll1qv> .
+
+
+###  http://www.example.org/dpll1qv
+<http://www.example.org/dpll1qv> rdf:type owl:NamedIndividual ,
+                                          <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "1600.0"^^xsd:double .
+
+
+###  http://www.example.org/dpll2
+<http://www.example.org/dpll2> rdf:type owl:NamedIndividual ,
+                                        <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                               <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpll2q> ;
+                               <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <http://www.example.org/dpll2ep> ;
+                               <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                               <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/lowerLimit> ;
+                               <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                               <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  http://www.example.org/dpll2beg
+<http://www.example.org/dpll2beg> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:15:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpll2end
+<http://www.example.org/dpll2end> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:30:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpll2ep
+<http://www.example.org/dpll2ep> rdf:type owl:NamedIndividual ,
+                                          <http://www.w3.org/2006/time#Interval> ;
+                                 <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpll2beg> ;
+                                 <http://www.w3.org/2006/time#hasEnd> <http://www.example.org/dpll2end> .
+
+
+###  http://www.example.org/dpll2q
+<http://www.example.org/dpll2q> rdf:type owl:NamedIndividual ,
+                                         <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpll2qv> .
+
+
+###  http://www.example.org/dpll2qv
+<http://www.example.org/dpll2qv> rdf:type owl:NamedIndividual ,
+                                          <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "2100.0"^^xsd:double .
+
+
+###  http://www.example.org/dpll96
+<http://www.example.org/dpll96> rdf:type owl:NamedIndividual ,
+                                         <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                                <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpll96q> ;
+                                <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <http://www.example.org/dpll96ep> ;
+                                <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/lowerLimit> ;
+                                <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  http://www.example.org/dpll96beg
+<http://www.example.org/dpll96beg> rdf:type owl:NamedIndividual ,
+                                            <http://www.w3.org/2006/time#Instant> ;
+                                   <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:23:45Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpll96end
+<http://www.example.org/dpll96end> rdf:type owl:NamedIndividual ,
+                                            <http://www.w3.org/2006/time#Instant> ;
+                                   <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-31T00:00:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpll96ep
+<http://www.example.org/dpll96ep> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Interval> ;
+                                  <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpll96beg> ;
+                                  <http://www.w3.org/2006/time#hasEnd> <http://www.example.org/dpll96end> .
+
+
+###  http://www.example.org/dpll96q
+<http://www.example.org/dpll96q> rdf:type owl:NamedIndividual ,
+                                          <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpll96qv> .
+
+
+###  http://www.example.org/dpll96qv
+<http://www.example.org/dpll96qv> rdf:type owl:NamedIndividual ,
+                                           <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                  <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                  <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "1800.0"^^xsd:double .
+
+
+###  http://www.example.org/dpul1
+<http://www.example.org/dpul1> rdf:type owl:NamedIndividual ,
+                                        <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                               <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpul1q> ;
+                               <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <http://www.example.org/dpul1ep> ;
+                               <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                               <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/upperLimit> ;
+                               <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                               <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  http://www.example.org/dpul1beg
+<http://www.example.org/dpul1beg> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:00:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpul1end
+<http://www.example.org/dpul1end> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:15:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpul1ep
+<http://www.example.org/dpul1ep> rdf:type owl:NamedIndividual ,
+                                          <http://www.w3.org/2006/time#Interval> ;
+                                 <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpul1beg> ;
+                                 <http://www.w3.org/2006/time#hasEnd> <http://www.example.org/dpul1end> .
+
+
+###  http://www.example.org/dpul1q
+<http://www.example.org/dpul1q> rdf:type owl:NamedIndividual ,
+                                         <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpul1qv> .
+
+
+###  http://www.example.org/dpul1qv
+<http://www.example.org/dpul1qv> rdf:type owl:NamedIndividual ,
+                                          <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "2700.0"^^xsd:double .
+
+
+###  http://www.example.org/dpul2
+<http://www.example.org/dpul2> rdf:type owl:NamedIndividual ,
+                                        <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                               <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpul2q> ;
+                               <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                               <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/upperLimit> ;
+                               <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                               <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  http://www.example.org/dpul2beg
+<http://www.example.org/dpul2beg> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:15:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpul2end
+<http://www.example.org/dpul2end> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Instant> ;
+                                  <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:30:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpul2ep
+<http://www.example.org/dpul2ep> rdf:type owl:NamedIndividual ,
+                                          <http://www.w3.org/2006/time#Interval> ;
+                                 <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpul2beg> ;
+                                 <http://www.w3.org/2006/time#hasEnd> <http://www.example.org/dpul2end> .
+
+
+###  http://www.example.org/dpul2q
+<http://www.example.org/dpul2q> rdf:type owl:NamedIndividual ,
+                                         <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpul2qv> .
+
+
+###  http://www.example.org/dpul2qv
+<http://www.example.org/dpul2qv> rdf:type owl:NamedIndividual ,
+                                          <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "3200.0"^^xsd:double .
+
+
+###  http://www.example.org/dpul96
+<http://www.example.org/dpul96> rdf:type owl:NamedIndividual ,
+                                         <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                                <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpul96q> ;
+                                <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <http://www.example.org/dpul96ep> ;
+                                <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/upperLimit> ;
+                                <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  http://www.example.org/dpul96beg
+<http://www.example.org/dpul96beg> rdf:type owl:NamedIndividual ,
+                                            <http://www.w3.org/2006/time#Instant> ;
+                                   <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:23:45Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpul96end
+<http://www.example.org/dpul96end> rdf:type owl:NamedIndividual ,
+                                            <http://www.w3.org/2006/time#Instant> ;
+                                   <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-31T00:00:00Z"^^xsd:dateTime .
+
+
+###  http://www.example.org/dpul96ep
+<http://www.example.org/dpul96ep> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Interval> ;
+                                  <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpul96beg> ;
+                                  <http://www.w3.org/2006/time#hasEnd> <http://www.example.org/dpul96end> .
+
+
+###  http://www.example.org/dpul96q
+<http://www.example.org/dpul96q> rdf:type owl:NamedIndividual ,
+                                          <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpul96qv> .
+
+
+###  http://www.example.org/dpul96qv
+<http://www.example.org/dpul96qv> rdf:type owl:NamedIndividual ,
+                                           <http://www.ontology-of-units-of-measure.org/resource/om-2/Measure> ;
+                                  <http://www.ontology-of-units-of-measure.org/resource/om-2/hasUnit> <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
+                                  <http://www.ontology-of-units-of-measure.org/resource/om-2/hasNumericalValue> "2900.0"^^xsd:double .
+
+
+###  http://www.example.org/price1q
+<http://www.example.org/price1q> rdf:type owl:NamedIndividual ,
+                                          <http://ontology.tno.nl/interconnect/units#AmountOfMoneyPerEnergy> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://ontology.tno.nl/interconnect/units#price1qv> .
+
+
+###  http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt
+<http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> rdf:type owl:NamedIndividual .
+
+
+###  http://www.w3.org/2006/time#unitHour
+<http://www.w3.org/2006/time#unitHour> rdf:type owl:NamedIndividual .
+
+
+###  http://www.w3.org/2006/time#unitMinute
+<http://www.w3.org/2006/time#unitMinute> rdf:type owl:NamedIndividual .
+
+
+###  https://ww.example.org/#Cybergrid
+<https://ww.example.org/#Cybergrid> rdf:type owl:NamedIndividual ,
+                                             <https://saref.etsi.org/core/Device> .
+
+
+###  https://ww.example.org/#UpdateRate1
+<https://ww.example.org/#UpdateRate1> rdf:type owl:NamedIndividual ,
+                                               <http://www.w3.org/2006/time#DurationDescription> ;
+                                      <http://www.w3.org/2006/time#hours> 1 .
+
+
+###  https://ww.example.org/#baseline1
+<https://ww.example.org/#baseline1> rdf:type owl:NamedIndividual ,
+                                             <https://saref.etsi.org/saref4tsrs/TimeSeries> ;
+                                    <https://saref.etsi.org/saref4tsrs/hasDataPoint> <https://ww.example.org/#dpbs1> ,
+                                                                                                 <https://ww.example.org/#dpbs2> ,
+                                                                                                 <https://ww.example.org/#dpbs96> ;
+                                    <https://saref.etsi.org/saref4tsrs/hasTemporalResolution> <https://ww.example.org/#temporalresolution1> ;
+                                    <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                    <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/baseLine> ;
+                                    <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                    <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  https://ww.example.org/#beg1
+<https://ww.example.org/#beg1> rdf:type owl:NamedIndividual ,
+                                        <http://www.w3.org/2006/time#Instant> ;
+                               <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:00:00Z"^^xsd:dateTime .
+
+
+###  https://ww.example.org/#creationtime1
+<https://ww.example.org/#creationtime1> rdf:type owl:NamedIndividual ,
+                                                 <http://www.w3.org/2006/time#Instant> ;
+                                        <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-29T15:00:00Z"^^xsd:dateTime .
+
+
+###  https://ww.example.org/#dpbs1
+<https://ww.example.org/#dpbs1> rdf:type owl:NamedIndividual ,
+                                         <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                                <https://saref.etsi.org/saref4tsrs/containsQuantity> <https://ww.example.org/#dpbs1q> ;
+                                <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <https://ww.example.org/#dpbs1ep> ;
+                                <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/baseLine> ;
+                                <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  https://ww.example.org/#dpbs1end
+<https://ww.example.org/#dpbs1end> rdf:type owl:NamedIndividual ,
+                                            <http://www.w3.org/2006/time#Instant> ;
+                                   <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-30T00:15:00Z"^^xsd:dateTimeStamp .
+
+
+###  https://ww.example.org/#dpbs1ep
+<https://ww.example.org/#dpbs1ep> rdf:type owl:NamedIndividual ,
+                                           <http://www.w3.org/2006/time#Interval> ;
+                                  <http://www.w3.org/2006/time#hasBeginning> <http://www.example.org/dpbs1beg> ;
+                                  <http://www.w3.org/2006/time#hasEnd> <https://ww.example.org/#dpbs1end> .
+
+
+###  https://ww.example.org/#dpbs1q
+<https://ww.example.org/#dpbs1q> rdf:type owl:NamedIndividual ,
+                                          <http://ontology.tno.nl/interconnect/units#ActivePower> ;
+                                 <http://www.ontology-of-units-of-measure.org/resource/om-2/hasValue> <http://www.example.org/dpbs1qv> .
+
+
+###  https://ww.example.org/#dpbs2
+<https://ww.example.org/#dpbs2> rdf:type owl:NamedIndividual ,
+                                         <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                                <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpbs2q> ;
+                                <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <http://www.example.org/dpbs2ep> ;
+                                <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/baseLine> ;
+                                <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  https://ww.example.org/#dpbs96
+<https://ww.example.org/#dpbs96> rdf:type owl:NamedIndividual ,
+                                          <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                                 <https://saref.etsi.org/saref4tsrs/containsQuantity> <http://www.example.org/dpbs96q> ;
+                                 <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <http://www.example.org/dpbs96ep> ;
+                                 <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                 <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/baseLine> ;
+                                 <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                 <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  https://ww.example.org/#durationDescription1
+<https://ww.example.org/#durationDescription1> rdf:type owl:NamedIndividual ,
+                                                        <http://www.w3.org/2006/time#DurationDescription> .
+
+
+###  https://ww.example.org/#effectivePeriod1
+<https://ww.example.org/#effectivePeriod1> rdf:type owl:NamedIndividual ,
+                                                    <http://www.w3.org/2006/time#Interval> ;
+                                           <http://www.w3.org/2006/time#hasBeginning> <https://ww.example.org/#beg1> ;
+                                           <http://www.w3.org/2006/time#hasEnd> <https://ww.example.org/#end1> .
+
+
+###  https://ww.example.org/#end1
+<https://ww.example.org/#end1> rdf:type owl:NamedIndividual ,
+                                        <http://www.w3.org/2006/time#Instant> ;
+                               <http://www.w3.org/2006/time#inXSDDateTimeStamp> "2021-08-31T00:00:00Z"^^xsd:dateTime .
+
+
+###  https://ww.example.org/#lowerlimit1
+<https://ww.example.org/#lowerlimit1> rdf:type owl:NamedIndividual ,
+                                               <https://saref.etsi.org/saref4tsrs/TimeSeries> ;
+                                      <https://saref.etsi.org/saref4tsrs/hasDataPoint> <http://www.example.org/dpll1> ,
+                                                                                                   <http://www.example.org/dpll2> ,
+                                                                                                   <http://www.example.org/dpll96> ;
+                                      <https://saref.etsi.org/saref4tsrs/hasTemporalResolution> <https://ww.example.org/#temporalresolution1> ;
+                                      <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                      <https://saref.etsi.org/saref4tsrs/hasUsage> <https://saref.etsi.org/saref4tsrs/lowerLimit> ;
+                                      <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                      <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  https://ww.example.org/#offer1
+<https://ww.example.org/#offer1> rdf:type owl:NamedIndividual ,
+                                          <https://saref.etsi.org/saref4flex/FlexOffer> ;
+                                 <https://saref.etsi.org/saref4tsrs/hasCreationTime> <https://ww.example.org/#creationtime1> ;
+                                 <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <https://ww.example.org/#effectivePeriod1> ;
+                                 <https://saref.etsi.org/saref4flex/includes> <https://ww.example.org/#baseline1> ,
+                                                                                            <https://ww.example.org/#lowerlimit1> ,
+                                                                                            <https://ww.example.org/#price1> .
+
+
+###  https://ww.example.org/#price1
+<https://ww.example.org/#price1> rdf:type owl:NamedIndividual ,
+                                          <https://saref.etsi.org/saref4tsrs/DataPoint> ;
+                                 <https://saref.etsi.org/saref4tsrs/hasEffectivePeriod> <https://ww.example.org/#effectivePeriod1> ;
+                                 <https://saref.etsi.org/saref4tsrs/hasUpdateRate> <https://ww.example.org/#ur1> ;
+                                 <https://saref.etsi.org/saref4tsrs/producedBy> <https://ww.example.org/#Cybergrid> ;
+                                 <http://ontology.tno.nl/interconnect/topology#hasTopologicalAssociation> <https://ww.example.org/#tplg_loc1> .
+
+
+###  https://ww.example.org/#temporalresolution1
+<https://ww.example.org/#temporalresolution1> rdf:type owl:NamedIndividual ,
+                                                       <http://www.w3.org/2006/time#DurationDescription> ;
+                                              <http://www.w3.org/2006/time#minutes> 15 .
+
+
+###  https://ww.example.org/#tplg_loc1
+<https://ww.example.org/#tplg_loc1> rdf:type owl:NamedIndividual ,
+                                             <http://ontology.tno.nl/interconnect/topology#TopologicalLocation> .
+
+
+###  https://ww.example.org/#ur1
+<https://ww.example.org/#ur1> rdf:type owl:NamedIndividual ,
+                                       <http://www.w3.org/2006/time#DurationDescription> ;
+                              <http://www.w3.org/2006/time#hours> 1 .
+
+
+###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
+
+dctype:conformsTo a owl:AnnotationProperty .
+dcterms:abstract a owl:AnnotationProperty .
\ No newline at end of file
diff --git a/examples/heatingSystemPowerProfile.ttl b/examples/heatingSystemPowerProfile.ttl
index 01bf5b7dce50cbdc4ad9e2c4f2faa51e9dfdc3db..053ad971104b16863780a46065f140fc95cbf489 100644
--- a/examples/heatingSystemPowerProfile.ttl
+++ b/examples/heatingSystemPowerProfile.ttl
@@ -103,18 +103,18 @@ ex:HeatingSystem
   saref:accomplishes ex:Heating ;
   saref:hasDescription "Heating system HS0001 is an example of how to instantiate a heating system with hot water tank using SAREF4ENER"^^xsd:string ;
 .
-ex:Measurement_1
-  rdf:type saref:Measurement ;
-  rdfs:label "Measurement 1"^^xsd:string ;
+ex:Observation_1
+  rdf:type saref:Observation ;
+  rdfs:label "Observation 1"^^xsd:string ;
   saref:hasValue "0.2"^^xsd:string ;
-  saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt_hour> ;
+  saref:isMeasuredIn <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt_hour> ;
   saref:relatesToProperty ex:Energy_1 ;
 .
-ex:Measurement_2
-  rdf:type saref:Measurement ;
-  rdfs:label "Measurement 2"^^xsd:string ;
+ex:Observation_2
+  rdf:type saref:Observation ;
+  rdfs:label "Observation 2"^^xsd:string ;
   saref:hasValue "0.2"^^xsd:string ;
-  saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt> ;
+  saref:isMeasuredIn <http://www.ontology-of-units-of-measure.org/resource/om-2/kilowatt> ;
   saref:relatesToProperty ex:Power_1 ;
 .
 ex:PowerProfile-1-HS0001
@@ -168,7 +168,7 @@ ex:Slot-1-HS0001
   rdf:type s4ener:Slot ;
   rdfs:label "Slot 1 HS0001"^^xsd:string ;
   s4ener:belongsTo ex:PowerSequence-1-HS0001 ;
-  s4ener:hasSlotValue ex:Measurement_1, ex:Measurement_2 ;
+  s4ener:hasSlotValue ex:Observation_1, ex:Observation_2 ;
   s4ener:slotNumber "1"^^xsd:unsignedInt ;
 .
 ex:Slot-2-HS0001
diff --git a/examples/operationModeProfile.ttl b/examples/operationModeProfile.ttl
index 27d827c079cc00e753854f86e33f82a1f4bc0c33..8b706a79e8a29f8bcd05b95129e33900e8ea5bd1 100644
--- a/examples/operationModeProfile.ttl
+++ b/examples/operationModeProfile.ttl
@@ -153,42 +153,42 @@
   rdfs:label "Number range 3" ;
 .
 :StartOfRange_1 
-  a saref:Measurement ;
+  a saref:Observation ;
   saref:isMeasuredIn om:watt ;
   saref:relatesToProperty :Power_1 ;
   saref:hasValue "0"^^xsd:decimal ;
 .
 
 :StartOfRange_2 
-  a saref:Measurement ;
+  a saref:Observation ;
   saref:isMeasuredIn om:watt ;
   saref:relatesToProperty :Power_1 ;
   saref:hasValue "-3000"^^xsd:decimal ;
 .
 
 :StartOfRange_3 
-  a saref:Measurement ;
+  a saref:Observation ;
   saref:isMeasuredIn om:watt ;
   saref:relatesToProperty :Power_1 ;
   saref:hasValue "-2500"^^xsd:decimal ;
 .
 
 :EndOfRange_1
-  a saref:Measurement ;
+  a saref:Observation ;
   saref:isMeasuredIn om:watt ;
   saref:relatesToProperty :Power_1 ;
   saref:hasValue "0"^^xsd:decimal ;
 .
 
 :EndOfRange_2 
-  a saref:Measurement ;
+  a saref:Observation ;
   saref:isMeasuredIn om:watt ;
   saref:relatesToProperty :Power_1 ;
   saref:hasValue "-3000"^^xsd:decimal ;
 .
 
 :EndOfRange_3
-  a saref:Measurement ;
+  a saref:Observation ;
   saref:isMeasuredIn om:watt ;
   saref:relatesToProperty :Power_1 ;
   saref:hasValue "-1500"^^xsd:decimal ;
diff --git a/examples/powerEnvelopeProfile.ttl b/examples/powerEnvelopeProfile.ttl
index 6e67d20c62a980f600a9c6630ab60657aa270a27..02dacc0d63dc96cc2043d07297bb259d28df8e34 100644
--- a/examples/powerEnvelopeProfile.ttl
+++ b/examples/powerEnvelopeProfile.ttl
@@ -52,7 +52,7 @@
   rdfs:label "Allowed limit range 4" ;
 .
 :DataPoint_1
-  a s4ener:DataPoint, saref:Measurement ;
+  a s4ener:DataPoint, saref:Observation ;
   rdfs:label "Data point 1" ;
   saref:hasTimestamp "2023-01-29T10:00:00Z"^^xsd:dateTimeStamp ;
   saref:hasValue "100" ;
@@ -60,7 +60,7 @@
   saref:isMeasuredIn om:kilowatt ;
 .
 :DataPoint_2
-  a s4ener:DataPoint, saref:Measurement ;
+  a s4ener:DataPoint, saref:Observation ;
   rdfs:label "Data point 2" ;
   saref:hasTimestamp "2023-01-29T10:00:00Z"^^xsd:dateTimeStamp ;
   saref:hasValue "200" ;
@@ -68,7 +68,7 @@
   saref:isMeasuredIn om:kilowatt ;
 .
 :DataPoint_3
-  a s4ener:DataPoint, saref:Measurement ;
+  a s4ener:DataPoint, saref:Observation ;
   rdfs:label "Data point 3" ;
   saref:hasTimestamp "2023-01-29T13:00:00Z"^^xsd:dateTimeStamp ;
   saref:hasValue "1000" ;
@@ -76,7 +76,7 @@
   saref:isMeasuredIn om:kilowatt ;
 .
 :DataPoint_4
-  a s4ener:DataPoint, saref:Measurement ;
+  a s4ener:DataPoint, saref:Observation ;
   rdfs:label "Data point 4" ;
   saref:hasTimestamp "2023-01-30T13:00:00Z"^^xsd:dateTimeStamp ;
   saref:hasValue "150" ;
@@ -84,7 +84,7 @@
   saref:isMeasuredIn om:kilowatt ;
 .
 :DataPoint_5
-  a s4ener:DataPoint, saref:Measurement ;
+  a s4ener:DataPoint, saref:Observation ;
   rdfs:label "Data point 5" ;
   saref:hasTimestamp "2023-01-30T17:00:00Z"^^xsd:dateTimeStamp ;
   saref:hasValue "200" ;
@@ -92,7 +92,7 @@
   saref:isMeasuredIn om:kilowatt ;
 .
 :DataPoint_6
-  a s4ener:DataPoint, saref:Measurement ;
+  a s4ener:DataPoint, saref:Observation ;
   rdfs:label "Data point 6" ;
   saref:hasTimestamp "2023-01-29T17:00:00Z"^^xsd:dateTimeStamp ;
   saref:hasValue "200" ;
@@ -110,16 +110,16 @@
   rdfs:label "Energy constraint 1" ;
 .
 :EnergyConstraintsRange_1 rdf:type s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_15 ;
-  s4ener:startOfRange :Measurement_16 ;
+  s4ener:endOfRange :Observation_15 ;
+  s4ener:startOfRange :Observation_16 ;
   rdfs:label "Energy constraint average power boundary" ;
 .
-:Measurement_15 rdf:type s4ener:DataPoint ;
+:Observation_15 rdf:type s4ener:DataPoint ;
   saref:hasValue "1000"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
 .
-:Measurement_16 rdf:type s4ener:DataPoint ;
+:Observation_16 rdf:type s4ener:DataPoint ;
   saref:hasValue "100"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
@@ -127,72 +127,72 @@
 
 :NumberRange_1
   a s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_7 ; # "550"^^xsd:decimal ;
-  s4ener:startOfRange :Measurement_8 ; #"400"^^xsd:decimal ;
+  s4ener:endOfRange :Observation_7 ; # "550"^^xsd:decimal ;
+  s4ener:startOfRange :Observation_8 ; #"400"^^xsd:decimal ;
   rdfs:label "Number range 1" ;
 .
 :NumberRange_2
   a s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_9 ; # "1100"^^xsd:decimal ;
-  s4ener:startOfRange :Measurement_10 ; #"800"^^xsd:decimal ;
+  s4ener:endOfRange :Observation_9 ; # "1100"^^xsd:decimal ;
+  s4ener:startOfRange :Observation_10 ; #"800"^^xsd:decimal ;
   rdfs:label "Number range 2" ;
 .
 :NumberRange_3
   a s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_11 ; # "150"^^xsd:decimal ;
-  s4ener:startOfRange :Measurement_12 ; # "0"^^xsd:decimal ;
+  s4ener:endOfRange :Observation_11 ; # "150"^^xsd:decimal ;
+  s4ener:startOfRange :Observation_12 ; # "0"^^xsd:decimal ;
   rdfs:label "Number range 3" ;
 .
 :NumberRange_4
   a s4ener:NumberRange ;
-  s4ener:endOfRange :Measurement_13 ; # "-500"^^xsd:decimal ;
-  s4ener:startOfRange :Measurement_14 ; #"-500"^^xsd:decimal ;
+  s4ener:endOfRange :Observation_13 ; # "-500"^^xsd:decimal ;
+  s4ener:startOfRange :Observation_14 ; #"-500"^^xsd:decimal ;
   rdfs:label "Number range 4" ;
 .
-:Measurement_7 
-  a saref:Measurement ;
+:Observation_7 
+  a saref:Observation ;
   saref:hasValue "550"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_8 
-  a saref:Measurement ;
+:Observation_8 
+  a saref:Observation ;
   saref:hasValue "400"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_9
-  a saref:Measurement ;
+:Observation_9
+  a saref:Observation ;
   saref:hasValue "1100"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_10 
-  a saref:Measurement ;
+:Observation_10 
+  a saref:Observation ;
   saref:hasValue "800"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_11
-  a saref:Measurement ;
+:Observation_11
+  a saref:Observation ;
   saref:hasValue "150"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_12
-  a saref:Measurement ;
+:Observation_12
+  a saref:Observation ;
   saref:hasValue "0"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_13
-  a saref:Measurement ;
+:Observation_13
+  a saref:Observation ;
   saref:hasValue "-500"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
 .
-:Measurement_14
-  a saref:Measurement ;
+:Observation_14
+  a saref:Observation ;
   saref:hasValue "500"^^xsd:decimal ;
   saref:relatesToProperty :Power_1 ;
   saref:isMeasuredIn om:kilowatt ;
diff --git a/examples/powerLimitProfile.ttl b/examples/powerLimitProfile.ttl
index 69070056daa99560ac942ec193170cbf6950f071..ba814c5fb15a34665bcfdd523373ddc71652b51c 100644
--- a/examples/powerLimitProfile.ttl
+++ b/examples/powerLimitProfile.ttl
@@ -44,8 +44,8 @@
   s4ener:hasEarliestStartTime "2023-01-29T10:00:00Z"^^xsd:dateTimeStamp ;
   s4ener:hasLatestEndTime "2023-01-29T19:00:00Z"^^xsd:dateTimeStamp ;
   s4ener:isActive "true"^^xsd:boolean ;
-  s4ener:hasPowerLimitConsumptionMax :Measurement_1 ;
-  s4ener:hasPowerLimitProductionMax :Measurement_2 ;
+  s4ener:hasPowerLimitConsumptionMax :Observation_1 ;
+  s4ener:hasPowerLimitProductionMax :Observation_2 ;
 .
 
 :ReceivedPowerLimit rdf:type s4ener:ContractualPowerLimit ;
@@ -54,8 +54,8 @@
   s4ener:hasEarliestStartTime "2023-01-29T10:00:00Z"^^xsd:dateTimeStamp ;
   s4ener:hasLatestEndTime "2023-01-29T19:00:00Z"^^xsd:dateTimeStamp ;
   s4ener:isActive "true"^^xsd:boolean ;
-  s4ener:hasContractualConsumptionMax :Measurement_3 ;
-  s4ener:hasContractualProductionMax :Measurement_4 ;
+  s4ener:hasContractualConsumptionMax :Observation_3 ;
+  s4ener:hasContractualProductionMax :Observation_4 ;
 .
 
 :ReceivedPowerLimit rdf:type s4ener:NominalPowerLimit ;
@@ -64,8 +64,8 @@
   s4ener:hasEarliestStartTime "2023-01-29T10:00:00Z"^^xsd:dateTimeStamp ;
   s4ener:hasLatestEndTime "2023-01-29T19:00:00Z"^^xsd:dateTimeStamp ;
   s4ener:isActive "true"^^xsd:boolean ;
-  s4ener:hasNominalConsumption :Measurement_5 ;
-  s4ener:hasNominalProduction :Measurement_6 ;
+  s4ener:hasNominalConsumption :Observation_5 ;
+  s4ener:hasNominalProduction :Observation_6 ;
 .
 
 :ReceivedPowerLimit rdf:type s4ener:FailsafePowerLimit ;
@@ -74,53 +74,53 @@
   s4ener:hasEarliestStartTime "2023-01-29T10:00:00Z"^^xsd:dateTimeStamp ;
   s4ener:hasLatestEndTime "2023-01-29T19:00:00Z"^^xsd:dateTimeStamp ;
   s4ener:isActive "false"^^xsd:boolean ;
-  s4ener:hasFailsafeConsumptionMax :Measurement_7 ;
-  s4ener:hasFailsafeProductionMax :Measurement_8 ;
+  s4ener:hasFailsafeConsumptionMax :Observation_7 ;
+  s4ener:hasFailsafeProductionMax :Observation_8 ;
 .
 
-:Measurement_1 rdf:type s4ener:DataPoint ;
+:Observation_1 rdf:type s4ener:DataPoint ;
   saref:hasValue "500"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
 .
 
-:Measurement_2 rdf:type s4ener:DataPoint ;
+:Observation_2 rdf:type s4ener:DataPoint ;
   saref:hasValue "1000"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
 .
 
-:Measurement_3 rdf:type s4ener:DataPoint ;
+:Observation_3 rdf:type s4ener:DataPoint ;
   saref:hasValue "400"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
 .
 
-:Measurement_4 rdf:type s4ener:DataPoint ;
+:Observation_4 rdf:type s4ener:DataPoint ;
   saref:hasValue "1500"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
 .
 
-:Measurement_5 rdf:type s4ener:DataPoint ;
+:Observation_5 rdf:type s4ener:DataPoint ;
   saref:hasValue "50"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
 .
 
-:Measurement_6 rdf:type s4ener:DataPoint ;
+:Observation_6 rdf:type s4ener:DataPoint ;
   saref:hasValue "1250"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
 .
 
-:Measurement_7 rdf:type s4ener:DataPoint ;
+:Observation_7 rdf:type s4ener:DataPoint ;
   saref:hasValue "10"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
 .
 
-:Measurement_8 rdf:type s4ener:DataPoint ;
+:Observation_8 rdf:type s4ener:DataPoint ;
   saref:hasValue "0"^^xsd:decimal ;
   saref:isMeasuredIn om:kilowatt ;
   saref:relatesToProperty :Power_1 ;
diff --git a/examples/powerProfileExample.ttl b/examples/powerProfileExample.ttl
index 372984e57f6719c5f9d62aa480d5db19db47c134..c719c90050ca8ea5b9d70ad54bd6908be861d6fc 100644
--- a/examples/powerProfileExample.ttl
+++ b/examples/powerProfileExample.ttl
@@ -47,23 +47,23 @@
   a saref:Energy ;
   rdfs:label "Energy 1" ;
 .
-:Measurement_1
-  a saref:Measurement ;
-  rdfs:label "Measurement 1" ;
+:Observation_1
+  a saref:Observation ;
+  rdfs:label "Observation 1" ;
   saref:hasValue "2000" ;
   saref:isMeasuredIn om-ucum:kilowattHour ;
   saref:relatesToProperty :Energy_1 ;
 .
-:Measurement_2
-  a saref:Measurement ;
-  rdfs:label "Measurement 2" ;
+:Observation_2
+  a saref:Observation ;
+  rdfs:label "Observation 2" ;
   saref:hasValue "1500" ;
   saref:isMeasuredIn om-ucum:kilowattHour ;
   saref:relatesToProperty :Power_1 ;
 .
-:Measurement_3
-  a saref:Measurement ;
-  rdfs:label "Measurement 3" ;
+:Observation_3
+  a saref:Observation ;
+  rdfs:label "Observation 3" ;
   saref:hasValue "100" ;
   saref:isMeasuredIn om-ucum:kilowattHour ;
   saref:relatesToProperty :Energy_1 ;
@@ -133,7 +133,7 @@
   s4ener:belongsTo :PowerSequence_1 ;
   s4ener:hasDurationDefault "PT1H"^^xsd:duration ;
   s4ener:hasDurationMin "PT30M"^^xsd:duration ;
-  s4ener:hasSlotValue :Measurement_3 ;
+  s4ener:hasSlotValue :Observation_3 ;
   s4ener:slotNumber "1"^^xsd:unsignedInt ;
 .
 :Slot_2
diff --git a/ontology/saref4ener.ttl b/ontology/saref4ener.ttl
index 5d6aee77889bc857452d52f08b36ed2cecde462c..429fd609b963baba061819e5327621f2bad7436c 100644
--- a/ontology/saref4ener.ttl
+++ b/ontology/saref4ener.ttl
@@ -1,5 +1,5 @@
 # baseURI: https://saref.etsi.org/saref4ener/
-# imports: https://saref.etsi.org/core/v3.1.1/
+# imports: https://saref.etsi.org/core/v4.1.1/
 # prefix: s4ener
 
 @prefix dcterms: <http://purl.org/dc/terms/> .
@@ -66,12 +66,13 @@ The additional key aspect captured in the ic-flex module is that a flex offer ca
 - Fill rate based flexibility (s4ener:FillRateBased is implemented using theS2 (ic-s2) that follows the S2 specification (and compliant also with S2)"""@en ;
   dcterms:license <https://forge.etsi.org/etsi-software-license> ;
   dcterms:modified "2024-06-05"^^xsd:date ;
+  dcterms:modified "2025-04-12"^^xsd:date ;
   dcterms:publisher <https://www.etsi.org/> ;
   dcterms:source <https://saref.etsi.org/sources/saref4ener/> ;
   dcterms:title "SAREF for Energy Flexibility"@en ;
   vann:preferredNamespacePrefix "s4ener" ;
   vann:preferredNamespaceUri "https://saref.etsi.org/saref4ener/" ;
-  owl:imports <https://saref.etsi.org/core/v3.2.1/> ;
+  owl:imports <https://saref.etsi.org/core/v4.1.1/> ;
   owl:versionIRI <https://saref.etsi.org/saref4ener/v2.1.1/> ;
   owl:versionInfo "v2.1.1" ;
   owl:priorVersion <https://saref.etsi.org/saref4ener/v1.2.1/> ;
@@ -222,7 +223,7 @@ s4ener:CO2Emission
 .
 s4ener:Calculated
   a s4ener:ValueSource ;
-  rdfs:comment "This value source codelist element indicates that this measurement has been calculated instead of measured or empirical." ;
+  rdfs:comment "This value source codelist element indicates that this observation has been calculated instead of measured or empirical." ;
   rdfs:label "Calculated"@en ;
 .
 s4ener:Committed
@@ -269,13 +270,13 @@ s4ener:DataPoint
   a owl:Class ;
   rdfs:comment """A data point is a quantity that is extended with various pieces of process information, namely
  
-- A creation time (instant). This is the point in time when the data point was created, which is not necessarily the time for which it is valid. In the case of soft-sensors or forecasters, a data point might have been created ahead of time, in the case of a direcet measurement a data point might created at its time of validity (or at the end of its validity time interval) and in the case of an archived value the data point might have been created after the fact.
+- A creation time (instant). This is the point in time when the data point was created, which is not necessarily the time for which it is valid. In the case of soft-sensors or forecasters, a data point might have been created ahead of time, in the case of a direct observation a data point might created at its time of validity (or at the end of its validity time interval) and in the case of an archived value the data point might have been created after the fact.
 
- - A validity time (temporal entity) which will be named \"time stamp\". The validity time is the instant or interval in time in which a specific quantity is in effect. For example a room temperature might be measured at 12:00, which means it is in effect at this very instant. A specific amount of energy might me expended within the time-slot between 12:30 and 12:45, which means that the energy measurement is in effect during this time interval.
+ - A validity time (temporal entity) which will be named \"time stamp\". The validity time is the instant or interval in time in which a specific quantity is in effect. For example a room temperature might be measured at 12:00, which means it is in effect at this very instant. A specific amount of energy might me expended within the time-slot between 12:30 and 12:45, which means that the energy observation is in effect during this time interval.
 
- - A location or topological association. For example, a measurement might be taken in a specific room, a power avarage might have been measured by a specific meter, a forecast might be valid for a specific region or grid segment. This association is therefore not always a location."""@en ;
+ - A location or topological association. For example, an observation might be taken in a specific room, a power avarage might have been measured by a specific meter, a forecast might be valid for a specific region or grid segment. This association is therefore not always a location."""@en ;
   rdfs:label "Data point"@en ;
-  rdfs:subClassOf saref:Measurement ;
+  rdfs:subClassOf saref:Observation ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:allValuesFrom s4ener:Usage ;
@@ -681,7 +682,7 @@ s4ener:FailsafeState
 .
 s4ener:Falling
   a s4ener:ValueTendency ;
-  rdfs:comment "This value tendency codelist element indicates that the tendency of this measurement indicates that the value is decreasing (i.e., falling)." ;
+  rdfs:comment "This value tendency codelist element indicates that the tendency of this observation indicates that the value is decreasing (i.e., falling)." ;
   rdfs:label "Falling"@en ;
 .
 s4ener:FillLevelTargetProfile
@@ -1768,7 +1769,7 @@ s4ener:Revoked
 .
 s4ener:Rising
   a s4ener:ValueTendency ;
-  rdfs:comment "This value tendency codelist element indicates that the tendency of this measurement indicates that the value is increasing (i.e., rising)." ;
+  rdfs:comment "This value tendency codelist element indicates that the tendency of this observation indicates that the value is increasing (i.e., rising)." ;
   rdfs:label "Rising"@en ;
 .
 s4ener:Role
@@ -1943,7 +1944,7 @@ s4ener:SlotTimeDurationDescription
 .
 s4ener:Stable
   a s4ener:ValueTendency ;
-  rdfs:comment "This value tendency codelist element indicates that the tendency this measurement has is to stay stable, instead of rising or falling." ;
+  rdfs:comment "This value tendency codelist element indicates that the tendency this observation has is to stay stable, instead of rising or falling." ;
   rdfs:label "Stable"@en ;
 .
 s4ener:StartInterruptionInstruction
@@ -2075,13 +2076,13 @@ s4ener:Usage
 .
 s4ener:ValueSource
   a owl:Class ;
-  rdfs:comment "Indicates the source (origin/foundation) of the measurement forecasted values for a power sequence. If absent, the source is undefined. Remark: This element shall express the reliability of the forecast." ;
+  rdfs:comment "Indicates the source (origin/foundation) of the observation forecasted values for a power sequence. If absent, the source is undefined. Remark: This element shall express the reliability of the forecast." ;
   rdfs:label "Value source"@en ;
   rdfs:subClassOf owl:Thing ;
 .
 s4ener:ValueTendency
   a owl:Class ;
-  rdfs:comment "This type indicates a codelist for the s4ener:valueTendency property about whether the tendency of a measurement is rising, stable or falling." ;
+  rdfs:comment "This type indicates a codelist for the s4ener:valueTendency property about whether the tendency of an observation is rising, stable or falling." ;
   rdfs:label "Value tendency"@en ;
   rdfs:subClassOf owl:Thing ;
 .
@@ -2197,7 +2198,7 @@ s4ener:endOfRange
   rdfs:comment "This property indicates the end of a number range." ;
   rdfs:domain s4ener:NumberRange ;
   rdfs:label "end of range"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
 .
 s4ener:eventID
   a owl:DatatypeProperty ;
@@ -2373,7 +2374,7 @@ s4ener:hasContractualConsumptionMax
   rdfs:comment "The relationship between the contractual power limit and the value indicating the max limit consumption."@en ;
   rdfs:domain s4ener:ContractualPowerLimit ;
   rdfs:label "has contractual consumption Max"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
   rdfs:subPropertyOf s4ener:hasPowerLimitConsumptionMax ;
 .
 s4ener:hasContractualProductionMax
@@ -2381,7 +2382,7 @@ s4ener:hasContractualProductionMax
   rdfs:comment "The relationship between the contractual power limit and the value indicating the max limit production."@en ;
   rdfs:domain s4ener:ContractualPowerLimit ;
   rdfs:label "has contractual production Max"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
   rdfs:subPropertyOf s4ener:hasPowerLimitProductionMax ;
 .
 s4ener:hasCost
@@ -2398,7 +2399,7 @@ s4ener:hasCreationTime
   a owl:DatatypeProperty ;
   rdfs:comment """The time instant that defines the creation time of a data point or quantity or forecast or similar entities. This is not the same as the time at which the quantity is in effect. For example, if a temperature is forecasted today at 12:30 (creation time of the forecast) for the following day at 14:45 (time when the temperature is expected to be in effect), the this instant should be 12:30 of today.
 
-A creation time (instant). This is the point in time when the data point was created, which is not necessarily the time for which it is valid. In the case of soft-sensors or forecasters, a data point might have been created ahead of time, in the case of a direcet measurement a data point might created at its time of validity (or at the end of its validity time interval) and in the case of an archived value the data point might have been created after the fact."""@en ;
+A creation time (instant). This is the point in time when the data point was created, which is not necessarily the time for which it is valid. In the case of soft-sensors or forecasters, a data point might have been created ahead of time, in the case of a direct observation a data point might created at its time of validity (or at the end of its validity time interval) and in the case of an archived value the data point might have been created after the fact."""@en ;
   rdfs:label "has creation time"@en ;
   rdfs:range xsd:dateTimeStamp ;
 .
@@ -2434,8 +2435,8 @@ s4ener:hasDuration
 
 - the startTime of the power sequence (in the PowerSequence class). SHALL be present
 - the endTime of the power sequence (in the PowerSequence class). If the value is available, it SHALL be denoted here. Otherwise the element SHALL be omitted.
-- the startTime of measurement as absolute or relative value (in the Measurement class).
-- the endTime of measurement as absolute or relative value (in the Measurement class).
+- the startTime of observation as absolute or relative value (in the Observation class).
+- the endTime of observation as absolute or relative value (in the Observation class).
 
 The duration is expected to be described as in xsd:duration"""@en ;
   rdfs:comment """This property specifies that the componenrt has a duration attribute further specified in the subproperty
@@ -2538,7 +2539,7 @@ s4ener:hasFailsafeConsumptionMax
   rdfs:comment "The relationship between the failsafe power limit and the value indicating its consumption."@en ;
   rdfs:domain s4ener:FailsafePowerLimit ;
   rdfs:label "has failsafe consumption max"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
   rdfs:subPropertyOf s4ener:hasPowerLimitConsumptionMax ;
 .
 s4ener:hasFailsafeDuration
@@ -2554,7 +2555,7 @@ s4ener:hasFailsafeProductionMax
   rdfs:comment "The relationship between the failsafe power limit and the value indicating its production."@en ;
   rdfs:domain s4ener:FailsafePowerLimit ;
   rdfs:label "has failsafe production max"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
   rdfs:subPropertyOf s4ener:hasPowerLimitProductionMax ;
 .
 s4ener:hasFillLevelRange
@@ -2715,7 +2716,7 @@ s4ener:hasNominalConsumption
   rdfs:comment "The relationship between the nominal power limit and the value indicating the max limit consumption."@en ;
   rdfs:domain s4ener:NominalPowerLimit ;
   rdfs:label "has nominal consumption Max"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
   rdfs:subPropertyOf s4ener:hasPowerLimitConsumptionMax ;
 .
 s4ener:hasNominalProduction
@@ -2723,7 +2724,7 @@ s4ener:hasNominalProduction
   rdfs:comment "The relationship between the nominal power limit and the value indicating the max limit production."@en ;
   rdfs:domain s4ener:NominalPowerLimit ;
   rdfs:label "has nominal production Max"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
   rdfs:subPropertyOf s4ener:hasPowerLimitProductionMax ;
 .
 s4ener:hasNumberRange
@@ -2791,7 +2792,7 @@ s4ener:hasPowerLimitConsumptionMax
   rdfs:comment "The relationship between the power limit and the value indicating the max limit consumption."@en ;
   rdfs:domain s4ener:PowerLimit ;
   rdfs:label "has power limit consumption Max"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
 .
 s4ener:hasPowerLimitDuration
   a owl:DatatypeProperty ;
@@ -2806,7 +2807,7 @@ s4ener:hasPowerLimitProductionMax
   rdfs:comment "The relationship between the power limit and the value indicating the max limit production."@en ;
   rdfs:domain s4ener:PowerLimit ;
   rdfs:label "has power limit production Max"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
 .
 s4ener:hasPowerLimitState
   a owl:ObjectProperty ;
@@ -2927,7 +2928,7 @@ s4ener:hasSlotValue
 This property is a suggestion to be added in Saref4Energy v2.""" ;
   rdfs:domain s4ener:Slot ;
   rdfs:label "has slot value"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
   rdfs:range [
       a owl:Restriction ;
       owl:minQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
@@ -2971,7 +2972,7 @@ s4ener:hasSupplyRange
 .
 s4ener:hasTemporalResolution
   a owl:DatatypeProperty ;
-  rdfs:comment "The resolution is the distance between two measurement time-stapms. This only makes sense if the measurements are equidistant." ;
+  rdfs:comment "The resolution is the distance between two observation time-stapms. This only makes sense if the observations are equidistant." ;
   rdfs:label "has temporal resolution"@en ;
   rdfs:range xsd:duration ;
 .
@@ -3080,7 +3081,7 @@ s4ener:hasValue
 .
 s4ener:hasValueSource
   a owl:ObjectProperty ;
-  rdfs:comment "Indicates the source (origin/foundation) of the measurement forecasted values for a power sequence. If absent, the source is undefined. Remark: This element shall express the reliability of the forecast."@en ;
+  rdfs:comment "Indicates the source (origin/foundation) of the observation forecasted values for a power sequence. If absent, the source is undefined. Remark: This element shall express the reliability of the forecast."@en ;
   rdfs:label "has value source"@en ;
   rdfs:range s4ener:ValueSource ;
 .
@@ -3134,7 +3135,7 @@ s4ener:isChangeable
   a owl:DatatypeProperty ;
   rdfs:comment """A relationship indicating that this element can be changed by its operator. The boolean value indicates whether it is indeed changeable.
 
-In the SAREF4ENER extension this property is intended for PowerLimits and IncentiveTable elements, such as the IncentivebasedProfile, IncentiveTableSlot, and the IncentiveTableTier."""@en ;
+In the SAREF4ENER extension this property is intended for PowerLimits and IncentiveTable elements, such as the IncentiveTableBasedProfile, IncentiveTableSlot, and the IncentiveTableTier."""@en ;
   rdfs:label "is changeable"@en ;
   rdfs:range xsd:boolean ;
 .
@@ -3191,7 +3192,7 @@ s4ener:leakageRate
   rdfs:comment "Indicates how fast the momentary fill level will decrease per second due to leakage within the given range of the fill level." ;
   rdfs:domain s4ener:LeakageBehaviourElement ;
   rdfs:label "Leakage Rate"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
 .
 s4ener:limitType
   a owl:ObjectProperty ;
@@ -3227,10 +3228,10 @@ s4ener:maxCyclesPerDay
   rdfs:label "max cycles per day"@en ;
   rdfs:range xsd:unsignedInt ;
 .
-s4ener:measurementID
+s4ener:observationID
   a owl:DatatypeProperty ;
   rdfs:comment "Enables the identification of different sensors on one EEBus address."@en ;
-  rdfs:label "measurement id"@en ;
+  rdfs:label "observation id"@en ;
   rdfs:range xsd:unsignedInt ;
   owl:deprecated true ;
 .
@@ -3278,10 +3279,10 @@ s4ener:optionalSlot
 .
 s4ener:presentFillLevel
   a owl:ObjectProperty ;
-  rdfs:comment "A saref:Measurement with a percentage value indicating the fill level of the storage." ;
+  rdfs:comment "A saref:Observation with a percentage value indicating the fill level of the storage." ;
   rdfs:domain s4ener:Storage ;
   rdfs:label "present fill level"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
 .
 s4ener:producedBy
   a owl:ObjectProperty ;
@@ -3435,7 +3436,7 @@ s4ener:startOfRange
   rdfs:comment "This property indicates the start of a number range." ;
   rdfs:domain s4ener:NumberRange ;
   rdfs:label "start of range"@en ;
-  rdfs:range saref:Measurement ;
+  rdfs:range saref:Observation ;
 .
 s4ener:startsTimer
   a owl:ObjectProperty ;
@@ -3488,7 +3489,7 @@ s4ener:triggersEventActionProduce
 .
 s4ener:valueTendency
   a owl:ObjectProperty ;
-  rdfs:comment "Indicates whether the tendency of a measurement is rising, stable, or falling."@en ;
+  rdfs:comment "Indicates whether the tendency of an observation is rising, stable, or falling."@en ;
   rdfs:label "value tendency"@en ;
   rdfs:range s4ener:ValueTendency ;
 .