diff --git a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_3.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_3.ttl
index 60d22dd0575c9013cfa612446c32bfbdc6e1b832..f9c7ade4ac0d9df7679e1ebed08453c2e98d88f7 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_3.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_3.ttl
@@ -68,6 +68,19 @@ result:orbit rdf:type owl:ObjectProperty ;
              base:fromStructure "SolarSystem-03" .
 
 
+#################################################################
+#    Data properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#Out_DataProperty
+base:Out_DataProperty rdf:type owl:DatatypeProperty .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasQuantity
+result:hasQuantity rdf:type owl:DatatypeProperty ;
+               rdfs:subPropertyOf base:Out_DataProperty .
+
+
 #################################################################
 #    Classes
 #################################################################
diff --git a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_4.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_4.ttl
index f309e99ffaca04c414a24d3380ee970996d82315..ea6cba27a4b93f720d662712530d2d53f65f7ca4 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_4.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_4.ttl
@@ -1,94 +1,263 @@
-@prefix base: <https://reference.tetras-libre.fr/base-ontology#> .
 @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 base: <https://reference.tetras-libre.fr/base-ontology#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix result: <https://reference.tetras-libre.fr/expected-result#> .
+@base <http://www.w3.org/2002/07/owl#> .
+
+[ rdf:type owl:Ontology
+ ] .
+
+#################################################################
+#    Annotation properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#fromStructure
+base:fromStructure rdf:type owl:AnnotationProperty .
+
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#Out_ObjectProperty
+base:Out_ObjectProperty rdf:type owl:ObjectProperty .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasCause
+result:hasCause rdf:type owl:ObjectProperty ;
+                rdfs:subPropertyOf base:Out_ObjectProperty ;
+                rdfs:label "hasCause" ;
+                base:fromStructure "predefinedProperty" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasFeature
+result:hasFeature rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf base:Out_ObjectProperty ;
+                  rdfs:label "hasFeature" ;
+                  base:fromStructure "predefinedProperty" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasSource
+result:hasSource rdf:type owl:ObjectProperty ;
+                 rdfs:subPropertyOf base:Out_ObjectProperty ;
+                 rdfs:label "hasSource" ;
+                 base:fromStructure "predefinedProperty" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasTarget
+result:hasTarget rdf:type owl:ObjectProperty ;
+                 rdfs:subPropertyOf base:Out_ObjectProperty ;
+                 rdfs:label "hasTarget" ;
+                 base:fromStructure "predefinedProperty" .
+
+
+#################################################################
+#    Data properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#Out_DataProperty
+base:Out_DataProperty rdf:type owl:DatatypeProperty .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasTime
+result:hasTime rdf:type owl:DatatypeProperty ;
+               rdfs:subPropertyOf base:Out_DataProperty .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  http://www.w3.org/2002/07/owl#Individual
+owl:Individual rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Entity
+base:Entity rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Event
+base:Event rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Feature
+base:Feature rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/expected-result#cloud
+result:cloud rdf:type owl:Class ;
+             rdfs:subClassOf base:Entity ;
+             rdfs:label "cloud" ;
+             base:fromStructure "SolarSystem-04" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#collapse
+result:collapse rdf:type owl:Class ;
+                rdfs:subClassOf base:Event .
+
+
+###  https://reference.tetras-libre.fr/expected-result#formation
+result:formation rdf:type owl:Class ;
+                 rdfs:subClassOf base:Event .
+
+
+###  https://reference.tetras-libre.fr/expected-result#gravity
+result:gravity rdf:type owl:Class ;
+               rdfs:subClassOf base:Entity .
+
+
+###  https://reference.tetras-libre.fr/expected-result#molecular-interstellar-giant-cloud
+result:molecular-interstellar-giant-cloud rdf:type owl:Class ;
+                                          rdfs:subClassOf result:cloud ,
+                                                          [ rdf:type owl:Restriction ;
+                                                            owl:onProperty result:hasFeature ;
+                                                            owl:hasValue result:giant
+                                                          ] ,
+                                                          [ rdf:type owl:Restriction ;
+                                                            owl:onProperty result:hasFeature ;
+                                                            owl:hasValue result:interstellar
+                                                          ] ,
+                                                          [ rdf:type owl:Restriction ;
+                                                            owl:onProperty result:hasFeature ;
+                                                            owl:hasValue result:molecular
+                                                          ] .
+
+
+###  https://reference.tetras-libre.fr/expected-result#molecular-interstellar-giant-cloud-collapse
+result:molecular-interstellar-giant-cloud-collapse rdf:type owl:Class ;
+                                                   rdfs:subClassOf result:collapse ,
+                                                                   [ rdf:type owl:Restriction ;
+                                                                     owl:onProperty result:hasCause ;
+                                                                     owl:hasValue result:gravity
+                                                                   ] ,
+                                                                   [ rdf:type owl:Restriction ;
+                                                                     owl:onProperty result:hasTarget ;
+                                                                     owl:hasValue result:molecular-interstellar-giant-cloud
+                                                                   ] .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system
+result:system rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system-formation
+result:system-formation rdf:type owl:Class ;
+                        rdfs:subClassOf result:formation ,
+                                        [ rdf:type owl:Restriction ;
+                                          owl:onProperty result:hasSource ;
+                                          owl:hasValue result:molecular-interstellar-giant-cloud-collapse
+                                        ] ,
+                                        [ rdf:type owl:Restriction ;
+                                          owl:onProperty result:hasTarget ;
+                                          owl:hasValue result:system
+                                        ] ;
+                        base:fromStructure "SolarSystem-04" .
+
+
+#################################################################
+#    Individuals
+#################################################################
+
+###  https://reference.tetras-libre.fr/expected-result#SolarSystem
+result:SolarSystem rdf:type owl:NamedIndividual ,
+                            owl:Individual ,
+                            base:Entity ,
+                            result:system ;
+                   rdfs:label "SolarSystem" ;
+                   base:fromStructure "SolarSystem-04" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#SolarSystem-formation
+result:SolarSystem-formation rdf:type owl:NamedIndividual ,
+                                      owl:Individual ,
+                                      base:Event ,
+                                      result:system-formation ;
+                             result:hasSource result:collapse-SolarSystem-04 ;
+                             result:hasTarget result:SolarSystem ;
+                             result:hasTime "-4600000000 years" ;
+                             rdfs:label "SolarSystem-formation" ;
+                             base:fromStructure "SolarSystem-04" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#collapse-SolarSystem-04
+result:collapse-SolarSystem-04 rdf:type owl:NamedIndividual ,
+                                        owl:Individual ,
+                                        base:Event ,
+                                        result:molecular-interstellar-giant-cloud-collapse ;
+                               result:hasCause result:gravity-SolarSystem-04 ;
+                               result:hasTarget result:molecular-interstellar-giant-cloud ;
+                               rdfs:label "collapse (SolarSystem-04)" ;
+                               base:fromStructure "SolarSystem-04" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#giant
+result:giant rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Feature ;
+             rdfs:label "giant" ;
+             base:fromStructure "SolarSystem-04" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#gravity
+result:gravity rdf:type owl:NamedIndividual .
+
+
+###  https://reference.tetras-libre.fr/expected-result#gravity-SolarSystem-04
+result:gravity-SolarSystem-04 rdf:type owl:NamedIndividual ,
+                                       owl:Individual ,
+                                       base:Entity ;
+                              rdfs:label "gravity (SolarSystem-04)" ;
+                              base:fromStructure "SolarSystem-04" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#interstellar
+result:interstellar rdf:type owl:NamedIndividual ,
+                             owl:Individual ,
+                             base:Feature ;
+                    rdfs:label "interstellar" ;
+                    base:fromStructure "SolarSystem-04" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#molecular
+result:molecular rdf:type owl:NamedIndividual ,
+                          owl:Individual ,
+                          base:Feature ;
+                 rdfs:label "molecular" ;
+                 base:fromStructure "SolarSystem-04" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#molecular-interstellar-giant-cloud
+result:molecular-interstellar-giant-cloud rdf:type owl:NamedIndividual .
+
+
+###  https://reference.tetras-libre.fr/expected-result#molecular-interstellar-giant-cloud-collapse
+result:molecular-interstellar-giant-cloud-collapse rdf:type owl:NamedIndividual .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system
+result:system rdf:type owl:NamedIndividual .
+
+
+#################################################################
+#    Annotations
+#################################################################
+
+result:gravity base:fromStructure "SolarSystem-04" ;
+               rdfs:label "gravity" .
+
+
+result:molecular-interstellar-giant-cloud base:fromStructure "SolarSystem-04" .
+
+
+result:molecular-interstellar-giant-cloud-collapse base:fromStructure "SolarSystem-04" .
+
+
+result:system base:fromStructure "SolarSystem-04" ;
+              rdfs:label "system" .
 
-result:SolarSystem a owl:Individual,
-        base:Entity,
-        result:system ;
-    rdfs:label "SolarSystem" ;
-    base:fromStructure "SolarSystem-04" .
-
-result:before a owl:Class ;
-    rdfs:label "before" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-04" .
-
-result:cause a owl:ObjectProperty ;
-    rdfs:label "cause" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-04" .
-
-result:collapse a owl:ObjectProperty ;
-    rdfs:label "collapse" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-04" .
-
-result:form a owl:ObjectProperty ;
-    rdfs:label "form" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-04" .
-
-result:gravity a owl:Class ;
-    rdfs:label "gravity" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-04" .
-
-result:molecular-interstellar-giant-cloud a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:giant ;
-            owl:onProperty result:hasFeature ],
-        [ a owl:Restriction ;
-            owl:hasValue result:interstellar ;
-            owl:onProperty result:hasFeature ],
-        [ a owl:Restriction ;
-            owl:hasValue result:molecular ;
-            owl:onProperty result:hasFeature ],
-        result:cloud ;
-    base:fromStructure "SolarSystem-04" .
-
-result:now a owl:Class ;
-    rdfs:label "now" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-04" .
-
-result:temporal-quantity a owl:Class ;
-    rdfs:label "temporal-quantity" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-04" .
-
-result:year a owl:ObjectProperty ;
-    rdfs:label "year" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-04" .
-
-result:cloud a owl:Class ;
-    rdfs:label "cloud" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-04" .
-
-result:system a owl:Class ;
-    rdfs:label "system" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-04" .
-
-result:giant a owl:Individual,
-        base:Feature ;
-    rdfs:label "giant" ;
-    base:fromStructure "SolarSystem-04" .
-
-result:interstellar a owl:Individual,
-        base:Feature ;
-    rdfs:label "interstellar" ;
-    base:fromStructure "SolarSystem-04" .
-
-result:molecular a owl:Individual,
-        base:Feature ;
-    rdfs:label "molecular" ;
-    base:fromStructure "SolarSystem-04" .
-
-result:hasFeature a owl:ObjectProperty ;
-    rdfs:label "hasFeature" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "predefinedProperty" .
 
+###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
diff --git a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_5.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_5.ttl
index b5462e1c5e78953402f41045cd64a893052ecc89..49ffd0c60ef84e364b08318c1b643e20176cdb08 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_5.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_5.ttl
@@ -1,76 +1,159 @@
-@prefix base: <https://reference.tetras-libre.fr/base-ontology#> .
 @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 base: <https://reference.tetras-libre.fr/base-ontology#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix result: <https://reference.tetras-libre.fr/expected-result#> .
+@base <http://www.w3.org/2002/07/owl#> .
+
+[ rdf:type owl:Ontology
+ ] .
+
+#################################################################
+#    Annotation properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#fromStructure
+base:fromStructure rdf:type owl:AnnotationProperty .
+
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#Out_ObjectProperty
+base:Out_ObjectProperty rdf:type owl:ObjectProperty .
+
+###  https://reference.tetras-libre.fr/expected-result#hasFeature
+result:hasFeature rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf base:Out_ObjectProperty ;
+                  rdfs:label "hasFeature" ;
+                  base:fromStructure "predefinedProperty" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasPart
+result:hasPart rdf:type owl:ObjectProperty ;
+               rdfs:subPropertyOf base:Out_ObjectProperty ;
+               rdfs:label "hasPart" ;
+               base:fromStructure "SolarSystem-05" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#isLocatedAt
+result:isLocatedAt rdf:type owl:ObjectProperty ;
+          rdfs:subPropertyOf base:Out_ObjectProperty ;
+          rdfs:label "isLocatedAt" ;
+          base:fromStructure "SolarSystem-05" .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  http://www.w3.org/2002/07/owl#Individual
+owl:Individual rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Degree
+base:Degree rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Entity
+base:Entity rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Feature
+base:Feature rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/expected-result#majority
+result:majority rdf:type owl:Class ;
+                rdfs:subClassOf base:Feature ;
+                rdfs:label "majority" ;
+                base:fromStructure "SolarSystem-05" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#mass
+result:mass rdf:type owl:Class ;
+            rdfs:subClassOf base:Entity ;
+            rdfs:label "mass" ;
+            base:fromStructure "SolarSystem-05" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#sun
+result:sun rdf:type owl:Class ;
+           rdfs:subClassOf base:Entity ;
+           rdfs:label "sun" ;
+           base:fromStructure "SolarSystem-05" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system
+result:system rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity ;
+              rdfs:label "system" ;
+              base:fromStructure "SolarSystem-05" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system-hasPart-mass
+result:system-hasPart-mass rdf:type owl:Class ;
+                           rdfs:subClassOf result:system ,
+                                           [ rdf:type owl:Restriction ;
+                                             owl:onProperty result:hasPart ;
+                                             owl:someValuesFrom result:mass
+                                           ] ;
+                           base:fromStructure "SolarSystem-05" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system-hasPart-vast-majority-mass
+result:system-hasPart-vast-majority-mass rdf:type owl:Class ;
+                                         rdfs:subClassOf result:system-hasPart-mass ,
+                                                         [ rdf:type owl:Restriction ;
+                                                           owl:onProperty result:hasPart ;
+                                                           owl:someValuesFrom result:vast-majority-mass
+                                                         ] ;
+                                         base:fromStructure "SolarSystem-05" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#vast-majority-mass
+result:vast-majority-mass rdf:type owl:Class ;
+                          rdfs:subClassOf result:mass ,
+                                          [ rdf:type owl:Restriction ;
+                                            owl:onProperty result:isLocatedAt ;
+                                            owl:someValuesFrom result:sun
+                                          ] ,
+                                          [ rdf:type owl:Restriction ;
+                                            owl:onProperty result:hasFeature ;
+                                            owl:hasValue result:vast-majority
+                                          ] ;
+                          base:fromStructure "SolarSystem-05" .
+
+
+#################################################################
+#    Individuals
+#################################################################
+
+###  https://reference.tetras-libre.fr/expected-result#vast
+result:vast rdf:type owl:NamedIndividual ,
+                     owl:Individual ,
+                     base:Degree ;
+            rdfs:label "vast" ;
+            base:fromStructure "SolarSystem-05" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#vast-majority
+result:vast-majority rdf:type owl:NamedIndividual ,
+                              owl:Individual ,
+                              base:Feature ,
+                              result:majority ;
+                     result:hasFeature result:vast .
+
+
+#################################################################
+#    Annotations
+#################################################################
+
+result:vast-majority rdfs:label "vast-majority" ;
+                     base:fromStructure "SolarSystem-05" .
 
-result:system-hasPart-mass-be-sun a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:mass-be-sun ],
-        result:system-hasPart-mass ;
-    base:fromStructure "SolarSystem-05" .
-
-result:vast-majority a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:vast ;
-            owl:onProperty result:hasFeature ],
-        result:majority ;
-    base:fromStructure "SolarSystem-05" .
-
-result:majority a owl:Class ;
-    rdfs:label "majority" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-05" .
-
-result:system a owl:Class ;
-    rdfs:label "system" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-05" .
-
-result:system-hasPart-mass a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:mass ],
-        [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:mass ],
-        result:system ;
-    base:fromStructure "SolarSystem-05" .
-
-result:be a owl:ObjectProperty ;
-    rdfs:label "be" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-05" .
-
-result:hasFeature a owl:ObjectProperty ;
-    rdfs:label "hasFeature" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "predefinedProperty" .
-
-result:mass-be-sun a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:be ;
-            owl:someValuesFrom result:sun ],
-        result:mass ;
-    base:fromStructure "SolarSystem-05" .
-
-result:sun a owl:Class ;
-    rdfs:label "sun" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-05" .
-
-result:vast a owl:Individual,
-        base:Feature ;
-    rdfs:label "vast" ;
-    base:fromStructure "SolarSystem-05" .
-
-result:mass a owl:Class ;
-    rdfs:label "mass" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-05" .
-
-result:hasPart a owl:ObjectProperty ;
-    rdfs:label "hasPart" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-05" .
 
+###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
diff --git a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_6.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_6.ttl
index da77d6deadfab9e6c7aeaf6f7c4f14794997388e..6dfdddec72b9d559b65bebba0cf45e3f8bc5d6fd 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_6.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_6.ttl
@@ -1,56 +1,155 @@
-@prefix base: <https://reference.tetras-libre.fr/base-ontology#> .
 @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 base: <https://reference.tetras-libre.fr/base-ontology#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix result: <https://reference.tetras-libre.fr/expected-result#> .
+@base <http://www.w3.org/2002/07/owl#> .
+
+[ rdf:type owl:Ontology
+ ] .
+
+#################################################################
+#    Annotation properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#fromStructure
+base:fromStructure rdf:type owl:AnnotationProperty .
+
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#Out_ObjectProperty
+base:Out_ObjectProperty rdf:type owl:ObjectProperty .
+
+
+###  https://reference.tetras-libre.fr/expected-result#contain
+result:contain rdf:type owl:ObjectProperty ;
+               rdfs:subPropertyOf base:Out_ObjectProperty ;
+               rdfs:label "contain" ;
+               base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasFeature
+result:hasFeature rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf base:Out_ObjectProperty ;
+                  rdfs:label "hasFeature" ;
+                  base:fromStructure "predefinedProperty" .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  http://www.w3.org/2002/07/owl#Individual
+owl:Individual rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Degree
+base:Degree rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Entity
+base:Entity rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Feature
+base:Feature rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/expected-result#majority
+result:majority rdf:type owl:Class ;
+                rdfs:label "majority" ;
+                base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#mass
+result:mass rdf:type owl:Class ;
+            rdfs:subClassOf base:Entity ;
+            rdfs:label "mass" ;
+            base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet
+result:planet rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity ;
+              rdfs:label "planet" ;
+              base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-contain-mass
+result:planet-contain-mass rdf:type owl:Class ;
+                           rdfs:subClassOf result:planet ,
+                                           [ rdf:type owl:Restriction ;
+                                             owl:onProperty result:contain ;
+                                             owl:someValuesFrom result:mass
+                                           ] ;
+                           base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-contain-remain-majority-mass
+result:planet-contain-remain-majority-mass rdf:type owl:Class ;
+                                           rdfs:subClassOf result:planet-contain-mass ,
+                                                           [ rdf:type owl:Restriction ;
+                                                             owl:onProperty result:contain ;
+                                                             owl:someValuesFrom result:remain-majority-mass
+                                                           ] ;
+                                           base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#remain-majority-mass
+result:remain-majority-mass rdf:type owl:Class ;
+                            rdfs:subClassOf result:mass ,
+                                            [ rdf:type owl:Restriction ;
+                                              owl:onProperty result:hasFeature ;
+                                              owl:hasValue result:remain-majority
+                                            ] ;
+                            base:fromStructure "SolarSystem-06" .
+
+
+#################################################################
+#    Individuals
+#################################################################
+
+###  https://reference.tetras-libre.fr/expected-result#Jupiter
+result:Jupiter rdf:type owl:NamedIndividual ,
+                        owl:Individual ,
+                        base:Entity ,
+                        result:planet ,
+                        result:planet-contain-mass ,
+                        result:planet-contain-remain-majority-mass ;
+               result:contain result:mass-SolarSystem-06 ;
+               rdfs:label "Jupiter" ;
+               base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#mass-SolarSystem-06
+result:mass-SolarSystem-06 rdf:type owl:NamedIndividual ,
+                                    owl:Individual ,
+                                    base:Entity ,
+                                    result:remain-majority-mass ;
+                           result:hasFeature result:remain-majority ;
+                           rdfs:label "mass (SolarSystem-06)" ;
+                           base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#remain
+result:remain rdf:type owl:NamedIndividual ,
+                       owl:Individual ,
+                       base:Degree .
+
+
+###  https://reference.tetras-libre.fr/expected-result#remain-majority
+result:remain-majority rdf:type owl:NamedIndividual ,
+                                owl:Individual ,
+                                base:Feature ,
+                                result:majority ;
+                       result:hasFeature result:remain ;
+                       rdfs:label "remain-majority" ;
+                       base:fromStructure "SolarSystem-05" .
 
-result:Jupiter a owl:Individual,
-        base:Entity,
-        result:planet,
-        result:planet-contain-mass ;
-    rdfs:label "Jupiter" ;
-    base:fromStructure "SolarSystem-06" ;
-    result:contain result:mass-SolarSystem-06 .
-
-result:hasFeature a owl:ObjectProperty ;
-    rdfs:label "hasFeature" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "predefinedProperty" .
-
-result:majority a owl:Class ;
-    rdfs:label "majority" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-06" .
-
-result:remain a owl:ObjectProperty ;
-    rdfs:label "remain" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-06" .
-
-result:mass-SolarSystem-06 a owl:Individual,
-        base:Entity,
-        result:mass ;
-    rdfs:label "mass (SolarSystem-06)" ;
-    base:fromStructure "SolarSystem-06" .
-
-result:planet-contain-mass a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:contain ;
-            owl:someValuesFrom result:mass ],
-        result:planet ;
-    base:fromStructure "SolarSystem-06" .
-
-result:contain a owl:ObjectProperty ;
-    rdfs:label "contain" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-06" .
-
-result:planet a owl:Class ;
-    rdfs:label "planet" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-06" .
-
-result:mass a owl:Class ;
-    rdfs:label "mass" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-06" .
 
+###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
diff --git a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_7.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_7.ttl
index 167114596326235f6ca5d90573292030b8d26591..2a0e963f22c83570633edb0ca58718e5c5fa7e09 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_7.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_7.ttl
@@ -1,200 +1,344 @@
-@prefix base: <https://reference.tetras-libre.fr/base-ontology#> .
 @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 base: <https://reference.tetras-libre.fr/base-ontology#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix result: <https://reference.tetras-libre.fr/expected-result#> .
+@base <http://www.w3.org/2002/07/owl#> .
+
+[ rdf:type owl:Ontology
+ ] .
+
+#################################################################
+#    Annotation properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#fromStructure
+base:fromStructure rdf:type owl:AnnotationProperty .
+
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#Out_ObjectProperty
+base:Out_ObjectProperty rdf:type owl:ObjectProperty .
+
+
+###  https://reference.tetras-libre.fr/expected-result#compose-of
+result:compose-of rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf base:Out_ObjectProperty ;
+                  rdfs:label "compose-of" ;
+                  base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasFeature
+result:hasFeature rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf base:Out_ObjectProperty ;
+                  rdfs:label "hasFeature" ;
+                  base:fromStructure "predefinedProperty" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasPart
+result:hasPart rdf:type owl:ObjectProperty ;
+               rdfs:subPropertyOf base:Out_ObjectProperty ;
+               rdfs:label "hasPart" ;
+               base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#primary-compose-of
+result:primary-compose-of rdf:type owl:ObjectProperty ;
+                          rdfs:subPropertyOf result:compose-of ;
+                          rdfs:label "primary-compose-of" ;
+                          base:fromStructure "SolarSystem-06" .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  http://www.w3.org/2002/07/owl#Individual
+owl:Individual rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Degree
+base:Degree rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Entity
+base:Entity rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Feature
+base:Feature rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/expected-result#inner-system
+result:inner-system rdf:type owl:Class ;
+                    rdfs:subClassOf result:system ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty result:hasFeature ;
+                                      owl:hasValue result:inner
+                                    ] ;
+                    base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#inner-system-hasPart-planet
+result:inner-system-hasPart-planet rdf:type owl:Class ;
+                                   rdfs:subClassOf result:inner-system ,
+                                                   [ rdf:type owl:Restriction ;
+                                                     owl:onProperty result:hasPart ;
+                                                     owl:someValuesFrom result:planet
+                                                   ] ;
+                                   base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#inner-system-hasPart-terrestrial-planet
+result:inner-system-hasPart-terrestrial-planet rdf:type owl:Class ;
+                                               rdfs:subClassOf result:inner-system-hasPart-planet ,
+                                                               [ rdf:type owl:Restriction ;
+                                                                 owl:onProperty result:hasPart ;
+                                                                 owl:someValuesFrom result:terrestrial-planet
+                                                               ] ;
+                                               base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#metal
+result:metal rdf:type owl:Class ;
+             rdfs:subClassOf base:Entity ;
+             rdfs:label "metal" ;
+             base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#more-small-planet
+result:more-small-planet rdf:type owl:Class ;
+                         rdfs:subClassOf result:terrestrial-planet ,
+                                         [ rdf:type owl:Restriction ;
+                                           owl:onProperty result:hasFeature ;
+                                           owl:hasValue result:more-small
+                                         ] ;
+                         base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet
+result:planet rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity ;
+              rdfs:label "planet" ;
+              base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-compose-of-metal
+result:planet-compose-of-metal rdf:type owl:Class ;
+                               rdfs:subClassOf result:terrestrial-planet ,
+                                               [ rdf:type owl:Restriction ;
+                                                 owl:onProperty result:compose-of ;
+                                                 owl:someValuesFrom result:metal
+                                               ] ;
+                               base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-compose-of-rock
+result:planet-compose-of-rock rdf:type owl:Class ;
+                              rdfs:subClassOf result:terrestrial-planet ,
+                                              [ rdf:type owl:Restriction ;
+                                                owl:onProperty result:compose-of ;
+                                                owl:someValuesFrom result:rock
+                                              ] ;
+                              base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-primary-compose-of-metal
+result:planet-primary-compose-of-metal rdf:type owl:Class ;
+                                       rdfs:subClassOf result:planet-compose-of-metal ,
+                                                       [ rdf:type owl:Restriction ;
+                                                         owl:onProperty result:primary-compose-of ;
+                                                         owl:someValuesFrom result:metal
+                                                       ] ;
+                                       base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-primary-compose-of-rock
+result:planet-primary-compose-of-rock rdf:type owl:Class ;
+                                      rdfs:subClassOf result:planet-compose-of-rock ,
+                                                      [ rdf:type owl:Restriction ;
+                                                        owl:onProperty result:primary-compose-of ;
+                                                        owl:someValuesFrom result:rock
+                                                      ] ;
+                                      base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#rock
+result:rock rdf:type owl:Class ;
+            rdfs:subClassOf base:Entity ;
+            rdfs:label "rock" ;
+            base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system
+result:system rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity ;
+              rdfs:label "system" ;
+              base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#terrestrial-planet
+result:terrestrial-planet rdf:type owl:Class ;
+                          rdfs:subClassOf result:planet ,
+                                          [ rdf:type owl:Restriction ;
+                                            owl:onProperty result:hasFeature ;
+                                            owl:hasValue result:terrestrial
+                                          ] ;
+                          base:fromStructure "SolarSystem-06" .
+
+
+#################################################################
+#    Individuals
+#################################################################
+
+###  https://reference.tetras-libre.fr/expected-result#Earth
+result:Earth rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Entity ,
+                      result:more-small-planet ,
+                      result:planet ,
+                      result:planet-primary-compose-of-metal ,
+                      result:planet-primary-compose-of-rock ,
+                      result:terrestrial-planet ;
+               result:hasFeature result:terrestrial ,
+                                 result:more-small ;
+             result:compose-of result:metal-SolarSystem-06 ,
+                               result:rock-SolarSystem-06 ;
+             rdfs:label "Earth" ;
+             base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#Mars
+result:Mars rdf:type owl:NamedIndividual ,
+                     owl:Individual ,
+                     base:Entity ,
+                     result:more-small-planet ,
+                     result:planet ,
+                     result:planet-primary-compose-of-metal ,
+                     result:planet-primary-compose-of-rock ,
+                     result:terrestrial-planet ;
+               result:hasFeature result:terrestrial ,
+                                 result:more-small ;
+            result:compose-of result:metal-SolarSystem-06 ,
+                              result:rock-SolarSystem-06 ;
+            rdfs:label "Mars" ;
+            base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#Mercury
+result:Mercury rdf:type owl:NamedIndividual ,
+                        owl:Individual ,
+                        base:Entity ,
+                        result:more-small-planet ,
+                        result:planet ,
+                        result:planet-primary-compose-of-metal ,
+                        result:planet-primary-compose-of-rock ,
+                        result:terrestrial-planet ;
+               result:hasFeature result:terrestrial ,
+                                 result:more-small ;
+               result:compose-of result:metal-SolarSystem-06 ,
+                                 result:rock-SolarSystem-06 ;
+               rdfs:label "Mercury" ;
+               base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#Venus
+result:Venus rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Entity ,
+                      result:more-small-planet ,
+                      result:planet ,
+                      result:planet-primary-compose-of-metal ,
+                      result:planet-primary-compose-of-rock ,
+                      result:terrestrial-planet ;
+               result:hasFeature result:terrestrial ,
+                                 result:more-small ;
+             result:compose-of result:metal-SolarSystem-06 ,
+                               result:rock-SolarSystem-06 ;
+             rdfs:label "Venus" ;
+             base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#inner
+result:inner rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Feature ;
+             rdfs:label "inner" ;
+             base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#metal-SolarSystem-06
+result:metal-SolarSystem-06 rdf:type owl:NamedIndividual ,
+                                                  owl:Individual ,
+                                                  base:Entity ,
+                                                  result:metal ;
+                                         rdfs:label "metal (SolarSystem-06)" ;
+                                         base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#more
+result:more rdf:type owl:NamedIndividual ,
+                     owl:Individual ,
+                     base:Degree .
+
+
+###  https://reference.tetras-libre.fr/expected-result#more-small
+result:more-small rdf:type owl:NamedIndividual ,
+                           owl:Individual ,
+                           base:Feature ;
+                  rdfs:label "more-small" ;
+                  base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#primary
+result:primary rdf:type owl:NamedIndividual ,
+                        owl:Individual ,
+                        base:Degree ;
+               rdfs:label "primary" ;
+               base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#rock-SolarSystem-06
+result:rock-SolarSystem-06 rdf:type owl:NamedIndividual ,
+                                                 owl:Individual ,
+                                                 base:Entity ,
+                                                 result:rock ;
+                                        rdfs:label "rock (SolarSystem-06)" ;
+                                        base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#small
+result:small rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Feature ;
+             rdfs:label "small" ;
+             base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system-SolarSystem-06
+result:system-SolarSystem-06 rdf:type owl:NamedIndividual ,
+                                                   owl:Individual ,
+                                                   base:Entity ,
+                                                   result:inner-system-hasPart-terrestrial-planet ;
+                                          result:hasPart result:Earth ,
+                                                         result:Mars ,
+                                                         result:Mercury ,
+                                                         result:Venus ;
+                                          rdfs:label "system (SolarSystem-06)" ;
+                                          base:fromStructure "SolarSystem-06" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#terrestrial
+result:terrestrial rdf:type owl:NamedIndividual ,
+                            owl:Individual ,
+                            base:Feature ;
+                   rdfs:label "terrestrial" ;
+                   base:fromStructure "SolarSystem-06" .
 
-result:more a owl:ObjectProperty ;
-    rdfs:label "more" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-07" .
-
-result:primary a owl:Class ;
-    rdfs:label "primary" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-07" .
-
-result:small a owl:Class ;
-    rdfs:label "small" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-07" .
-
-result:system-SolarSystem-07 a owl:Individual,
-        base:Entity,
-        result:inner-system-hasPart-planet,
-        result:inner-system-hasPart-planet-compose-metal,
-        result:inner-system-hasPart-planet-compose-rock ;
-    rdfs:label "system (SolarSystem-07)" ;
-    base:fromStructure "SolarSystem-07" ;
-    result:hasPart result:Earth,
-        result:Mars,
-        result:Mercury,
-        result:Venus .
-
-result:terrestrial-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:terrestrial ;
-            owl:onProperty result:hasFeature ],
-        result:planet ;
-    base:fromStructure "SolarSystem-07" .
-
-result:Earth a owl:Individual,
-        base:Entity,
-        result:planet,
-        result:planet-compose-metal,
-        result:planet-compose-rock ;
-    rdfs:label "Earth" ;
-    base:fromStructure "SolarSystem-07" ;
-    result:compose result:metal-SolarSystem-07,
-        result:rock-SolarSystem-07 .
-
-result:Mars a owl:Individual,
-        base:Entity,
-        result:planet,
-        result:planet-compose-metal,
-        result:planet-compose-rock ;
-    rdfs:label "Mars" ;
-    base:fromStructure "SolarSystem-07" ;
-    result:compose result:metal-SolarSystem-07,
-        result:rock-SolarSystem-07 .
-
-result:Mercury a owl:Individual,
-        base:Entity,
-        result:planet,
-        result:planet-compose-metal,
-        result:planet-compose-rock ;
-    rdfs:label "Mercury" ;
-    base:fromStructure "SolarSystem-07" ;
-    result:compose result:metal-SolarSystem-07,
-        result:rock-SolarSystem-07 .
-
-result:Venus a owl:Individual,
-        base:Entity,
-        result:planet,
-        result:planet-compose-metal,
-        result:planet-compose-rock ;
-    rdfs:label "Venus" ;
-    base:fromStructure "SolarSystem-07" ;
-    result:compose result:metal-SolarSystem-07,
-        result:rock-SolarSystem-07 .
-
-result:inner-system a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:inner ;
-            owl:onProperty result:hasFeature ],
-        result:system ;
-    base:fromStructure "SolarSystem-07" .
-
-result:inner-system-hasPart-planet-compose-metal a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:planet-compose-metal ],
-        result:inner-system-hasPart-planet ;
-    base:fromStructure "SolarSystem-07" .
-
-result:inner-system-hasPart-planet-compose-rock a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:planet-compose-rock ],
-        result:inner-system-hasPart-planet ;
-    base:fromStructure "SolarSystem-07" .
-
-result:system a owl:Class ;
-    rdfs:label "system" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-07" .
-
-result:inner a owl:Individual,
-        base:Feature ;
-    rdfs:label "inner" ;
-    base:fromStructure "SolarSystem-07" .
-
-result:terrestrial a owl:Individual,
-        base:Feature ;
-    rdfs:label "terrestrial" ;
-    base:fromStructure "SolarSystem-07" .
-
-result:inner-system-hasPart-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:planet ],
-        [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:planet ],
-        result:inner-system ;
-    base:fromStructure "SolarSystem-07" .
-
-result:hasFeature a owl:ObjectProperty ;
-    rdfs:label "hasFeature" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "predefinedProperty" .
-
-result:metal-SolarSystem-07 a owl:Individual,
-        base:Entity,
-        result:metal ;
-    rdfs:label "metal (SolarSystem-07)" ;
-    base:fromStructure "SolarSystem-07" .
-
-result:rock-SolarSystem-07 a owl:Individual,
-        base:Entity,
-        result:rock ;
-    rdfs:label "rock (SolarSystem-07)" ;
-    base:fromStructure "SolarSystem-07" .
-
-result:planet-compose-metal a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:compose ;
-            owl:someValuesFrom result:metal ],
-        [ a owl:Restriction ;
-            owl:onProperty result:compose ;
-            owl:someValuesFrom result:metal ],
-        [ a owl:Restriction ;
-            owl:onProperty result:compose ;
-            owl:someValuesFrom result:metal ],
-        [ a owl:Restriction ;
-            owl:onProperty result:compose ;
-            owl:someValuesFrom result:metal ],
-        result:planet ;
-    base:fromStructure "SolarSystem-07" .
-
-result:planet-compose-rock a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:compose ;
-            owl:someValuesFrom result:rock ],
-        [ a owl:Restriction ;
-            owl:onProperty result:compose ;
-            owl:someValuesFrom result:rock ],
-        [ a owl:Restriction ;
-            owl:onProperty result:compose ;
-            owl:someValuesFrom result:rock ],
-        [ a owl:Restriction ;
-            owl:onProperty result:compose ;
-            owl:someValuesFrom result:rock ],
-        result:planet ;
-    base:fromStructure "SolarSystem-07" .
-
-result:hasPart a owl:ObjectProperty ;
-    rdfs:label "hasPart" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-07" .
-
-result:metal a owl:Class ;
-    rdfs:label "metal" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-07" .
-
-result:rock a owl:Class ;
-    rdfs:label "rock" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-07" .
-
-result:planet a owl:Class ;
-    rdfs:label "planet" ;
-    rdfs:subClassOf base:Entity,
-        base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-07" .
-
-result:compose a owl:ObjectProperty ;
-    rdfs:label "compose" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-07" .
 
+###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
diff --git a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_8.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_8.ttl
index 7ea1191c40647437b4e9d6b3388b063c94e3cec9..6690910f782156cf115ac78f656d601de2e5dbdc 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_8.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_8.ttl
@@ -1,116 +1,214 @@
-@prefix base: <https://reference.tetras-libre.fr/base-ontology#> .
 @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 base: <https://reference.tetras-libre.fr/base-ontology#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix result: <https://reference.tetras-libre.fr/expected-result#> .
+@base <http://www.w3.org/2002/07/owl#> .
+
+[ rdf:type owl:Ontology
+ ] .
+
+#################################################################
+#    Annotation properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#fromStructure
+base:fromStructure rdf:type owl:AnnotationProperty .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#hasQuantity
+base:hasQuantity rdf:type owl:AnnotationProperty .
+
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  https://reference.tetras-libre.fr/base-ontology#Out_ObjectProperty
+base:Out_ObjectProperty rdf:type owl:ObjectProperty .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasFeature
+result:hasFeature rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf base:Out_ObjectProperty ;
+                  rdfs:label "hasFeature" ;
+                  base:fromStructure "predefinedProperty" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#hasPart
+result:hasPart rdf:type owl:ObjectProperty ;
+               rdfs:subPropertyOf base:Out_ObjectProperty ;
+               rdfs:label "hasPart" ;
+               base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#isSubstantialMoreMassiveThan
+result:isSubstantialMoreMassiveThan rdf:type owl:ObjectProperty ;
+                         rdfs:subPropertyOf base:Out_ObjectProperty ;
+                         base:fromStructure "SolarSystem-07" .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  http://www.w3.org/2002/07/owl#Individual
+owl:Individual rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Degree
+base:Degree rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Entity
+base:Entity rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#Feature
+base:Feature rdf:type owl:Class .
+
+
+###  https://reference.tetras-libre.fr/expected-result#giant-planet
+result:giant-planet rdf:type owl:Class ;
+                    rdfs:subClassOf result:planet ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty result:isSubstantialMoreMassiveThan ;
+                                      owl:someValuesFrom result:terrestrial-planet
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty result:hasFeature ;
+                                      owl:hasValue result:giant
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty result:hasFeature ;
+                                      owl:hasValue result:substantial-more-massive
+                                    ] ;
+                    base:fromStructure "SolarSystem-07" ;
+                    base:hasQuantity 4 .
+
+
+###  https://reference.tetras-libre.fr/expected-result#outer-system
+result:outer-system rdf:type owl:Class ;
+                    rdfs:subClassOf result:system ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty result:hasFeature ;
+                                      owl:hasValue result:outer
+                                    ] ;
+                    base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#outer-system-hasPart-giant-planet
+result:outer-system-hasPart-giant-planet rdf:type owl:Class ;
+                                         rdfs:subClassOf result:outer-system-hasPart-planet ,
+                                                         [ rdf:type owl:Restriction ;
+                                                           owl:onProperty result:hasPart ;
+                                                           owl:someValuesFrom result:giant-planet
+                                                         ] ;
+                                         base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#outer-system-hasPart-planet
+result:outer-system-hasPart-planet rdf:type owl:Class ;
+                                   rdfs:subClassOf result:outer-system ,
+                                                   [ rdf:type owl:Restriction ;
+                                                     owl:onProperty result:hasPart ;
+                                                     owl:someValuesFrom result:planet
+                                                   ] ;
+                                   base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet
+result:planet rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity ;
+              rdfs:label "planet" ;
+              base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#system
+result:system rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity ;
+              rdfs:label "system" ;
+              base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#terrestrial-planet
+result:terrestrial-planet rdf:type owl:Class ;
+                          rdfs:subClassOf result:planet ,
+                                          [ rdf:type owl:Restriction ;
+                                            owl:onProperty result:hasFeature ;
+                                            owl:hasValue result:terrestrial
+                                          ] ;
+                          base:fromStructure "SolarSystem-07" .
+
+
+#################################################################
+#    Individuals
+#################################################################
+
+###  https://reference.tetras-libre.fr/expected-result#giant
+result:giant rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Feature ;
+             rdfs:label "giant" ;
+             base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#more
+result:more rdf:type owl:NamedIndividual ,
+                     owl:Individual ,
+                     base:Degree ;
+            rdfs:label "more" ;
+            base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#more-massive
+result:more-massive rdf:type owl:NamedIndividual ,
+                             owl:Individual ,
+                             base:Feature ;
+                    rdfs:label "more-massive" ;
+                    base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#substantial-more-massive
+result:substantial-more-massive rdf:type owl:NamedIndividual ,
+                             owl:Individual ,
+                             base:Feature ;
+                    rdfs:label "substantial-more-massive" ;
+                    base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#outer
+result:outer rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Feature ;
+             rdfs:label "outer" ;
+             base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#substantial
+result:substantial rdf:type owl:NamedIndividual ,
+                            owl:Individual ,
+                            base:Degree ;
+                   rdfs:label "substantial" ;
+                   base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#substantial-more
+result:substantial-more rdf:type owl:NamedIndividual ,
+                                 owl:Individual ,
+                                 base:Degree ;
+                        rdfs:label "substantial-more" ;
+                        base:fromStructure "SolarSystem-07" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#terrestrial
+result:terrestrial rdf:type owl:NamedIndividual ,
+                            owl:Individual ,
+                            base:Feature ;
+                   rdfs:label "terrestrial" ;
+                   base:fromStructure "SolarSystem-07" .
 
-result:more a owl:Individual,
-        base:Degree ;
-    rdfs:label "more" ;
-    base:fromStructure "SolarSystem-08" .
-
-result:outer-system-hasPart-giant-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:giant-planet ],
-        result:outer-system-hasPart-planet ;
-    base:fromStructure "SolarSystem-08" .
-
-result:outer-system-hasPart-more-massive-giant-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:more-massive-giant-planet ],
-        result:outer-system-hasPart-planet ;
-    base:fromStructure "SolarSystem-08" .
-
-result:substantial a owl:Class ;
-    rdfs:label "substantial" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-08" .
-
-result:outer-system a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:outer ;
-            owl:onProperty result:hasFeature ],
-        result:system ;
-    base:fromStructure "SolarSystem-08" .
-
-result:system a owl:Class ;
-    rdfs:label "system" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-08" .
-
-result:giant a owl:Individual,
-        base:Feature ;
-    rdfs:label "giant" ;
-    base:fromStructure "SolarSystem-08" .
-
-result:isMoreMassiveThan rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-08" .
-
-result:more-massive a owl:Individual,
-        base:Feature ;
-    rdfs:label "more-massive" ;
-    base:fromStructure "SolarSystem-08" .
-
-result:more-massive-giant-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:isMoreMassiveThan ;
-            owl:someValuesFrom result:terrestrial-planet ],
-        [ a owl:Restriction ;
-            owl:hasValue result:more-massive ;
-            owl:onProperty result:hasFeature ],
-        result:giant-planet,
-        result:planet ;
-    base:fromStructure "SolarSystem-08" .
-
-result:outer a owl:Individual,
-        base:Feature ;
-    rdfs:label "outer" ;
-    base:fromStructure "SolarSystem-08" .
-
-result:terrestrial a owl:Individual,
-        base:Feature ;
-    rdfs:label "terrestrial" ;
-    base:fromStructure "SolarSystem-08" .
-
-result:terrestrial-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:terrestrial ;
-            owl:onProperty result:hasFeature ],
-        result:planet ;
-    base:fromStructure "SolarSystem-08" .
-
-result:giant-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:giant ;
-            owl:onProperty result:hasFeature ],
-        result:planet ;
-    base:fromStructure "SolarSystem-08" .
-
-result:outer-system-hasPart-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:planet ],
-        [ a owl:Restriction ;
-            owl:onProperty result:hasPart ;
-            owl:someValuesFrom result:planet ],
-        result:outer-system,
-        result:outer-system-hasPart-planet ;
-    base:fromStructure "SolarSystem-08" .
-
-result:planet a owl:Class ;
-    rdfs:label "planet" ;
-    rdfs:subClassOf base:Entity,
-        base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-08" .
-
-result:hasFeature a owl:ObjectProperty ;
-    rdfs:label "hasFeature" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "predefinedProperty" .
-
-result:hasPart a owl:ObjectProperty ;
-    rdfs:label "hasPart" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-08" .
 
+###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi