From f57a8856919ea30fbfb5fc74ca0e9368afa4bd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Lamercerie?=
 <aurelien.lamercerie@tetras-libre.fr>
Date: Wed, 14 Jun 2023 18:04:34 +0200
Subject: [PATCH] New Preprocessing Rule: AMR Leaf adding

---
 tenet/scheme/amr_master_rule/__init__.py      |   4 +-
 .../preprocessing/amr_reification10.py        |   1 -
 .../preprocessing/amr_reification_10.py       |  86 +++
 .../preprocessing/amr_reification_8.py        |   2 +-
 .../preprocessing/amr_reification_9.py        |  78 ++
 tenet/scheme/owl_amr_scheme_1.py              |   8 +-
 tenet/tenet.log                               | 110 +--
 .../SolarSystemDev01_factoid.ttl              |  56 +-
 .../technical-data/tenet.log                  | 106 +--
 ...net.tetras-libre.fr_demo_01_Generation.ttl | 717 ++++++++++++------
 ....tetras-libre.fr_demo_01_Preprocessing.ttl | 136 ++--
 ...t.tetras-libre.fr_demo_01_Transduction.ttl | 637 +++++++++++-----
 .../tenet.tetras-libre.fr_demo_01_factoid.ttl |  56 +-
 13 files changed, 1390 insertions(+), 607 deletions(-)
 delete mode 100644 tenet/scheme/amr_master_rule/preprocessing/amr_reification10.py
 create mode 100644 tenet/scheme/amr_master_rule/preprocessing/amr_reification_10.py

diff --git a/tenet/scheme/amr_master_rule/__init__.py b/tenet/scheme/amr_master_rule/__init__.py
index 252d453f..ac7ede94 100644
--- a/tenet/scheme/amr_master_rule/__init__.py
+++ b/tenet/scheme/amr_master_rule/__init__.py
@@ -8,8 +8,8 @@ from scheme.amr_master_rule.preprocessing.amr_reification_5 import *
 from scheme.amr_master_rule.preprocessing.amr_reification_6 import * 
 from scheme.amr_master_rule.preprocessing.amr_reification_7 import * 
 from scheme.amr_master_rule.preprocessing.amr_reification_8 import * 
-# from scheme.amr_master_rule.preprocessing.amr_reification_9 import *
-# from scheme.amr_master_rule.preprocessing.amr_reification_10 import *  
+from scheme.amr_master_rule.preprocessing.amr_reification_9 import *
+from scheme.amr_master_rule.preprocessing.amr_reification_10 import *  
 
 from scheme.amr_master_rule.transduction.extractor.atom_class_extractor import * 
 from scheme.amr_master_rule.transduction.extractor.atom_individual_extractor import * 
diff --git a/tenet/scheme/amr_master_rule/preprocessing/amr_reification10.py b/tenet/scheme/amr_master_rule/preprocessing/amr_reification10.py
deleted file mode 100644
index 8d1c8b69..00000000
--- a/tenet/scheme/amr_master_rule/preprocessing/amr_reification10.py
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/tenet/scheme/amr_master_rule/preprocessing/amr_reification_10.py b/tenet/scheme/amr_master_rule/preprocessing/amr_reification_10.py
new file mode 100644
index 00000000..da3f5917
--- /dev/null
+++ b/tenet/scheme/amr_master_rule/preprocessing/amr_reification_10.py
@@ -0,0 +1,86 @@
+#!/usr/bin/python3.10
+# -*- coding: Utf-8 -*-
+
+#==============================================================================
+# TENET: Rule to add AMR leaf for reified concept
+#------------------------------------------------------------------------------
+# Add AMR leaf corresponding to reified concept (with new variable)
+#==============================================================================
+
+from rdflib import Graph, Literal
+
+import transduction
+from transduction import net
+from transduction.query_builder import generate_select_query
+from transduction.rdfterm_computer import ( produce_uriref, produce_literal )
+
+
+#==============================================================================
+# Pattern Search: concept{variable, concept}
+#==============================================================================
+
+def __search_pattern(graph):
+    select_data_list = ['?concept', '?cLabel', '?variable', '?vLabel']
+    clause_list = ['?concept rdfs:subClassOf* amr:AMR_Concept .',
+                    '?concept amr:isReifiedConcept true .',
+                    '?concept amr:label ?cLabel .',
+                    '?concept amr:fromAmrLk ?linkedC .',
+                    '?variable a amr:AMR_Variable .',
+                    '?variable amr:isReifiedVariable true .',
+                    '?variable amr:label ?vLabel .',
+                    '?variable a ?linkedC .']
+    query_code = generate_select_query(graph, select_data_list, clause_list)
+    result_set = graph.query(query_code) 
+    return query_code, result_set
+
+
+#==============================================================================
+# Construct Method(s)
+#==============================================================================
+
+def __add_amr_leaf(graph, concept, cLabel, variable, vLabel):
+    triple_list = []
+    
+    # -- New leaf
+    new_leaf_uri = produce_uriref(graph, f'amr:leaf_{cLabel}_{vLabel}')
+    relation = produce_uriref(graph, 'rdf:type')
+    value = produce_uriref(graph, 'amr:AMR_Leaf')
+    triple_list.append((new_leaf_uri, relation, value))
+    
+    # -- Reification flag
+    relation = produce_uriref(graph, 'amr:isReifiedLeaf')
+    value = Literal(True)
+    triple_list.append((new_leaf_uri, relation, value))
+    
+    # -- Relation: hasVariable
+    relation = produce_uriref(graph, 'amr:hasVariable')
+    triple_list.append((new_leaf_uri, relation, variable))
+    
+    # -- Relation: hasConcept
+    relation = produce_uriref(graph, 'amr:hasConcept')
+    triple_list.append((new_leaf_uri, relation, concept))
+    
+    return triple_list
+
+
+#==============================================================================
+# Main Method
+#==============================================================================
+
+def add_amr_leaf_for_reified_concept(graph):
+    
+    # -- Rule Initialization
+    rule_label = 'add AMR leaf for reified concept'
+    
+    # -- Search for patterns
+    _, pattern_set = __search_pattern(graph)
+    
+    # -- Selection Analyzing (1)
+    rule_triple_list = []
+    for pattern in pattern_set:
+        rule_triple_list += __add_amr_leaf(
+            graph, pattern.concept, pattern.cLabel, pattern.variable, pattern.vLabel)
+    
+    return rule_label, rule_triple_list
+ 
+ 
diff --git a/tenet/scheme/amr_master_rule/preprocessing/amr_reification_8.py b/tenet/scheme/amr_master_rule/preprocessing/amr_reification_8.py
index 12cffa53..ac310c68 100644
--- a/tenet/scheme/amr_master_rule/preprocessing/amr_reification_8.py
+++ b/tenet/scheme/amr_master_rule/preprocessing/amr_reification_8.py
@@ -47,7 +47,7 @@ def __add_new_variable_for_reified_concept(graph, originConcept, vLetter, vLabel
     new_variable_uri = produce_uriref(graph, f'amr:variable_{vLabel}')
     
     # -- New variable
-    relation = produce_uriref(graph, 'rdfs:type')
+    relation = produce_uriref(graph, 'rdf:type')
     value = produce_uriref(graph, 'amr:AMR_Variable')
     triple_list.append((new_variable_uri, relation, value))
     
diff --git a/tenet/scheme/amr_master_rule/preprocessing/amr_reification_9.py b/tenet/scheme/amr_master_rule/preprocessing/amr_reification_9.py
index 8d1c8b69..a9c2d7e4 100644
--- a/tenet/scheme/amr_master_rule/preprocessing/amr_reification_9.py
+++ b/tenet/scheme/amr_master_rule/preprocessing/amr_reification_9.py
@@ -1 +1,79 @@
+#!/usr/bin/python3.10
+# -*- coding: Utf-8 -*-
+
+#==============================================================================
+# TENET: Rule to add AMR leaf for reclassified concept
+#------------------------------------------------------------------------------
+# Add AMR leaf corresponding to the relation between concept and variable.
+#==============================================================================
+
+from rdflib import Graph
+
+import transduction
+from transduction import net
+from transduction.query_builder import generate_select_query
+from transduction.rdfterm_computer import ( produce_uriref, produce_literal )
+
+
+#==============================================================================
+# Pattern Search: concept{variable, concept}
+#==============================================================================
+
+def __search_pattern(graph):
+    select_data_list = ['?concept', '?cLabel', '?variable', '?vLabel']
+    clause_list = [f'?concept rdfs:subClassOf* amr:AMR_Concept .',
+                   f'?concept amr:label ?cLabel .',
+                   f'?concept amr:fromAmrLk ?linkedC .',
+                   f'?variable a amr:AMR_Variable .',
+                   f'?variable amr:label ?vLabel .',
+                   f'?variable amr:fromAmrLk ?v .',
+                   f'?v a ?linkedC .']
+    query_code = generate_select_query(graph, select_data_list, clause_list)
+    result_set = graph.query(query_code) 
+    return query_code, result_set
+
+
+#==============================================================================
+# Construct Method(s)
+#==============================================================================
+
+def __add_amr_leaf(graph, concept, cLabel, variable, vLabel):
+    triple_list = []
+    
+    # -- New leaf
+    new_leaf_uri = produce_uriref(graph, f'amr:leaf_{cLabel}_{vLabel}')
+    relation = produce_uriref(graph, 'rdf:type')
+    value = produce_uriref(graph, 'amr:AMR_Leaf')
+    triple_list.append((new_leaf_uri, relation, value))
+    
+    # -- Relation: hasVariable
+    relation = produce_uriref(graph, 'amr:hasVariable')
+    triple_list.append((new_leaf_uri, relation, variable))
+    
+    # -- Relation: hasConcept
+    relation = produce_uriref(graph, 'amr:hasConcept')
+    triple_list.append((new_leaf_uri, relation, concept))
+    
+    return triple_list
+
+
+#==============================================================================
+# Main Method
+#==============================================================================
+
+def add_amr_leaf_for_reclassified_concept(graph):
+    
+    # -- Rule Initialization
+    rule_label = 'add AMR leaf for reclassified concept'
+    
+    # -- Search for patterns
+    _, pattern_set = __search_pattern(graph)
+    
+    # -- Selection Analyzing (1)
+    rule_triple_list = []
+    for pattern in pattern_set:
+        rule_triple_list += __add_amr_leaf(
+            graph, pattern.concept, pattern.cLabel, pattern.variable, pattern.vLabel)
+    
+    return rule_label, rule_triple_list
  
diff --git a/tenet/scheme/owl_amr_scheme_1.py b/tenet/scheme/owl_amr_scheme_1.py
index 7b4ade69..5d2082c2 100644
--- a/tenet/scheme/owl_amr_scheme_1.py
+++ b/tenet/scheme/owl_amr_scheme_1.py
@@ -76,8 +76,8 @@ nov_amr_reification_sequence = {
                       #'reify-roles-as-concept',
                       #'reclassify-existing-variable',
                       #'add-new-variable-for-reified-concept',
-                      'add-amr-leaf-for-reclassified-concept',
-                      'add-amr-leaf-for-reified-concept',
+                      #'add-amr-leaf-for-reclassified-concept',
+                      #'add-amr-leaf-for-reified-concept',
                       'add-amr-edge-for-core-relation',
                       'add-amr-edge-for-reified-concept',
                       'add-amr-edge-for-name-relation',
@@ -95,7 +95,9 @@ amr_reification_sequence = ['AMR reification from AMR-Linked-Data to AMR (tenet)
                             rule.reclassify_concept_5,
                             rule.reify_roles_as_concept,
                             rule.reclassify_existing_variable,
-                            rule.add_new_variable_for_reified_concept
+                            rule.add_new_variable_for_reified_concept,
+                            rule.add_amr_leaf_for_reclassified_concept,
+                            rule.add_amr_leaf_for_reified_concept
                             ]
 
 # ---------------------------------------------
diff --git a/tenet/tenet.log b/tenet/tenet.log
index 790259ba..50610415 100644
--- a/tenet/tenet.log
+++ b/tenet/tenet.log
@@ -74,90 +74,90 @@
 - DEBUG - ----- Total rule number: 18
 - INFO - -- Step 1: Preprocessing
 - INFO - --- *** November Transduction *** Sequence: amrld-correcting-sequence
-- INFO - ----- fix-amr-bug-about-system-solar-planet: 5/5 new triples (603, 0:00:00.116813)
+- INFO - ----- fix-amr-bug-about-system-solar-planet: 5/5 new triples (603, 0:00:00.042193)
 - INFO - --- Sequence: AMR reification from AMR-Linked-Data to AMR (tenet) structure
-- INFO - ----- reclassify AMR-LD concept (1): 10/10 new triples (613, 0:00:00.097001)
-- DEBUG - ----- reclassify AMR-LD concept (2): 0/0 new triple (613, 0:00:00.051071)
-- INFO - ----- reclassify AMR-LD concept (3): 12/12 new triples (625, 0:00:00.031494)
-- INFO - ----- reclassify AMR-LD concept (4): 16/16 new triples (641, 0:00:00.042261)
-- INFO - ----- reclassify AMR-LD concept (5): 2/4 new triples (643, 0:00:00.023160)
-- INFO - ----- reify roles as concept: 10/10 new triples (653, 0:00:00.031341)
-- INFO - ----- reclassify existing variable: 45/45 new triples (698, 0:00:00.018505)
-- INFO - ----- add new variable for reified concept: 8/8 new triples (706, 0:00:00.037320)
+- INFO - ----- reclassify AMR-LD concept (1): 10/10 new triples (613, 0:00:00.102829)
+- DEBUG - ----- reclassify AMR-LD concept (2): 0/0 new triple (613, 0:00:00.044106)
+- INFO - ----- reclassify AMR-LD concept (3): 12/12 new triples (625, 0:00:00.038416)
+- INFO - ----- reclassify AMR-LD concept (4): 16/16 new triples (641, 0:00:00.061895)
+- INFO - ----- reclassify AMR-LD concept (5): 2/4 new triples (643, 0:00:00.034456)
+- INFO - ----- reify roles as concept: 10/10 new triples (653, 0:00:00.042023)
+- INFO - ----- reclassify existing variable: 45/45 new triples (698, 0:00:00.026731)
+- INFO - ----- add new variable for reified concept: 8/8 new triples (706, 0:00:00.044332)
+- INFO - ----- add AMR leaf for reclassified concept: 33/33 new triples (739, 0:00:00.024475)
+- INFO - ----- add AMR leaf for reified concept: 8/8 new triples (747, 0:00:00.013921)
 - INFO - --- *** November Transduction *** Sequence: amr-reification-sequence
-- INFO - ----- add-amr-leaf-for-reclassified-concept: 33/33 new triples (739, 0:00:00.046261)
-- DEBUG - ----- add-amr-leaf-for-reified-concept: 0/0 new triple (739, 0:00:00.036339)
-- INFO - ----- add-amr-edge-for-core-relation: 27/27 new triples (766, 0:00:00.109515)
-- DEBUG - ----- add-amr-edge-for-reified-concept: 0/0 new triple (766, 0:00:00.067585)
-- INFO - ----- add-amr-edge-for-name-relation: 5/5 new triples (771, 0:00:00.099479)
-- DEBUG - ----- add-value-for-quant-relation: 0/0 new triple (771, 0:00:00.093799)
-- INFO - ----- add-amr-edge-for-polarity-relation: 5/5 new triples (776, 0:00:00.109524)
-- INFO - ----- update-amr-edge-role-1: 11/11 new triples (787, 0:00:00.087497)
-- INFO - ----- add-amr-root: 5/5 new triples (792, 0:00:00.040803)
+- INFO - ----- add-amr-edge-for-core-relation: 27/27 new triples (774, 0:00:00.116593)
+- INFO - ----- add-amr-edge-for-reified-concept: 12/12 new triples (786, 0:00:00.125194)
+- INFO - ----- add-amr-edge-for-name-relation: 5/5 new triples (791, 0:00:00.069840)
+- DEBUG - ----- add-value-for-quant-relation: 0/0 new triple (791, 0:00:00.066898)
+- INFO - ----- add-amr-edge-for-polarity-relation: 5/5 new triples (796, 0:00:00.075913)
+- INFO - ----- update-amr-edge-role-1: 15/15 new triples (811, 0:00:00.091490)
+- INFO - ----- add-amr-root: 5/5 new triples (816, 0:00:00.024982)
 - DEBUG - --- Serializing graph to tenet.tetras-libre.fr_demo_01_Preprocessing 
 - DEBUG - ----- step: Preprocessing
 - DEBUG - ----- id: https://tenet.tetras-libre.fr/demo/01/
 - DEBUG - ----- work_file: /home/lamenji/Workspace/Tetras/tenet/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Preprocessing.ttl
 - DEBUG - ----- base: http://https://tenet.tetras-libre.fr/demo/01//Preprocessing
-- INFO - ----- 194 triples extracted during Preprocessing step
+- INFO - ----- 218 triples extracted during Preprocessing step
 - INFO - -- Step 2: Transduction
 - INFO - --- Sequence: atomic extraction sequence
-- INFO - ----- extract atom classes: 30/30 new triples (822, 0:00:00.193618)
-- INFO - ----- extract atom individuals: 8/8 new triples (830, 0:00:00.057638)
-- INFO - ----- extract atomic properties: 49/49 new triples (879, 0:00:00.189840)
-- INFO - ----- extract atom values: 10/10 new triples (889, 0:00:00.063652)
-- INFO - ----- extract atom phenomena: 14/14 new triples (903, 0:00:00.093796)
-- INFO - ----- propagate atom relations: 20/52 new triples (923, 0:00:00.902266)
+- INFO - ----- extract atom classes: 30/30 new triples (846, 0:00:00.164632)
+- INFO - ----- extract atom individuals: 8/8 new triples (854, 0:00:00.046073)
+- INFO - ----- extract atomic properties: 75/75 new triples (929, 0:00:00.225725)
+- INFO - ----- extract atom values: 10/10 new triples (939, 0:00:00.066707)
+- INFO - ----- extract atom phenomena: 14/14 new triples (953, 0:00:00.075190)
+- INFO - ----- propagate atom relations: 24/68 new triples (977, 0:00:01.331963)
 - INFO - --- Sequence: classification sequence (1)
-- DEBUG - ----- classify modality phenomena: 0/0 new triple (923, 0:00:00.019754)
-- DEBUG - ----- reclassify argument property to class: 0/0 new triple (923, 0:00:00.025035)
+- DEBUG - ----- classify modality phenomena: 0/0 new triple (977, 0:00:00.021275)
+- INFO - ----- reclassify argument property to class: 11/14 new triples (988, 0:00:00.085088)
 - INFO - --- Sequence: phenomena analyze sequence (1)
-- INFO - ----- analyze "polarity" phenomena (1): 32/36 new triples (955, 0:00:00.101026)
-- DEBUG - ----- analyze "polarity" phenomena (2): 0/0 new triple (955, 0:00:00.014009)
-- DEBUG - ----- analyze "polarity" phenomena (3): 0/0 new triple (955, 0:00:00.012298)
-- DEBUG - ----- analyze "polarity" phenomena (4): 0/0 new triple (955, 0:00:00.033059)
-- DEBUG - ----- analyze "polarity" phenomena (5): 0/0 new triple (955, 0:00:00.033254)
-- DEBUG - ----- analyze modifier phenomena (mod): 0/0 new triple (955, 0:00:00.007692)
-- DEBUG - ----- classify modality phenomena: 0/0 new triple (955, 0:00:00.018203)
+- INFO - ----- analyze "polarity" phenomena (1): 32/36 new triples (1020, 0:00:00.107939)
+- DEBUG - ----- analyze "polarity" phenomena (2): 0/0 new triple (1020, 0:00:00.013870)
+- DEBUG - ----- analyze "polarity" phenomena (3): 0/0 new triple (1020, 0:00:00.018920)
+- DEBUG - ----- analyze "polarity" phenomena (4): 0/0 new triple (1020, 0:00:00.031485)
+- DEBUG - ----- analyze "polarity" phenomena (5): 0/0 new triple (1020, 0:00:00.038943)
+- DEBUG - ----- analyze modifier phenomena (mod): 0/0 new triple (1020, 0:00:00.012694)
+- DEBUG - ----- classify modality phenomena: 0/0 new triple (1020, 0:00:00.019295)
 - INFO - --- Sequence: phenomena analyze sequence (2)
-- DEBUG - ----- analyze "or" phenomena (1): 0/0 new triple (955, 0:00:00.017103)
-- DEBUG - ----- analyze "or" phenomena (2): 0/0 new triple (955, 0:00:00.018517)
-- DEBUG - ----- analyze "and" phenomena (1): 0/0 new triple (955, 0:00:00.019055)
-- DEBUG - ----- analyze "and" phenomena (2): 0/0 new triple (955, 0:00:00.015868)
+- INFO - ----- analyze "or" phenomena (1): 1/1 new triple (1021, 0:00:00.078029)
+- INFO - ----- analyze "or" phenomena (2): 55/82 new triples (1076, 0:00:00.298662)
+- INFO - ----- analyze "and" phenomena (1): 2/14 new triples (1078, 0:00:00.173906)
+- DEBUG - ----- analyze "and" phenomena (2): 0/0 new triple (1078, 0:00:00.014463)
 - INFO - --- Sequence: composite class extraction sequence
-- INFO - ----- extract composite classes (1): 46/48 new triples (1001, 0:00:00.217068)
-- DEBUG - ----- extract composite classes (2): 0/0 new triple (1001, 0:00:00.024731)
+- INFO - ----- extract composite classes (1): 127/138 new triples (1205, 0:00:00.599295)
+- DEBUG - ----- extract composite classes (2): 0/0 new triple (1205, 0:00:00.038679)
 - INFO - --- Sequence: classification sequence (2)
-- INFO - ----- classify class net as entity from core arguments: 8/26 new triples (1009, 0:00:00.235898)
-- DEBUG - ----- classify class net as entity from :part relation: 0/0 new triple (1009, 0:00:00.011622)
-- DEBUG - ----- classify class net as entity from degree arguments: 0/0 new triple (1009, 0:00:00.017043)
-- INFO - ----- Associate mother to class net from :domain relation: 1/16 new triple (1010, 0:00:00.036231)
-- DEBUG - ----- Propagate individuals to net with same base node: 0/6 new triple (1010, 0:00:00.021667)
-- INFO - ----- Propagate individuals to net with domain link: 1/12 new triple (1011, 0:00:00.049730)
+- INFO - ----- classify class net as entity from core arguments: 10/181 new triples (1215, 0:00:00.306414)
+- DEBUG - ----- classify class net as entity from :part relation: 0/0 new triple (1215, 0:00:00.010347)
+- DEBUG - ----- classify class net as entity from degree arguments: 0/0 new triple (1215, 0:00:00.017225)
+- INFO - ----- Associate mother to class net from :domain relation: 5/34 new triples (1220, 0:00:00.096490)
+- DEBUG - ----- Propagate individuals to net with same base node: 0/10 new triple (1220, 0:00:00.032242)
+- INFO - ----- Propagate individuals to net with domain link: 3/60 new triples (1223, 0:00:00.128059)
 - DEBUG - --- Serializing graph to tenet.tetras-libre.fr_demo_01_Transduction 
 - DEBUG - ----- step: Transduction
 - DEBUG - ----- id: https://tenet.tetras-libre.fr/demo/01/
 - DEBUG - ----- work_file: /home/lamenji/Workspace/Tetras/tenet/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Transduction.ttl
 - DEBUG - ----- base: http://https://tenet.tetras-libre.fr/demo/01//Transduction
-- INFO - ----- 219 triples extracted during Transduction step
+- INFO - ----- 407 triples extracted during Transduction step
 - INFO - -- Step 3: Generation
 - INFO - --- Sequence: OWL Generation Sequence
-- INFO - ----- generate OWL class: 30/30 new triples (1041, 0:00:00.285631)
-- INFO - ----- generate OWL property: 15/15 new triples (1056, 0:00:00.137508)
-- INFO - ----- generate OWL individual: 4/5 new triples (1060, 0:00:00.052614)
+- INFO - ----- generate OWL class: 52/55 new triples (1275, 0:00:00.610934)
+- INFO - ----- generate OWL property: 29/29 new triples (1304, 0:00:00.318082)
+- INFO - ----- generate OWL individual: 6/7 new triples (1310, 0:00:00.080452)
 - DEBUG - --- Serializing graph to tenet.tetras-libre.fr_demo_01_Generation 
 - DEBUG - ----- step: Generation
 - DEBUG - ----- id: https://tenet.tetras-libre.fr/demo/01/
 - DEBUG - ----- work_file: /home/lamenji/Workspace/Tetras/tenet/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Generation.ttl
 - DEBUG - ----- base: http://https://tenet.tetras-libre.fr/demo/01//Generation
-- INFO - ----- 49 triples extracted during Generation step
+- INFO - ----- 87 triples extracted during Generation step
 - DEBUG - --- Serializing graph to factoid file (/home/lamenji/Workspace/Tetras/tenet/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_factoid.ttl)
-- DEBUG - ----- Number of factoids: 50
+- DEBUG - ----- Number of factoids: 91
 - DEBUG - ----- Graph base: http://https://tenet.tetras-libre.fr/demo/01//factoid
 - INFO - 
  === Final Ontology Generation  === 
 - INFO - -- Making complete factoid graph by merging the result factoids
-- INFO - ----- Total factoid number: 50
+- INFO - ----- Total factoid number: 91
 - INFO - -- Serializing graph to factoid string
 - INFO - ----- Graph base: http://https://tenet.tetras-libre.fr/demo/01//factoid
 - INFO - -- Serializing graph to factoid file
@@ -167,6 +167,6 @@
 - INFO - 
   *** Execution Time *** 
 ----- Function: create_ontology_from_amrld_dir (tenet.main)
------ Total Time: 0:00:04.538157
------ Process Time: 0:00:04.477511
+----- Total Time: 0:00:06.756032
+----- Process Time: 0:00:06.601319
   *** - *** 
diff --git a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/SolarSystemDev01_factoid.ttl b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/SolarSystemDev01_factoid.ttl
index 02ecf0fd..d1b2817a 100644
--- a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/SolarSystemDev01_factoid.ttl
+++ b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/SolarSystemDev01_factoid.ttl
@@ -4,7 +4,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
 <https://tenet.tetras-libre.fr/extract-result#SolarSystem> a owl:Individual,
-        <https://tenet.tetras-libre.fr/extract-result#system> ;
+        <https://tenet.tetras-libre.fr/extract-result#system>,
+        <https://tenet.tetras-libre.fr/extract-result#system-hasPart-object>,
+        <https://tenet.tetras-libre.fr/extract-result#system-hasPart-sun> ;
     rdfs:label "Solar System" ;
     ns1:fromStructure "SSC-01-01" .
 
@@ -20,13 +22,25 @@
         <https://tenet.tetras-libre.fr/extract-result#gravitation> ;
     ns1:fromStructure "SSC-01-01" .
 
+<https://tenet.tetras-libre.fr/extract-result#hasManner> a owl:ObjectProperty ;
+    rdfs:label "hasManner" ;
+    rdfs:subPropertyOf ns1:Out_ObjectProperty ;
+    ns1:fromStructure "SSC-01-01" .
+
 <https://tenet.tetras-libre.fr/extract-result#not-direct> a owl:ObjectProperty ;
     rdfs:subPropertyOf ns1:Out_ObjectProperty ;
     ns1:fromStructure "SSC-01-01" .
 
-<https://tenet.tetras-libre.fr/extract-result#object-orbit-sun> a owl:Class ;
+<https://tenet.tetras-libre.fr/extract-result#object-orbit-hasManner-direct-sun> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-direct> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
+        <https://tenet.tetras-libre.fr/extract-result#object> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#object-orbit-hasManner-not-direct-sun> a owl:Class ;
     rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit> ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-not-direct> ;
             owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
         <https://tenet.tetras-libre.fr/extract-result#object> ;
     ns1:fromStructure "SSC-01-01" .
@@ -41,9 +55,31 @@
     rdfs:subClassOf ns1:Entity ;
     ns1:fromStructure "SSC-01-01" .
 
-<https://tenet.tetras-libre.fr/extract-result#object> a owl:Class ;
-    rdfs:label "object" ;
-    rdfs:subClassOf ns1:Entity ;
+<https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-direct> a owl:ObjectProperty ;
+    rdfs:subPropertyOf <https://tenet.tetras-libre.fr/extract-result#orbit> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-not-direct> a owl:ObjectProperty ;
+    rdfs:subPropertyOf <https://tenet.tetras-libre.fr/extract-result#orbit> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#system-hasPart-object> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#hasPart> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#object> ],
+        <https://tenet.tetras-libre.fr/extract-result#system> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#system-hasPart-sun> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#hasPart> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
+        <https://tenet.tetras-libre.fr/extract-result#system> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#hasPart> a owl:ObjectProperty ;
+    rdfs:label "hasPart" ;
+    rdfs:subPropertyOf ns1:Out_ObjectProperty ;
     ns1:fromStructure "SSC-01-01" .
 
 <https://tenet.tetras-libre.fr/extract-result#orbit> a owl:ObjectProperty ;
@@ -51,6 +87,11 @@
     rdfs:subPropertyOf ns1:Out_ObjectProperty ;
     ns1:fromStructure "SSC-01-01" .
 
+<https://tenet.tetras-libre.fr/extract-result#object> a owl:Class ;
+    rdfs:label "object" ;
+    rdfs:subClassOf ns1:Entity ;
+    ns1:fromStructure "SSC-01-01" .
+
 <https://tenet.tetras-libre.fr/extract-result#sun> a owl:Class ;
     rdfs:label "sun" ;
     rdfs:subClassOf ns1:Entity ;
@@ -58,6 +99,7 @@
 
 <https://tenet.tetras-libre.fr/extract-result#system> a owl:Class ;
     rdfs:label "system" ;
-    rdfs:subClassOf ns1:Entity ;
+    rdfs:subClassOf ns1:Entity,
+        ns1:Undetermined_Thing ;
     ns1:fromStructure "SSC-01-01" .
 
diff --git a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.log b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.log
index 72811865..36d626ac 100644
--- a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.log
+++ b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.log
@@ -74,90 +74,90 @@
 - DEBUG - ----- Total rule number: 18
 - INFO - -- Step 1: Preprocessing
 - INFO - --- *** November Transduction *** Sequence: amrld-correcting-sequence
-- INFO - ----- fix-amr-bug-about-system-solar-planet: 5/5 new triples (603, 0:00:00.116813)
+- INFO - ----- fix-amr-bug-about-system-solar-planet: 5/5 new triples (603, 0:00:00.042193)
 - INFO - --- Sequence: AMR reification from AMR-Linked-Data to AMR (tenet) structure
-- INFO - ----- reclassify AMR-LD concept (1): 10/10 new triples (613, 0:00:00.097001)
-- DEBUG - ----- reclassify AMR-LD concept (2): 0/0 new triple (613, 0:00:00.051071)
-- INFO - ----- reclassify AMR-LD concept (3): 12/12 new triples (625, 0:00:00.031494)
-- INFO - ----- reclassify AMR-LD concept (4): 16/16 new triples (641, 0:00:00.042261)
-- INFO - ----- reclassify AMR-LD concept (5): 2/4 new triples (643, 0:00:00.023160)
-- INFO - ----- reify roles as concept: 10/10 new triples (653, 0:00:00.031341)
-- INFO - ----- reclassify existing variable: 45/45 new triples (698, 0:00:00.018505)
-- INFO - ----- add new variable for reified concept: 8/8 new triples (706, 0:00:00.037320)
+- INFO - ----- reclassify AMR-LD concept (1): 10/10 new triples (613, 0:00:00.102829)
+- DEBUG - ----- reclassify AMR-LD concept (2): 0/0 new triple (613, 0:00:00.044106)
+- INFO - ----- reclassify AMR-LD concept (3): 12/12 new triples (625, 0:00:00.038416)
+- INFO - ----- reclassify AMR-LD concept (4): 16/16 new triples (641, 0:00:00.061895)
+- INFO - ----- reclassify AMR-LD concept (5): 2/4 new triples (643, 0:00:00.034456)
+- INFO - ----- reify roles as concept: 10/10 new triples (653, 0:00:00.042023)
+- INFO - ----- reclassify existing variable: 45/45 new triples (698, 0:00:00.026731)
+- INFO - ----- add new variable for reified concept: 8/8 new triples (706, 0:00:00.044332)
+- INFO - ----- add AMR leaf for reclassified concept: 33/33 new triples (739, 0:00:00.024475)
+- INFO - ----- add AMR leaf for reified concept: 8/8 new triples (747, 0:00:00.013921)
 - INFO - --- *** November Transduction *** Sequence: amr-reification-sequence
-- INFO - ----- add-amr-leaf-for-reclassified-concept: 33/33 new triples (739, 0:00:00.046261)
-- DEBUG - ----- add-amr-leaf-for-reified-concept: 0/0 new triple (739, 0:00:00.036339)
-- INFO - ----- add-amr-edge-for-core-relation: 27/27 new triples (766, 0:00:00.109515)
-- DEBUG - ----- add-amr-edge-for-reified-concept: 0/0 new triple (766, 0:00:00.067585)
-- INFO - ----- add-amr-edge-for-name-relation: 5/5 new triples (771, 0:00:00.099479)
-- DEBUG - ----- add-value-for-quant-relation: 0/0 new triple (771, 0:00:00.093799)
-- INFO - ----- add-amr-edge-for-polarity-relation: 5/5 new triples (776, 0:00:00.109524)
-- INFO - ----- update-amr-edge-role-1: 11/11 new triples (787, 0:00:00.087497)
-- INFO - ----- add-amr-root: 5/5 new triples (792, 0:00:00.040803)
+- INFO - ----- add-amr-edge-for-core-relation: 27/27 new triples (774, 0:00:00.116593)
+- INFO - ----- add-amr-edge-for-reified-concept: 12/12 new triples (786, 0:00:00.125194)
+- INFO - ----- add-amr-edge-for-name-relation: 5/5 new triples (791, 0:00:00.069840)
+- DEBUG - ----- add-value-for-quant-relation: 0/0 new triple (791, 0:00:00.066898)
+- INFO - ----- add-amr-edge-for-polarity-relation: 5/5 new triples (796, 0:00:00.075913)
+- INFO - ----- update-amr-edge-role-1: 15/15 new triples (811, 0:00:00.091490)
+- INFO - ----- add-amr-root: 5/5 new triples (816, 0:00:00.024982)
 - DEBUG - --- Serializing graph to tenet.tetras-libre.fr_demo_01_Preprocessing 
 - DEBUG - ----- step: Preprocessing
 - DEBUG - ----- id: https://tenet.tetras-libre.fr/demo/01/
 - DEBUG - ----- work_file: /home/lamenji/Workspace/Tetras/tenet/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Preprocessing.ttl
 - DEBUG - ----- base: http://https://tenet.tetras-libre.fr/demo/01//Preprocessing
-- INFO - ----- 194 triples extracted during Preprocessing step
+- INFO - ----- 218 triples extracted during Preprocessing step
 - INFO - -- Step 2: Transduction
 - INFO - --- Sequence: atomic extraction sequence
-- INFO - ----- extract atom classes: 30/30 new triples (822, 0:00:00.193618)
-- INFO - ----- extract atom individuals: 8/8 new triples (830, 0:00:00.057638)
-- INFO - ----- extract atomic properties: 49/49 new triples (879, 0:00:00.189840)
-- INFO - ----- extract atom values: 10/10 new triples (889, 0:00:00.063652)
-- INFO - ----- extract atom phenomena: 14/14 new triples (903, 0:00:00.093796)
-- INFO - ----- propagate atom relations: 20/52 new triples (923, 0:00:00.902266)
+- INFO - ----- extract atom classes: 30/30 new triples (846, 0:00:00.164632)
+- INFO - ----- extract atom individuals: 8/8 new triples (854, 0:00:00.046073)
+- INFO - ----- extract atomic properties: 75/75 new triples (929, 0:00:00.225725)
+- INFO - ----- extract atom values: 10/10 new triples (939, 0:00:00.066707)
+- INFO - ----- extract atom phenomena: 14/14 new triples (953, 0:00:00.075190)
+- INFO - ----- propagate atom relations: 24/68 new triples (977, 0:00:01.331963)
 - INFO - --- Sequence: classification sequence (1)
-- DEBUG - ----- classify modality phenomena: 0/0 new triple (923, 0:00:00.019754)
-- DEBUG - ----- reclassify argument property to class: 0/0 new triple (923, 0:00:00.025035)
+- DEBUG - ----- classify modality phenomena: 0/0 new triple (977, 0:00:00.021275)
+- INFO - ----- reclassify argument property to class: 11/14 new triples (988, 0:00:00.085088)
 - INFO - --- Sequence: phenomena analyze sequence (1)
-- INFO - ----- analyze "polarity" phenomena (1): 32/36 new triples (955, 0:00:00.101026)
-- DEBUG - ----- analyze "polarity" phenomena (2): 0/0 new triple (955, 0:00:00.014009)
-- DEBUG - ----- analyze "polarity" phenomena (3): 0/0 new triple (955, 0:00:00.012298)
-- DEBUG - ----- analyze "polarity" phenomena (4): 0/0 new triple (955, 0:00:00.033059)
-- DEBUG - ----- analyze "polarity" phenomena (5): 0/0 new triple (955, 0:00:00.033254)
-- DEBUG - ----- analyze modifier phenomena (mod): 0/0 new triple (955, 0:00:00.007692)
-- DEBUG - ----- classify modality phenomena: 0/0 new triple (955, 0:00:00.018203)
+- INFO - ----- analyze "polarity" phenomena (1): 32/36 new triples (1020, 0:00:00.107939)
+- DEBUG - ----- analyze "polarity" phenomena (2): 0/0 new triple (1020, 0:00:00.013870)
+- DEBUG - ----- analyze "polarity" phenomena (3): 0/0 new triple (1020, 0:00:00.018920)
+- DEBUG - ----- analyze "polarity" phenomena (4): 0/0 new triple (1020, 0:00:00.031485)
+- DEBUG - ----- analyze "polarity" phenomena (5): 0/0 new triple (1020, 0:00:00.038943)
+- DEBUG - ----- analyze modifier phenomena (mod): 0/0 new triple (1020, 0:00:00.012694)
+- DEBUG - ----- classify modality phenomena: 0/0 new triple (1020, 0:00:00.019295)
 - INFO - --- Sequence: phenomena analyze sequence (2)
-- DEBUG - ----- analyze "or" phenomena (1): 0/0 new triple (955, 0:00:00.017103)
-- DEBUG - ----- analyze "or" phenomena (2): 0/0 new triple (955, 0:00:00.018517)
-- DEBUG - ----- analyze "and" phenomena (1): 0/0 new triple (955, 0:00:00.019055)
-- DEBUG - ----- analyze "and" phenomena (2): 0/0 new triple (955, 0:00:00.015868)
+- INFO - ----- analyze "or" phenomena (1): 1/1 new triple (1021, 0:00:00.078029)
+- INFO - ----- analyze "or" phenomena (2): 55/82 new triples (1076, 0:00:00.298662)
+- INFO - ----- analyze "and" phenomena (1): 2/14 new triples (1078, 0:00:00.173906)
+- DEBUG - ----- analyze "and" phenomena (2): 0/0 new triple (1078, 0:00:00.014463)
 - INFO - --- Sequence: composite class extraction sequence
-- INFO - ----- extract composite classes (1): 46/48 new triples (1001, 0:00:00.217068)
-- DEBUG - ----- extract composite classes (2): 0/0 new triple (1001, 0:00:00.024731)
+- INFO - ----- extract composite classes (1): 127/138 new triples (1205, 0:00:00.599295)
+- DEBUG - ----- extract composite classes (2): 0/0 new triple (1205, 0:00:00.038679)
 - INFO - --- Sequence: classification sequence (2)
-- INFO - ----- classify class net as entity from core arguments: 8/26 new triples (1009, 0:00:00.235898)
-- DEBUG - ----- classify class net as entity from :part relation: 0/0 new triple (1009, 0:00:00.011622)
-- DEBUG - ----- classify class net as entity from degree arguments: 0/0 new triple (1009, 0:00:00.017043)
-- INFO - ----- Associate mother to class net from :domain relation: 1/16 new triple (1010, 0:00:00.036231)
-- DEBUG - ----- Propagate individuals to net with same base node: 0/6 new triple (1010, 0:00:00.021667)
-- INFO - ----- Propagate individuals to net with domain link: 1/12 new triple (1011, 0:00:00.049730)
+- INFO - ----- classify class net as entity from core arguments: 10/181 new triples (1215, 0:00:00.306414)
+- DEBUG - ----- classify class net as entity from :part relation: 0/0 new triple (1215, 0:00:00.010347)
+- DEBUG - ----- classify class net as entity from degree arguments: 0/0 new triple (1215, 0:00:00.017225)
+- INFO - ----- Associate mother to class net from :domain relation: 5/34 new triples (1220, 0:00:00.096490)
+- DEBUG - ----- Propagate individuals to net with same base node: 0/10 new triple (1220, 0:00:00.032242)
+- INFO - ----- Propagate individuals to net with domain link: 3/60 new triples (1223, 0:00:00.128059)
 - DEBUG - --- Serializing graph to tenet.tetras-libre.fr_demo_01_Transduction 
 - DEBUG - ----- step: Transduction
 - DEBUG - ----- id: https://tenet.tetras-libre.fr/demo/01/
 - DEBUG - ----- work_file: /home/lamenji/Workspace/Tetras/tenet/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Transduction.ttl
 - DEBUG - ----- base: http://https://tenet.tetras-libre.fr/demo/01//Transduction
-- INFO - ----- 219 triples extracted during Transduction step
+- INFO - ----- 407 triples extracted during Transduction step
 - INFO - -- Step 3: Generation
 - INFO - --- Sequence: OWL Generation Sequence
-- INFO - ----- generate OWL class: 30/30 new triples (1041, 0:00:00.285631)
-- INFO - ----- generate OWL property: 15/15 new triples (1056, 0:00:00.137508)
-- INFO - ----- generate OWL individual: 4/5 new triples (1060, 0:00:00.052614)
+- INFO - ----- generate OWL class: 52/55 new triples (1275, 0:00:00.610934)
+- INFO - ----- generate OWL property: 29/29 new triples (1304, 0:00:00.318082)
+- INFO - ----- generate OWL individual: 6/7 new triples (1310, 0:00:00.080452)
 - DEBUG - --- Serializing graph to tenet.tetras-libre.fr_demo_01_Generation 
 - DEBUG - ----- step: Generation
 - DEBUG - ----- id: https://tenet.tetras-libre.fr/demo/01/
 - DEBUG - ----- work_file: /home/lamenji/Workspace/Tetras/tenet/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Generation.ttl
 - DEBUG - ----- base: http://https://tenet.tetras-libre.fr/demo/01//Generation
-- INFO - ----- 49 triples extracted during Generation step
+- INFO - ----- 87 triples extracted during Generation step
 - DEBUG - --- Serializing graph to factoid file (/home/lamenji/Workspace/Tetras/tenet/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_factoid.ttl)
-- DEBUG - ----- Number of factoids: 50
+- DEBUG - ----- Number of factoids: 91
 - DEBUG - ----- Graph base: http://https://tenet.tetras-libre.fr/demo/01//factoid
 - INFO - 
  === Final Ontology Generation  === 
 - INFO - -- Making complete factoid graph by merging the result factoids
-- INFO - ----- Total factoid number: 50
+- INFO - ----- Total factoid number: 91
 - INFO - -- Serializing graph to factoid string
 - INFO - ----- Graph base: http://https://tenet.tetras-libre.fr/demo/01//factoid
 - INFO - -- Serializing graph to factoid file
diff --git a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Generation.ttl b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Generation.ttl
index 1fb6c5ce..9e0bda54 100644
--- a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Generation.ttl
+++ b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Generation.ttl
@@ -59,16 +59,6 @@ ns2:root a owl:AnnotationProperty .
 :AMR_Prep_Role a owl:Class ;
     rdfs:subClassOf :AMR_Role .
 
-:concept_manner rdfs:subClassOf :AMR_Predicat_Concept ;
-    :fromAmrLk ns11:manner ;
-    :isReifiedConcept true ;
-    :label "hasManner" .
-
-:concept_part rdfs:subClassOf :AMR_Predicat_Concept ;
-    :fromAmrLk ns11:part ;
-    :isReifiedConcept true ;
-    :label "hasPart" .
-
 :edge_a_op1_s2 a :AMR_Edge ;
     :hasAmrRole :role_op1 ;
     :hasRoleID "op1" .
@@ -89,6 +79,14 @@ ns2:root a owl:AnnotationProperty .
     :hasAmrRole :role_polarity ;
     :hasRoleID "polarity" .
 
+:edge_m9_ARG0_o2 a :AMR_Edge ;
+    :hasAmrRole :role_ARG0 ;
+    :hasRoleID "ARG0" .
+
+:edge_m9_ARG1_o3 a :AMR_Edge ;
+    :hasAmrRole :role_ARG1 ;
+    :hasRoleID "ARG1" .
+
 :edge_o2_ARG0_o a :AMR_Edge ;
     :hasAmrRole :role_ARG0 ;
     :hasRoleID "ARG0" .
@@ -105,6 +103,14 @@ ns2:root a owl:AnnotationProperty .
     :hasAmrRole :role_op2 ;
     :hasRoleID "op2" .
 
+:edge_p9_ARG0_s a :AMR_Edge ;
+    :hasAmrRole :role_ARG0 ;
+    :hasRoleID "ARG0" .
+
+:edge_p9_ARG1_a a :AMR_Edge ;
+    :hasAmrRole :role_ARG1 ;
+    :hasRoleID "ARG1" .
+
 :edge_p_name_SolarSystem a :AMR_Edge ;
     :hasAmrRole :role_name ;
     :hasRoleID "name" .
@@ -361,24 +367,11 @@ ns2:root a owl:AnnotationProperty .
 :toReifyWithHeadEdge a owl:AnnotationProperty ;
     rdfs:subPropertyOf :toReify .
 
-:variable_m9 a ns11:manner ;
-    rdfs:type :AMR_Variable ;
-    :isReifiedVariable true ;
-    :label "m9" .
-
-:variable_p9 a ns11:part ;
-    rdfs:type :AMR_Variable ;
-    :isReifiedVariable true ;
-    :label "p9" .
-
 <https://tenet.tetras-libre.fr/base-ontology> a owl:Ontology .
 
 sys:Event a owl:Class ;
     rdfs:subClassOf sys:Out_Structure .
 
-sys:Undetermined_Thing a owl:Class ;
-    rdfs:subClassOf sys:Out_Structure .
-
 sys:fromStructure a owl:AnnotationProperty ;
     rdfs:subPropertyOf sys:Out_AnnotationProperty .
 
@@ -429,7 +422,9 @@ cprm:targetOntologyURI a rdf:Property ;
     rdfs:subPropertyOf cprm:configParamProperty .
 
 <https://tenet.tetras-libre.fr/extract-result#SolarSystem> a owl:Individual,
-        <https://tenet.tetras-libre.fr/extract-result#system> ;
+        <https://tenet.tetras-libre.fr/extract-result#system>,
+        <https://tenet.tetras-libre.fr/extract-result#system-hasPart-object>,
+        <https://tenet.tetras-libre.fr/extract-result#system-hasPart-sun> ;
     rdfs:label "Solar System" ;
     sys:fromStructure "SSC-01-01" .
 
@@ -445,13 +440,25 @@ cprm:targetOntologyURI a rdf:Property ;
         <https://tenet.tetras-libre.fr/extract-result#gravitation> ;
     sys:fromStructure "SSC-01-01" .
 
+<https://tenet.tetras-libre.fr/extract-result#hasManner> a owl:ObjectProperty ;
+    rdfs:label "hasManner" ;
+    rdfs:subPropertyOf sys:Out_ObjectProperty ;
+    sys:fromStructure "SSC-01-01" .
+
 <https://tenet.tetras-libre.fr/extract-result#not-direct> a owl:ObjectProperty ;
     rdfs:subPropertyOf sys:Out_ObjectProperty ;
     sys:fromStructure "SSC-01-01" .
 
-<https://tenet.tetras-libre.fr/extract-result#object-orbit-sun> a owl:Class ;
+<https://tenet.tetras-libre.fr/extract-result#object-orbit-hasManner-direct-sun> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-direct> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
+        <https://tenet.tetras-libre.fr/extract-result#object> ;
+    sys:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#object-orbit-hasManner-not-direct-sun> a owl:Class ;
     rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit> ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-not-direct> ;
             owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
         <https://tenet.tetras-libre.fr/extract-result#object> ;
     sys:fromStructure "SSC-01-01" .
@@ -516,17 +523,35 @@ net:compositeClass_gravitation-bind-system_g a net:Composite_Class_Net ;
     net:hasRestriction net:restriction_bind-system_b ;
     net:hasStructure "SSC-01-01" .
 
-net:compositeClass_object-orbit-sun_o a net:Composite_Class_Net ;
+net:compositeClass_object-orbit-hasManner-direct-sun_o a net:Composite_Class_Net ;
     net:composeFrom net:atomClass_object_o,
         net:atomClass_sun_s2,
-        net:atomProperty_orbit_o2 ;
+        net:compositeProperty_orbit-hasManner-direct_o2 ;
+    net:coverBaseNode :leaf_object_o ;
+    net:coverNode :leaf_direct-02_d,
+        :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_object_o,
+        :leaf_orbit-01_o2,
+        :leaf_sun_s2 ;
+    net:hasMotherClassNet net:atomClass_object_o ;
+    net:hasNaming "object-orbit-hasManner-direct-sun" ;
+    net:hasRestriction net:restriction_orbit-hasManner-direct-sun_o2 ;
+    net:hasStructure "SSC-01-01" .
+
+net:compositeClass_object-orbit-hasManner-not-direct-sun_o a net:Composite_Class_Net ;
+    net:composeFrom net:atomClass_object_o,
+        net:atomClass_sun_s2,
+        net:compositeProperty_orbit-hasManner-not-direct_o2 ;
     net:coverBaseNode :leaf_object_o ;
-    net:coverNode :leaf_object_o,
+    net:coverNode :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_object_o,
         :leaf_orbit-01_o2,
         :leaf_sun_s2 ;
     net:hasMotherClassNet net:atomClass_object_o ;
-    net:hasNaming "object-orbit-sun" ;
-    net:hasRestriction net:restriction_orbit-sun_o2 ;
+    net:hasNaming "object-orbit-hasManner-not-direct-sun" ;
+    net:hasRestriction net:restriction_orbit-hasManner-not-direct-sun_o2 ;
     net:hasStructure "SSC-01-01" .
 
 net:entityClass a owl:AnnotationProperty ;
@@ -648,27 +673,6 @@ net:modCat2 a owl:AnnotationProperty ;
 
 net:normal_direction a owl:NamedIndividual .
 
-net:phenomena_conjunction-AND_a a net:Phenomena_Net ;
-    :role_op1 net:atomClass_sun_s2 ;
-    :role_op2 net:atomClass_object_o ;
-    net:coverBaseNode :leaf_and_a ;
-    net:coverNode :leaf_and_a ;
-    net:hasNaming "conjunction-AND" ;
-    net:hasPhenomenaRef "and" ;
-    net:hasPhenomenaType :phenomena_conjunction_and ;
-    net:hasStructure "SSC-01-01" .
-
-net:phenomena_conjunction-OR_o3 a net:Phenomena_Net ;
-    :role_op1 net:atomProperty_direct_d ;
-    :role_op2 net:atomProperty_direct_d2,
-        net:compositeProperty_not-direct_d2 ;
-    net:coverBaseNode :leaf_or_o3 ;
-    net:coverNode :leaf_or_o3 ;
-    net:hasNaming "conjunction-OR" ;
-    net:hasPhenomenaRef "or" ;
-    net:hasPhenomenaType :phenomena_conjunction_or ;
-    net:hasStructure "SSC-01-01" .
-
 net:relationOf a owl:AnnotationProperty ;
     rdfs:label "relation of" ;
     rdfs:subPropertyOf net:typeProperty .
@@ -724,6 +728,11 @@ ns2:AMR a owl:Class ;
     :fromAmrLk ns11:gravitation ;
     :label "gravitation" .
 
+:concept_manner rdfs:subClassOf :AMR_Predicat_Concept ;
+    :fromAmrLk ns11:manner ;
+    :isReifiedConcept true ;
+    :label "hasManner" .
+
 :concept_object rdfs:subClassOf :AMR_Term_Concept ;
     :fromAmrLk ns11:object ;
     :label "object" .
@@ -737,6 +746,11 @@ ns2:AMR a owl:Class ;
     :fromAmrLk ns3:orbit-01 ;
     :label "orbit-01" .
 
+:concept_part rdfs:subClassOf :AMR_Predicat_Concept ;
+    :fromAmrLk ns11:part ;
+    :isReifiedConcept true ;
+    :label "hasPart" .
+
 :concept_sun rdfs:subClassOf :AMR_Term_Concept ;
     :fromAmrLk ns11:sun ;
     :label "sun" .
@@ -780,6 +794,11 @@ ns2:AMR a owl:Class ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#g> ;
     :label "g" .
 
+:variable_m9 a ns11:manner,
+        :AMR_Variable ;
+    :isReifiedVariable true ;
+    :label "m9" .
+
 :variable_o a :AMR_Variable ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#o> ;
     :label "o" .
@@ -797,6 +816,11 @@ ns2:AMR a owl:Class ;
     :label "p" ;
     :name "Solar System" .
 
+:variable_p9 a ns11:part,
+        :AMR_Variable ;
+    :isReifiedVariable true ;
+    :label "p9" .
+
 :variable_s a :AMR_Variable ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#s> ;
     :label "s" .
@@ -813,6 +837,9 @@ sys:Feature a owl:Class ;
 
 sys:Out_AnnotationProperty a owl:AnnotationProperty .
 
+sys:Undetermined_Thing a owl:Class ;
+    rdfs:subClassOf sys:Out_Structure .
+
 <https://tenet.tetras-libre.fr/extract-result#bind> a owl:ObjectProperty ;
     rdfs:label "bind" ;
     rdfs:subPropertyOf sys:Out_ObjectProperty ;
@@ -823,23 +850,27 @@ sys:Out_AnnotationProperty a owl:AnnotationProperty .
     rdfs:subClassOf sys:Entity ;
     sys:fromStructure "SSC-01-01" .
 
-<https://tenet.tetras-libre.fr/extract-result#object> a owl:Class ;
-    rdfs:label "object" ;
-    rdfs:subClassOf sys:Entity ;
+<https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-direct> a owl:ObjectProperty ;
+    rdfs:subPropertyOf <https://tenet.tetras-libre.fr/extract-result#orbit> ;
     sys:fromStructure "SSC-01-01" .
 
-<https://tenet.tetras-libre.fr/extract-result#orbit> a owl:ObjectProperty ;
-    rdfs:label "orbit" ;
-    rdfs:subPropertyOf sys:Out_ObjectProperty ;
+<https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-not-direct> a owl:ObjectProperty ;
+    rdfs:subPropertyOf <https://tenet.tetras-libre.fr/extract-result#orbit> ;
     sys:fromStructure "SSC-01-01" .
 
-<https://tenet.tetras-libre.fr/extract-result#sun> a owl:Class ;
-    rdfs:label "sun" ;
-    rdfs:subClassOf sys:Entity ;
+<https://tenet.tetras-libre.fr/extract-result#system-hasPart-object> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#hasPart> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#object> ],
+        <https://tenet.tetras-libre.fr/extract-result#system> ;
     sys:fromStructure "SSC-01-01" .
 
-net:Composite_Property_Net a owl:Class ;
-    rdfs:subClassOf net:Property_Net .
+<https://tenet.tetras-libre.fr/extract-result#system-hasPart-sun> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#hasPart> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
+        <https://tenet.tetras-libre.fr/extract-result#system> ;
+    sys:fromStructure "SSC-01-01" .
 
 net:Feature a owl:Class ;
     rdfs:subClassOf net:Net_Structure .
@@ -847,35 +878,81 @@ net:Feature a owl:Class ;
 net:Individual_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
-net:atomProperty_direct_d a net:Atom_Property_Net ;
-    net:coverBaseNode :leaf_direct-02_d ;
-    net:coverNode :leaf_direct-02_d ;
-    net:hasNaming "direct" ;
-    net:hasPropertyName "direct" ;
-    net:hasPropertyName01 "directing" ;
-    net:hasPropertyName10 "direct-by" ;
-    net:hasPropertyName12 "direct-of" ;
-    net:hasPropertyType owl:ObjectProperty ;
-    net:hasStructure "SSC-01-01" ;
-    net:isCoreRoleLinked "true" .
+net:atomClass_orbit_o2 a net:Atom_Class_Net,
+        net:Class_Net,
+        net:Deprecated_Net ;
+    :role_ARG0 net:atomClass_object_o ;
+    :role_ARG1 net:atomClass_sun_s2 ;
+    net:composeFrom net:atomProperty_orbit_o2 ;
+    net:coverBaseNode :leaf_orbit-01_o2 ;
+    net:coverNode :leaf_orbit-01_o2 ;
+    net:hasClassName "orbit" ;
+    net:hasClassType sys:Entity ;
+    net:hasNaming "orbit" ;
+    net:hasStructure "SSC-01-01" .
 
-net:has_value a owl:AnnotationProperty ;
-    rdfs:subPropertyOf net:netProperty .
+net:compositeClass_system-hasPart-object_s a net:Class_Net,
+        net:Composite_Class_Net ;
+    :role_domain net:atomClass_system_p,
+        net:individual_SolarSystem_p ;
+    net:composeFrom net:atomClass_object_o,
+        net:atomClass_system_s,
+        net:atomProperty_hasPart_p9 ;
+    net:coverBaseNode :leaf_system_s ;
+    net:coverNode :leaf_hasPart_p9,
+        :leaf_object_o,
+        :leaf_system_s ;
+    net:hasMotherClassNet net:atomClass_system_p,
+        net:atomClass_system_s ;
+    net:hasNaming "system-hasPart-object" ;
+    net:hasRestriction net:restriction_hasPart-object_p9 ;
+    net:hasStructure "SSC-01-01" .
 
-net:individual_SolarSystem_p a net:Individual_Net ;
-    :role_name net:value_SolarSystem_blankNode ;
-    net:coverBaseNode :leaf_system_p ;
-    net:coverNode :leaf_system_p ;
-    net:hasIndividualLabel "Solar System" ;
+net:compositeClass_system-hasPart-sun_s a net:Class_Net,
+        net:Composite_Class_Net ;
+    :role_domain net:atomClass_system_p,
+        net:individual_SolarSystem_p ;
+    net:composeFrom net:atomClass_sun_s2,
+        net:atomClass_system_s,
+        net:atomProperty_hasPart_p9 ;
+    net:coverBaseNode :leaf_system_s ;
+    net:coverNode :leaf_hasPart_p9,
+        :leaf_sun_s2,
+        :leaf_system_s ;
     net:hasMotherClassNet net:atomClass_system_p,
         net:atomClass_system_s ;
-    net:hasNaming "SolarSystem" ;
+    net:hasNaming "system-hasPart-sun" ;
+    net:hasRestriction net:restriction_hasPart-sun_p9 ;
     net:hasStructure "SSC-01-01" .
 
+net:has_value a owl:AnnotationProperty ;
+    rdfs:subPropertyOf net:netProperty .
+
 net:objectType a owl:AnnotationProperty ;
     rdfs:label "object type" ;
     rdfs:subPropertyOf net:objectProperty .
 
+net:phenomena_conjunction-AND_a a net:Phenomena_Net ;
+    :role_op1 net:atomClass_sun_s2 ;
+    :role_op2 net:atomClass_object_o ;
+    net:coverBaseNode :leaf_and_a ;
+    net:coverNode :leaf_and_a ;
+    net:hasNaming "conjunction-AND" ;
+    net:hasPhenomenaRef "and" ;
+    net:hasPhenomenaType :phenomena_conjunction_and ;
+    net:hasStructure "SSC-01-01" .
+
+net:phenomena_conjunction-OR_o3 a net:Phenomena_Net ;
+    :role_op1 net:atomProperty_direct_d ;
+    :role_op2 net:atomProperty_direct_d2,
+        net:compositeProperty_not-direct_d2 ;
+    net:coverBaseNode :leaf_or_o3 ;
+    net:coverNode :leaf_or_o3 ;
+    net:hasNaming "conjunction-OR" ;
+    net:hasPhenomenaRef "or" ;
+    net:hasPhenomenaType :phenomena_conjunction_or ;
+    net:hasStructure "SSC-01-01" .
+
 net:restriction_bind-system_b a net:Restriction_Net ;
     net:composeFrom net:atomClass_system_s,
         net:atomProperty_bind_b ;
@@ -887,15 +964,78 @@ net:restriction_bind-system_b a net:Restriction_Net ;
     net:hasRestrictionOnProperty net:atomProperty_bind_b ;
     net:hasStructure "SSC-01-01" .
 
-net:restriction_orbit-sun_o2 a net:Restriction_Net ;
+net:restriction_hasManner-direct_m9 a net:Restriction_Net ;
+    net:composeFrom net:atomProperty_direct_d,
+        net:atomProperty_direct_d2,
+        net:atomProperty_hasManner_m9 ;
+    net:coverBaseNode :leaf_hasManner_m9 ;
+    net:coverNode :leaf_direct-02_d,
+        :leaf_direct-02_d2,
+        :leaf_hasManner_m9 ;
+    net:hasNaming "hasManner-direct" ;
+    net:hasRestrictionNetValue net:atomProperty_direct_d,
+        net:atomProperty_direct_d2 ;
+    net:hasRestrictionOnProperty net:atomProperty_hasManner_m9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_hasManner-not-direct_m9 a net:Restriction_Net ;
+    net:composeFrom net:atomProperty_hasManner_m9,
+        net:compositeProperty_not-direct_d2 ;
+    net:coverBaseNode :leaf_hasManner_m9 ;
+    net:coverNode :leaf_direct-02_d2,
+        :leaf_hasManner_m9 ;
+    net:hasNaming "hasManner-not-direct" ;
+    net:hasRestrictionNetValue net:compositeProperty_not-direct_d2 ;
+    net:hasRestrictionOnProperty net:atomProperty_hasManner_m9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_hasPart-object_p9 a net:Restriction_Net ;
+    net:composeFrom net:atomClass_object_o,
+        net:atomProperty_hasPart_p9 ;
+    net:coverBaseNode :leaf_hasPart_p9 ;
+    net:coverNode :leaf_hasPart_p9,
+        :leaf_object_o ;
+    net:hasNaming "hasPart-object" ;
+    net:hasRestrictionNetValue net:atomClass_object_o ;
+    net:hasRestrictionOnProperty net:atomProperty_hasPart_p9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_hasPart-sun_p9 a net:Restriction_Net ;
     net:composeFrom net:atomClass_sun_s2,
-        net:atomProperty_orbit_o2 ;
+        net:atomProperty_hasPart_p9 ;
+    net:coverBaseNode :leaf_hasPart_p9 ;
+    net:coverNode :leaf_hasPart_p9,
+        :leaf_sun_s2 ;
+    net:hasNaming "hasPart-sun" ;
+    net:hasRestrictionNetValue net:atomClass_sun_s2 ;
+    net:hasRestrictionOnProperty net:atomProperty_hasPart_p9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_orbit-hasManner-direct-sun_o2 a net:Restriction_Net ;
+    net:composeFrom net:atomClass_sun_s2,
+        net:compositeProperty_orbit-hasManner-direct_o2 ;
+    net:coverBaseNode :leaf_orbit-01_o2 ;
+    net:coverNode :leaf_direct-02_d,
+        :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_orbit-01_o2,
+        :leaf_sun_s2 ;
+    net:hasNaming "orbit-hasManner-direct-sun" ;
+    net:hasRestrictionNetValue net:atomClass_sun_s2 ;
+    net:hasRestrictionOnProperty net:compositeProperty_orbit-hasManner-direct_o2 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_orbit-hasManner-not-direct-sun_o2 a net:Restriction_Net ;
+    net:composeFrom net:atomClass_sun_s2,
+        net:compositeProperty_orbit-hasManner-not-direct_o2 ;
     net:coverBaseNode :leaf_orbit-01_o2 ;
-    net:coverNode :leaf_orbit-01_o2,
+    net:coverNode :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_orbit-01_o2,
         :leaf_sun_s2 ;
-    net:hasNaming "orbit-sun" ;
+    net:hasNaming "orbit-hasManner-not-direct-sun" ;
     net:hasRestrictionNetValue net:atomClass_sun_s2 ;
-    net:hasRestrictionOnProperty net:atomProperty_orbit_o2 ;
+    net:hasRestrictionOnProperty net:compositeProperty_orbit-hasManner-not-direct_o2 ;
     net:hasStructure "SSC-01-01" .
 
 <http://amr.isi.edu/amr_data/SSC-01-01#a> a ns2:and ;
@@ -982,18 +1122,6 @@ ns2:or a ns2:Concept ;
 :hasLink a owl:AnnotationProperty ;
     rdfs:subPropertyOf :AMR_AnnotationProperty .
 
-:leaf_and_a a :AMR_Leaf ;
-    :edge_a_op1_s2 :leaf_sun_s2 ;
-    :edge_a_op2_o :leaf_object_o ;
-    :hasConcept :concept_and ;
-    :hasVariable :variable_a .
-
-:leaf_or_o3 a :AMR_Leaf ;
-    :edge_o3_op1_d :leaf_direct-02_d ;
-    :edge_o3_op2_d2 :leaf_direct-02_d2 ;
-    :hasConcept :concept_or ;
-    :hasVariable :variable_o3 .
-
 :phenomena_conjunction a owl:Class ;
     rdfs:subClassOf :AMR_Phenomena ;
     :hasConceptLink "contrast-01",
@@ -1011,16 +1139,6 @@ ns2:or a ns2:Concept ;
     :hasConceptLink "or" ;
     :label "conjunction-OR" .
 
-:role_ARG0 a owl:Class,
-        net:Relation ;
-    rdfs:subClassOf :AMR_Core_Role ;
-    :label "ARG0" .
-
-:role_ARG1 a owl:Class,
-        net:Relation ;
-    rdfs:subClassOf :AMR_Core_Role ;
-    :label "ARG1" .
-
 :role_op1 a owl:Class,
         net:Relation ;
     rdfs:subClassOf :AMR_Op_Role ;
@@ -1034,13 +1152,15 @@ ns2:or a ns2:Concept ;
 :value_SolarSystem a :AMR_Value ;
     rdfs:label "Solar System" .
 
-<https://tenet.tetras-libre.fr/extract-result#system> a owl:Class ;
-    rdfs:label "system" ;
-    rdfs:subClassOf sys:Entity ;
+<https://tenet.tetras-libre.fr/extract-result#hasPart> a owl:ObjectProperty ;
+    rdfs:label "hasPart" ;
+    rdfs:subPropertyOf sys:Out_ObjectProperty ;
     sys:fromStructure "SSC-01-01" .
 
-net:Composite_Class_Net a owl:Class ;
-    rdfs:subClassOf net:Class_Net .
+<https://tenet.tetras-libre.fr/extract-result#orbit> a owl:ObjectProperty ;
+    rdfs:label "orbit" ;
+    rdfs:subPropertyOf sys:Out_ObjectProperty ;
+    sys:fromStructure "SSC-01-01" .
 
 net:Phenomena_Net a owl:Class ;
     rdfs:subClassOf net:Net .
@@ -1048,9 +1168,6 @@ net:Phenomena_Net a owl:Class ;
 net:Property_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
-net:Restriction_Net a owl:Class ;
-    rdfs:subClassOf net:Net .
-
 net:Value_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
@@ -1108,10 +1225,6 @@ ns2:Frame a ns2:Concept,
     rdfs:range rdfs:Literal ;
     rdfs:subPropertyOf :AMR_AnnotationProperty .
 
-:leaf_direct-02_d a :AMR_Leaf ;
-    :hasConcept :concept_direct-02 ;
-    :hasVariable :variable_d .
-
 :phenomena_modality a owl:Class ;
     rdfs:subClassOf :AMR_Phenomena .
 
@@ -1121,9 +1234,22 @@ ns2:Frame a ns2:Concept,
 :value_negative a :AMR_Value ;
     rdfs:label "negative" .
 
+<https://tenet.tetras-libre.fr/extract-result#object> a owl:Class ;
+    rdfs:label "object" ;
+    rdfs:subClassOf sys:Entity ;
+    sys:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#sun> a owl:Class ;
+    rdfs:label "sun" ;
+    rdfs:subClassOf sys:Entity ;
+    sys:fromStructure "SSC-01-01" .
+
 net:Axiom_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
+net:Composite_Property_Net a owl:Class ;
+    rdfs:subClassOf net:Property_Net .
+
 net:Net_Structure a owl:Class ;
     rdfs:label "Semantic Net Structure" ;
     rdfs:comment "A semantic net captures a set of nodes, and associates this set with type(s) and value(s)." .
@@ -1138,15 +1264,6 @@ net:atomClass_gravitation_g a net:Atom_Class_Net,
     net:hasNaming "gravitation" ;
     net:hasStructure "SSC-01-01" .
 
-net:atomClass_system_p a net:Atom_Class_Net,
-        net:Deprecated_Net ;
-    :role_name net:value_SolarSystem_blankNode ;
-    net:coverBaseNode :leaf_system_p ;
-    net:coverNode :leaf_system_p ;
-    net:hasClassName "system" ;
-    net:hasNaming "system" ;
-    net:hasStructure "SSC-01-01" .
-
 net:atomProperty_bind_b a net:Atom_Property_Net ;
     :role_ARG0 net:atomClass_gravitation_g ;
     :role_ARG1 net:atomClass_system_s ;
@@ -1163,26 +1280,56 @@ net:atomProperty_bind_b a net:Atom_Property_Net ;
     net:targetArgumentNode :leaf_gravitation_g,
         :leaf_system_s .
 
-net:atomProperty_orbit_o2 a net:Atom_Property_Net ;
+net:compositeProperty_orbit-hasManner-direct_o2 a net:Composite_Property_Net ;
     :role_ARG0 net:atomClass_object_o ;
     :role_ARG1 net:atomClass_sun_s2 ;
+    net:composeFrom net:atomProperty_direct_d,
+        net:atomProperty_direct_d2,
+        net:atomProperty_hasManner_m9,
+        net:atomProperty_orbit_o2 ;
     net:coverBaseNode :leaf_orbit-01_o2 ;
-    net:coverNode :leaf_orbit-01_o2 ;
-    net:hasNaming "orbit" ;
-    net:hasPropertyName "orbit" ;
-    net:hasPropertyName01 "orbiting" ;
-    net:hasPropertyName10 "orbit-by" ;
-    net:hasPropertyName12 "orbit-of" ;
+    net:coverNode :leaf_direct-02_d,
+        :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_orbit-01_o2 ;
+    net:hasMotherPropertyNet net:atomProperty_orbit_o2 ;
+    net:hasNaming "orbit-hasManner-direct" ;
     net:hasPropertyType owl:ObjectProperty ;
-    net:hasStructure "SSC-01-01" ;
-    net:isCoreRoleLinked "true" ;
-    net:targetArgumentNode :leaf_object_o,
-        :leaf_sun_s2 .
+    net:hasRestriction net:restriction_hasManner-direct_m9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:compositeProperty_orbit-hasManner-not-direct_o2 a net:Composite_Property_Net ;
+    :role_ARG0 net:atomClass_object_o ;
+    :role_ARG1 net:atomClass_sun_s2 ;
+    net:composeFrom net:atomProperty_hasManner_m9,
+        net:atomProperty_orbit_o2,
+        net:compositeProperty_not-direct_d2 ;
+    net:coverBaseNode :leaf_orbit-01_o2 ;
+    net:coverNode :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_orbit-01_o2 ;
+    net:hasMotherPropertyNet net:atomProperty_orbit_o2 ;
+    net:hasNaming "orbit-hasManner-not-direct" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasRestriction net:restriction_hasManner-not-direct_m9 ;
+    net:hasStructure "SSC-01-01" .
 
 net:has_relation_value a owl:AnnotationProperty ;
     rdfs:label "has relation value" ;
     rdfs:subPropertyOf net:has_object .
 
+net:individual_SolarSystem_p a net:Individual_Net ;
+    :role_name net:value_SolarSystem_blankNode ;
+    net:coverBaseNode :leaf_system_p ;
+    net:coverNode :leaf_system_p ;
+    net:hasIndividualLabel "Solar System" ;
+    net:hasMotherClassNet net:atomClass_system_p,
+        net:atomClass_system_s,
+        net:compositeClass_system-hasPart-object_s,
+        net:compositeClass_system-hasPart-sun_s ;
+    net:hasNaming "SolarSystem" ;
+    net:hasStructure "SSC-01-01" .
+
 ns3:FrameRole a ns2:Role,
         owl:Class,
         owl:NamedIndividual ;
@@ -1195,21 +1342,45 @@ ns3:FrameRole a ns2:Role,
 :AMR_Term_Concept a owl:Class ;
     rdfs:subClassOf :AMR_Concept .
 
-net:Atom_Property_Net a owl:Class ;
-    rdfs:subClassOf net:Property_Net .
+:leaf_and_a a :AMR_Leaf ;
+    :edge_a_op1_s2 :leaf_sun_s2 ;
+    :edge_a_op2_o :leaf_object_o ;
+    :hasConcept :concept_and ;
+    :hasVariable :variable_a .
 
-net:Deprecated_Net a owl:Class ;
-    rdfs:subClassOf net:Net .
+:leaf_or_o3 a :AMR_Leaf ;
+    :edge_o3_op1_d :leaf_direct-02_d ;
+    :edge_o3_op2_d2 :leaf_direct-02_d2 ;
+    :hasConcept :concept_or ;
+    :hasVariable :variable_o3 .
 
-net:atomClass_object_o a net:Atom_Class_Net,
-        net:Class_Net,
-        net:Deprecated_Net ;
-    net:coverBaseNode :leaf_object_o ;
-    net:coverNode :leaf_object_o ;
-    net:hasClassName "object" ;
-    net:hasClassType sys:Entity ;
-    net:hasNaming "object" ;
-    net:hasStructure "SSC-01-01" .
+:role_ARG0 a owl:Class,
+        net:Relation ;
+    rdfs:subClassOf :AMR_Core_Role ;
+    :label "ARG0" .
+
+:role_ARG1 a owl:Class,
+        net:Relation ;
+    rdfs:subClassOf :AMR_Core_Role ;
+    :label "ARG1" .
+
+<https://tenet.tetras-libre.fr/extract-result#system> a owl:Class ;
+    rdfs:label "system" ;
+    rdfs:subClassOf sys:Entity,
+        sys:Undetermined_Thing ;
+    sys:fromStructure "SSC-01-01" .
+
+net:atomProperty_direct_d a net:Atom_Property_Net ;
+    net:coverBaseNode :leaf_direct-02_d ;
+    net:coverNode :leaf_direct-02_d ;
+    net:hasNaming "direct" ;
+    net:hasPropertyName "direct" ;
+    net:hasPropertyName01 "directing" ;
+    net:hasPropertyName10 "direct-by" ;
+    net:hasPropertyName12 "direct-of" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasStructure "SSC-01-01" ;
+    net:isCoreRoleLinked "true" .
 
 net:typeProperty a owl:AnnotationProperty ;
     rdfs:label "type property" .
@@ -1229,12 +1400,6 @@ net:typeProperty a owl:AnnotationProperty ;
     :hasConcept :concept_bind-01 ;
     :hasVariable :variable_b .
 
-:leaf_orbit-01_o2 a :AMR_Leaf ;
-    :edge_o2_ARG0_o :leaf_object_o ;
-    :edge_o2_ARG1_s2 :leaf_sun_s2 ;
-    :hasConcept :concept_orbit-01 ;
-    :hasVariable :variable_o2 .
-
 :leaf_system_p a :AMR_Leaf ;
     :edge_p_name_SolarSystem :value_SolarSystem ;
     :hasConcept :concept_system ;
@@ -1243,30 +1408,118 @@ net:typeProperty a owl:AnnotationProperty ;
 sys:Out_Structure a owl:Class ;
     rdfs:label "Output Ontology Structure" .
 
+net:Composite_Class_Net a owl:Class ;
+    rdfs:subClassOf net:Class_Net .
+
+net:netProperty a owl:AnnotationProperty ;
+    rdfs:label "netProperty" .
+
+:AMR_ObjectProperty a owl:ObjectProperty ;
+    rdfs:subPropertyOf owl:topObjectProperty .
+
+:AMR_Structure a owl:Class .
+
+:leaf_gravitation_g a :AMR_Leaf ;
+    :hasConcept :concept_gravitation ;
+    :hasVariable :variable_g .
+
+cprm:configParamProperty a rdf:Property ;
+    rdfs:label "Config Parameter Property" .
+
 net:Atom_Class_Net a owl:Class ;
     rdfs:subClassOf net:Class_Net .
 
-net:atomClass_sun_s2 a net:Atom_Class_Net,
-        net:Class_Net ;
-    net:coverBaseNode :leaf_sun_s2 ;
-    net:coverNode :leaf_sun_s2 ;
-    net:hasClassName "sun" ;
-    net:hasClassType sys:Entity ;
-    net:hasNaming "sun" ;
-    net:hasStructure "SSC-01-01" .
+net:Atom_Property_Net a owl:Class ;
+    rdfs:subClassOf net:Property_Net .
 
-net:atomClass_system_s a net:Atom_Class_Net,
-        net:Class_Net ;
-    :role_domain net:atomClass_system_p,
-        net:individual_SolarSystem_p ;
-    net:coverBaseNode :leaf_system_s ;
-    net:coverNode :leaf_system_s ;
+net:atomProperty_hasManner_m9 a net:Atom_Property_Net ;
+    :role_ARG0 net:atomClass_orbit_o2,
+        net:atomProperty_orbit_o2 ;
+    :role_ARG1 net:phenomena_conjunction-OR_o3 ;
+    net:coverBaseNode :leaf_hasManner_m9 ;
+    net:coverNode :leaf_hasManner_m9 ;
+    net:hasNaming "hasManner" ;
+    net:hasPropertyName "hasManner" ;
+    net:hasPropertyName01 "hasMannering" ;
+    net:hasPropertyName10 "hasManner-by" ;
+    net:hasPropertyName12 "hasManner-of" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasStructure "SSC-01-01" ;
+    net:isCoreRoleLinked "true" ;
+    net:targetArgumentNode :leaf_or_o3,
+        :leaf_orbit-01_o2 .
+
+net:atomProperty_hasPart_p9 a net:Atom_Property_Net ;
+    :role_ARG0 net:atomClass_system_s ;
+    :role_ARG1 net:atomClass_object_o,
+        net:atomClass_sun_s2,
+        net:phenomena_conjunction-AND_a ;
+    net:coverBaseNode :leaf_hasPart_p9 ;
+    net:coverNode :leaf_hasPart_p9 ;
+    net:hasNaming "hasPart" ;
+    net:hasPropertyName "hasPart" ;
+    net:hasPropertyName01 "hasParting" ;
+    net:hasPropertyName10 "hasPart-by" ;
+    net:hasPropertyName12 "hasPart-of" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasStructure "SSC-01-01" ;
+    net:isCoreRoleLinked "true" ;
+    net:targetArgumentNode :leaf_and_a,
+        :leaf_system_s .
+
+net:atomProperty_orbit_o2 a net:Atom_Property_Net,
+        net:Deprecated_Net ;
+    :role_ARG0 net:atomClass_object_o ;
+    :role_ARG1 net:atomClass_sun_s2 ;
+    net:coverBaseNode :leaf_orbit-01_o2 ;
+    net:coverNode :leaf_orbit-01_o2 ;
+    net:hasNaming "orbit" ;
+    net:hasPropertyName "orbit" ;
+    net:hasPropertyName01 "orbiting" ;
+    net:hasPropertyName10 "orbit-by" ;
+    net:hasPropertyName12 "orbit-of" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasStructure "SSC-01-01" ;
+    net:isCoreRoleLinked "true" ;
+    net:targetArgumentNode :leaf_object_o,
+        :leaf_sun_s2 .
+
+rdf:Property a owl:Class .
+
+:AMR_Relation a owl:Class ;
+    rdfs:subClassOf :AMR_Structure .
+
+:leaf_direct-02_d a :AMR_Leaf ;
+    :hasConcept :concept_direct-02 ;
+    :hasVariable :variable_d .
+
+net:Deprecated_Net a owl:Class ;
+    rdfs:subClassOf net:Net .
+
+net:Relation a owl:Class ;
+    rdfs:subClassOf net:Net_Structure .
+
+net:Restriction_Net a owl:Class ;
+    rdfs:subClassOf net:Net .
+
+net:atomClass_system_p a net:Atom_Class_Net,
+        net:Deprecated_Net ;
+    :role_name net:value_SolarSystem_blankNode ;
+    net:coverBaseNode :leaf_system_p ;
+    net:coverNode :leaf_system_p ;
     net:hasClassName "system" ;
-    net:hasClassType sys:Entity ;
-    net:hasMotherClassNet net:atomClass_system_p ;
     net:hasNaming "system" ;
     net:hasStructure "SSC-01-01" .
 
+:leaf_hasPart_p9 a :AMR_Leaf ;
+    :edge_p9_ARG0_s :leaf_system_s ;
+    :edge_p9_ARG1_a :leaf_and_a ;
+    :hasConcept :concept_part ;
+    :hasVariable :variable_p9 ;
+    :isReifiedLeaf true .
+
+sys:Out_ObjectProperty a owl:ObjectProperty .
+
 net:compositeProperty_not-direct_d2 a net:Composite_Property_Net ;
     :role_polarity net:value_negative_blankNode ;
     net:composeFrom net:atomProperty_direct_d2 ;
@@ -1276,26 +1529,19 @@ net:compositeProperty_not-direct_d2 a net:Composite_Property_Net ;
     net:hasPropertyType owl:ObjectProperty ;
     net:hasStructure "SSC-01-01" .
 
-net:netProperty a owl:AnnotationProperty ;
-    rdfs:label "netProperty" .
-
-:AMR_ObjectProperty a owl:ObjectProperty ;
-    rdfs:subPropertyOf owl:topObjectProperty .
-
-:AMR_Structure a owl:Class .
-
-:leaf_gravitation_g a :AMR_Leaf ;
-    :hasConcept :concept_gravitation ;
-    :hasVariable :variable_g .
-
-sys:Out_ObjectProperty a owl:ObjectProperty .
+net:has_object a owl:AnnotationProperty ;
+    rdfs:label "relation" ;
+    rdfs:subPropertyOf net:netProperty .
 
-cprm:configParamProperty a rdf:Property ;
-    rdfs:label "Config Parameter Property" .
+:AMR_Op_Role a owl:Class ;
+    rdfs:subClassOf :AMR_Role .
 
 net:Class_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
+net:Net a owl:Class ;
+    rdfs:subClassOf net:Net_Structure .
+
 net:atomProperty_direct_d2 a net:Atom_Property_Net,
         net:Deprecated_Net ;
     :role_polarity net:value_negative_blankNode ;
@@ -1311,10 +1557,26 @@ net:atomProperty_direct_d2 a net:Atom_Property_Net,
     net:isCoreRoleLinked "true" ;
     net:targetArgumentNode :value_negative .
 
-rdf:Property a owl:Class .
+:AMR_AnnotationProperty a owl:AnnotationProperty .
 
-:AMR_Relation a owl:Class ;
-    rdfs:subClassOf :AMR_Structure .
+:AMR_Core_Role a owl:Class ;
+    rdfs:subClassOf :AMR_Role .
+
+sys:Entity a owl:Class ;
+    rdfs:subClassOf sys:Out_Structure .
+
+net:atomClass_system_s a net:Atom_Class_Net,
+        net:Class_Net,
+        net:Deprecated_Net ;
+    :role_domain net:atomClass_system_p,
+        net:individual_SolarSystem_p ;
+    net:coverBaseNode :leaf_system_s ;
+    net:coverNode :leaf_system_s ;
+    net:hasClassName "system" ;
+    net:hasClassType sys:Entity ;
+    net:hasMotherClassNet net:atomClass_system_p ;
+    net:hasNaming "system" ;
+    net:hasStructure "SSC-01-01" .
 
 :leaf_object_o a :AMR_Leaf ;
     :hasConcept :concept_object ;
@@ -1324,50 +1586,61 @@ rdf:Property a owl:Class .
     :hasConcept :concept_sun ;
     :hasVariable :variable_s2 .
 
+:leaf_hasManner_m9 a :AMR_Leaf ;
+    :edge_m9_ARG0_o2 :leaf_orbit-01_o2 ;
+    :edge_m9_ARG1_o3 :leaf_or_o3 ;
+    :hasConcept :concept_manner ;
+    :hasVariable :variable_m9 ;
+    :isReifiedLeaf true .
+
+:AMR_Variable a owl:Class ;
+    rdfs:subClassOf :AMR_Element .
+
 :leaf_system_s a :AMR_Leaf ;
     :edge_s_domain_p :leaf_system_p ;
     :hasConcept :concept_system ;
     :hasVariable :variable_s .
 
-net:Relation a owl:Class ;
-    rdfs:subClassOf net:Net_Structure .
+net:atomClass_object_o a net:Atom_Class_Net,
+        net:Class_Net,
+        net:Deprecated_Net ;
+    net:coverBaseNode :leaf_object_o ;
+    net:coverNode :leaf_object_o ;
+    net:hasClassName "object" ;
+    net:hasClassType sys:Entity ;
+    net:hasNaming "object" ;
+    net:hasStructure "SSC-01-01" .
 
-net:has_object a owl:AnnotationProperty ;
-    rdfs:label "relation" ;
-    rdfs:subPropertyOf net:netProperty .
+:AMR_Leaf a owl:Class ;
+    rdfs:subClassOf :AMR_Structure .
 
-:AMR_Op_Role a owl:Class ;
-    rdfs:subClassOf :AMR_Role .
+net:atomClass_sun_s2 a net:Atom_Class_Net,
+        net:Class_Net ;
+    net:coverBaseNode :leaf_sun_s2 ;
+    net:coverNode :leaf_sun_s2 ;
+    net:hasClassName "sun" ;
+    net:hasClassType sys:Entity ;
+    net:hasNaming "sun" ;
+    net:hasStructure "SSC-01-01" .
+
+:leaf_orbit-01_o2 a :AMR_Leaf ;
+    :edge_o2_ARG0_o :leaf_object_o ;
+    :edge_o2_ARG1_s2 :leaf_sun_s2 ;
+    :hasConcept :concept_orbit-01 ;
+    :hasVariable :variable_o2 .
+
+net:objectValue a owl:AnnotationProperty ;
+    rdfs:label "valuations"@fr ;
+    rdfs:subPropertyOf net:objectProperty .
 
 :leaf_direct-02_d2 a :AMR_Leaf ;
     :edge_d2_polarity_negative :value_negative ;
     :hasConcept :concept_direct-02 ;
     :hasVariable :variable_d2 .
 
-sys:Entity a owl:Class ;
-    rdfs:subClassOf sys:Out_Structure .
-
-net:Net a owl:Class ;
-    rdfs:subClassOf net:Net_Structure .
-
-:AMR_AnnotationProperty a owl:AnnotationProperty .
-
-:AMR_Core_Role a owl:Class ;
-    rdfs:subClassOf :AMR_Role .
-
-:AMR_Leaf a owl:Class ;
-    rdfs:subClassOf :AMR_Structure .
-
-:AMR_Variable a owl:Class ;
-    rdfs:subClassOf :AMR_Element .
-
 :AMR_Edge a owl:Class ;
     rdfs:subClassOf :AMR_Structure .
 
-net:objectValue a owl:AnnotationProperty ;
-    rdfs:label "valuations"@fr ;
-    rdfs:subPropertyOf net:objectProperty .
-
 :AMR_Linked_Data a owl:Class .
 
 [] a owl:AllDisjointClasses ;
diff --git a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Preprocessing.ttl b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Preprocessing.ttl
index 19eeaf4c..f7e426b8 100644
--- a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Preprocessing.ttl
+++ b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Preprocessing.ttl
@@ -59,16 +59,6 @@ ns2:root a owl:AnnotationProperty .
 :AMR_Prep_Role a owl:Class ;
     rdfs:subClassOf :AMR_Role .
 
-:concept_manner rdfs:subClassOf :AMR_Predicat_Concept ;
-    :fromAmrLk ns11:manner ;
-    :isReifiedConcept true ;
-    :label "hasManner" .
-
-:concept_part rdfs:subClassOf :AMR_Predicat_Concept ;
-    :fromAmrLk ns11:part ;
-    :isReifiedConcept true ;
-    :label "hasPart" .
-
 :edge_a_op1_s2 a :AMR_Edge ;
     :hasAmrRole :role_op1 ;
     :hasRoleID "op1" .
@@ -89,6 +79,14 @@ ns2:root a owl:AnnotationProperty .
     :hasAmrRole :role_polarity ;
     :hasRoleID "polarity" .
 
+:edge_m9_ARG0_o2 a :AMR_Edge ;
+    :hasAmrRole :role_ARG0 ;
+    :hasRoleID "ARG0" .
+
+:edge_m9_ARG1_o3 a :AMR_Edge ;
+    :hasAmrRole :role_ARG1 ;
+    :hasRoleID "ARG1" .
+
 :edge_o2_ARG0_o a :AMR_Edge ;
     :hasAmrRole :role_ARG0 ;
     :hasRoleID "ARG0" .
@@ -105,6 +103,14 @@ ns2:root a owl:AnnotationProperty .
     :hasAmrRole :role_op2 ;
     :hasRoleID "op2" .
 
+:edge_p9_ARG0_s a :AMR_Edge ;
+    :hasAmrRole :role_ARG0 ;
+    :hasRoleID "ARG0" .
+
+:edge_p9_ARG1_a a :AMR_Edge ;
+    :hasAmrRole :role_ARG1 ;
+    :hasRoleID "ARG1" .
+
 :edge_p_name_SolarSystem a :AMR_Edge ;
     :hasAmrRole :role_name ;
     :hasRoleID "name" .
@@ -185,29 +191,25 @@ ns2:root a owl:AnnotationProperty .
 :label a owl:AnnotationProperty ;
     rdfs:subPropertyOf :AMR_AnnotationProperty .
 
-:leaf_and_a a :AMR_Leaf ;
-    :edge_a_op1_s2 :leaf_sun_s2 ;
-    :edge_a_op2_o :leaf_object_o ;
-    :hasConcept :concept_and ;
-    :hasVariable :variable_a .
-
 :leaf_bind-01_b a :AMR_Leaf ;
     :edge_b_ARG0_g :leaf_gravitation_g ;
     :edge_b_ARG1_s :leaf_system_s ;
     :hasConcept :concept_bind-01 ;
     :hasVariable :variable_b .
 
-:leaf_or_o3 a :AMR_Leaf ;
-    :edge_o3_op1_d :leaf_direct-02_d ;
-    :edge_o3_op2_d2 :leaf_direct-02_d2 ;
-    :hasConcept :concept_or ;
-    :hasVariable :variable_o3 .
+:leaf_hasManner_m9 a :AMR_Leaf ;
+    :edge_m9_ARG0_o2 :leaf_orbit-01_o2 ;
+    :edge_m9_ARG1_o3 :leaf_or_o3 ;
+    :hasConcept :concept_manner ;
+    :hasVariable :variable_m9 ;
+    :isReifiedLeaf true .
 
-:leaf_orbit-01_o2 a :AMR_Leaf ;
-    :edge_o2_ARG0_o :leaf_object_o ;
-    :edge_o2_ARG1_s2 :leaf_sun_s2 ;
-    :hasConcept :concept_orbit-01 ;
-    :hasVariable :variable_o2 .
+:leaf_hasPart_p9 a :AMR_Leaf ;
+    :edge_p9_ARG0_s :leaf_system_s ;
+    :edge_p9_ARG1_a :leaf_and_a ;
+    :hasConcept :concept_part ;
+    :hasVariable :variable_p9 ;
+    :isReifiedLeaf true .
 
 :phenomena_degree a owl:Class ;
     rdfs:subClassOf :AMR_Phenomena ;
@@ -385,16 +387,6 @@ ns2:root a owl:AnnotationProperty .
 :toReifyWithHeadEdge a owl:AnnotationProperty ;
     rdfs:subPropertyOf :toReify .
 
-:variable_m9 a ns11:manner ;
-    rdfs:type :AMR_Variable ;
-    :isReifiedVariable true ;
-    :label "m9" .
-
-:variable_p9 a ns11:part ;
-    rdfs:type :AMR_Variable ;
-    :isReifiedVariable true ;
-    :label "p9" .
-
 <https://tenet.tetras-libre.fr/base-ontology> a owl:Ontology .
 
 sys:Event a owl:Class ;
@@ -679,6 +671,11 @@ ns2:AMR a owl:Class ;
     :fromAmrLk ns11:gravitation ;
     :label "gravitation" .
 
+:concept_manner rdfs:subClassOf :AMR_Predicat_Concept ;
+    :fromAmrLk ns11:manner ;
+    :isReifiedConcept true ;
+    :label "hasManner" .
+
 :concept_object rdfs:subClassOf :AMR_Term_Concept ;
     :fromAmrLk ns11:object ;
     :label "object" .
@@ -692,10 +689,21 @@ ns2:AMR a owl:Class ;
     :fromAmrLk ns3:orbit-01 ;
     :label "orbit-01" .
 
+:concept_part rdfs:subClassOf :AMR_Predicat_Concept ;
+    :fromAmrLk ns11:part ;
+    :isReifiedConcept true ;
+    :label "hasPart" .
+
 :concept_sun rdfs:subClassOf :AMR_Term_Concept ;
     :fromAmrLk ns11:sun ;
     :label "sun" .
 
+:leaf_and_a a :AMR_Leaf ;
+    :edge_a_op1_s2 :leaf_sun_s2 ;
+    :edge_a_op2_o :leaf_object_o ;
+    :hasConcept :concept_and ;
+    :hasVariable :variable_a .
+
 :leaf_direct-02_d a :AMR_Leaf ;
     :hasConcept :concept_direct-02 ;
     :hasVariable :variable_d .
@@ -709,6 +717,18 @@ ns2:AMR a owl:Class ;
     :hasConcept :concept_gravitation ;
     :hasVariable :variable_g .
 
+:leaf_or_o3 a :AMR_Leaf ;
+    :edge_o3_op1_d :leaf_direct-02_d ;
+    :edge_o3_op2_d2 :leaf_direct-02_d2 ;
+    :hasConcept :concept_or ;
+    :hasVariable :variable_o3 .
+
+:leaf_orbit-01_o2 a :AMR_Leaf ;
+    :edge_o2_ARG0_o :leaf_object_o ;
+    :edge_o2_ARG1_s2 :leaf_sun_s2 ;
+    :hasConcept :concept_orbit-01 ;
+    :hasVariable :variable_o2 .
+
 :leaf_system_p a :AMR_Leaf ;
     :edge_p_name_SolarSystem :value_SolarSystem ;
     :hasConcept :concept_system ;
@@ -766,6 +786,11 @@ ns2:AMR a owl:Class ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#g> ;
     :label "g" .
 
+:variable_m9 a ns11:manner,
+        :AMR_Variable ;
+    :isReifiedVariable true ;
+    :label "m9" .
+
 :variable_o a :AMR_Variable ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#o> ;
     :label "o" .
@@ -783,6 +808,11 @@ ns2:AMR a owl:Class ;
     :label "p" ;
     :name "Solar System" .
 
+:variable_p9 a ns11:part,
+        :AMR_Variable ;
+    :isReifiedVariable true ;
+    :label "p9" .
+
 :variable_s a :AMR_Variable ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#s> ;
     :label "s" .
@@ -907,11 +937,6 @@ ns2:or a ns2:Concept ;
     :hasConcept :concept_sun ;
     :hasVariable :variable_s2 .
 
-:leaf_system_s a :AMR_Leaf ;
-    :edge_s_domain_p :leaf_system_p ;
-    :hasConcept :concept_system ;
-    :hasVariable :variable_s .
-
 :phenomena_conjunction a owl:Class ;
     rdfs:subClassOf :AMR_Phenomena ;
     :hasConceptLink "contrast-01",
@@ -919,14 +944,6 @@ ns2:or a ns2:Concept ;
         "neither" ;
     :label "conjunction" .
 
-:role_ARG0 a owl:Class ;
-    rdfs:subClassOf :AMR_Core_Role ;
-    :label "ARG0" .
-
-:role_ARG1 a owl:Class ;
-    rdfs:subClassOf :AMR_Core_Role ;
-    :label "ARG1" .
-
 :role_op1 a owl:Class ;
     rdfs:subClassOf :AMR_Op_Role ;
     :label "op1" .
@@ -985,6 +1002,11 @@ ns2:Frame a ns2:Concept,
     rdfs:range rdfs:Literal ;
     rdfs:subPropertyOf :AMR_AnnotationProperty .
 
+:leaf_system_s a :AMR_Leaf ;
+    :edge_s_domain_p :leaf_system_p ;
+    :hasConcept :concept_system ;
+    :hasVariable :variable_s .
+
 :phenomena_modality a owl:Class ;
     rdfs:subClassOf :AMR_Phenomena .
 
@@ -1011,6 +1033,14 @@ ns3:FrameRole a ns2:Role,
 :AMR_Term_Concept a owl:Class ;
     rdfs:subClassOf :AMR_Concept .
 
+:role_ARG0 a owl:Class ;
+    rdfs:subClassOf :AMR_Core_Role ;
+    :label "ARG0" .
+
+:role_ARG1 a owl:Class ;
+    rdfs:subClassOf :AMR_Core_Role ;
+    :label "ARG1" .
+
 net:typeProperty a owl:AnnotationProperty ;
     rdfs:label "type property" .
 
@@ -1057,19 +1087,19 @@ net:Net a owl:Class ;
 :AMR_Core_Role a owl:Class ;
     rdfs:subClassOf :AMR_Role .
 
-:AMR_Leaf a owl:Class ;
-    rdfs:subClassOf :AMR_Structure .
-
 :AMR_Variable a owl:Class ;
     rdfs:subClassOf :AMR_Element .
 
-:AMR_Edge a owl:Class ;
+:AMR_Leaf a owl:Class ;
     rdfs:subClassOf :AMR_Structure .
 
 net:objectValue a owl:AnnotationProperty ;
     rdfs:label "valuations"@fr ;
     rdfs:subPropertyOf net:objectProperty .
 
+:AMR_Edge a owl:Class ;
+    rdfs:subClassOf :AMR_Structure .
+
 :AMR_Linked_Data a owl:Class .
 
 [] a owl:AllDisjointClasses ;
diff --git a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Transduction.ttl b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Transduction.ttl
index 12f74b4b..8b74cb17 100644
--- a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Transduction.ttl
+++ b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_Transduction.ttl
@@ -59,16 +59,6 @@ ns2:root a owl:AnnotationProperty .
 :AMR_Prep_Role a owl:Class ;
     rdfs:subClassOf :AMR_Role .
 
-:concept_manner rdfs:subClassOf :AMR_Predicat_Concept ;
-    :fromAmrLk ns11:manner ;
-    :isReifiedConcept true ;
-    :label "hasManner" .
-
-:concept_part rdfs:subClassOf :AMR_Predicat_Concept ;
-    :fromAmrLk ns11:part ;
-    :isReifiedConcept true ;
-    :label "hasPart" .
-
 :edge_a_op1_s2 a :AMR_Edge ;
     :hasAmrRole :role_op1 ;
     :hasRoleID "op1" .
@@ -89,6 +79,14 @@ ns2:root a owl:AnnotationProperty .
     :hasAmrRole :role_polarity ;
     :hasRoleID "polarity" .
 
+:edge_m9_ARG0_o2 a :AMR_Edge ;
+    :hasAmrRole :role_ARG0 ;
+    :hasRoleID "ARG0" .
+
+:edge_m9_ARG1_o3 a :AMR_Edge ;
+    :hasAmrRole :role_ARG1 ;
+    :hasRoleID "ARG1" .
+
 :edge_o2_ARG0_o a :AMR_Edge ;
     :hasAmrRole :role_ARG0 ;
     :hasRoleID "ARG0" .
@@ -105,6 +103,14 @@ ns2:root a owl:AnnotationProperty .
     :hasAmrRole :role_op2 ;
     :hasRoleID "op2" .
 
+:edge_p9_ARG0_s a :AMR_Edge ;
+    :hasAmrRole :role_ARG0 ;
+    :hasRoleID "ARG0" .
+
+:edge_p9_ARG1_a a :AMR_Edge ;
+    :hasAmrRole :role_ARG1 ;
+    :hasRoleID "ARG1" .
+
 :edge_p_name_SolarSystem a :AMR_Edge ;
     :hasAmrRole :role_name ;
     :hasRoleID "name" .
@@ -361,16 +367,6 @@ ns2:root a owl:AnnotationProperty .
 :toReifyWithHeadEdge a owl:AnnotationProperty ;
     rdfs:subPropertyOf :toReify .
 
-:variable_m9 a ns11:manner ;
-    rdfs:type :AMR_Variable ;
-    :isReifiedVariable true ;
-    :label "m9" .
-
-:variable_p9 a ns11:part ;
-    rdfs:type :AMR_Variable ;
-    :isReifiedVariable true ;
-    :label "p9" .
-
 <https://tenet.tetras-libre.fr/base-ontology> a owl:Ontology .
 
 sys:Event a owl:Class ;
@@ -488,17 +484,35 @@ net:compositeClass_gravitation-bind-system_g a net:Composite_Class_Net ;
     net:hasRestriction net:restriction_bind-system_b ;
     net:hasStructure "SSC-01-01" .
 
-net:compositeClass_object-orbit-sun_o a net:Composite_Class_Net ;
+net:compositeClass_object-orbit-hasManner-direct-sun_o a net:Composite_Class_Net ;
     net:composeFrom net:atomClass_object_o,
         net:atomClass_sun_s2,
-        net:atomProperty_orbit_o2 ;
+        net:compositeProperty_orbit-hasManner-direct_o2 ;
+    net:coverBaseNode :leaf_object_o ;
+    net:coverNode :leaf_direct-02_d,
+        :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_object_o,
+        :leaf_orbit-01_o2,
+        :leaf_sun_s2 ;
+    net:hasMotherClassNet net:atomClass_object_o ;
+    net:hasNaming "object-orbit-hasManner-direct-sun" ;
+    net:hasRestriction net:restriction_orbit-hasManner-direct-sun_o2 ;
+    net:hasStructure "SSC-01-01" .
+
+net:compositeClass_object-orbit-hasManner-not-direct-sun_o a net:Composite_Class_Net ;
+    net:composeFrom net:atomClass_object_o,
+        net:atomClass_sun_s2,
+        net:compositeProperty_orbit-hasManner-not-direct_o2 ;
     net:coverBaseNode :leaf_object_o ;
-    net:coverNode :leaf_object_o,
+    net:coverNode :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_object_o,
         :leaf_orbit-01_o2,
         :leaf_sun_s2 ;
     net:hasMotherClassNet net:atomClass_object_o ;
-    net:hasNaming "object-orbit-sun" ;
-    net:hasRestriction net:restriction_orbit-sun_o2 ;
+    net:hasNaming "object-orbit-hasManner-not-direct-sun" ;
+    net:hasRestriction net:restriction_orbit-hasManner-not-direct-sun_o2 ;
     net:hasStructure "SSC-01-01" .
 
 net:entityClass a owl:AnnotationProperty ;
@@ -620,27 +634,6 @@ net:modCat2 a owl:AnnotationProperty ;
 
 net:normal_direction a owl:NamedIndividual .
 
-net:phenomena_conjunction-AND_a a net:Phenomena_Net ;
-    :role_op1 net:atomClass_sun_s2 ;
-    :role_op2 net:atomClass_object_o ;
-    net:coverBaseNode :leaf_and_a ;
-    net:coverNode :leaf_and_a ;
-    net:hasNaming "conjunction-AND" ;
-    net:hasPhenomenaRef "and" ;
-    net:hasPhenomenaType :phenomena_conjunction_and ;
-    net:hasStructure "SSC-01-01" .
-
-net:phenomena_conjunction-OR_o3 a net:Phenomena_Net ;
-    :role_op1 net:atomProperty_direct_d ;
-    :role_op2 net:atomProperty_direct_d2,
-        net:compositeProperty_not-direct_d2 ;
-    net:coverBaseNode :leaf_or_o3 ;
-    net:coverNode :leaf_or_o3 ;
-    net:hasNaming "conjunction-OR" ;
-    net:hasPhenomenaRef "or" ;
-    net:hasPhenomenaType :phenomena_conjunction_or ;
-    net:hasStructure "SSC-01-01" .
-
 net:relationOf a owl:AnnotationProperty ;
     rdfs:label "relation of" ;
     rdfs:subPropertyOf net:typeProperty .
@@ -696,6 +689,11 @@ ns2:AMR a owl:Class ;
     :fromAmrLk ns11:gravitation ;
     :label "gravitation" .
 
+:concept_manner rdfs:subClassOf :AMR_Predicat_Concept ;
+    :fromAmrLk ns11:manner ;
+    :isReifiedConcept true ;
+    :label "hasManner" .
+
 :concept_object rdfs:subClassOf :AMR_Term_Concept ;
     :fromAmrLk ns11:object ;
     :label "object" .
@@ -709,6 +707,11 @@ ns2:AMR a owl:Class ;
     :fromAmrLk ns3:orbit-01 ;
     :label "orbit-01" .
 
+:concept_part rdfs:subClassOf :AMR_Predicat_Concept ;
+    :fromAmrLk ns11:part ;
+    :isReifiedConcept true ;
+    :label "hasPart" .
+
 :concept_sun rdfs:subClassOf :AMR_Term_Concept ;
     :fromAmrLk ns11:sun ;
     :label "sun" .
@@ -752,6 +755,11 @@ ns2:AMR a owl:Class ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#g> ;
     :label "g" .
 
+:variable_m9 a ns11:manner,
+        :AMR_Variable ;
+    :isReifiedVariable true ;
+    :label "m9" .
+
 :variable_o a :AMR_Variable ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#o> ;
     :label "o" .
@@ -769,6 +777,11 @@ ns2:AMR a owl:Class ;
     :label "p" ;
     :name "Solar System" .
 
+:variable_p9 a ns11:part,
+        :AMR_Variable ;
+    :isReifiedVariable true ;
+    :label "p9" .
+
 :variable_s a :AMR_Variable ;
     :fromAmrLk <http://amr.isi.edu/amr_data/SSC-01-01#s> ;
     :label "s" .
@@ -785,44 +798,87 @@ sys:Feature a owl:Class ;
 
 sys:Out_AnnotationProperty a owl:AnnotationProperty .
 
-net:Composite_Property_Net a owl:Class ;
-    rdfs:subClassOf net:Property_Net .
-
 net:Feature a owl:Class ;
     rdfs:subClassOf net:Net_Structure .
 
 net:Individual_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
-net:atomProperty_direct_d a net:Atom_Property_Net ;
-    net:coverBaseNode :leaf_direct-02_d ;
-    net:coverNode :leaf_direct-02_d ;
-    net:hasNaming "direct" ;
-    net:hasPropertyName "direct" ;
-    net:hasPropertyName01 "directing" ;
-    net:hasPropertyName10 "direct-by" ;
-    net:hasPropertyName12 "direct-of" ;
-    net:hasPropertyType owl:ObjectProperty ;
-    net:hasStructure "SSC-01-01" ;
-    net:isCoreRoleLinked "true" .
+net:atomClass_orbit_o2 a net:Atom_Class_Net,
+        net:Class_Net,
+        net:Deprecated_Net ;
+    :role_ARG0 net:atomClass_object_o ;
+    :role_ARG1 net:atomClass_sun_s2 ;
+    net:composeFrom net:atomProperty_orbit_o2 ;
+    net:coverBaseNode :leaf_orbit-01_o2 ;
+    net:coverNode :leaf_orbit-01_o2 ;
+    net:hasClassName "orbit" ;
+    net:hasClassType sys:Entity ;
+    net:hasNaming "orbit" ;
+    net:hasStructure "SSC-01-01" .
 
-net:has_value a owl:AnnotationProperty ;
-    rdfs:subPropertyOf net:netProperty .
+net:compositeClass_system-hasPart-object_s a net:Class_Net,
+        net:Composite_Class_Net ;
+    :role_domain net:atomClass_system_p,
+        net:individual_SolarSystem_p ;
+    net:composeFrom net:atomClass_object_o,
+        net:atomClass_system_s,
+        net:atomProperty_hasPart_p9 ;
+    net:coverBaseNode :leaf_system_s ;
+    net:coverNode :leaf_hasPart_p9,
+        :leaf_object_o,
+        :leaf_system_s ;
+    net:hasMotherClassNet net:atomClass_system_p,
+        net:atomClass_system_s ;
+    net:hasNaming "system-hasPart-object" ;
+    net:hasRestriction net:restriction_hasPart-object_p9 ;
+    net:hasStructure "SSC-01-01" .
 
-net:individual_SolarSystem_p a net:Individual_Net ;
-    :role_name net:value_SolarSystem_blankNode ;
-    net:coverBaseNode :leaf_system_p ;
-    net:coverNode :leaf_system_p ;
-    net:hasIndividualLabel "Solar System" ;
+net:compositeClass_system-hasPart-sun_s a net:Class_Net,
+        net:Composite_Class_Net ;
+    :role_domain net:atomClass_system_p,
+        net:individual_SolarSystem_p ;
+    net:composeFrom net:atomClass_sun_s2,
+        net:atomClass_system_s,
+        net:atomProperty_hasPart_p9 ;
+    net:coverBaseNode :leaf_system_s ;
+    net:coverNode :leaf_hasPart_p9,
+        :leaf_sun_s2,
+        :leaf_system_s ;
     net:hasMotherClassNet net:atomClass_system_p,
         net:atomClass_system_s ;
-    net:hasNaming "SolarSystem" ;
+    net:hasNaming "system-hasPart-sun" ;
+    net:hasRestriction net:restriction_hasPart-sun_p9 ;
     net:hasStructure "SSC-01-01" .
 
+net:has_value a owl:AnnotationProperty ;
+    rdfs:subPropertyOf net:netProperty .
+
 net:objectType a owl:AnnotationProperty ;
     rdfs:label "object type" ;
     rdfs:subPropertyOf net:objectProperty .
 
+net:phenomena_conjunction-AND_a a net:Phenomena_Net ;
+    :role_op1 net:atomClass_sun_s2 ;
+    :role_op2 net:atomClass_object_o ;
+    net:coverBaseNode :leaf_and_a ;
+    net:coverNode :leaf_and_a ;
+    net:hasNaming "conjunction-AND" ;
+    net:hasPhenomenaRef "and" ;
+    net:hasPhenomenaType :phenomena_conjunction_and ;
+    net:hasStructure "SSC-01-01" .
+
+net:phenomena_conjunction-OR_o3 a net:Phenomena_Net ;
+    :role_op1 net:atomProperty_direct_d ;
+    :role_op2 net:atomProperty_direct_d2,
+        net:compositeProperty_not-direct_d2 ;
+    net:coverBaseNode :leaf_or_o3 ;
+    net:coverNode :leaf_or_o3 ;
+    net:hasNaming "conjunction-OR" ;
+    net:hasPhenomenaRef "or" ;
+    net:hasPhenomenaType :phenomena_conjunction_or ;
+    net:hasStructure "SSC-01-01" .
+
 net:restriction_bind-system_b a net:Restriction_Net ;
     net:composeFrom net:atomClass_system_s,
         net:atomProperty_bind_b ;
@@ -834,15 +890,78 @@ net:restriction_bind-system_b a net:Restriction_Net ;
     net:hasRestrictionOnProperty net:atomProperty_bind_b ;
     net:hasStructure "SSC-01-01" .
 
-net:restriction_orbit-sun_o2 a net:Restriction_Net ;
+net:restriction_hasManner-direct_m9 a net:Restriction_Net ;
+    net:composeFrom net:atomProperty_direct_d,
+        net:atomProperty_direct_d2,
+        net:atomProperty_hasManner_m9 ;
+    net:coverBaseNode :leaf_hasManner_m9 ;
+    net:coverNode :leaf_direct-02_d,
+        :leaf_direct-02_d2,
+        :leaf_hasManner_m9 ;
+    net:hasNaming "hasManner-direct" ;
+    net:hasRestrictionNetValue net:atomProperty_direct_d,
+        net:atomProperty_direct_d2 ;
+    net:hasRestrictionOnProperty net:atomProperty_hasManner_m9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_hasManner-not-direct_m9 a net:Restriction_Net ;
+    net:composeFrom net:atomProperty_hasManner_m9,
+        net:compositeProperty_not-direct_d2 ;
+    net:coverBaseNode :leaf_hasManner_m9 ;
+    net:coverNode :leaf_direct-02_d2,
+        :leaf_hasManner_m9 ;
+    net:hasNaming "hasManner-not-direct" ;
+    net:hasRestrictionNetValue net:compositeProperty_not-direct_d2 ;
+    net:hasRestrictionOnProperty net:atomProperty_hasManner_m9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_hasPart-object_p9 a net:Restriction_Net ;
+    net:composeFrom net:atomClass_object_o,
+        net:atomProperty_hasPart_p9 ;
+    net:coverBaseNode :leaf_hasPart_p9 ;
+    net:coverNode :leaf_hasPart_p9,
+        :leaf_object_o ;
+    net:hasNaming "hasPart-object" ;
+    net:hasRestrictionNetValue net:atomClass_object_o ;
+    net:hasRestrictionOnProperty net:atomProperty_hasPart_p9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_hasPart-sun_p9 a net:Restriction_Net ;
     net:composeFrom net:atomClass_sun_s2,
-        net:atomProperty_orbit_o2 ;
+        net:atomProperty_hasPart_p9 ;
+    net:coverBaseNode :leaf_hasPart_p9 ;
+    net:coverNode :leaf_hasPart_p9,
+        :leaf_sun_s2 ;
+    net:hasNaming "hasPart-sun" ;
+    net:hasRestrictionNetValue net:atomClass_sun_s2 ;
+    net:hasRestrictionOnProperty net:atomProperty_hasPart_p9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_orbit-hasManner-direct-sun_o2 a net:Restriction_Net ;
+    net:composeFrom net:atomClass_sun_s2,
+        net:compositeProperty_orbit-hasManner-direct_o2 ;
+    net:coverBaseNode :leaf_orbit-01_o2 ;
+    net:coverNode :leaf_direct-02_d,
+        :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_orbit-01_o2,
+        :leaf_sun_s2 ;
+    net:hasNaming "orbit-hasManner-direct-sun" ;
+    net:hasRestrictionNetValue net:atomClass_sun_s2 ;
+    net:hasRestrictionOnProperty net:compositeProperty_orbit-hasManner-direct_o2 ;
+    net:hasStructure "SSC-01-01" .
+
+net:restriction_orbit-hasManner-not-direct-sun_o2 a net:Restriction_Net ;
+    net:composeFrom net:atomClass_sun_s2,
+        net:compositeProperty_orbit-hasManner-not-direct_o2 ;
     net:coverBaseNode :leaf_orbit-01_o2 ;
-    net:coverNode :leaf_orbit-01_o2,
+    net:coverNode :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_orbit-01_o2,
         :leaf_sun_s2 ;
-    net:hasNaming "orbit-sun" ;
+    net:hasNaming "orbit-hasManner-not-direct-sun" ;
     net:hasRestrictionNetValue net:atomClass_sun_s2 ;
-    net:hasRestrictionOnProperty net:atomProperty_orbit_o2 ;
+    net:hasRestrictionOnProperty net:compositeProperty_orbit-hasManner-not-direct_o2 ;
     net:hasStructure "SSC-01-01" .
 
 <http://amr.isi.edu/amr_data/SSC-01-01#a> a ns2:and ;
@@ -929,18 +1048,6 @@ ns2:or a ns2:Concept ;
 :hasLink a owl:AnnotationProperty ;
     rdfs:subPropertyOf :AMR_AnnotationProperty .
 
-:leaf_and_a a :AMR_Leaf ;
-    :edge_a_op1_s2 :leaf_sun_s2 ;
-    :edge_a_op2_o :leaf_object_o ;
-    :hasConcept :concept_and ;
-    :hasVariable :variable_a .
-
-:leaf_or_o3 a :AMR_Leaf ;
-    :edge_o3_op1_d :leaf_direct-02_d ;
-    :edge_o3_op2_d2 :leaf_direct-02_d2 ;
-    :hasConcept :concept_or ;
-    :hasVariable :variable_o3 .
-
 :phenomena_conjunction a owl:Class ;
     rdfs:subClassOf :AMR_Phenomena ;
     :hasConceptLink "contrast-01",
@@ -958,16 +1065,6 @@ ns2:or a ns2:Concept ;
     :hasConceptLink "or" ;
     :label "conjunction-OR" .
 
-:role_ARG0 a owl:Class,
-        net:Relation ;
-    rdfs:subClassOf :AMR_Core_Role ;
-    :label "ARG0" .
-
-:role_ARG1 a owl:Class,
-        net:Relation ;
-    rdfs:subClassOf :AMR_Core_Role ;
-    :label "ARG1" .
-
 :role_op1 a owl:Class,
         net:Relation ;
     rdfs:subClassOf :AMR_Op_Role ;
@@ -983,18 +1080,12 @@ ns2:or a ns2:Concept ;
 
 sys:Out_ObjectProperty a owl:ObjectProperty .
 
-net:Composite_Class_Net a owl:Class ;
-    rdfs:subClassOf net:Class_Net .
-
 net:Phenomena_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
 net:Property_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
-net:Restriction_Net a owl:Class ;
-    rdfs:subClassOf net:Net .
-
 net:Value_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
@@ -1052,10 +1143,6 @@ ns2:Frame a ns2:Concept,
     rdfs:range rdfs:Literal ;
     rdfs:subPropertyOf :AMR_AnnotationProperty .
 
-:leaf_direct-02_d a :AMR_Leaf ;
-    :hasConcept :concept_direct-02 ;
-    :hasVariable :variable_d .
-
 :phenomena_modality a owl:Class ;
     rdfs:subClassOf :AMR_Phenomena .
 
@@ -1068,6 +1155,9 @@ ns2:Frame a ns2:Concept,
 net:Axiom_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
+net:Composite_Property_Net a owl:Class ;
+    rdfs:subClassOf net:Property_Net .
+
 net:Net_Structure a owl:Class ;
     rdfs:label "Semantic Net Structure" ;
     rdfs:comment "A semantic net captures a set of nodes, and associates this set with type(s) and value(s)." .
@@ -1082,15 +1172,6 @@ net:atomClass_gravitation_g a net:Atom_Class_Net,
     net:hasNaming "gravitation" ;
     net:hasStructure "SSC-01-01" .
 
-net:atomClass_system_p a net:Atom_Class_Net,
-        net:Deprecated_Net ;
-    :role_name net:value_SolarSystem_blankNode ;
-    net:coverBaseNode :leaf_system_p ;
-    net:coverNode :leaf_system_p ;
-    net:hasClassName "system" ;
-    net:hasNaming "system" ;
-    net:hasStructure "SSC-01-01" .
-
 net:atomProperty_bind_b a net:Atom_Property_Net ;
     :role_ARG0 net:atomClass_gravitation_g ;
     :role_ARG1 net:atomClass_system_s ;
@@ -1107,26 +1188,56 @@ net:atomProperty_bind_b a net:Atom_Property_Net ;
     net:targetArgumentNode :leaf_gravitation_g,
         :leaf_system_s .
 
-net:atomProperty_orbit_o2 a net:Atom_Property_Net ;
+net:compositeProperty_orbit-hasManner-direct_o2 a net:Composite_Property_Net ;
     :role_ARG0 net:atomClass_object_o ;
     :role_ARG1 net:atomClass_sun_s2 ;
+    net:composeFrom net:atomProperty_direct_d,
+        net:atomProperty_direct_d2,
+        net:atomProperty_hasManner_m9,
+        net:atomProperty_orbit_o2 ;
     net:coverBaseNode :leaf_orbit-01_o2 ;
-    net:coverNode :leaf_orbit-01_o2 ;
-    net:hasNaming "orbit" ;
-    net:hasPropertyName "orbit" ;
-    net:hasPropertyName01 "orbiting" ;
-    net:hasPropertyName10 "orbit-by" ;
-    net:hasPropertyName12 "orbit-of" ;
+    net:coverNode :leaf_direct-02_d,
+        :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_orbit-01_o2 ;
+    net:hasMotherPropertyNet net:atomProperty_orbit_o2 ;
+    net:hasNaming "orbit-hasManner-direct" ;
     net:hasPropertyType owl:ObjectProperty ;
-    net:hasStructure "SSC-01-01" ;
-    net:isCoreRoleLinked "true" ;
-    net:targetArgumentNode :leaf_object_o,
-        :leaf_sun_s2 .
+    net:hasRestriction net:restriction_hasManner-direct_m9 ;
+    net:hasStructure "SSC-01-01" .
+
+net:compositeProperty_orbit-hasManner-not-direct_o2 a net:Composite_Property_Net ;
+    :role_ARG0 net:atomClass_object_o ;
+    :role_ARG1 net:atomClass_sun_s2 ;
+    net:composeFrom net:atomProperty_hasManner_m9,
+        net:atomProperty_orbit_o2,
+        net:compositeProperty_not-direct_d2 ;
+    net:coverBaseNode :leaf_orbit-01_o2 ;
+    net:coverNode :leaf_direct-02_d2,
+        :leaf_hasManner_m9,
+        :leaf_orbit-01_o2 ;
+    net:hasMotherPropertyNet net:atomProperty_orbit_o2 ;
+    net:hasNaming "orbit-hasManner-not-direct" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasRestriction net:restriction_hasManner-not-direct_m9 ;
+    net:hasStructure "SSC-01-01" .
 
 net:has_relation_value a owl:AnnotationProperty ;
     rdfs:label "has relation value" ;
     rdfs:subPropertyOf net:has_object .
 
+net:individual_SolarSystem_p a net:Individual_Net ;
+    :role_name net:value_SolarSystem_blankNode ;
+    net:coverBaseNode :leaf_system_p ;
+    net:coverNode :leaf_system_p ;
+    net:hasIndividualLabel "Solar System" ;
+    net:hasMotherClassNet net:atomClass_system_p,
+        net:atomClass_system_s,
+        net:compositeClass_system-hasPart-object_s,
+        net:compositeClass_system-hasPart-sun_s ;
+    net:hasNaming "SolarSystem" ;
+    net:hasStructure "SSC-01-01" .
+
 ns3:FrameRole a ns2:Role,
         owl:Class,
         owl:NamedIndividual ;
@@ -1139,21 +1250,39 @@ ns3:FrameRole a ns2:Role,
 :AMR_Term_Concept a owl:Class ;
     rdfs:subClassOf :AMR_Concept .
 
-net:Atom_Property_Net a owl:Class ;
-    rdfs:subClassOf net:Property_Net .
+:leaf_and_a a :AMR_Leaf ;
+    :edge_a_op1_s2 :leaf_sun_s2 ;
+    :edge_a_op2_o :leaf_object_o ;
+    :hasConcept :concept_and ;
+    :hasVariable :variable_a .
 
-net:Deprecated_Net a owl:Class ;
-    rdfs:subClassOf net:Net .
+:leaf_or_o3 a :AMR_Leaf ;
+    :edge_o3_op1_d :leaf_direct-02_d ;
+    :edge_o3_op2_d2 :leaf_direct-02_d2 ;
+    :hasConcept :concept_or ;
+    :hasVariable :variable_o3 .
 
-net:atomClass_object_o a net:Atom_Class_Net,
-        net:Class_Net,
-        net:Deprecated_Net ;
-    net:coverBaseNode :leaf_object_o ;
-    net:coverNode :leaf_object_o ;
-    net:hasClassName "object" ;
-    net:hasClassType sys:Entity ;
-    net:hasNaming "object" ;
-    net:hasStructure "SSC-01-01" .
+:role_ARG0 a owl:Class,
+        net:Relation ;
+    rdfs:subClassOf :AMR_Core_Role ;
+    :label "ARG0" .
+
+:role_ARG1 a owl:Class,
+        net:Relation ;
+    rdfs:subClassOf :AMR_Core_Role ;
+    :label "ARG1" .
+
+net:atomProperty_direct_d a net:Atom_Property_Net ;
+    net:coverBaseNode :leaf_direct-02_d ;
+    net:coverNode :leaf_direct-02_d ;
+    net:hasNaming "direct" ;
+    net:hasPropertyName "direct" ;
+    net:hasPropertyName01 "directing" ;
+    net:hasPropertyName10 "direct-by" ;
+    net:hasPropertyName12 "direct-of" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasStructure "SSC-01-01" ;
+    net:isCoreRoleLinked "true" .
 
 net:typeProperty a owl:AnnotationProperty ;
     rdfs:label "type property" .
@@ -1173,47 +1302,127 @@ net:typeProperty a owl:AnnotationProperty ;
     :hasConcept :concept_bind-01 ;
     :hasVariable :variable_b .
 
-:leaf_orbit-01_o2 a :AMR_Leaf ;
-    :edge_o2_ARG0_o :leaf_object_o ;
-    :edge_o2_ARG1_s2 :leaf_sun_s2 ;
-    :hasConcept :concept_orbit-01 ;
-    :hasVariable :variable_o2 .
-
 :leaf_system_p a :AMR_Leaf ;
     :edge_p_name_SolarSystem :value_SolarSystem ;
     :hasConcept :concept_system ;
     :hasVariable :variable_p .
 
+sys:Out_Structure a owl:Class ;
+    rdfs:label "Output Ontology Structure" .
+
+net:Composite_Class_Net a owl:Class ;
+    rdfs:subClassOf net:Class_Net .
+
+net:netProperty a owl:AnnotationProperty ;
+    rdfs:label "netProperty" .
+
+:AMR_ObjectProperty a owl:ObjectProperty ;
+    rdfs:subPropertyOf owl:topObjectProperty .
+
+:AMR_Structure a owl:Class .
+
+:leaf_gravitation_g a :AMR_Leaf ;
+    :hasConcept :concept_gravitation ;
+    :hasVariable :variable_g .
+
 sys:Entity a owl:Class ;
     rdfs:subClassOf sys:Out_Structure .
 
-sys:Out_Structure a owl:Class ;
-    rdfs:label "Output Ontology Structure" .
+cprm:configParamProperty a rdf:Property ;
+    rdfs:label "Config Parameter Property" .
 
 net:Atom_Class_Net a owl:Class ;
     rdfs:subClassOf net:Class_Net .
 
-net:atomClass_sun_s2 a net:Atom_Class_Net,
-        net:Class_Net ;
-    net:coverBaseNode :leaf_sun_s2 ;
-    net:coverNode :leaf_sun_s2 ;
-    net:hasClassName "sun" ;
-    net:hasClassType sys:Entity ;
-    net:hasNaming "sun" ;
-    net:hasStructure "SSC-01-01" .
+net:Atom_Property_Net a owl:Class ;
+    rdfs:subClassOf net:Property_Net .
 
-net:atomClass_system_s a net:Atom_Class_Net,
-        net:Class_Net ;
-    :role_domain net:atomClass_system_p,
-        net:individual_SolarSystem_p ;
-    net:coverBaseNode :leaf_system_s ;
-    net:coverNode :leaf_system_s ;
+net:atomProperty_hasManner_m9 a net:Atom_Property_Net ;
+    :role_ARG0 net:atomClass_orbit_o2,
+        net:atomProperty_orbit_o2 ;
+    :role_ARG1 net:phenomena_conjunction-OR_o3 ;
+    net:coverBaseNode :leaf_hasManner_m9 ;
+    net:coverNode :leaf_hasManner_m9 ;
+    net:hasNaming "hasManner" ;
+    net:hasPropertyName "hasManner" ;
+    net:hasPropertyName01 "hasMannering" ;
+    net:hasPropertyName10 "hasManner-by" ;
+    net:hasPropertyName12 "hasManner-of" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasStructure "SSC-01-01" ;
+    net:isCoreRoleLinked "true" ;
+    net:targetArgumentNode :leaf_or_o3,
+        :leaf_orbit-01_o2 .
+
+net:atomProperty_hasPart_p9 a net:Atom_Property_Net ;
+    :role_ARG0 net:atomClass_system_s ;
+    :role_ARG1 net:atomClass_object_o,
+        net:atomClass_sun_s2,
+        net:phenomena_conjunction-AND_a ;
+    net:coverBaseNode :leaf_hasPart_p9 ;
+    net:coverNode :leaf_hasPart_p9 ;
+    net:hasNaming "hasPart" ;
+    net:hasPropertyName "hasPart" ;
+    net:hasPropertyName01 "hasParting" ;
+    net:hasPropertyName10 "hasPart-by" ;
+    net:hasPropertyName12 "hasPart-of" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasStructure "SSC-01-01" ;
+    net:isCoreRoleLinked "true" ;
+    net:targetArgumentNode :leaf_and_a,
+        :leaf_system_s .
+
+net:atomProperty_orbit_o2 a net:Atom_Property_Net,
+        net:Deprecated_Net ;
+    :role_ARG0 net:atomClass_object_o ;
+    :role_ARG1 net:atomClass_sun_s2 ;
+    net:coverBaseNode :leaf_orbit-01_o2 ;
+    net:coverNode :leaf_orbit-01_o2 ;
+    net:hasNaming "orbit" ;
+    net:hasPropertyName "orbit" ;
+    net:hasPropertyName01 "orbiting" ;
+    net:hasPropertyName10 "orbit-by" ;
+    net:hasPropertyName12 "orbit-of" ;
+    net:hasPropertyType owl:ObjectProperty ;
+    net:hasStructure "SSC-01-01" ;
+    net:isCoreRoleLinked "true" ;
+    net:targetArgumentNode :leaf_object_o,
+        :leaf_sun_s2 .
+
+rdf:Property a owl:Class .
+
+:AMR_Relation a owl:Class ;
+    rdfs:subClassOf :AMR_Structure .
+
+:leaf_direct-02_d a :AMR_Leaf ;
+    :hasConcept :concept_direct-02 ;
+    :hasVariable :variable_d .
+
+net:Deprecated_Net a owl:Class ;
+    rdfs:subClassOf net:Net .
+
+net:Relation a owl:Class ;
+    rdfs:subClassOf net:Net_Structure .
+
+net:Restriction_Net a owl:Class ;
+    rdfs:subClassOf net:Net .
+
+net:atomClass_system_p a net:Atom_Class_Net,
+        net:Deprecated_Net ;
+    :role_name net:value_SolarSystem_blankNode ;
+    net:coverBaseNode :leaf_system_p ;
+    net:coverNode :leaf_system_p ;
     net:hasClassName "system" ;
-    net:hasClassType sys:Entity ;
-    net:hasMotherClassNet net:atomClass_system_p ;
     net:hasNaming "system" ;
     net:hasStructure "SSC-01-01" .
 
+:leaf_hasPart_p9 a :AMR_Leaf ;
+    :edge_p9_ARG0_s :leaf_system_s ;
+    :edge_p9_ARG1_a :leaf_and_a ;
+    :hasConcept :concept_part ;
+    :hasVariable :variable_p9 ;
+    :isReifiedLeaf true .
+
 net:compositeProperty_not-direct_d2 a net:Composite_Property_Net ;
     :role_polarity net:value_negative_blankNode ;
     net:composeFrom net:atomProperty_direct_d2 ;
@@ -1223,24 +1432,19 @@ net:compositeProperty_not-direct_d2 a net:Composite_Property_Net ;
     net:hasPropertyType owl:ObjectProperty ;
     net:hasStructure "SSC-01-01" .
 
-net:netProperty a owl:AnnotationProperty ;
-    rdfs:label "netProperty" .
-
-:AMR_ObjectProperty a owl:ObjectProperty ;
-    rdfs:subPropertyOf owl:topObjectProperty .
-
-:AMR_Structure a owl:Class .
-
-:leaf_gravitation_g a :AMR_Leaf ;
-    :hasConcept :concept_gravitation ;
-    :hasVariable :variable_g .
+net:has_object a owl:AnnotationProperty ;
+    rdfs:label "relation" ;
+    rdfs:subPropertyOf net:netProperty .
 
-cprm:configParamProperty a rdf:Property ;
-    rdfs:label "Config Parameter Property" .
+:AMR_Op_Role a owl:Class ;
+    rdfs:subClassOf :AMR_Role .
 
 net:Class_Net a owl:Class ;
     rdfs:subClassOf net:Net .
 
+net:Net a owl:Class ;
+    rdfs:subClassOf net:Net_Structure .
+
 net:atomProperty_direct_d2 a net:Atom_Property_Net,
         net:Deprecated_Net ;
     :role_polarity net:value_negative_blankNode ;
@@ -1256,10 +1460,23 @@ net:atomProperty_direct_d2 a net:Atom_Property_Net,
     net:isCoreRoleLinked "true" ;
     net:targetArgumentNode :value_negative .
 
-rdf:Property a owl:Class .
+:AMR_AnnotationProperty a owl:AnnotationProperty .
 
-:AMR_Relation a owl:Class ;
-    rdfs:subClassOf :AMR_Structure .
+:AMR_Core_Role a owl:Class ;
+    rdfs:subClassOf :AMR_Role .
+
+net:atomClass_system_s a net:Atom_Class_Net,
+        net:Class_Net,
+        net:Deprecated_Net ;
+    :role_domain net:atomClass_system_p,
+        net:individual_SolarSystem_p ;
+    net:coverBaseNode :leaf_system_s ;
+    net:coverNode :leaf_system_s ;
+    net:hasClassName "system" ;
+    net:hasClassType sys:Entity ;
+    net:hasMotherClassNet net:atomClass_system_p ;
+    net:hasNaming "system" ;
+    net:hasStructure "SSC-01-01" .
 
 :leaf_object_o a :AMR_Leaf ;
     :hasConcept :concept_object ;
@@ -1269,47 +1486,61 @@ rdf:Property a owl:Class .
     :hasConcept :concept_sun ;
     :hasVariable :variable_s2 .
 
+:leaf_hasManner_m9 a :AMR_Leaf ;
+    :edge_m9_ARG0_o2 :leaf_orbit-01_o2 ;
+    :edge_m9_ARG1_o3 :leaf_or_o3 ;
+    :hasConcept :concept_manner ;
+    :hasVariable :variable_m9 ;
+    :isReifiedLeaf true .
+
+:AMR_Variable a owl:Class ;
+    rdfs:subClassOf :AMR_Element .
+
 :leaf_system_s a :AMR_Leaf ;
     :edge_s_domain_p :leaf_system_p ;
     :hasConcept :concept_system ;
     :hasVariable :variable_s .
 
-net:Relation a owl:Class ;
-    rdfs:subClassOf net:Net_Structure .
+net:atomClass_object_o a net:Atom_Class_Net,
+        net:Class_Net,
+        net:Deprecated_Net ;
+    net:coverBaseNode :leaf_object_o ;
+    net:coverNode :leaf_object_o ;
+    net:hasClassName "object" ;
+    net:hasClassType sys:Entity ;
+    net:hasNaming "object" ;
+    net:hasStructure "SSC-01-01" .
 
-net:has_object a owl:AnnotationProperty ;
-    rdfs:label "relation" ;
-    rdfs:subPropertyOf net:netProperty .
+:AMR_Leaf a owl:Class ;
+    rdfs:subClassOf :AMR_Structure .
 
-:AMR_Op_Role a owl:Class ;
-    rdfs:subClassOf :AMR_Role .
+net:atomClass_sun_s2 a net:Atom_Class_Net,
+        net:Class_Net ;
+    net:coverBaseNode :leaf_sun_s2 ;
+    net:coverNode :leaf_sun_s2 ;
+    net:hasClassName "sun" ;
+    net:hasClassType sys:Entity ;
+    net:hasNaming "sun" ;
+    net:hasStructure "SSC-01-01" .
+
+:leaf_orbit-01_o2 a :AMR_Leaf ;
+    :edge_o2_ARG0_o :leaf_object_o ;
+    :edge_o2_ARG1_s2 :leaf_sun_s2 ;
+    :hasConcept :concept_orbit-01 ;
+    :hasVariable :variable_o2 .
+
+net:objectValue a owl:AnnotationProperty ;
+    rdfs:label "valuations"@fr ;
+    rdfs:subPropertyOf net:objectProperty .
 
 :leaf_direct-02_d2 a :AMR_Leaf ;
     :edge_d2_polarity_negative :value_negative ;
     :hasConcept :concept_direct-02 ;
     :hasVariable :variable_d2 .
 
-net:Net a owl:Class ;
-    rdfs:subClassOf net:Net_Structure .
-
-:AMR_AnnotationProperty a owl:AnnotationProperty .
-
-:AMR_Core_Role a owl:Class ;
-    rdfs:subClassOf :AMR_Role .
-
-:AMR_Leaf a owl:Class ;
-    rdfs:subClassOf :AMR_Structure .
-
-:AMR_Variable a owl:Class ;
-    rdfs:subClassOf :AMR_Element .
-
 :AMR_Edge a owl:Class ;
     rdfs:subClassOf :AMR_Structure .
 
-net:objectValue a owl:AnnotationProperty ;
-    rdfs:label "valuations"@fr ;
-    rdfs:subPropertyOf net:objectProperty .
-
 :AMR_Linked_Data a owl:Class .
 
 [] a owl:AllDisjointClasses ;
diff --git a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_factoid.ttl b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_factoid.ttl
index 02ecf0fd..d1b2817a 100644
--- a/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_factoid.ttl
+++ b/tests/main_tests/test_owl_output/SolarSystemDev01-20230614/technical-data/tenet.tetras-libre.fr_demo_01-1/tenet.tetras-libre.fr_demo_01_factoid.ttl
@@ -4,7 +4,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
 <https://tenet.tetras-libre.fr/extract-result#SolarSystem> a owl:Individual,
-        <https://tenet.tetras-libre.fr/extract-result#system> ;
+        <https://tenet.tetras-libre.fr/extract-result#system>,
+        <https://tenet.tetras-libre.fr/extract-result#system-hasPart-object>,
+        <https://tenet.tetras-libre.fr/extract-result#system-hasPart-sun> ;
     rdfs:label "Solar System" ;
     ns1:fromStructure "SSC-01-01" .
 
@@ -20,13 +22,25 @@
         <https://tenet.tetras-libre.fr/extract-result#gravitation> ;
     ns1:fromStructure "SSC-01-01" .
 
+<https://tenet.tetras-libre.fr/extract-result#hasManner> a owl:ObjectProperty ;
+    rdfs:label "hasManner" ;
+    rdfs:subPropertyOf ns1:Out_ObjectProperty ;
+    ns1:fromStructure "SSC-01-01" .
+
 <https://tenet.tetras-libre.fr/extract-result#not-direct> a owl:ObjectProperty ;
     rdfs:subPropertyOf ns1:Out_ObjectProperty ;
     ns1:fromStructure "SSC-01-01" .
 
-<https://tenet.tetras-libre.fr/extract-result#object-orbit-sun> a owl:Class ;
+<https://tenet.tetras-libre.fr/extract-result#object-orbit-hasManner-direct-sun> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-direct> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
+        <https://tenet.tetras-libre.fr/extract-result#object> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#object-orbit-hasManner-not-direct-sun> a owl:Class ;
     rdfs:subClassOf [ a owl:Restriction ;
-            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit> ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-not-direct> ;
             owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
         <https://tenet.tetras-libre.fr/extract-result#object> ;
     ns1:fromStructure "SSC-01-01" .
@@ -41,9 +55,31 @@
     rdfs:subClassOf ns1:Entity ;
     ns1:fromStructure "SSC-01-01" .
 
-<https://tenet.tetras-libre.fr/extract-result#object> a owl:Class ;
-    rdfs:label "object" ;
-    rdfs:subClassOf ns1:Entity ;
+<https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-direct> a owl:ObjectProperty ;
+    rdfs:subPropertyOf <https://tenet.tetras-libre.fr/extract-result#orbit> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#orbit-hasManner-not-direct> a owl:ObjectProperty ;
+    rdfs:subPropertyOf <https://tenet.tetras-libre.fr/extract-result#orbit> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#system-hasPart-object> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#hasPart> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#object> ],
+        <https://tenet.tetras-libre.fr/extract-result#system> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#system-hasPart-sun> a owl:Class ;
+    rdfs:subClassOf [ a owl:Restriction ;
+            owl:onProperty <https://tenet.tetras-libre.fr/extract-result#hasPart> ;
+            owl:someValuesFrom <https://tenet.tetras-libre.fr/extract-result#sun> ],
+        <https://tenet.tetras-libre.fr/extract-result#system> ;
+    ns1:fromStructure "SSC-01-01" .
+
+<https://tenet.tetras-libre.fr/extract-result#hasPart> a owl:ObjectProperty ;
+    rdfs:label "hasPart" ;
+    rdfs:subPropertyOf ns1:Out_ObjectProperty ;
     ns1:fromStructure "SSC-01-01" .
 
 <https://tenet.tetras-libre.fr/extract-result#orbit> a owl:ObjectProperty ;
@@ -51,6 +87,11 @@
     rdfs:subPropertyOf ns1:Out_ObjectProperty ;
     ns1:fromStructure "SSC-01-01" .
 
+<https://tenet.tetras-libre.fr/extract-result#object> a owl:Class ;
+    rdfs:label "object" ;
+    rdfs:subClassOf ns1:Entity ;
+    ns1:fromStructure "SSC-01-01" .
+
 <https://tenet.tetras-libre.fr/extract-result#sun> a owl:Class ;
     rdfs:label "sun" ;
     rdfs:subClassOf ns1:Entity ;
@@ -58,6 +99,7 @@
 
 <https://tenet.tetras-libre.fr/extract-result#system> a owl:Class ;
     rdfs:label "system" ;
-    rdfs:subClassOf ns1:Entity ;
+    rdfs:subClassOf ns1:Entity,
+        ns1:Undetermined_Thing ;
     ns1:fromStructure "SSC-01-01" .
 
-- 
GitLab