diff --git a/SolarSystem-20231005/SolarSystem.sentence.txt b/SolarSystem-20231005/SolarSystem.sentence.txt
index 2cde5802f42f56f5d9e0a6ef09b3b218e09cf89d..5db79c18e7c3abc0b9084807c66e213cf2e1f766 100644
--- a/SolarSystem-20231005/SolarSystem.sentence.txt
+++ b/SolarSystem-20231005/SolarSystem.sentence.txt
@@ -16,5 +16,5 @@ The asteroid belt, which lies between the orbits of Mars and Jupiter, contains o
 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 objects called sednoids.
-Six of the planets, and many of the smaller bodies are orbited by natural satellites, usually termed "moons".
+Six planets 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-19/SolarSystem-19.stog.amr.dot b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.dot
index e3b3e49eb6385b67f383cd008e3f45bfdb827a12..43c4df572bdd557c5f90a2c8ee6698af300aa606 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.dot
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.dot
@@ -6,34 +6,13 @@ digraph amr_graph {
 	t [label="t/term-01" shape=circle]
 	m [label="m/moon" shape=circle]
 	u [label="u/usual" shape=circle]
-	a [label="a/and" shape=circle]
 	p [label="p/planet" shape=circle]
-	ii [label="ii/include-91" shape=circle]
-	p2 [label="p2/planet" shape=circle]
-	b [label="b/body" shape=circle]
-	m2 [label="m2/many" shape=circle]
-	ii2 [label="ii2/include-91" shape=circle]
-	b2 [label="b2/body" shape=circle]
-	h [label="h/have-degree-91" shape=circle]
-	s2 [label="s2/small" shape=circle]
-	m3 [label="m3/more" shape=circle]
 	o -> s [label=":ARG0"]
 	s -> n [label=":ARG1-of"]
 	s -> t [label=":ARG1-of"]
 	t -> m [label=":ARG2"]
 	t -> u [label=":mod"]
-	o -> a [label=":ARG1"]
-	a -> p [label=":op1"]
-	p -> ii [label=":ARG1-of"]
-	ii -> p2 [label=":ARG2"]
-	a -> b [label=":op2"]
-	b -> m2 [label=":quant"]
-	b -> ii2 [label=":ARG1-of"]
-	ii2 -> b2 [label=":ARG2"]
-	b2 -> h [label=":ARG1-of"]
-	h -> s2 [label=":ARG2"]
-	h -> m3 [label=":ARG3"]
-	h -> p [label=":ARG4"]
+	o -> p [label=":ARG1"]
 	node_0 [label=6 shape=rectangle]
 	p -> node_0 [label=":quant"]
 }
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.nt b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.nt
index 11ac8a237676dd7a53e16d41eba816bfab374a0e..46142d12b01e0d79ce99bae97c995caf8ad3fdab 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.nt
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.nt
@@ -1,79 +1,42 @@
-<http://amr.isi.edu/amr_data/SolarSystem-19#u> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#usual> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#p> <http://amr.isi.edu/rdf/amr-terms#quant> "6" .
-<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-19#h> <http://amr.isi.edu/frames/ld/v1.2.2/have-degree-91.ARG3> <http://amr.isi.edu/amr_data/SolarSystem-19#m3> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#root01> <http://amr.isi.edu/rdf/core-amr#root> <http://amr.isi.edu/amr_data/SolarSystem-19#o> .
-<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/amr_data/SolarSystem-19#a> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#and> .
-<http://amr.isi.edu/frames/ld/v1.2.2/orbit-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-19#root01> <http://amr.isi.edu/rdf/core-amr#has-sentence> "Six of the planets, and many of the smaller bodies are orbited by natural satellites, usually termed \"moons\"." .
-<http://amr.isi.edu/amr_data/SolarSystem-19#root01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#AMR> .
-<http://amr.isi.edu/frames/ld/v1.2.2/have-degree-91> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Frame> .
-<http://amr.isi.edu/rdf/amr-terms#many> <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-19#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/include-91.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/frames/ld/v1.2.2/have-degree-91.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/rdf/core-amr#NamedEntity> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-EntityType" .
+<http://amr.isi.edu/frames/ld/v1.2.2/term-01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Frame> .
+<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-19#m> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/entity-types#moon> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#t> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-19#u> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#satellite> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#o> <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/entity-types#moon> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#NamedEntity> .
-<http://amr.isi.edu/frames/ld/v1.2.2/term-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/frames/ld/v1.2.2/have-degree-91.ARG3> <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-19#t> <http://amr.isi.edu/frames/ld/v1.2.2/term-01.ARG2> <http://amr.isi.edu/amr_data/SolarSystem-19#m> .
-<http://amr.isi.edu/rdf/core-amr#more> <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-19#ii2> <http://amr.isi.edu/frames/ld/v1.2.2/include-91.ARG2> <http://amr.isi.edu/amr_data/SolarSystem-19#b2> .
-<http://amr.isi.edu/rdf/amr-terms#small> <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-19#root01> <http://amr.isi.edu/rdf/core-amr#has-id> "SolarSystem-19" .
-<http://amr.isi.edu/amr_data/SolarSystem-19#h> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/have-degree-91> .
-<http://amr.isi.edu/frames/ld/v1.2.2/term-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-19#m3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#more> .
-<http://amr.isi.edu/frames/ld/v1.2.2/include-91.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-19#h> <http://amr.isi.edu/frames/ld/v1.2.2/have-degree-91.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-19#b2> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#s2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#small> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#t> <http://amr.isi.edu/frames/ld/v1.2.2/term-01.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-19#s> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#a> <http://amr.isi.edu/rdf/amr-terms#op1> <http://amr.isi.edu/amr_data/SolarSystem-19#p> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#h> <http://amr.isi.edu/frames/ld/v1.2.2/have-degree-91.ARG4> <http://amr.isi.edu/amr_data/SolarSystem-19#p> .
+<http://amr.isi.edu/frames/ld/v1.2.2/natural-03.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/rdf/core-amr#Concept> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Concept" .
+<http://amr.isi.edu/amr_data/SolarSystem-19#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/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#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/rdf/core-amr#Frame> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Frame" .
+<http://amr.isi.edu/amr_data/SolarSystem-19#t> <http://amr.isi.edu/frames/ld/v1.2.2/term-01.ARG2> <http://amr.isi.edu/amr_data/SolarSystem-19#m> .
 <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/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-19#t> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/term-01> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#n> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/natural-03> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#p> <http://amr.isi.edu/rdf/amr-terms#quant> "6" .
+<http://amr.isi.edu/amr_data/SolarSystem-19#root01> <http://amr.isi.edu/rdf/core-amr#has-id> "SolarSystem-19" .
 <http://amr.isi.edu/amr_data/SolarSystem-19#o> <http://amr.isi.edu/frames/ld/v1.2.2/orbit-01.ARG0> <http://amr.isi.edu/amr_data/SolarSystem-19#s> .
-<http://amr.isi.edu/frames/ld/v1.2.2/have-degree-91.ARG4> <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-19#s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#satellite> .
-<http://amr.isi.edu/frames/ld/v1.2.2/natural-03.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-19#b2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#body> .
-<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/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/amr_data/SolarSystem-19#ii> <http://amr.isi.edu/frames/ld/v1.2.2/include-91.ARG2> <http://amr.isi.edu/amr_data/SolarSystem-19#p2> .
-<http://amr.isi.edu/frames/ld/v1.2.2/include-91> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Frame> .
-<http://amr.isi.edu/rdf/amr-terms#quant> <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/have-degree-91.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/rdf/core-amr#and> <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-19#o> <http://amr.isi.edu/frames/ld/v1.2.2/orbit-01.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-19#p> .
 <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-19#p2> <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#Frame> <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-19#b> <http://amr.isi.edu/rdf/amr-terms#quant> <http://amr.isi.edu/amr_data/SolarSystem-19#m2> .
-<http://amr.isi.edu/rdf/amr-terms#satellite> <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/2000/01/rdf-schema#label> "AMR-Term" .
+<http://amr.isi.edu/amr_data/SolarSystem-19#root01> <http://amr.isi.edu/rdf/core-amr#has-sentence> "Six planets are orbited by natural satellites, usually termed \"moons\"." .
+<http://amr.isi.edu/frames/ld/v1.2.2/orbit-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/frames/ld/v1.2.2/natural-03> <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-19#o> <http://amr.isi.edu/frames/ld/v1.2.2/orbit-01.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-19#a> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#n> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/natural-03> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#ii> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/include-91> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#m2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#many> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#body> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#h> <http://amr.isi.edu/frames/ld/v1.2.2/have-degree-91.ARG2> <http://amr.isi.edu/amr_data/SolarSystem-19#s2> .
-<http://amr.isi.edu/rdf/core-amr#Frame> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Frame" .
-<http://amr.isi.edu/amr_data/SolarSystem-19#o> <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-19#m> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/entity-types#moon> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#a> <http://amr.isi.edu/rdf/amr-terms#op2> <http://amr.isi.edu/amr_data/SolarSystem-19#b> .
-<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/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-19#ii2> <http://amr.isi.edu/frames/ld/v1.2.2/include-91.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-19#b> .
-<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-19#t> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/term-01> .
+<http://amr.isi.edu/frames/ld/v1.2.2/term-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-19#n> <http://amr.isi.edu/frames/ld/v1.2.2/natural-03.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-19#s> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#ii> <http://amr.isi.edu/frames/ld/v1.2.2/include-91.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-19#p> .
-<http://amr.isi.edu/amr_data/SolarSystem-19#t> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-19#u> .
-<http://amr.isi.edu/rdf/amr-terms#body> <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-19#ii2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/include-91> .
-<http://amr.isi.edu/frames/ld/v1.2.2/term-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/rdf/amr-terms#op2> <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/rdf/amr-terms#usual> <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#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/term-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/rdf/amr-terms#satellite> <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#usual> <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/FrameRole> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Role" .
+<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/amr_data/SolarSystem-19#root01> <http://amr.isi.edu/rdf/core-amr#root> <http://amr.isi.edu/amr_data/SolarSystem-19#o> .
+<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/amr_data/SolarSystem-19#t> <http://amr.isi.edu/frames/ld/v1.2.2/term-01.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-19#s> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#u> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#usual> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#root01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#AMR> .
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.penman b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.penman
index e0e119f2b03446930074f130bfd6b0a5639b1e63..77e5745d632e840a3a15694785ca31acdeeaa6a6 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.penman
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.penman
@@ -1,21 +1,10 @@
 # ::id SolarSystem-19
-# ::snt Six of the planets, and many of the smaller bodies are orbited by natural satellites, usually termed "moons".
+# ::snt Six planets are orbited by natural satellites, usually termed "moons".
 (o / orbit-01
       :ARG0 (s / satellite
             :ARG1-of (n / natural-03)
             :ARG1-of (t / term-01
                   :ARG2 (m / moon)
                   :mod (u / usual)))
-      :ARG1 (a / and
-            :op1 (p / planet
-                  :quant 6
-                  :ARG1-of (ii / include-91
-                        :ARG2 (p2 / planet)))
-            :op2 (b / body
-                  :quant (m2 / many)
-                  :ARG1-of (ii2 / include-91
-                        :ARG2 (b2 / body
-                              :ARG1-of (h / have-degree-91
-                                    :ARG2 (s2 / small)
-                                    :ARG3 (m3 / more)
-                                    :ARG4 p))))))
\ No newline at end of file
+      :ARG1 (p / planet
+            :quant 6))
\ No newline at end of file
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.png b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.png
index 1cd2bfb2200709aac75417cded45dacf924ee049..c1eb551811b10a44ae15f11c71966cb52f1616cc 100644
Binary files a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.png and b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.png differ
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.svg b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.svg
index c117ea141eae6d135202a3881af5a4ac740a17b6..d07f20208e6cff87ba5eddca796d695ae1261ee8 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.svg
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.svg
@@ -4,244 +4,107 @@
 <!-- Generated by graphviz version 9.0.0 (0)
  -->
 <!-- Title: amr_graph Pages: 1 -->
-<svg width="864pt" height="286pt"
- viewBox="0.00 0.00 864.00 285.96" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(0.44412 0.44412) rotate(0) translate(4 639.87)">
+<svg width="758pt" height="394pt"
+ viewBox="0.00 0.00 757.58 394.04" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 390.04)">
 <title>amr_graph</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-639.87 1941.42,-639.87 1941.42,4 -4,4"/>
+<polygon fill="white" stroke="none" points="-4,4 -4,-390.04 753.58,-390.04 753.58,4 -4,4"/>
 <!-- o -->
 <g id="node1" class="node">
 <title>o</title>
-<ellipse fill="none" stroke="black" cx="60.15" cy="-363.09" rx="60.15" ry="60.15"/>
-<text text-anchor="middle" x="60.15" y="-358.42" font-family="Times,serif" font-size="14.00">o/orbit&#45;01</text>
+<ellipse fill="none" stroke="black" cx="60.15" cy="-117.26" rx="60.15" ry="60.15"/>
+<text text-anchor="middle" x="60.15" y="-112.59" font-family="Times,serif" font-size="14.00">o/orbit&#45;01</text>
 </g>
 <!-- s -->
 <g id="node2" class="node">
 <title>s</title>
-<ellipse fill="none" stroke="black" cx="261.46" cy="-422.09" rx="60.15" ry="60.15"/>
-<text text-anchor="middle" x="261.46" y="-417.42" font-family="Times,serif" font-size="14.00">s/satellite</text>
+<ellipse fill="none" stroke="black" cx="261.46" cy="-182.26" rx="60.15" ry="60.15"/>
+<text text-anchor="middle" x="261.46" y="-177.59" font-family="Times,serif" font-size="14.00">s/satellite</text>
 </g>
 <!-- o&#45;&gt;s -->
 <g id="edge1" class="edge">
 <title>o&#45;&gt;s</title>
-<path fill="none" stroke="black" d="M118.26,-380C141.41,-386.85 168.32,-394.82 192.46,-401.96"/>
-<polygon fill="black" stroke="black" points="191.3,-405.27 201.88,-404.75 193.29,-398.56 191.3,-405.27"/>
-<text text-anchor="middle" x="160.8" y="-401.04" font-family="Times,serif" font-size="14.00">:ARG0</text>
+<path fill="none" stroke="black" d="M117.73,-135.71C141.19,-143.36 168.59,-152.3 193.08,-160.29"/>
+<polygon fill="black" stroke="black" points="191.7,-163.52 202.3,-163.29 193.87,-156.86 191.7,-163.52"/>
+<text text-anchor="middle" x="160.8" y="-159.21" font-family="Times,serif" font-size="14.00">:ARG0</text>
 </g>
-<!-- a -->
+<!-- p -->
 <g id="node7" class="node">
-<title>a</title>
-<ellipse fill="none" stroke="black" cx="261.46" cy="-305.09" rx="38.58" ry="38.58"/>
-<text text-anchor="middle" x="261.46" y="-300.42" font-family="Times,serif" font-size="14.00">a/and</text>
+<title>p</title>
+<ellipse fill="none" stroke="black" cx="261.46" cy="-52.26" rx="52.26" ry="52.26"/>
+<text text-anchor="middle" x="261.46" y="-47.59" font-family="Times,serif" font-size="14.00">p/planet</text>
 </g>
-<!-- o&#45;&gt;a -->
+<!-- o&#45;&gt;p -->
 <g id="edge6" class="edge">
-<title>o&#45;&gt;a</title>
-<path fill="none" stroke="black" d="M118.26,-346.47C148.32,-337.72 184.74,-327.13 213.19,-318.85"/>
-<polygon fill="black" stroke="black" points="213.99,-322.26 222.61,-316.1 212.03,-315.54 213.99,-322.26"/>
-<text text-anchor="middle" x="160.8" y="-343.04" font-family="Times,serif" font-size="14.00">:ARG1</text>
+<title>o&#45;&gt;p</title>
+<path fill="none" stroke="black" d="M117.73,-98.81C143.73,-90.33 174.56,-80.27 200.91,-71.68"/>
+<polygon fill="black" stroke="black" points="201.66,-75.12 210.08,-68.69 199.49,-68.46 201.66,-75.12"/>
+<text text-anchor="middle" x="160.8" y="-95.21" font-family="Times,serif" font-size="14.00">:ARG1</text>
 </g>
 <!-- n -->
 <g id="node3" class="node">
 <title>n</title>
-<ellipse fill="none" stroke="black" cx="493.39" cy="-563.09" rx="72.78" ry="72.78"/>
-<text text-anchor="middle" x="493.39" y="-558.42" font-family="Times,serif" font-size="14.00">n/natural&#45;03</text>
+<ellipse fill="none" stroke="black" cx="493.39" cy="-313.26" rx="72.78" ry="72.78"/>
+<text text-anchor="middle" x="493.39" y="-308.59" font-family="Times,serif" font-size="14.00">n/natural&#45;03</text>
 </g>
 <!-- s&#45;&gt;n -->
 <g id="edge2" class="edge">
 <title>s&#45;&gt;n</title>
-<path fill="none" stroke="black" d="M313.2,-453.21C344.87,-472.63 386.12,-497.92 421.05,-519.35"/>
-<polygon fill="black" stroke="black" points="419.08,-522.24 429.44,-524.49 422.74,-516.28 419.08,-522.24"/>
-<text text-anchor="middle" x="371.11" y="-509.04" font-family="Times,serif" font-size="14.00">:ARG1&#45;of</text>
+<path fill="none" stroke="black" d="M314.34,-211.82C345.45,-229.54 385.47,-252.35 419.69,-271.84"/>
+<polygon fill="black" stroke="black" points="417.9,-274.85 428.32,-276.76 421.37,-268.77 417.9,-274.85"/>
+<text text-anchor="middle" x="371.11" y="-263.21" font-family="Times,serif" font-size="14.00">:ARG1&#45;of</text>
 </g>
 <!-- t -->
 <g id="node4" class="node">
 <title>t</title>
-<ellipse fill="none" stroke="black" cx="493.39" cy="-414.09" rx="58.57" ry="58.57"/>
-<text text-anchor="middle" x="493.39" y="-409.42" font-family="Times,serif" font-size="14.00">t/term&#45;01</text>
+<ellipse fill="none" stroke="black" cx="493.39" cy="-164.26" rx="58.57" ry="58.57"/>
+<text text-anchor="middle" x="493.39" y="-159.59" font-family="Times,serif" font-size="14.00">t/term&#45;01</text>
 </g>
 <!-- s&#45;&gt;t -->
 <g id="edge3" class="edge">
 <title>s&#45;&gt;t</title>
-<path fill="none" stroke="black" d="M321.97,-420.02C353.03,-418.94 391.2,-417.61 423.54,-416.49"/>
-<polygon fill="black" stroke="black" points="423.33,-420 433.2,-416.15 423.08,-413 423.33,-420"/>
-<text text-anchor="middle" x="371.11" y="-423.04" font-family="Times,serif" font-size="14.00">:ARG1&#45;of</text>
+<path fill="none" stroke="black" d="M321.67,-177.62C352.73,-175.19 390.97,-172.2 423.37,-169.66"/>
+<polygon fill="black" stroke="black" points="423.36,-173.17 433.06,-168.9 422.82,-166.2 423.36,-173.17"/>
+<text text-anchor="middle" x="371.11" y="-179.21" font-family="Times,serif" font-size="14.00">:ARG1&#45;of</text>
 </g>
 <!-- m -->
 <g id="node5" class="node">
 <title>m</title>
-<ellipse fill="none" stroke="black" cx="744.26" cy="-518.09" rx="51.21" ry="51.21"/>
-<text text-anchor="middle" x="744.26" y="-513.42" font-family="Times,serif" font-size="14.00">m/moon</text>
+<ellipse fill="none" stroke="black" cx="698.37" cy="-222.26" rx="51.21" ry="51.21"/>
+<text text-anchor="middle" x="698.37" y="-217.59" font-family="Times,serif" font-size="14.00">m/moon</text>
 </g>
 <!-- t&#45;&gt;m -->
 <g id="edge4" class="edge">
 <title>t&#45;&gt;m</title>
-<path fill="none" stroke="black" d="M547.78,-436.4C588.51,-453.42 644.51,-476.83 686.13,-494.22"/>
-<polygon fill="black" stroke="black" points="684.69,-497.41 695.26,-498.04 687.38,-490.95 684.69,-497.41"/>
-<text text-anchor="middle" x="615.66" y="-479.04" font-family="Times,serif" font-size="14.00">:ARG2</text>
+<path fill="none" stroke="black" d="M550.12,-180.19C577.37,-187.97 610.19,-197.35 637.92,-205.27"/>
+<polygon fill="black" stroke="black" points="636.64,-208.55 647.21,-207.93 638.56,-201.82 636.64,-208.55"/>
+<text text-anchor="middle" x="606.66" y="-205.21" font-family="Times,serif" font-size="14.00">:ARG2</text>
 </g>
 <!-- u -->
 <g id="node6" class="node">
 <title>u</title>
-<ellipse fill="none" stroke="black" cx="744.26" cy="-401.09" rx="47.53" ry="47.53"/>
-<text text-anchor="middle" x="744.26" y="-396.42" font-family="Times,serif" font-size="14.00">u/usual</text>
+<ellipse fill="none" stroke="black" cx="698.37" cy="-105.26" rx="47.53" ry="47.53"/>
+<text text-anchor="middle" x="698.37" y="-100.59" font-family="Times,serif" font-size="14.00">u/usual</text>
 </g>
 <!-- t&#45;&gt;u -->
 <g id="edge5" class="edge">
 <title>t&#45;&gt;u</title>
-<path fill="none" stroke="black" d="M552.11,-411.08C592.1,-408.99 645.14,-406.22 685.21,-404.12"/>
-<polygon fill="black" stroke="black" points="685.35,-407.62 695.15,-403.6 684.98,-400.63 685.35,-407.62"/>
-<text text-anchor="middle" x="615.66" y="-413.04" font-family="Times,serif" font-size="14.00">:mod</text>
-</g>
-<!-- p -->
-<g id="node8" class="node">
-<title>p</title>
-<ellipse fill="none" stroke="black" cx="1438.77" cy="-317.09" rx="52.26" ry="52.26"/>
-<text text-anchor="middle" x="1438.77" y="-312.42" font-family="Times,serif" font-size="14.00">p/planet</text>
-</g>
-<!-- a&#45;&gt;p -->
-<g id="edge7" class="edge">
-<title>a&#45;&gt;p</title>
-<path fill="none" stroke="black" d="M300.25,-309.07C345.77,-313.52 424.58,-320.09 492.39,-320.09 492.39,-320.09 492.39,-320.09 1204.8,-320.09 1262.41,-320.09 1328.03,-319.16 1374.91,-318.34"/>
-<polygon fill="black" stroke="black" points="1374.97,-321.84 1384.9,-318.16 1374.84,-314.84 1374.97,-321.84"/>
-<text text-anchor="middle" x="863.85" y="-324.04" font-family="Times,serif" font-size="14.00">:op1</text>
-</g>
-<!-- b -->
-<g id="node11" class="node">
-<title>b</title>
-<ellipse fill="none" stroke="black" cx="493.39" cy="-234.09" rx="44.89" ry="44.89"/>
-<text text-anchor="middle" x="493.39" y="-229.42" font-family="Times,serif" font-size="14.00">b/body</text>
-</g>
-<!-- a&#45;&gt;b -->
-<g id="edge10" class="edge">
-<title>a&#45;&gt;b</title>
-<path fill="none" stroke="black" d="M298.64,-293.92C336.45,-282.24 396.16,-263.8 439.31,-250.48"/>
-<polygon fill="black" stroke="black" points="440.21,-253.87 448.73,-247.57 438.14,-247.18 440.21,-253.87"/>
-<text text-anchor="middle" x="371.11" y="-284.04" font-family="Times,serif" font-size="14.00">:op2</text>
-</g>
-<!-- ii -->
-<g id="node9" class="node">
-<title>ii</title>
-<ellipse fill="none" stroke="black" cx="1666.49" cy="-389.09" rx="72.78" ry="72.78"/>
-<text text-anchor="middle" x="1666.49" y="-384.42" font-family="Times,serif" font-size="14.00">ii/include&#45;91</text>
-</g>
-<!-- p&#45;&gt;ii -->
-<g id="edge8" class="edge">
-<title>p&#45;&gt;ii</title>
-<path fill="none" stroke="black" d="M1489.03,-332.8C1517.35,-341.84 1553.6,-353.4 1585.87,-363.7"/>
-<polygon fill="black" stroke="black" points="1584.62,-366.97 1595.21,-366.67 1586.74,-360.3 1584.62,-366.97"/>
-<text text-anchor="middle" x="1544.21" y="-363.04" font-family="Times,serif" font-size="14.00">:ARG1&#45;of</text>
+<path fill="none" stroke="black" d="M550.12,-148.06C578.51,-139.81 612.94,-129.8 641.37,-121.54"/>
+<polygon fill="black" stroke="black" points="642.27,-124.92 650.89,-118.77 640.31,-118.2 642.27,-124.92"/>
+<text text-anchor="middle" x="606.66" y="-140.21" font-family="Times,serif" font-size="14.00">:mod</text>
 </g>
 <!-- node_0 -->
-<g id="node18" class="node">
+<g id="node8" class="node">
 <title>node_0</title>
-<polygon fill="none" stroke="black" points="1693.49,-298.09 1639.49,-298.09 1639.49,-262.09 1693.49,-262.09 1693.49,-298.09"/>
-<text text-anchor="middle" x="1666.49" y="-275.42" font-family="Times,serif" font-size="14.00">6</text>
+<polygon fill="none" stroke="black" points="520.39,-70.26 466.39,-70.26 466.39,-34.26 520.39,-34.26 520.39,-70.26"/>
+<text text-anchor="middle" x="493.39" y="-47.59" font-family="Times,serif" font-size="14.00">6</text>
 </g>
 <!-- p&#45;&gt;node_0 -->
-<g id="edge18" class="edge">
+<g id="edge7" class="edge">
 <title>p&#45;&gt;node_0</title>
-<path fill="none" stroke="black" d="M1490.71,-308.74C1532.54,-301.89 1590.81,-292.33 1628.35,-286.18"/>
-<polygon fill="black" stroke="black" points="1628.49,-289.7 1637.8,-284.63 1627.36,-282.8 1628.49,-289.7"/>
-<text text-anchor="middle" x="1544.21" y="-309.04" font-family="Times,serif" font-size="14.00">:quant</text>
-</g>
-<!-- p2 -->
-<g id="node10" class="node">
-<title>p2</title>
-<ellipse fill="none" stroke="black" cx="1878.84" cy="-389.09" rx="58.57" ry="58.57"/>
-<text text-anchor="middle" x="1878.84" y="-384.42" font-family="Times,serif" font-size="14.00">p2/planet</text>
-</g>
-<!-- ii&#45;&gt;p2 -->
-<g id="edge9" class="edge">
-<title>ii&#45;&gt;p2</title>
-<path fill="none" stroke="black" d="M1739.59,-389.09C1761.97,-389.09 1786.58,-389.09 1808.75,-389.09"/>
-<polygon fill="black" stroke="black" points="1808.59,-392.59 1818.59,-389.09 1808.59,-385.59 1808.59,-392.59"/>
-<text text-anchor="middle" x="1779.77" y="-393.04" font-family="Times,serif" font-size="14.00">:ARG2</text>
-</g>
-<!-- m2 -->
-<g id="node12" class="node">
-<title>m2</title>
-<ellipse fill="none" stroke="black" cx="744.26" cy="-234.09" rx="57.52" ry="57.52"/>
-<text text-anchor="middle" x="744.26" y="-229.42" font-family="Times,serif" font-size="14.00">m2/many</text>
-</g>
-<!-- b&#45;&gt;m2 -->
-<g id="edge11" class="edge">
-<title>b&#45;&gt;m2</title>
-<path fill="none" stroke="black" d="M538.59,-234.09C576.42,-234.09 631.48,-234.09 674.97,-234.09"/>
-<polygon fill="black" stroke="black" points="674.82,-237.59 684.82,-234.09 674.82,-230.59 674.82,-237.59"/>
-<text text-anchor="middle" x="615.66" y="-238.04" font-family="Times,serif" font-size="14.00">:quant</text>
-</g>
-<!-- ii2 -->
-<g id="node13" class="node">
-<title>ii2</title>
-<ellipse fill="none" stroke="black" cx="744.26" cy="-79.09" rx="79.09" ry="79.09"/>
-<text text-anchor="middle" x="744.26" y="-74.42" font-family="Times,serif" font-size="14.00">ii2/include&#45;91</text>
-</g>
-<!-- b&#45;&gt;ii2 -->
-<g id="edge12" class="edge">
-<title>b&#45;&gt;ii2</title>
-<path fill="none" stroke="black" d="M532.18,-210.55C567.78,-188.38 622.16,-154.51 666.8,-126.71"/>
-<polygon fill="black" stroke="black" points="668.54,-129.75 675.18,-121.49 664.84,-123.81 668.54,-129.75"/>
-<text text-anchor="middle" x="615.66" y="-179.04" font-family="Times,serif" font-size="14.00">:ARG1&#45;of</text>
-</g>
-<!-- b2 -->
-<g id="node14" class="node">
-<title>b2</title>
-<ellipse fill="none" stroke="black" cx="955.56" cy="-165.09" rx="51.21" ry="51.21"/>
-<text text-anchor="middle" x="955.56" y="-160.42" font-family="Times,serif" font-size="14.00">b2/body</text>
-</g>
-<!-- ii2&#45;&gt;b2 -->
-<g id="edge13" class="edge">
-<title>ii2&#45;&gt;b2</title>
-<path fill="none" stroke="black" d="M817.87,-108.93C843.79,-119.58 872.61,-131.42 897.08,-141.47"/>
-<polygon fill="black" stroke="black" points="895.65,-144.67 906.23,-145.23 898.31,-138.2 895.65,-144.67"/>
-<text text-anchor="middle" x="863.85" y="-139.04" font-family="Times,serif" font-size="14.00">:ARG2</text>
-</g>
-<!-- h -->
-<g id="node15" class="node">
-<title>h</title>
-<ellipse fill="none" stroke="black" cx="1203.8" cy="-186.09" rx="98.03" ry="98.03"/>
-<text text-anchor="middle" x="1203.8" y="-181.42" font-family="Times,serif" font-size="14.00">h/have&#45;degree&#45;91</text>
-</g>
-<!-- b2&#45;&gt;h -->
-<g id="edge14" class="edge">
-<title>b2&#45;&gt;h</title>
-<path fill="none" stroke="black" d="M1006.98,-169.39C1032.29,-171.55 1064,-174.25 1094.47,-176.85"/>
-<polygon fill="black" stroke="black" points="1093.86,-180.31 1104.12,-177.68 1094.45,-173.34 1093.86,-180.31"/>
-<text text-anchor="middle" x="1056.26" y="-181.04" font-family="Times,serif" font-size="14.00">:ARG1&#45;of</text>
-</g>
-<!-- h&#45;&gt;p -->
-<g id="edge17" class="edge">
-<title>h&#45;&gt;p</title>
-<path fill="none" stroke="black" d="M1289.89,-233.94C1320.92,-251.39 1355.16,-270.64 1382.87,-286.22"/>
-<polygon fill="black" stroke="black" points="1381.01,-289.19 1391.44,-291.04 1384.44,-283.09 1381.01,-289.19"/>
-<text text-anchor="middle" x="1342.33" y="-278.04" font-family="Times,serif" font-size="14.00">:ARG4</text>
-</g>
-<!-- s2 -->
-<g id="node16" class="node">
-<title>s2</title>
-<ellipse fill="none" stroke="black" cx="1438.77" cy="-189.09" rx="52.79" ry="52.79"/>
-<text text-anchor="middle" x="1438.77" y="-184.42" font-family="Times,serif" font-size="14.00">s2/small</text>
-</g>
-<!-- h&#45;&gt;s2 -->
-<g id="edge15" class="edge">
-<title>h&#45;&gt;s2</title>
-<path fill="none" stroke="black" d="M1302.25,-187.35C1326.56,-187.66 1352.02,-187.99 1374.21,-188.27"/>
-<polygon fill="black" stroke="black" points="1373.94,-191.77 1383.99,-188.4 1374.03,-184.77 1373.94,-191.77"/>
-<text text-anchor="middle" x="1342.33" y="-193.04" font-family="Times,serif" font-size="14.00">:ARG2</text>
-</g>
-<!-- m3 -->
-<g id="node17" class="node">
-<title>m3</title>
-<ellipse fill="none" stroke="black" cx="1438.77" cy="-62.09" rx="55.94" ry="55.94"/>
-<text text-anchor="middle" x="1438.77" y="-57.42" font-family="Times,serif" font-size="14.00">m3/more</text>
-</g>
-<!-- h&#45;&gt;m3 -->
-<g id="edge16" class="edge">
-<title>h&#45;&gt;m3</title>
-<path fill="none" stroke="black" d="M1290.89,-140.27C1320.19,-124.67 1352.26,-107.6 1378.94,-93.4"/>
-<polygon fill="black" stroke="black" points="1380.36,-96.61 1387.55,-88.82 1377.07,-90.43 1380.36,-96.61"/>
-<text text-anchor="middle" x="1342.33" y="-128.04" font-family="Times,serif" font-size="14.00">:ARG3</text>
+<path fill="none" stroke="black" d="M314.06,-52.26C356.77,-52.26 416.46,-52.26 454.78,-52.26"/>
+<polygon fill="black" stroke="black" points="454.42,-55.76 464.42,-52.26 454.42,-48.76 454.42,-55.76"/>
+<text text-anchor="middle" x="371.11" y="-56.21" font-family="Times,serif" font-size="14.00">:quant</text>
 </g>
 </g>
 </svg>
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.ttl b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.ttl
index 1c693f173a813033d179706d7ee828620c643e80..d250fef349d67e163465a4877a83327dda489013 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.ttl
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-19/SolarSystem-19.stog.amr.ttl
@@ -1,5 +1,5 @@
-@prefix ns1: <http://amr.isi.edu/rdf/amr-terms#> .
-@prefix ns2: <http://amr.isi.edu/frames/ld/v1.2.2/> .
+@prefix ns1: <http://amr.isi.edu/frames/ld/v1.2.2/> .
+@prefix ns2: <http://amr.isi.edu/rdf/amr-terms#> .
 @prefix ns3: <http://amr.isi.edu/rdf/core-amr#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
@@ -9,128 +9,65 @@ ns3:Concept a rdfs:Class ;
 ns3:Role a rdfs:Class ;
     rdfs:label "AMR-Role" .
 
-<http://amr.isi.edu/amr_data/SolarSystem-19#h> a ns2:have-degree-91 ;
-    ns2:have-degree-91.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#b2> ;
-    ns2:have-degree-91.ARG2 <http://amr.isi.edu/amr_data/SolarSystem-19#s2> ;
-    ns2:have-degree-91.ARG3 <http://amr.isi.edu/amr_data/SolarSystem-19#m3> ;
-    ns2:have-degree-91.ARG4 <http://amr.isi.edu/amr_data/SolarSystem-19#p> .
-
-<http://amr.isi.edu/amr_data/SolarSystem-19#ii> a ns2:include-91 ;
-    ns2:include-91.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#p> ;
-    ns2:include-91.ARG2 <http://amr.isi.edu/amr_data/SolarSystem-19#p2> .
-
-<http://amr.isi.edu/amr_data/SolarSystem-19#ii2> a ns2:include-91 ;
-    ns2:include-91.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#b> ;
-    ns2:include-91.ARG2 <http://amr.isi.edu/amr_data/SolarSystem-19#b2> .
-
-<http://amr.isi.edu/amr_data/SolarSystem-19#n> a ns2:natural-03 ;
-    ns2:natural-03.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#s> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#n> a ns1:natural-03 ;
+    ns1:natural-03.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#s> .
 
 <http://amr.isi.edu/amr_data/SolarSystem-19#root01> a ns3:AMR ;
     ns3:has-id "SolarSystem-19" ;
-    ns3:has-sentence "Six of the planets, and many of the smaller bodies are orbited by natural satellites, usually termed \"moons\"." ;
+    ns3:has-sentence "Six planets are orbited by natural satellites, usually termed \"moons\"." ;
     ns3:root <http://amr.isi.edu/amr_data/SolarSystem-19#o> .
 
-<http://amr.isi.edu/amr_data/SolarSystem-19#t> a ns2:term-01 ;
-    ns2:term-01.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#s> ;
-    ns2:term-01.ARG2 <http://amr.isi.edu/amr_data/SolarSystem-19#m> ;
-    ns1:mod <http://amr.isi.edu/amr_data/SolarSystem-19#u> .
-
-ns2:have-degree-91.ARG1 a ns2:FrameRole .
-
-ns2:have-degree-91.ARG2 a ns2:FrameRole .
-
-ns2:have-degree-91.ARG3 a ns2:FrameRole .
-
-ns2:have-degree-91.ARG4 a ns2:FrameRole .
-
-ns2:include-91.ARG1 a ns2:FrameRole .
+<http://amr.isi.edu/amr_data/SolarSystem-19#t> a ns1:term-01 ;
+    ns1:term-01.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#s> ;
+    ns1:term-01.ARG2 <http://amr.isi.edu/amr_data/SolarSystem-19#m> ;
+    ns2:mod <http://amr.isi.edu/amr_data/SolarSystem-19#u> .
 
-ns2:include-91.ARG2 a ns2:FrameRole .
+ns1:natural-03.ARG1 a ns1:FrameRole .
 
-ns2:natural-03.ARG1 a ns2:FrameRole .
+ns1:orbit-01.ARG0 a ns1:FrameRole .
 
-ns2:orbit-01.ARG0 a ns2:FrameRole .
+ns1:orbit-01.ARG1 a ns1:FrameRole .
 
-ns2:orbit-01.ARG1 a ns2:FrameRole .
+ns1:term-01.ARG1 a ns1:FrameRole .
 
-ns2:term-01.ARG1 a ns2:FrameRole .
+ns1:term-01.ARG2 a ns1:FrameRole .
 
-ns2:term-01.ARG2 a ns2:FrameRole .
-
-ns1:mod a ns3:Role .
-
-ns1:op1 a ns3:Role .
-
-ns1:op2 a ns3:Role .
-
-ns1:quant a ns3:Role .
-
-<http://amr.isi.edu/amr_data/SolarSystem-19#a> a ns3:and ;
-    ns1:op1 <http://amr.isi.edu/amr_data/SolarSystem-19#p> ;
-    ns1:op2 <http://amr.isi.edu/amr_data/SolarSystem-19#b> .
+ns2:mod a ns3:Role .
 
 <http://amr.isi.edu/amr_data/SolarSystem-19#m> a <http://amr.isi.edu/entity-types#moon> .
 
-<http://amr.isi.edu/amr_data/SolarSystem-19#m2> a ns1:many .
-
-<http://amr.isi.edu/amr_data/SolarSystem-19#m3> a ns3:more .
-
-<http://amr.isi.edu/amr_data/SolarSystem-19#o> a ns2:orbit-01 ;
-    ns2:orbit-01.ARG0 <http://amr.isi.edu/amr_data/SolarSystem-19#s> ;
-    ns2:orbit-01.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#a> .
+<http://amr.isi.edu/amr_data/SolarSystem-19#o> a ns1:orbit-01 ;
+    ns1:orbit-01.ARG0 <http://amr.isi.edu/amr_data/SolarSystem-19#s> ;
+    ns1:orbit-01.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-19#p> .
 
-<http://amr.isi.edu/amr_data/SolarSystem-19#p2> a <http://amr.isi.edu/entity-types#planet> .
-
-<http://amr.isi.edu/amr_data/SolarSystem-19#s2> a ns1:small .
+<http://amr.isi.edu/amr_data/SolarSystem-19#p> a <http://amr.isi.edu/entity-types#planet> ;
+    ns2:quant "6" .
 
-<http://amr.isi.edu/amr_data/SolarSystem-19#u> a ns1:usual .
+<http://amr.isi.edu/amr_data/SolarSystem-19#u> a ns2:usual .
 
 <http://amr.isi.edu/entity-types#moon> a ns3:NamedEntity .
 
-ns2:have-degree-91 a ns3:Frame .
-
-ns2:natural-03 a ns3:Frame .
-
-ns2:orbit-01 a ns3:Frame .
-
-ns2:term-01 a ns3:Frame .
-
-ns1:many a ns3:Concept .
-
-ns1:satellite a ns3:Concept .
-
-ns1:small a ns3:Concept .
-
-ns1:usual a ns3:Concept .
-
-ns3:and a ns3:Concept .
+<http://amr.isi.edu/entity-types#planet> a ns3:NamedEntity .
 
-ns3:more a ns3:Concept .
+ns1:natural-03 a ns3:Frame .
 
-<http://amr.isi.edu/amr_data/SolarSystem-19#b> a ns1:body ;
-    ns1:quant <http://amr.isi.edu/amr_data/SolarSystem-19#m2> .
+ns1:orbit-01 a ns3:Frame .
 
-<http://amr.isi.edu/amr_data/SolarSystem-19#b2> a ns1:body .
+ns1:term-01 a ns3:Frame .
 
-<http://amr.isi.edu/entity-types#planet> a ns3:NamedEntity .
+ns2:satellite a ns3:Concept .
 
-ns2:include-91 a ns3:Frame .
-
-ns1:body a ns3:Concept .
+ns2:usual a ns3:Concept .
 
 ns3:NamedEntity a ns3:Concept ;
     rdfs:label "AMR-EntityType",
         "AMR-Term" .
 
-<http://amr.isi.edu/amr_data/SolarSystem-19#p> a <http://amr.isi.edu/entity-types#planet> ;
-    ns1:quant "6" .
-
-<http://amr.isi.edu/amr_data/SolarSystem-19#s> a ns1:satellite .
+<http://amr.isi.edu/amr_data/SolarSystem-19#s> a ns2:satellite .
 
 ns3:Frame a ns3:Concept ;
     rdfs:label "AMR-PropBank-Frame" .
 
-ns2:FrameRole a ns3:Role ;
+ns1:FrameRole a ns3:Role ;
     rdfs:label "AMR-PropBank-Role" .
 
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-20/SolarSystem-20.stog.amr.nt b/SolarSystem-20231005/amr-structures/SolarSystem-20/SolarSystem-20.stog.amr.nt
index e7261a108a0b0415a3162d2a9ca4714ec39e24ee..c5ab312c226791c2448beff6c19a3e26be325673 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-20/SolarSystem-20.stog.amr.nt
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-20/SolarSystem-20.stog.amr.nt
@@ -1,46 +1,46 @@
-<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-20#root01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#AMR> .
-<http://amr.isi.edu/frames/ld/v1.2.2/encircle-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-20#r> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-20#p> .
 <http://amr.isi.edu/amr_data/SolarSystem-20#e> <http://amr.isi.edu/frames/ld/v1.2.2/encircle-01.ARG2> <http://amr.isi.edu/amr_data/SolarSystem-20#p2> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#root01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#AMR> .
+<http://amr.isi.edu/frames/ld/v1.2.2/encircle-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-20#a> <http://amr.isi.edu/rdf/amr-terms#op2> <http://amr.isi.edu/amr_data/SolarSystem-20#r> .
-<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-20#r> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-20#p> .
-<http://amr.isi.edu/rdf/core-amr#Frame> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Frame" .
+<http://amr.isi.edu/amr_data/SolarSystem-20#root01> <http://amr.isi.edu/rdf/core-amr#has-id> "SolarSystem-20" .
+<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/rdf/amr-terms#op2> <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-20#s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#small> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#o> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-20#s> .
+<http://amr.isi.edu/rdf/core-amr#Role> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Role" .
 <http://amr.isi.edu/rdf/amr-terms#ring> <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-20#d> <http://amr.isi.edu/rdf/amr-terms#consist> <http://amr.isi.edu/amr_data/SolarSystem-20#r> .
-<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/amr_data/SolarSystem-20#a> <http://amr.isi.edu/rdf/amr-terms#op1> <http://amr.isi.edu/amr_data/SolarSystem-20#o> .
 <http://amr.isi.edu/amr_data/SolarSystem-20#d> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#dust> .
-<http://amr.isi.edu/amr_data/SolarSystem-20#e> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/encircle-01> .
-<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#dust> <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-20#d> <http://amr.isi.edu/rdf/amr-terms#consist> <http://amr.isi.edu/amr_data/SolarSystem-20#r> .
+<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/amr_data/SolarSystem-20#root01> <http://amr.isi.edu/rdf/core-amr#root> <http://amr.isi.edu/amr_data/SolarSystem-20#e> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#o2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#outer> .
+<http://amr.isi.edu/rdf/amr-terms#small> <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-20#p2> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-20#o2> .
 <http://amr.isi.edu/amr_data/SolarSystem-20#a> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#and> .
-<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/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-20#root01> <http://amr.isi.edu/rdf/core-amr#has-sentence> "Outer planets are encircled by small objects and planetary rings of dust." .
-<http://amr.isi.edu/amr_data/SolarSystem-20#a> <http://amr.isi.edu/rdf/amr-terms#op1> <http://amr.isi.edu/amr_data/SolarSystem-20#o> .
-<http://amr.isi.edu/amr_data/SolarSystem-20#e> <http://amr.isi.edu/frames/ld/v1.2.2/encircle-01.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-20#a> .
-<http://amr.isi.edu/rdf/amr-terms#op2> <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-Term" .
+<http://amr.isi.edu/amr_data/SolarSystem-20#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#NamedEntity> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-EntityType" .
-<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/amr_data/SolarSystem-20#p2> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-20#o2> .
-<http://amr.isi.edu/rdf/core-amr#and> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
+<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/core-amr#Concept> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Concept" .
 <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/amr-terms#dust> <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-20#p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/entity-types#planet> .
-<http://amr.isi.edu/amr_data/SolarSystem-20#s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#small> .
-<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-20#o2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#outer> .
-<http://amr.isi.edu/amr_data/SolarSystem-20#root01> <http://amr.isi.edu/rdf/core-amr#has-id> "SolarSystem-20" .
-<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/frames/ld/v1.2.2/encircle-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#Frame> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-PropBank-Frame" .
 <http://amr.isi.edu/amr_data/SolarSystem-20#o> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#object> .
-<http://amr.isi.edu/rdf/amr-terms#consist> <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/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
 <http://amr.isi.edu/amr_data/SolarSystem-20#p2> <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#NamedEntity> <http://www.w3.org/2000/01/rdf-schema#label> "AMR-Term" .
-<http://amr.isi.edu/amr_data/SolarSystem-20#r> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#ring> .
-<http://amr.isi.edu/rdf/amr-terms#small> <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/encircle-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-20#o> <http://amr.isi.edu/rdf/amr-terms#mod> <http://amr.isi.edu/amr_data/SolarSystem-20#s> .
+<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/amr_data/SolarSystem-20#e> <http://amr.isi.edu/frames/ld/v1.2.2/encircle-01.ARG1> <http://amr.isi.edu/amr_data/SolarSystem-20#a> .
+<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/rdf/amr-terms#consist> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Role> .
 <http://amr.isi.edu/rdf/amr-terms#outer> <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-20#root01> <http://amr.isi.edu/rdf/core-amr#root> <http://amr.isi.edu/amr_data/SolarSystem-20#e> .
+<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/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-20#e> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/frames/ld/v1.2.2/encircle-01> .
+<http://amr.isi.edu/frames/ld/v1.2.2/encircle-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/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#r> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/amr-terms#ring> .
+<http://amr.isi.edu/frames/ld/v1.2.2/encircle-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-20#root01> <http://amr.isi.edu/rdf/core-amr#has-sentence> "Outer planets are encircled by small objects and planetary rings of dust." .
+<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#and> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://amr.isi.edu/rdf/core-amr#Concept> .
diff --git a/SolarSystem-20231005/amr-structures/SolarSystem-20/SolarSystem-20.stog.amr.ttl b/SolarSystem-20231005/amr-structures/SolarSystem-20/SolarSystem-20.stog.amr.ttl
index aae660c4aeb552f821e191b4dbe81b726013687b..08f90dd4ef52cf8883914f72bdbfd9618249be27 100644
--- a/SolarSystem-20231005/amr-structures/SolarSystem-20/SolarSystem-20.stog.amr.ttl
+++ b/SolarSystem-20231005/amr-structures/SolarSystem-20/SolarSystem-20.stog.amr.ttl
@@ -1,80 +1,80 @@
-@prefix ns1: <http://amr.isi.edu/rdf/core-amr#> .
+@prefix ns1: <http://amr.isi.edu/rdf/amr-terms#> .
 @prefix ns2: <http://amr.isi.edu/frames/ld/v1.2.2/> .
-@prefix ns3: <http://amr.isi.edu/rdf/amr-terms#> .
+@prefix ns3: <http://amr.isi.edu/rdf/core-amr#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
-ns1:Concept a rdfs:Class ;
+ns3:Concept a rdfs:Class ;
     rdfs:label "AMR-Concept" .
 
-ns1:Role a rdfs:Class ;
+ns3:Role a rdfs:Class ;
     rdfs:label "AMR-Role" .
 
-<http://amr.isi.edu/amr_data/SolarSystem-20#d> a ns3:dust ;
-    ns3:consist <http://amr.isi.edu/amr_data/SolarSystem-20#r> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#d> a ns1:dust ;
+    ns1:consist <http://amr.isi.edu/amr_data/SolarSystem-20#r> .
 
-<http://amr.isi.edu/amr_data/SolarSystem-20#root01> a ns1:AMR ;
-    ns1:has-id "SolarSystem-20" ;
-    ns1:has-sentence "Outer planets are encircled by small objects and planetary rings of dust." ;
-    ns1:root <http://amr.isi.edu/amr_data/SolarSystem-20#e> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#root01> a ns3:AMR ;
+    ns3:has-id "SolarSystem-20" ;
+    ns3:has-sentence "Outer planets are encircled by small objects and planetary rings of dust." ;
+    ns3:root <http://amr.isi.edu/amr_data/SolarSystem-20#e> .
 
 ns2:encircle-01.ARG1 a ns2:FrameRole .
 
 ns2:encircle-01.ARG2 a ns2:FrameRole .
 
-ns3:consist a ns1:Role .
+ns1:consist a ns3:Role .
 
-ns3:mod a ns1:Role .
+ns1:mod a ns3:Role .
 
-ns3:op1 a ns1:Role .
+ns1:op1 a ns3:Role .
 
-ns3:op2 a ns1:Role .
+ns1:op2 a ns3:Role .
 
-<http://amr.isi.edu/amr_data/SolarSystem-20#a> a ns1:and ;
-    ns3:op1 <http://amr.isi.edu/amr_data/SolarSystem-20#o> ;
-    ns3:op2 <http://amr.isi.edu/amr_data/SolarSystem-20#r> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#a> a ns3:and ;
+    ns1:op1 <http://amr.isi.edu/amr_data/SolarSystem-20#o> ;
+    ns1:op2 <http://amr.isi.edu/amr_data/SolarSystem-20#r> .
 
 <http://amr.isi.edu/amr_data/SolarSystem-20#e> a ns2:encircle-01 ;
     ns2:encircle-01.ARG1 <http://amr.isi.edu/amr_data/SolarSystem-20#a> ;
     ns2:encircle-01.ARG2 <http://amr.isi.edu/amr_data/SolarSystem-20#p2> .
 
-<http://amr.isi.edu/amr_data/SolarSystem-20#o> a ns3:object ;
-    ns3:mod <http://amr.isi.edu/amr_data/SolarSystem-20#s> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#o> a ns1:object ;
+    ns1:mod <http://amr.isi.edu/amr_data/SolarSystem-20#s> .
 
-<http://amr.isi.edu/amr_data/SolarSystem-20#o2> a ns3:outer .
+<http://amr.isi.edu/amr_data/SolarSystem-20#o2> a ns1:outer .
 
 <http://amr.isi.edu/amr_data/SolarSystem-20#p> a <http://amr.isi.edu/entity-types#planet> .
 
 <http://amr.isi.edu/amr_data/SolarSystem-20#p2> a <http://amr.isi.edu/entity-types#planet> ;
-    ns3:mod <http://amr.isi.edu/amr_data/SolarSystem-20#o2> .
+    ns1:mod <http://amr.isi.edu/amr_data/SolarSystem-20#o2> .
 
-<http://amr.isi.edu/amr_data/SolarSystem-20#s> a ns3:small .
+<http://amr.isi.edu/amr_data/SolarSystem-20#s> a ns1:small .
 
-ns2:encircle-01 a ns1:Frame .
+ns2:encircle-01 a ns3:Frame .
 
-ns3:dust a ns1:Concept .
+ns1:dust a ns3:Concept .
 
-ns3:object a ns1:Concept .
+ns1:object a ns3:Concept .
 
-ns3:outer a ns1:Concept .
+ns1:outer a ns3:Concept .
 
-ns3:ring a ns1:Concept .
+ns1:ring a ns3:Concept .
 
-ns3:small a ns1:Concept .
+ns1:small a ns3:Concept .
 
-ns1:Frame a ns1:Concept ;
+ns3:Frame a ns3:Concept ;
     rdfs:label "AMR-PropBank-Frame" .
 
-ns1:NamedEntity a ns1:Concept ;
+ns3:NamedEntity a ns3:Concept ;
     rdfs:label "AMR-EntityType",
         "AMR-Term" .
 
-ns1:and a ns1:Concept .
+ns3:and a ns3:Concept .
 
-<http://amr.isi.edu/amr_data/SolarSystem-20#r> a ns3:ring ;
-    ns3:mod <http://amr.isi.edu/amr_data/SolarSystem-20#p> .
+<http://amr.isi.edu/amr_data/SolarSystem-20#r> a ns1:ring ;
+    ns1:mod <http://amr.isi.edu/amr_data/SolarSystem-20#p> .
 
-<http://amr.isi.edu/entity-types#planet> a ns1:NamedEntity .
+<http://amr.isi.edu/entity-types#planet> a ns3:NamedEntity .
 
-ns2:FrameRole a ns1:Role ;
+ns2:FrameRole a ns3:Role ;
     rdfs:label "AMR-PropBank-Role" .
 
diff --git a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_19.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_19.ttl
index 6b830c617bd27fdc1a9da72cc47d96b069bc2a43..55e2af7e9cabec167e8eef5eca42f41929315994 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_19.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_19.ttl
@@ -1,144 +1,124 @@
-@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 .
+
+
+###  https://reference.tetras-libre.fr/base-ontology#hasUsualTerm
+base:hasUsualTerm 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#orbit
+result:orbit rdf:type owl:ObjectProperty ;
+             rdfs:subPropertyOf base:Out_ObjectProperty ;
+             rdfs:label "orbit" ;
+             base:fromStructure "SolarSystem-19" .
+
+
+#################################################################
+#    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/expected-result#planet
+result:planet rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity ;
+              rdfs:label "planet" ;
+              base:fromStructure "SolarSystem-19" .
+
+
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-SolarSystem-19
+result:planet-SolarSystem-19 rdf:type owl:Class ;
+                             rdfs:subClassOf result:planet ;
+              rdfs:label "planet (SolarSystem-19)" ;
+              base:hasQuantity 6 ;
+                             base:fromStructure "SolarSystem-19" .
+
+
+
+###  https://reference.tetras-libre.fr/expected-result#satellite
+result:satellite rdf:type owl:Class ;
+                 rdfs:subClassOf base:Entity ;
+                 rdfs:label "satellite" ;
+                 base:fromStructure "SolarSystem-19" .
+
+
+
+###  https://reference.tetras-libre.fr/expected-result#natural-satellite
+result:natural-satellite rdf:type owl:Class ;
+                 rdfs:subClassOf result:satellite ,
+                                       [ rdf:type owl:Restriction ;
+                                         owl:onProperty result:hasFeature ;
+                                         owl:hasValue result:natural
+                                       ] ,
+                                       [ rdf:type owl:Restriction ;
+                                         owl:onProperty result:orbit ;
+                                         owl:someValuesFrom result:planet-SolarSystem-19
+                                       ] ;
+                 base:hasUsualTerm "moon" ;
+                 rdfs:label "natural-satellite" ;
+                 base:fromStructure "SolarSystem-19" .
+
+
+
+
+
+#################################################################
+#    Individuals
+#################################################################
+
+###  https://reference.tetras-libre.fr/expected-result#natural
+result:natural rdf:type owl:NamedIndividual ,
+                     owl:Individual ,
+                     base:Feature ;
+            rdfs:label "natural" ;
+            base:fromStructure "SolarSystem-19" .
 
-result:body-isMoreSmallThan-planet-include-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:isMoreSmallThan ;
-            owl:someValuesFrom result:planet-include-planet ],
-        result:more-small-body ;
-    base:fromStructure "SolarSystem-19" .
-
-result:many a owl:Class ;
-    rdfs:label "many" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-19" .
-
-result:moon a owl:Class ;
-    rdfs:label "moon" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-19" .
-
-result:more a owl:Individual,
-        base:Degree ;
-    rdfs:label "more" ;
-    base:fromStructure "SolarSystem-19" .
-
-result:natural a owl:ObjectProperty ;
-    rdfs:label "natural" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-19" .
-
-result:satellite-orbit-body-include-more-small-body a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:orbit ;
-            owl:someValuesFrom result:body-include-more-small-body ],
-        result:satellite-orbit-body ;
-    base:fromStructure "SolarSystem-19" .
-
-result:satellite-orbit-planet-include-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:orbit ;
-            owl:someValuesFrom result:planet-include-planet ],
-        result:satellite-orbit-planet ;
-    base:fromStructure "SolarSystem-19" .
-
-result:term a owl:ObjectProperty ;
-    rdfs:label "term" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-19" .
-
-result:usual a owl:Class ;
-    rdfs:label "usual" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-19" .
-
-result:satellite-orbit-body a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:orbit ;
-            owl:someValuesFrom result:body ],
-        [ a owl:Restriction ;
-            owl:onProperty result:orbit ;
-            owl:someValuesFrom result:body ],
-        result:satellite ;
-    base:fromStructure "SolarSystem-19" .
-
-result:satellite-orbit-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:orbit ;
-            owl:someValuesFrom result:planet ],
-        [ a owl:Restriction ;
-            owl:onProperty result:orbit ;
-            owl:someValuesFrom result:planet ],
-        result:satellite ;
-    base:fromStructure "SolarSystem-19" .
-
-result:body-include-more-small-body a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:include ;
-            owl:someValuesFrom result:more-small-body ],
-        result:body ;
-    base:fromStructure "SolarSystem-19" .
-
-result:satellite a owl:Class ;
-    rdfs:label "satellite" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-19" .
-
-result:more-small-body a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:more-small ;
-            owl:onProperty result:hasFeature ],
-        [ a owl:Restriction ;
-            owl:onProperty result:isMoreSmallThan ;
-            owl:someValuesFrom result:planet ],
-        [ a owl:Restriction ;
-            owl:hasValue result:more-small ;
-            owl:onProperty result:hasFeature ],
-        [ a owl:Restriction ;
-            owl:onProperty result:isMoreSmallThan ;
-            owl:someValuesFrom result:planet ],
-        result:body ;
-    base:fromStructure "SolarSystem-19" .
-
-result:hasFeature a owl:ObjectProperty ;
-    rdfs:label "hasFeature" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "predefinedProperty" .
-
-result:include a owl:ObjectProperty ;
-    rdfs:label "include" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-19" .
-
-result:more-small a owl:Individual,
-        base:Feature ;
-    rdfs:label "more-small" ;
-    base:fromStructure "SolarSystem-19" .
-
-result:planet-include-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:include ;
-            owl:someValuesFrom result:planet ],
-        result:planet ;
-    base:fromStructure "SolarSystem-19" .
-
-result:body a owl:Class ;
-    rdfs:label "body" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-19" .
-
-result:isMoreSmallThan rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-19" .
-
-result:planet a owl:Class ;
-    rdfs:label "planet" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-19" .
-
-result:orbit a owl:ObjectProperty ;
-    rdfs:label "orbit" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-19" .
 
+###  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_20.ttl b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_20.ttl
index 333fd9b69bf92f6d2843582eaef2fbeb77d401be..403852a605e23b6b75405b4186d787f1478cd9b3 100644
--- a/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_20.ttl
+++ b/SolarSystem-20231005/reference-ontology-definitions/SolarSystemProd_factoid_20.ttl
@@ -1,82 +1,180 @@
-@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#encircle
+result:encircle rdf:type owl:ObjectProperty ;
+                rdfs:subPropertyOf base:Out_ObjectProperty ;
+                rdfs:label "encircle" ;
+                base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#encircle
+result:consistOf rdf:type owl:ObjectProperty ;
+                rdfs:subPropertyOf base:Out_ObjectProperty ;
+                rdfs:label "consistOf" ;
+                base:fromStructure "SolarSystem-20" .
+
+
+###  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#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#dust
+result:dust rdf:type owl:Class ;
+            rdfs:subClassOf base:Entity ;
+            rdfs:label "dust" ;
+            base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#object
+result:object rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity ;
+              rdfs:label "object" ;
+              base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#outer-planet
+result:outer-planet rdf:type owl:Class ;
+                    rdfs:subClassOf result:planet ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty result:hasFeature ;
+                                      owl:hasValue result:outer
+                                    ] ;
+                    base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet
+result:planet rdf:type owl:Class ;
+              rdfs:subClassOf base:Entity .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-ring
+result:planet-ring rdf:type owl:Class ;
+                   rdfs:subClassOf result:ring ,
+                                   [ rdf:type owl:Restriction ;
+                                     owl:onProperty result:hasFeature ;
+                                     owl:hasValue result:planet
+                                   ] ,
+                                   [ rdf:type owl:Restriction ;
+                                     owl:onProperty result:consistOf ;
+                                     owl:someValuesFrom result:dust
+                                   ] ;
+                   base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet-ring-encircle-outer-planet
+result:planet-ring-encircle-outer-planet rdf:type owl:Class ;
+                                         rdfs:subClassOf result:planet-ring ,
+                                                         [ rdf:type owl:Restriction ;
+                                                           owl:onProperty result:encircle ;
+                                                           owl:someValuesFrom result:outer-planet
+                                                         ] ;
+                                         base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#ring
+result:ring rdf:type owl:Class ;
+            rdfs:subClassOf base:Entity ;
+            rdfs:label "ring" ;
+            base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#small-object
+result:small-object rdf:type owl:Class ;
+                    rdfs:subClassOf result:object ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty result:hasFeature ;
+                                      owl:hasValue result:small
+                                    ] ;
+                    base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#small-object-encircle-outer-planet
+result:small-object-encircle-outer-planet rdf:type owl:Class ;
+                                          rdfs:subClassOf result:small-object ,
+                                                          [ rdf:type owl:Restriction ;
+                                                            owl:onProperty result:encircle ;
+                                                            owl:someValuesFrom result:outer-planet
+                                                          ] ;
+                                          base:fromStructure "SolarSystem-20" .
+
+
+#################################################################
+#    Individuals
+#################################################################
+
+###  https://reference.tetras-libre.fr/expected-result#outer
+result:outer rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Feature ;
+             rdfs:label "outer" ;
+             base:fromStructure "SolarSystem-20" .
+
+
+###  https://reference.tetras-libre.fr/expected-result#planet
+result:planet rdf:type owl:NamedIndividual ,
+                       owl:Individual ,
+                       base:Feature .
+
+
+###  https://reference.tetras-libre.fr/expected-result#small
+result:small rdf:type owl:NamedIndividual ,
+                      owl:Individual ,
+                      base:Feature ;
+             rdfs:label "small" ;
+             base:fromStructure "SolarSystem-20" .
+
+
+#################################################################
+#    Annotations
+#################################################################
+
+result:planet base:fromStructure "SolarSystem-20" ;
+              rdfs:label "planet" .
 
-result:dust a owl:Class ;
-    rdfs:label "dust" ;
-    rdfs:subClassOf base:Undetermined_Thing ;
-    base:fromStructure "SolarSystem-20" .
-
-result:planet-ring-encircle-outer-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:encircle ;
-            owl:someValuesFrom result:outer-planet ],
-        result:planet-ring ;
-    base:fromStructure "SolarSystem-20" .
-
-result:small-object-encircle-outer-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty result:encircle ;
-            owl:someValuesFrom result:outer-planet ],
-        result:small-object ;
-    base:fromStructure "SolarSystem-20" .
-
-result:object a owl:Class ;
-    rdfs:label "object" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-20" .
-
-result:planet-ring a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:planet ;
-            owl:onProperty result:hasFeature ],
-        result:ring ;
-    base:fromStructure "SolarSystem-20" .
-
-result:ring a owl:Class ;
-    rdfs:label "ring" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-20" .
-
-result:small-object a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:small ;
-            owl:onProperty result:hasFeature ],
-        result:object ;
-    base:fromStructure "SolarSystem-20" .
-
-result:outer a owl:Individual,
-        base:Feature ;
-    rdfs:label "outer" ;
-    base:fromStructure "SolarSystem-20" .
-
-result:small a owl:Individual,
-        base:Feature ;
-    rdfs:label "small" ;
-    base:fromStructure "SolarSystem-20" .
-
-result:planet a owl:Class,
-        owl:Individual,
-        base:Feature ;
-    rdfs:label "planet" ;
-    rdfs:subClassOf base:Entity ;
-    base:fromStructure "SolarSystem-20" .
-
-result:encircle a owl:ObjectProperty ;
-    rdfs:label "encircle" ;
-    rdfs:subPropertyOf base:Out_ObjectProperty ;
-    base:fromStructure "SolarSystem-20" .
-
-result:outer-planet a owl:Class ;
-    rdfs:subClassOf [ a owl:Restriction ;
-            owl:hasValue result:outer ;
-            owl:onProperty result:hasFeature ],
-        result:planet ;
-    base:fromStructure "SolarSystem-20" .
-
-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