diff --git a/SolarSystem-20231005/SolarSystem.sentence.txt b/SolarSystem-20231005/SolarSystem.sentence.txt
index 032eb54baf616ced998c5b384547f83878e20518..2cde5802f42f56f5d9e0a6ef09b3b218e09cf89d 100644
--- a/SolarSystem-20231005/SolarSystem.sentence.txt
+++ b/SolarSystem-20231005/SolarSystem.sentence.txt
@@ -15,6 +15,6 @@ The Solar System also contains smaller objects.
The asteroid belt, which lies between the orbits of Mars and Jupiter, contains objects composed of rock and metal.
Beyond Neptune's orbit, there are two regions known as the Kuiper Belt and the scattered disk.
The Kuiper Belt and the scattered disk contain objects primarily composed of ice.
-Beyond Neptune's orbit, there is also objects called sednoids.
+Beyond Neptune's orbit, there is objects called sednoids.
Six of the planets, and many of the smaller bodies are orbited by natural satellites, usually termed "moons".
Outer planets are encircled by small objects and planetary rings of dust.
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.dot b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.dot
index c4a7d7bc767b5ce13d59ab0be42834c0668e9f39..6b7bc3a4b3b3bd6b33b0f57fec6c7fc50416929a 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.dot
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.dot
@@ -3,14 +3,12 @@ digraph amr_graph {
o [label="o/object" shape=circle]
c [label="c/call-01" shape=circle]
s [label="s/sedoid" shape=circle]
- a [label="a/also" shape=circle]
b [label="b/beyond" shape=circle]
o2 [label="o2/orbit-01" shape=circle]
p [label="p/planet" shape=circle]
n [label="n/name" shape=circle]
o -> c [label=":ARG1-of"]
c -> s [label=":ARG2"]
- o -> a [label=":mod"]
o -> b [label=":location"]
b -> o2 [label=":op1"]
o2 -> p [label=":ARG0"]
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.nt b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.nt
index 66e34e294feba9b971ec4704d369c67bcabb5bb3..a6b4ba0018ba65a9651e6680da2177e755b6a6cc 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.nt
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.nt
@@ -1,42 +1,38 @@
+<http://amr.isi.edu/rdf/core-amr#Role> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Role" .
<http://amr.isi.edu/amr_data/SolarSystem-18#c> <http://amr.isi.edu/frames/ld/v1.2.2/call-01.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-18#o> .
-<http://amr.isi.edu/frames/ld/v1.2.2/call-01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Frame> .
-<http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Role" .
-<http://amr.isi.edu/rdf/amr-terms#also> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/entity-types#planet> .
-<http://amr.isi.edu/rdf/core-amr#Role> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#root01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#AMR> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#beyond> .
<http://amr.isi.edu/amr_data/SolarSystem-18#root01> <http://amr.isi.edu/rdf/core-amr#has-id> "SolarSystem-18" .
-<http://amr.isi.edu/rdf/amr-terms#beyond> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
<http://amr.isi.edu/amr_data/SolarSystem-18#o> <http://amr.isi.edu/rdf/amr-terms#location> <http://amr.isi.edu/amr_data/SolarSystem-18#b> .
-<http://amr.isi.edu/frames/ld/v1.2.2/orbit-01.ARG0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#root01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#AMR> .
+<http://amr.isi.edu/entity-types#planet> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#NamedEntity> .
<http://amr.isi.edu/amr_data/SolarSystem-18#root01> <http://amr.isi.edu/rdf/core-amr#root> <http://amr.isi.edu/amr_data/SolarSystem-18#o> .
<http://amr.isi.edu/rdf/amr-terms#op1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Role> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#c> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/call-01> .
-<http://amr.isi.edu/rdf/amr-terms#mod> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Role> .
-<http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Role> .
-<http://amr.isi.edu/rdf/core-amr#NamedEntity> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-EntityType" .
+<http://amr.isi.edu/amr_data/SolarSystem-18#b> <http://amr.isi.edu/rdf/amr-terms#op1> <http://amr.isi.edu/amr_data/SolarSystem-18#o2> .
<http://amr.isi.edu/amr_data/SolarSystem-18#o> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#object> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#c> <http://amr.isi.edu/frames/ld/v1.2.2/call-01.ARG2> <http://amr.isi.edu/amr_data/SolarSystem-18#s> .
+<http://amr.isi.edu/rdf/core-amr#Frame> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Frame" .
+<http://amr.isi.edu/rdf/core-amr#Frame> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
+<http://amr.isi.edu/frames/ld/v1.2.2/orbit-01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Frame> .
<http://amr.isi.edu/rdf/core-amr#NamedEntity> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Term" .
-<http://amr.isi.edu/entity-types#planet> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#NamedEntity> .
-<http://amr.isi.edu/rdf/amr-terms#object> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
-<http://amr.isi.edu/rdf/core-amr#Concept> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Concept" .
-<http://amr.isi.edu/amr_data/SolarSystem-18#b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#beyond> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#p> <http://www.w3.org/2000/01/rdf-schema#label> "Neptune" .
+<http://amr.isi.edu/amr_data/SolarSystem-18#o2> <http://amr.isi.edu/frames/ld/v1.2.2/orbit-01.ARG0> <http://amr.isi.edu/amr_data/SolarSystem-18#p> .
+<http://amr.isi.edu/frames/ld/v1.2.2/call-01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Frame> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#c> <http://amr.isi.edu/frames/ld/v1.2.2/call-01.ARG2> <http://amr.isi.edu/amr_data/SolarSystem-18#s> .
+<http://amr.isi.edu/rdf/core-amr#NamedEntity> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
<http://amr.isi.edu/rdf/amr-terms#location> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Role> .
-<http://amr.isi.edu/rdf/core-amr#Concept> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#o> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-18#a> .
<http://amr.isi.edu/frames/ld/v1.2.2/call-01.ARG1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#root01> <http://amr.isi.edu/rdf/core-amr#has-sentence> "Beyond Neptune's orbit, there is also objects called sednoids." .
-<http://amr.isi.edu/rdf/core-amr#Frame> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
-<http://amr.isi.edu/frames/ld/v1.2.2/call-01.ARG2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#o2> <http://amr.isi.edu/frames/ld/v1.2.2/orbit-01.ARG0> <http://amr.isi.edu/amr_data/SolarSystem-18#p> .
-<http://amr.isi.edu/frames/ld/v1.2.2/orbit-01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Frame> .
+<http://amr.isi.edu/rdf/core-amr#Concept> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Concept" .
+<http://amr.isi.edu/rdf/amr-terms#beyond> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/entity-types#planet> .
+<http://amr.isi.edu/frames/ld/v1.2.2/orbit-01.ARG0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> .
<http://amr.isi.edu/rdf/amr-terms#sedoid> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
-<http://amr.isi.edu/rdf/core-amr#NamedEntity> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
-<http://amr.isi.edu/rdf/core-amr#Role> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Role" .
-<http://amr.isi.edu/amr_data/SolarSystem-18#a> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#also> .
-<http://amr.isi.edu/rdf/core-amr#Frame> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Frame" .
+<http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Role> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#p> <http://www.w3.org/2000/01/rdf-schema#label> "Neptune" .
+<http://amr.isi.edu/rdf/amr-terms#object> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
+<http://amr.isi.edu/rdf/core-amr#Concept> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#c> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/call-01> .
+<http://amr.isi.edu/rdf/core-amr#Role> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#root01> <http://amr.isi.edu/rdf/core-amr#has-sentence> "Beyond Neptune's orbit, there is objects called sednoids." .
<http://amr.isi.edu/amr_data/SolarSystem-18#s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#sedoid> .
+<http://amr.isi.edu/rdf/core-amr#NamedEntity> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-EntityType" .
+<http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Role" .
<http://amr.isi.edu/amr_data/SolarSystem-18#o2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/orbit-01> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#b> <http://amr.isi.edu/rdf/amr-terms#op1> <http://amr.isi.edu/amr_data/SolarSystem-18#o2> .
+<http://amr.isi.edu/frames/ld/v1.2.2/call-01.ARG2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/FrameRole> .
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.penman b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.penman
index e9b166fd7ebb7669fc43c715e213b7221148a7bc..56f3db54ca8a716d919d9561483e7018e90d7694 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.penman
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.penman
@@ -1,9 +1,8 @@
# ::id SolarSystem-18
-# ::snt Beyond Neptune's orbit, there is also objects called sednoids.
+# ::snt Beyond Neptune's orbit, there is objects called sednoids.
(o / object
:ARG1-of (c / call-01
:ARG2 (s / sedoid))
- :mod (a / also)
:location (b / beyond
:op1 (o2 / orbit-01
:ARG0 (p / planet
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.png b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.png
index bfc5d864c9a80076ed34f8e6f873671432a45963..b1eb3d3d8dff82042208b3e162f5d789191e2c8f 100644
Binary files a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.png and b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.png differ
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.svg b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.svg
index 8e92da394cb865213c48d8a57c4ba92b2edea59a..b04fe39d7f0eb5c5d38e1a78f9c0bf29b1cd61a1 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.svg
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.svg
@@ -4,116 +4,103 @@
<!-- Generated by graphviz version 9.0.0 (0)
-->
<!-- Title: amr_graph Pages: 1 -->
-<svg width="864pt" height="289pt"
- viewBox="0.00 0.00 864.00 289.25" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(0.818835 0.818835) rotate(0) translate(4 349.25)">
+<svg width="864pt" height="216pt"
+ viewBox="0.00 0.00 864.00 215.95" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(0.818835 0.818835) rotate(0) translate(4 259.73)">
<title>amr_graph</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-349.25 1051.16,-349.25 1051.16,4 -4,4"/>
+<polygon fill="white" stroke="none" points="-4,4 -4,-259.73 1051.16,-259.73 1051.16,4 -4,4"/>
<!-- o -->
<g id="node1" class="node">
<title>o</title>
-<ellipse fill="none" stroke="black" cx="50.68" cy="-181.47" rx="50.68" ry="50.68"/>
-<text text-anchor="middle" x="50.68" y="-176.79" font-family="Times,serif" font-size="14.00">o/object</text>
+<ellipse fill="none" stroke="black" cx="50.68" cy="-136.47" rx="50.68" ry="50.68"/>
+<text text-anchor="middle" x="50.68" y="-131.79" font-family="Times,serif" font-size="14.00">o/object</text>
</g>
<!-- c -->
<g id="node2" class="node">
<title>c</title>
-<ellipse fill="none" stroke="black" cx="257.36" cy="-292.47" rx="52.79" ry="52.79"/>
-<text text-anchor="middle" x="257.36" y="-287.79" font-family="Times,serif" font-size="14.00">c/call-01</text>
+<ellipse fill="none" stroke="black" cx="257.36" cy="-202.47" rx="52.79" ry="52.79"/>
+<text text-anchor="middle" x="257.36" y="-197.79" font-family="Times,serif" font-size="14.00">c/call-01</text>
</g>
<!-- o->c -->
<g id="edge1" class="edge">
<title>o->c</title>
-<path fill="none" stroke="black" d="M95.84,-205.41C126.51,-222.05 167.63,-244.34 200.57,-262.21"/>
-<polygon fill="black" stroke="black" points="198.72,-265.19 209.17,-266.88 202.05,-259.03 198.72,-265.19"/>
-<text text-anchor="middle" x="150.86" y="-253.42" font-family="Times,serif" font-size="14.00">:ARG1-of</text>
-</g>
-<!-- a -->
-<g id="node4" class="node">
-<title>a</title>
-<ellipse fill="none" stroke="black" cx="257.36" cy="-181.47" rx="40.16" ry="40.16"/>
-<text text-anchor="middle" x="257.36" y="-176.79" font-family="Times,serif" font-size="14.00">a/also</text>
-</g>
-<!-- o->a -->
-<g id="edge3" class="edge">
-<title>o->a</title>
-<path fill="none" stroke="black" d="M101.75,-181.47C133.27,-181.47 173.82,-181.47 205.49,-181.47"/>
-<polygon fill="black" stroke="black" points="205.21,-184.97 215.21,-181.47 205.21,-177.97 205.21,-184.97"/>
-<text text-anchor="middle" x="150.86" y="-185.42" font-family="Times,serif" font-size="14.00">:mod</text>
+<path fill="none" stroke="black" d="M99.41,-151.86C128.26,-161.16 165.29,-173.1 196.14,-183.05"/>
+<polygon fill="black" stroke="black" points="194.74,-186.27 205.33,-186.01 196.89,-179.61 194.74,-186.27"/>
+<text text-anchor="middle" x="150.86" y="-180.42" font-family="Times,serif" font-size="14.00">:ARG1-of</text>
</g>
<!-- b -->
-<g id="node5" class="node">
+<g id="node4" class="node">
<title>b</title>
-<ellipse fill="none" stroke="black" cx="257.36" cy="-66.47" rx="57" ry="57"/>
-<text text-anchor="middle" x="257.36" y="-61.79" font-family="Times,serif" font-size="14.00">b/beyond</text>
+<ellipse fill="none" stroke="black" cx="257.36" cy="-72.47" rx="57" ry="57"/>
+<text text-anchor="middle" x="257.36" y="-67.79" font-family="Times,serif" font-size="14.00">b/beyond</text>
</g>
<!-- o->b -->
-<g id="edge4" class="edge">
+<g id="edge3" class="edge">
<title>o->b</title>
-<path fill="none" stroke="black" d="M95.34,-156.94C125.02,-140.26 164.66,-117.99 197.18,-99.72"/>
-<polygon fill="black" stroke="black" points="198.7,-102.88 205.7,-94.93 195.27,-96.77 198.7,-102.88"/>
-<text text-anchor="middle" x="150.86" y="-144.42" font-family="Times,serif" font-size="14.00">:location</text>
+<path fill="none" stroke="black" d="M99.41,-121.54C126.87,-112.95 161.75,-102.05 191.65,-92.7"/>
+<polygon fill="black" stroke="black" points="192.47,-96.11 200.97,-89.79 190.38,-89.43 192.47,-96.11"/>
+<text text-anchor="middle" x="150.86" y="-117.42" font-family="Times,serif" font-size="14.00">:location</text>
</g>
<!-- s -->
<g id="node3" class="node">
<title>s</title>
-<ellipse fill="none" stroke="black" cx="461.82" cy="-292.47" rx="52.26" ry="52.26"/>
-<text text-anchor="middle" x="461.82" y="-287.79" font-family="Times,serif" font-size="14.00">s/sedoid</text>
+<ellipse fill="none" stroke="black" cx="461.82" cy="-203.47" rx="52.26" ry="52.26"/>
+<text text-anchor="middle" x="461.82" y="-198.79" font-family="Times,serif" font-size="14.00">s/sedoid</text>
</g>
<!-- c->s -->
<g id="edge2" class="edge">
<title>c->s</title>
-<path fill="none" stroke="black" d="M310.5,-292.47C337.17,-292.47 369.84,-292.47 397.9,-292.47"/>
-<polygon fill="black" stroke="black" points="397.69,-295.97 407.69,-292.47 397.69,-288.97 397.69,-295.97"/>
-<text text-anchor="middle" x="354.85" y="-296.42" font-family="Times,serif" font-size="14.00">:ARG2</text>
+<path fill="none" stroke="black" d="M310.5,-202.72C337.17,-202.85 369.84,-203.02 397.9,-203.15"/>
+<polygon fill="black" stroke="black" points="397.68,-206.65 407.69,-203.2 397.71,-199.65 397.68,-206.65"/>
+<text text-anchor="middle" x="354.85" y="-206.42" font-family="Times,serif" font-size="14.00">:ARG2</text>
</g>
<!-- o2 -->
-<g id="node6" class="node">
+<g id="node5" class="node">
<title>o2</title>
<ellipse fill="none" stroke="black" cx="461.82" cy="-66.47" rx="66.47" ry="66.47"/>
<text text-anchor="middle" x="461.82" y="-61.79" font-family="Times,serif" font-size="14.00">o2/orbit-01</text>
</g>
<!-- b->o2 -->
-<g id="edge5" class="edge">
+<g id="edge4" class="edge">
<title>b->o2</title>
-<path fill="none" stroke="black" d="M314.76,-66.47C336.08,-66.47 360.72,-66.47 383.62,-66.47"/>
-<polygon fill="black" stroke="black" points="383.54,-69.97 393.54,-66.47 383.54,-62.97 383.54,-69.97"/>
-<text text-anchor="middle" x="354.85" y="-70.42" font-family="Times,serif" font-size="14.00">:op1</text>
+<path fill="none" stroke="black" d="M314.76,-70.79C336.08,-70.16 360.72,-69.43 383.62,-68.75"/>
+<polygon fill="black" stroke="black" points="383.65,-72.25 393.55,-68.46 383.45,-65.26 383.65,-72.25"/>
+<text text-anchor="middle" x="354.85" y="-74.42" font-family="Times,serif" font-size="14.00">:op1</text>
</g>
<!-- p -->
-<g id="node7" class="node">
+<g id="node6" class="node">
<title>p</title>
<ellipse fill="none" stroke="black" cx="661.55" cy="-66.47" rx="52.26" ry="52.26"/>
<text text-anchor="middle" x="661.55" y="-61.79" font-family="Times,serif" font-size="14.00">p/planet</text>
</g>
<!-- o2->p -->
-<g id="edge6" class="edge">
+<g id="edge5" class="edge">
<title>o2->p</title>
<path fill="none" stroke="black" d="M528.66,-66.47C550.95,-66.47 575.77,-66.47 597.81,-66.47"/>
<polygon fill="black" stroke="black" points="597.54,-69.97 607.54,-66.47 597.54,-62.97 597.54,-69.97"/>
<text text-anchor="middle" x="568.78" y="-70.42" font-family="Times,serif" font-size="14.00">:ARG0</text>
</g>
<!-- n -->
-<g id="node8" class="node">
+<g id="node7" class="node">
<title>n</title>
<ellipse fill="none" stroke="black" cx="841.36" cy="-66.47" rx="48.05" ry="48.05"/>
<text text-anchor="middle" x="841.36" y="-61.79" font-family="Times,serif" font-size="14.00">n/name</text>
</g>
<!-- p->n -->
-<g id="edge7" class="edge">
+<g id="edge6" class="edge">
<title>p->n</title>
<path fill="none" stroke="black" d="M713.98,-66.47C735.1,-66.47 759.69,-66.47 781.52,-66.47"/>
<polygon fill="black" stroke="black" points="781.48,-69.97 791.48,-66.47 781.48,-62.97 781.48,-69.97"/>
<text text-anchor="middle" x="753.56" y="-70.42" font-family="Times,serif" font-size="14.00">:name</text>
</g>
<!-- node_0 -->
-<g id="node9" class="node">
+<g id="node8" class="node">
<title>node_0</title>
<polygon fill="none" stroke="black" points="1047.16,-84.47 956.16,-84.47 956.16,-48.47 1047.16,-48.47 1047.16,-84.47"/>
<text text-anchor="middle" x="1001.66" y="-61.79" font-family="Times,serif" font-size="14.00">"Neptune"</text>
</g>
<!-- n->node_0 -->
-<g id="edge8" class="edge">
+<g id="edge7" class="edge">
<title>n->node_0</title>
<path fill="none" stroke="black" d="M889.85,-66.47C907.03,-66.47 926.6,-66.47 944.46,-66.47"/>
<polygon fill="black" stroke="black" points="944.39,-69.97 954.39,-66.47 944.39,-62.97 944.39,-69.97"/>
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.ttl b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.ttl
index f17175bf87a4d1c29e0be07ba36b39ddc164789b..5fc4bdc04a2c3036e4e2fd563e381410aaa62653 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.ttl
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-18/SolarSystem-18.stog.amr.ttl
@@ -1,73 +1,66 @@
-@prefix ns1: <http://amr.isi.edu/rdf/core-amr#> .
-@prefix ns2: <http://amr.isi.edu/frames/ld/v1.2.2/> .
-@prefix ns3: <http://amr.isi.edu/rdf/amr-terms#> .
+@prefix ns1: <http://amr.isi.edu/rdf/amr-terms#> .
+@prefix ns2: <http://amr.isi.edu/rdf/core-amr#> .
+@prefix ns3: <http://amr.isi.edu/frames/ld/v1.2.2/> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-ns1:Concept a rdfs:Class ;
+ns2:Concept a rdfs:Class ;
rdfs:label "AMR-Concept" .
-ns1:Role a rdfs:Class ;
+ns2:Role a rdfs:Class ;
rdfs:label "AMR-Role" .
-<http://amr.isi.edu/amr_data/SolarSystem-18#c> a ns2:call-01 ;
- ns2:call-01.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-18#o> ;
- ns2:call-01.ARG2 <http://amr.isi.edu/amr_data/SolarSystem-18#s> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#c> a ns3:call-01 ;
+ ns3:call-01.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-18#o> ;
+ ns3:call-01.ARG2 <http://amr.isi.edu/amr_data/SolarSystem-18#s> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#root01> a ns1:AMR ;
- ns1:has-id "SolarSystem-18" ;
- ns1:has-sentence "Beyond Neptune's orbit, there is also objects called sednoids." ;
- ns1:root <http://amr.isi.edu/amr_data/SolarSystem-18#o> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#root01> a ns2:AMR ;
+ ns2:has-id "SolarSystem-18" ;
+ ns2:has-sentence "Beyond Neptune's orbit, there is objects called sednoids." ;
+ ns2:root <http://amr.isi.edu/amr_data/SolarSystem-18#o> .
-ns2:call-01.ARG1 a ns2:FrameRole .
+ns3:call-01.ARG1 a ns3:FrameRole .
-ns2:call-01.ARG2 a ns2:FrameRole .
+ns3:call-01.ARG2 a ns3:FrameRole .
-ns2:orbit-01.ARG0 a ns2:FrameRole .
+ns3:orbit-01.ARG0 a ns3:FrameRole .
-ns3:location a ns1:Role .
+ns1:location a ns2:Role .
-ns3:mod a ns1:Role .
+ns1:op1 a ns2:Role .
-ns3:op1 a ns1:Role .
+<http://amr.isi.edu/amr_data/SolarSystem-18#b> a ns1:beyond ;
+ ns1:op1 <http://amr.isi.edu/amr_data/SolarSystem-18#o2> .
-<http://amr.isi.edu/amr_data/SolarSystem-18#a> a ns3:also .
-
-<http://amr.isi.edu/amr_data/SolarSystem-18#b> a ns3:beyond ;
- ns3:op1 <http://amr.isi.edu/amr_data/SolarSystem-18#o2> .
-
-<http://amr.isi.edu/amr_data/SolarSystem-18#o2> a ns2:orbit-01 ;
- ns2:orbit-01.ARG0 <http://amr.isi.edu/amr_data/SolarSystem-18#p> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#o2> a ns3:orbit-01 ;
+ ns3:orbit-01.ARG0 <http://amr.isi.edu/amr_data/SolarSystem-18#p> .
<http://amr.isi.edu/amr_data/SolarSystem-18#p> a <http://amr.isi.edu/entity-types#planet> ;
rdfs:label "Neptune" .
-<http://amr.isi.edu/amr_data/SolarSystem-18#s> a ns3:sedoid .
-
-<http://amr.isi.edu/entity-types#planet> a ns1:NamedEntity .
+<http://amr.isi.edu/amr_data/SolarSystem-18#s> a ns1:sedoid .
-ns2:call-01 a ns1:Frame .
+<http://amr.isi.edu/entity-types#planet> a ns2:NamedEntity .
-ns2:orbit-01 a ns1:Frame .
+ns3:call-01 a ns2:Frame .
-ns3:also a ns1:Concept .
+ns3:orbit-01 a ns2:Frame .
-ns3:beyond a ns1:Concept .
+ns1:beyond a ns2:Concept .
-ns3:object a ns1:Concept .
+ns1:object a ns2:Concept .
-ns3:sedoid a ns1:Concept .
+ns1:sedoid a ns2:Concept .
-ns1:NamedEntity a ns1:Concept ;
+ns2:NamedEntity a ns2:Concept ;
rdfs:label "AMR-EntityType",
"AMR-Term" .
-<http://amr.isi.edu/amr_data/SolarSystem-18#o> a ns3:object ;
- ns3:location <http://amr.isi.edu/amr_data/SolarSystem-18#b> ;
- ns3:mod <http://amr.isi.edu/amr_data/SolarSystem-18#a> .
+<http://amr.isi.edu/amr_data/SolarSystem-18#o> a ns1:object ;
+ ns1:location <http://amr.isi.edu/amr_data/SolarSystem-18#b> .
-ns1:Frame a ns1:Concept ;
+ns2:Frame a ns2:Concept ;
rdfs:label "AMR-PropBank-Frame" .
-ns2:FrameRole a ns1:Role ;
+ns3:FrameRole a ns2:Role ;
rdfs:label "AMR-PropBank-Role" .
diff --git a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_17.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_17.ttl
index 91e8e463430489847e2c87593b8ef7dbd9f14942..164bd3ae5245a5e3585a88f13f380e41986c57c7 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_17.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_17.ttl
@@ -1,122 +1,253 @@
-@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-17" .
+
+
+### 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#isComposedOf
+result:isComposedOf rdf:type owl:ObjectProperty ;
+ rdfs:subPropertyOf base:Out_ObjectProperty ;
+ rdfs:label "isComposedOf" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#isPrimaryComposedOf
+result:isPrimaryComposedOf rdf:type owl:ObjectProperty ;
+ rdfs:subPropertyOf result:isComposedOf ;
+ rdfs:label "isPrimaryComposedOf" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+#################################################################
+# 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#disk
+result:disk rdf:type owl:Class ;
+ rdfs:subClassOf base:Entity ;
+ rdfs:label "disk" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#ice
+result:ice rdf:type owl:Class ;
+ rdfs:subClassOf base:Entity ;
+ rdfs:label "ice" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#object
+result:object rdf:type owl:Class ;
+ rdfs:subClassOf base:Entity ;
+ rdfs:label "object" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#object-composedOf-ice
+result:object-composedOf-ice rdf:type owl:Class ;
+ rdfs:subClassOf result:object ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:isComposedOf ;
+ owl:someValuesFrom result:ice
+ ] ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#object-primaryComposedOf-ice
+result:object-primaryComposedOf-ice rdf:type owl:Class ;
+ rdfs:subClassOf result:object-composedOf-ice ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:isPrimaryComposedOf ;
+ owl:someValuesFrom result:ice
+ ] ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#region
+result:region rdf:type owl:Class ;
+ rdfs:subClassOf base:Entity ;
+ rdfs:label "region" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#region-contain-object
+result:region-contain-object rdf:type owl:Class ;
+ rdfs:subClassOf result:region ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:contain ;
+ owl:someValuesFrom result:object
+ ] ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#region-contain-object-composedOf-ice
+result:region-contain-object-composedOf-ice rdf:type owl:Class ;
+ rdfs:subClassOf result:region-contain-object ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:contain ;
+ owl:someValuesFrom result:object-composedOf-ice
+ ] ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#region-contain-object-primaryComposedOf-ice
+result:region-contain-object-primaryComposedOf-ice rdf:type owl:Class ;
+ rdfs:subClassOf result:region-contain-object-composedOf-ice ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:contain ;
+ owl:someValuesFrom result:object-primaryComposedOf-ice
+ ] ;
+ base:fromStructure "SolarSystem-17" .
+
-result:KuiperBelt a owl:Individual,
- base:Entity,
- result:world-region,
- result:world-region-contain-object,
- result:world-region-contain-object-compose-ice ;
- rdfs:label "KuiperBelt" ;
- base:fromStructure "SolarSystem-17" ;
- result:contain result:object-SolarSystem-17 .
-
-result:disk-SolarSystem-17 a owl:Individual,
- base:Entity,
- result:disk-contain-object,
- result:disk-contain-object-compose-ice ;
- rdfs:label "disk (SolarSystem-17)" ;
- base:fromStructure "SolarSystem-17" ;
- result:contain result:object-SolarSystem-17 .
-
-result:hasFeature a owl:ObjectProperty ;
- rdfs:label "hasFeature" ;
- rdfs:subPropertyOf base:Out_ObjectProperty ;
- base:fromStructure "predefinedProperty" .
-
-result:primary a owl:Class ;
- rdfs:label "primary" ;
- rdfs:subClassOf base:Undetermined_Thing ;
- base:fromStructure "SolarSystem-17" .
-
-result:scatter a owl:ObjectProperty ;
- rdfs:label "scatter" ;
- rdfs:subPropertyOf base:Out_ObjectProperty ;
- base:fromStructure "SolarSystem-17" .
-
-result:disk a owl:Class ;
- rdfs:label "disk" ;
- rdfs:subClassOf base:Entity ;
- base:fromStructure "SolarSystem-17" .
-
-result:disk-contain-object-compose-ice a owl:Class ;
- rdfs:subClassOf [ a owl:Restriction ;
- owl:onProperty result:contain ;
- owl:someValuesFrom result:object-compose-ice ],
- result:disk-contain-object ;
- base:fromStructure "SolarSystem-17" .
-
-result:ice-SolarSystem-17 a owl:Individual,
- base:Entity,
- result:ice ;
- rdfs:label "ice (SolarSystem-17)" ;
- base:fromStructure "SolarSystem-17" .
-
-result:world-region-contain-object-compose-ice a owl:Class ;
- rdfs:subClassOf [ a owl:Restriction ;
- owl:onProperty result:contain ;
- owl:someValuesFrom result:object-compose-ice ],
- result:world-region-contain-object ;
- base:fromStructure "SolarSystem-17" .
-
-result:compose a owl:ObjectProperty ;
- rdfs:label "compose" ;
- rdfs:subPropertyOf base:Out_ObjectProperty ;
- base:fromStructure "SolarSystem-17" .
-
-result:disk-contain-object a owl:Class ;
- rdfs:subClassOf [ a owl:Restriction ;
- owl:onProperty result:contain ;
- owl:someValuesFrom result:object ],
- [ a owl:Restriction ;
- owl:onProperty result:contain ;
- owl:someValuesFrom result:object ],
- result:disk ;
- base:fromStructure "SolarSystem-17" .
-
-result:object-SolarSystem-17 a owl:Individual,
- base:Entity,
- result:object,
- result:object-compose-ice ;
- rdfs:label "object (SolarSystem-17)" ;
- base:fromStructure "SolarSystem-17" ;
- result:compose result:ice-SolarSystem-17 .
-
-result:world-region a owl:Class ;
- rdfs:label "world-region" ;
- rdfs:subClassOf base:Entity ;
- base:fromStructure "SolarSystem-17" .
-
-result:world-region-contain-object a owl:Class ;
- rdfs:subClassOf [ a owl:Restriction ;
- owl:onProperty result:contain ;
- owl:someValuesFrom result:object ],
- [ a owl:Restriction ;
- owl:onProperty result:contain ;
- owl:someValuesFrom result:object ],
- result:world-region ;
- base:fromStructure "SolarSystem-17" .
-
-result:ice a owl:Class ;
- rdfs:label "ice" ;
- rdfs:subClassOf base:Entity ;
- base:fromStructure "SolarSystem-17" .
-
-result:object-compose-ice a owl:Class ;
- rdfs:subClassOf [ a owl:Restriction ;
- owl:onProperty result:compose ;
- owl:someValuesFrom result:ice ],
- result:object ;
- base:fromStructure "SolarSystem-17" .
-
-result:object a owl:Class ;
- rdfs:label "object" ;
- rdfs:subClassOf base:Entity ;
- base:fromStructure "SolarSystem-17" .
-
-result:contain a owl:ObjectProperty ;
- rdfs:label "contain" ;
- rdfs:subPropertyOf base:Out_ObjectProperty ;
- base:fromStructure "SolarSystem-17" .
+### https://reference.tetras-libre.fr/expected-result#scattered-disk
+result:scattered-disk rdf:type owl:Class ;
+ rdfs:subClassOf result:disk ;
+ rdfs:label "scattered-disk" ;
+ base:fromStructure "SolarSystem-17" .
+
+### https://reference.tetras-libre.fr/expected-result#scattered-disk-contain-object
+result:scattered-disk-contain-object rdf:type owl:Class ;
+ rdfs:subClassOf result:scattered-disk ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:contain ;
+ owl:someValuesFrom result:object
+ ] ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#scattered-disk-contain-object-composedOf-ice
+result:scattered-disk-contain-object-composedOf-ice rdf:type owl:Class ;
+ rdfs:subClassOf result:scattered-disk-contain-object ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:contain ;
+ owl:someValuesFrom result:object-composedOf-ice
+ ] ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#scattered-disk-contain-object-primaryComposedOf-ice
+result:scattered-disk-contain-object-primaryComposedOf-ice rdf:type owl:Class ;
+ rdfs:subClassOf result:scattered-disk-contain-object-composedOf-ice ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:contain ;
+ owl:someValuesFrom result:object-primaryComposedOf-ice
+ ] ;
+ base:fromStructure "SolarSystem-17" .
+
+
+#################################################################
+# Individuals
+#################################################################
+
+### https://reference.tetras-libre.fr/expected-result#KuiperBelt
+result:KuiperBelt rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Entity ,
+ result:region ,
+ result:region-contain-object-primaryComposedOf-ice ;
+ result:contain result:object-SolarSystem-17 ;
+ rdfs:label "KuiperBelt" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#ice-SolarSystem-17
+result:ice-SolarSystem-17 rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Entity ,
+ result:ice ;
+ rdfs:label "ice (SolarSystem-17)" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#object-SolarSystem-17
+result:object-SolarSystem-17 rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Entity ,
+ result:object ,
+ result:object-primaryComposedOf-ice ;
+ result:isComposedOf result:ice-SolarSystem-17 ;
+ rdfs:label "object (SolarSystem-17)" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#primary
+result:primary rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Degree ;
+ rdfs:label "primary" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#scattered
+result:scattered rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Feature ;
+ rdfs:label "scattered" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### https://reference.tetras-libre.fr/expected-result#scattered-disk-SolarSystem-17
+result:scattered-disk-SolarSystem-17 rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Entity ,
+ result:scattered-disk-contain-object-primaryComposedOf-ice ;
+ result:hasFeature result:scattered ;
+ rdfs:label "scattered disk (SolarSystem-17)" ;
+ base:fromStructure "SolarSystem-17" .
+
+
+### 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_18.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_18.ttl
index c57b3e21ea929d3c17e407b8d3a09147947aec4b..142768b0202c3175451f301b86e0185a88de2fb5 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_18.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_18.ttl
@@ -1,65 +1,164 @@
-@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#call
+result:call rdf:type owl:ObjectProperty ;
+ rdfs:subPropertyOf base:Out_ObjectProperty ;
+ rdfs:label "call" ;
+ base:fromStructure "SolarSystem-18" .
+
+
+### 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#hasLocation
+result:hasLocation rdf:type owl:ObjectProperty ;
+ rdfs:subPropertyOf base:Out_ObjectProperty ;
+ rdfs:label "hasLocation" ;
+ base:fromStructure "predefinedProperty" .
+
+
+### https://reference.tetras-libre.fr/expected-result#hasOrbit
+result:hasOrbit rdf:type owl:ObjectProperty ;
+ rdfs:subPropertyOf base:Out_ObjectProperty ;
+ rdfs:label "hasOrbit" ;
+ base:fromStructure "SolarSystem-18" .
+
+
+### https://reference.tetras-libre.fr/expected-result#isBeyond
+result:isBeyond rdf:type owl:ObjectProperty ;
+ rdfs:subPropertyOf base:Out_ObjectProperty ;
+ rdfs:label "isBeyond" ;
+ base:fromStructure "SolarSystem-18" .
+
+
+#################################################################
+# 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#Feature
+base:Feature rdf:type owl:Class .
+
+
+### https://reference.tetras-libre.fr/base-ontology#Location
+base:Location rdf:type owl:Class .
+
+
+### https://reference.tetras-libre.fr/expected-result#orbit
+result:orbit rdf:type owl:Class ;
+ rdfs:subClassOf base:Entity ;
+ rdfs:label "orbit" ;
+ base:fromStructure "SolarSystem-18" .
+
+
+### https://reference.tetras-libre.fr/expected-result#orbit-of-planet
+result:orbit-of-planet rdf:type owl:Class ;
+ rdfs:subClassOf result:orbit ;
+ rdfs:label "orbit-of-planet" ;
+ base:fromStructure "SolarSystem-18" .
+
+
+### https://reference.tetras-libre.fr/expected-result#object
+result:object rdf:type owl:Class ;
+ rdfs:subClassOf base:Entity ;
+ rdfs:label "object" ;
+ base:fromStructure "SolarSystem-18" .
+
+
+### https://reference.tetras-libre.fr/expected-result#object-SolarSystem-18
+result:object-SolarSystem-18 rdf:type owl:Class ;
+ rdfs:subClassOf result:object ,
+ [ rdf:type owl:Restriction ;
+ owl:onProperty result:hasLocation ;
+ owl:hasValue result:location-SolarSystem-18
+ ] ;
+ rdfs:label "object (SolarSystem-18)" ;
+ base:fromStructure "SolarSystem-18" .
+
+
+### https://reference.tetras-libre.fr/expected-result#planet
+result:planet rdf:type owl:Class ;
+ rdfs:subClassOf base:Entity ;
+ rdfs:label "planet" ;
+ base:fromStructure "SolarSystem-18" .
+
+
+#################################################################
+# Individuals
+#################################################################
+
+### https://reference.tetras-libre.fr/expected-sedoid
+result:sedoid rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Entity ,
+ result:object ,
+ result:object-SolarSystem-18 ;
+ rdfs:label "sedoid" ;
+ result:hasLocation result:location-SolarSystem-18 ;
+ base:fromStructure "SolarSystem-18" .
+
+### https://reference.tetras-libre.fr/expected-result#Neptune
+result:Neptune rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Entity ,
+ result:planet ;
+ rdfs:label "Neptune" ;
+ result:hasOrbit result:orbit-of-Neptune ;
+ base:fromStructure "SolarSystem-18" .
+
+
+### https://reference.tetras-libre.fr/expected-result#orbit-of-Neptune
+result:orbit-of-Neptune rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Entity ,
+ result:orbit-of-planet ;
+ rdfs:label "orbit-of-Neptune" ;
+ base:fromStructure "SolarSystem-18" .
+
+### https://reference.tetras-libre.fr/expected-result#location-SolarSystem-18
+result:location-SolarSystem-18 rdf:type owl:NamedIndividual ,
+ owl:Individual ,
+ base:Location ;
+ result:isBeyond result:orbit-of-Neptune ;
+ rdfs:label "location beyond orbit of Nepture" ;
+ base:fromStructure "SolarSystem-18" .
-result:Neptune a owl:Individual,
- base:Entity,
- result:planet ;
- rdfs:label "Neptune" ;
- base:fromStructure "SolarSystem-18" .
-
-result:also-object-call-sedoid a owl:Class ;
- rdfs:subClassOf [ a owl:Restriction ;
- owl:onProperty result:call ;
- owl:someValuesFrom result:sedoid ],
- result:also-object ;
- base:fromStructure "SolarSystem-18" .
-
-result:beyond a owl:Class ;
- rdfs:label "beyond" ;
- rdfs:subClassOf base:Undetermined_Thing ;
- base:fromStructure "SolarSystem-18" .
-
-result:orbit a owl:ObjectProperty ;
- rdfs:label "orbit" ;
- rdfs:subPropertyOf base:Out_ObjectProperty ;
- base:fromStructure "SolarSystem-18" .
-
-result:also-object a owl:Class ;
- rdfs:subClassOf [ a owl:Restriction ;
- owl:hasValue result:also ;
- owl:onProperty result:hasFeature ],
- result:object ;
- base:fromStructure "SolarSystem-18" .
-
-result:object a owl:Class ;
- rdfs:label "object" ;
- rdfs:subClassOf base:Entity ;
- base:fromStructure "SolarSystem-18" .
-
-result:planet a owl:Class ;
- rdfs:label "planet" ;
- rdfs:subClassOf base:Entity ;
- base:fromStructure "SolarSystem-18" .
-
-result:also a owl:Individual,
- base:Feature ;
- rdfs:label "also" ;
- base:fromStructure "SolarSystem-18" .
-
-result:call a owl:ObjectProperty ;
- rdfs:label "call" ;
- rdfs:subPropertyOf base:Out_ObjectProperty ;
- base:fromStructure "SolarSystem-18" .
-
-result:hasFeature a owl:ObjectProperty ;
- rdfs:label "hasFeature" ;
- rdfs:subPropertyOf base:Out_ObjectProperty ;
- base:fromStructure "predefinedProperty" .
-
-result:sedoid a owl:Class ;
- rdfs:label "sedoid" ;
- rdfs:subClassOf base:Entity ;
- base:fromStructure "SolarSystem-18" .
+### Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi