diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn
index 287ddf6f2..f687139ef 100644
--- a/src/ontology/edits/oeo-physical.omn
+++ b/src/ontology/edits/oeo-physical.omn
@@ -1609,7 +1609,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/810"
         owl:equivalentClass "http://purl.obolibrary.org/obo/ENVO_01000665"
     
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000023>
+        <http://purl.obolibrary.org/obo/BFO_0000023>,
+        OEO_00010121 some <http://purl.obolibrary.org/obo/BFO_0000027>
     
     
 Class: OEO_00000043
@@ -2609,7 +2610,10 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/810"
         owl:equivalentClass "http://purl.obolibrary.org/obo/CHEBI_76413"
     
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000016>
+        <http://purl.obolibrary.org/obo/BFO_0000016>,
+        OEO_00010121 some 
+            (OEO_00000331
+             and (OEO_00000531 value OEO_00000182))
     
     
 Class: OEO_00000199
@@ -3823,7 +3827,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/39",
         rdfs:label "state of matter"
     
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000019>
+        <http://purl.obolibrary.org/obo/BFO_0000019>,
+        OEO_00010121 some OEO_00000331
     
     
 Class: OEO_00000396
@@ -4369,7 +4374,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/356",
         rdfs:label "volatility"@en
     
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000016>
+        <http://purl.obolibrary.org/obo/BFO_0000016>,
+        OEO_00010121 some OEO_00000331
     
     
 Class: OEO_00010012
@@ -7130,6 +7136,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/949",
     
     SubClassOf: 
         <http://purl.obolibrary.org/obo/BFO_0000019>,
+        OEO_00010121 some 
+            (OEO_00000044 or OEO_00000448),
         OEO_00140002 some OEO_00140001
     
     
@@ -7978,6 +7986,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/509",
     
     SubClassOf: 
         <http://purl.obolibrary.org/obo/BFO_0000019>,
+        OEO_00010121 some OEO_00000044,
         OEO_00140002 some OEO_00140001
     
     
@@ -8607,6 +8616,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/779",
     
     SubClassOf: 
         <http://purl.obolibrary.org/obo/BFO_0000019>,
+        OEO_00010121 some OEO_00000031,
         OEO_00140002 some OEO_00140127
     
     
@@ -8649,6 +8659,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/779",
     
     SubClassOf: 
         <http://purl.obolibrary.org/obo/BFO_0000019>,
+        OEO_00010121 some OEO_00000031,
         OEO_00140002 some OEO_00140127
     
     
diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn
index 31f80e629..b0d6a058c 100644
--- a/src/ontology/edits/oeo-shared.omn
+++ b/src/ontology/edits/oeo-shared.omn
@@ -1008,7 +1008,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/210",
         rdfs:label "agent"
     
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000023>
+        <http://purl.obolibrary.org/obo/BFO_0000023>,
+        OEO_00010121 some 
+            (OEO_00000323 or OEO_00030022)
     
     
 Class: OEO_00000061
@@ -1486,6 +1488,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1127",
     
     SubClassOf: 
         <http://purl.obolibrary.org/obo/BFO_0000023>,
+        OEO_00010121 some <http://purl.obolibrary.org/obo/BFO_0000002>,
         OEO_00020180 some OEO_00040003
     
     
@@ -1771,7 +1774,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/972",
         rdfs:label "resolution"
     
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000019>
+        <http://purl.obolibrary.org/obo/BFO_0000019>,
+        OEO_00010121 some <http://purl.obolibrary.org/obo/IAO_0000100>
     
     
 Class: OEO_00020122
@@ -1786,7 +1790,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/972",
         rdfs:label "temporal resolution"
     
     SubClassOf: 
-        OEO_00020121
+        OEO_00020121,
+        OEO_00010121 some OEO_00030034
     
     DisjointWith: 
         OEO_00020123
@@ -2242,6 +2247,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/538",
         <http://purl.obolibrary.org/obo/BFO_0000148>
     
     
+Class: OEO_00030034
+
+    
 Class: OEO_00030035
 
     Annotations: 
@@ -2523,7 +2531,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/569",
         rdfs:label "demand"@en
     
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000017>
+        <http://purl.obolibrary.org/obo/BFO_0000017>,
+        OEO_00010121 some 
+            (OEO_00000323 or OEO_00030022 or <http://purl.obolibrary.org/obo/BFO_0000030>)
     
     
 Class: OEO_00140081