diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index db23729dd..79c5bbb4b 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -8,6 +8,22 @@
 - https://github.com/eclipse-syson/syson/issues/393[#393] [general-view] Code refactoring:
 * Rename `ExhibitStatesCompartmentItemNodeDescriptionProvider` to `StatesCompartmentItemNodeDescriptionProvider`.
 * _StatesCompartmentNodeDescriptionProvider_ now handles both exhibit and non-exhibit states.
+- https://github.com/eclipse-syson/syson/issues/564[#564] [metamodel] Align metamodel to SysMLv2 Beta 2 specification released on the 3rd of February 2024(see https://www.omg.org/spec/SysML/ for more details) and KerML Beta 2 specification released on the 17the of February 2024(see https://www.omg.org/spec/KerML/ for more details).
+You may have to fix your existing SysON models/projects by your own means to still be able to open them with SysON.
+Please download all your models/projects before upgrading to 2024.9.0.
+The changes are:
+* AnnotatingElement
+** add derived reference "ownedAnnotatingRelationship : Annotation"
+* Annotation
+** add derived reference "owningAnnotatingElement : AnnotatingElement"
+* Connector
+** remove attribute "isDirected : boolean"
+* OperatorExpression
+** remove derived reference "operand : Expression"
+* ParameterMembership
+** add operation "parameterDirection()  : FeatureDirectionKind"
+* Type
+** add operation "directionOfExcluding(Feature, Type[0..\*]) : FeatureDirectionKind"
 
 === Dependency update
 
diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotatingElementItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotatingElementItemProvider.java
index 0e0c832ff..a38185d00 100644
--- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotatingElementItemProvider.java
+++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotatingElementItemProvider.java
@@ -50,6 +50,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 
             this.addAnnotatedElementPropertyDescriptor(object);
             this.addAnnotationPropertyDescriptor(object);
+            this.addOwnedAnnotatingRelationshipPropertyDescriptor(object);
         }
         return this.itemPropertyDescriptors;
     }
@@ -92,6 +93,26 @@ protected void addAnnotationPropertyDescriptor(Object object) {
                 null));
     }
 
+    /**
+     * This adds a property descriptor for the Owned Annotating Relationship feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addOwnedAnnotatingRelationshipPropertyDescriptor(Object object) {
+        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
+                this.getResourceLocator(),
+                this.getString("_UI_AnnotatingElement_ownedAnnotatingRelationship_feature"),
+                this.getString("_UI_PropertyDescriptor_description", "_UI_AnnotatingElement_ownedAnnotatingRelationship_feature", "_UI_AnnotatingElement_type"),
+                SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(),
+                false,
+                false,
+                false,
+                null,
+                null,
+                null));
+    }
+
     /**
      * This returns AnnotatingElement.svg. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotationItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotationItemProvider.java
index cd1a6f208..de433568f 100644
--- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotationItemProvider.java
+++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotationItemProvider.java
@@ -51,6 +51,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             this.addAnnotatedElementPropertyDescriptor(object);
             this.addAnnotatingElementPropertyDescriptor(object);
             this.addOwningAnnotatedElementPropertyDescriptor(object);
+            this.addOwningAnnotatingElementPropertyDescriptor(object);
         }
         return this.itemPropertyDescriptors;
     }
@@ -113,6 +114,26 @@ protected void addOwningAnnotatedElementPropertyDescriptor(Object object) {
                 null));
     }
 
+    /**
+     * This adds a property descriptor for the Owning Annotating Element feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addOwningAnnotatingElementPropertyDescriptor(Object object) {
+        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
+                this.getResourceLocator(),
+                this.getString("_UI_Annotation_owningAnnotatingElement_feature"),
+                this.getString("_UI_PropertyDescriptor_description", "_UI_Annotation_owningAnnotatingElement_feature", "_UI_Annotation_type"),
+                SysmlPackage.eINSTANCE.getAnnotation_OwningAnnotatingElement(),
+                false,
+                false,
+                false,
+                null,
+                null,
+                null));
+    }
+
     /**
      * This returns Annotation.svg. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java
index 5422b2596..c83da765b 100644
--- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java
+++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java
@@ -56,7 +56,6 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             this.addRelatedElementPropertyDescriptor(object);
             this.addSourcePropertyDescriptor(object);
             this.addTargetPropertyDescriptor(object);
-            this.addIsDirectedPropertyDescriptor(object);
             this.addAssociationPropertyDescriptor(object);
             this.addConnectorEndPropertyDescriptor(object);
             this.addRelatedFeaturePropertyDescriptor(object);
@@ -180,25 +179,6 @@ protected void addConnectorEndPropertyDescriptor(Object object) {
                 null));
     }
 
-    /**
-     * This adds a property descriptor for the Is Directed feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addIsDirectedPropertyDescriptor(Object object) {
-        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
-                this.getResourceLocator(),
-                this.getString("_UI_Connector_isDirected_feature"),
-                this.getString("_UI_PropertyDescriptor_description", "_UI_Connector_isDirected_feature", "_UI_Connector_type"),
-                SysmlPackage.eINSTANCE.getConnector_IsDirected(),
-                true,
-                false,
-                false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                null,
-                null));
-    }
-
     /**
      * This adds a property descriptor for the Related Feature feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -310,7 +290,6 @@ public void notifyChanged(Notification notification) {
 
         switch (notification.getFeatureID(ConnectorAsUsage.class)) {
             case SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED:
-            case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED:
                 this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
                 return;
             case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT:
diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java
index 538f71f00..e9d52f692 100644
--- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java
+++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java
@@ -56,7 +56,6 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             this.addRelatedElementPropertyDescriptor(object);
             this.addSourcePropertyDescriptor(object);
             this.addTargetPropertyDescriptor(object);
-            this.addIsDirectedPropertyDescriptor(object);
             this.addAssociationPropertyDescriptor(object);
             this.addConnectorEndPropertyDescriptor(object);
             this.addRelatedFeaturePropertyDescriptor(object);
@@ -180,25 +179,6 @@ protected void addConnectorEndPropertyDescriptor(Object object) {
                 null));
     }
 
-    /**
-     * This adds a property descriptor for the Is Directed feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addIsDirectedPropertyDescriptor(Object object) {
-        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
-                this.getResourceLocator(),
-                this.getString("_UI_Connector_isDirected_feature"),
-                this.getString("_UI_PropertyDescriptor_description", "_UI_Connector_isDirected_feature", "_UI_Connector_type"),
-                SysmlPackage.eINSTANCE.getConnector_IsDirected(),
-                true,
-                false,
-                false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                null,
-                null));
-    }
-
     /**
      * This adds a property descriptor for the Related Feature feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -320,7 +300,6 @@ public void notifyChanged(Notification notification) {
 
         switch (notification.getFeatureID(Connector.class)) {
             case SysmlPackage.CONNECTOR__IS_IMPLIED:
-            case SysmlPackage.CONNECTOR__IS_DIRECTED:
                 this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
                 return;
             case SysmlPackage.CONNECTOR__OWNED_RELATED_ELEMENT:
diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataFeatureItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataFeatureItemProvider.java
index ceb76f559..d154e20d2 100644
--- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataFeatureItemProvider.java
+++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataFeatureItemProvider.java
@@ -50,6 +50,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 
             this.addAnnotatedElementPropertyDescriptor(object);
             this.addAnnotationPropertyDescriptor(object);
+            this.addOwnedAnnotatingRelationshipPropertyDescriptor(object);
             this.addMetaclassPropertyDescriptor(object);
         }
         return this.itemPropertyDescriptors;
@@ -93,6 +94,26 @@ protected void addAnnotationPropertyDescriptor(Object object) {
                 null));
     }
 
+    /**
+     * This adds a property descriptor for the Owned Annotating Relationship feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addOwnedAnnotatingRelationshipPropertyDescriptor(Object object) {
+        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
+                this.getResourceLocator(),
+                this.getString("_UI_AnnotatingElement_ownedAnnotatingRelationship_feature"),
+                this.getString("_UI_PropertyDescriptor_description", "_UI_AnnotatingElement_ownedAnnotatingRelationship_feature", "_UI_AnnotatingElement_type"),
+                SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(),
+                false,
+                false,
+                false,
+                null,
+                null,
+                null));
+    }
+
     /**
      * This adds a property descriptor for the Metaclass feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataUsageItemProvider.java
index acfcff00b..49dbea545 100644
--- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataUsageItemProvider.java
+++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataUsageItemProvider.java
@@ -50,6 +50,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 
             this.addAnnotatedElementPropertyDescriptor(object);
             this.addAnnotationPropertyDescriptor(object);
+            this.addOwnedAnnotatingRelationshipPropertyDescriptor(object);
             this.addMetaclassPropertyDescriptor(object);
             this.addMetadataDefinitionPropertyDescriptor(object);
         }
@@ -94,6 +95,26 @@ protected void addAnnotationPropertyDescriptor(Object object) {
                 null));
     }
 
+    /**
+     * This adds a property descriptor for the Owned Annotating Relationship feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addOwnedAnnotatingRelationshipPropertyDescriptor(Object object) {
+        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
+                this.getResourceLocator(),
+                this.getString("_UI_AnnotatingElement_ownedAnnotatingRelationship_feature"),
+                this.getString("_UI_PropertyDescriptor_description", "_UI_AnnotatingElement_ownedAnnotatingRelationship_feature", "_UI_AnnotatingElement_type"),
+                SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(),
+                false,
+                false,
+                false,
+                null,
+                null,
+                null));
+    }
+
     /**
      * This adds a property descriptor for the Metaclass feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OperatorExpressionItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OperatorExpressionItemProvider.java
index e70c4abc1..42a2079d0 100644
--- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OperatorExpressionItemProvider.java
+++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OperatorExpressionItemProvider.java
@@ -17,13 +17,11 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.syson.sysml.OperatorExpression;
-import org.eclipse.syson.sysml.SysmlFactory;
 import org.eclipse.syson.sysml.SysmlPackage;
 
 /**
@@ -76,36 +74,6 @@ protected void addOperatorPropertyDescriptor(Object object) {
                 null));
     }
 
-    /**
-     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (this.childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            this.childrenFeatures.add(SysmlPackage.eINSTANCE.getOperatorExpression_Operand());
-        }
-        return this.childrenFeatures;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
-
-        return super.getChildFeature(object, child);
-    }
-
     /**
      * This returns OperatorExpression.svg. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -142,9 +110,6 @@ public void notifyChanged(Notification notification) {
             case SysmlPackage.OPERATOR_EXPRESSION__OPERATOR:
                 this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
                 return;
-            case SysmlPackage.OPERATOR_EXPRESSION__OPERAND:
-                this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
         }
         super.notifyChanged(notification);
     }
@@ -158,96 +123,6 @@ public void notifyChanged(Notification notification) {
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createCalculationUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createCaseUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createAnalysisCaseUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createConstraintUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createAssertConstraintUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createBooleanExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createInvocationExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createOperatorExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createCollectExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createRequirementUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createConcernUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createFeatureChainExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createFeatureReferenceExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createUseCaseUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createIncludeUseCaseUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createInvariant()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createLiteralExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createLiteralBoolean()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createLiteralInfinity()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createLiteralInteger()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createLiteralRational()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createLiteralString()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createMetadataAccessExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createNullExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createSatisfyRequirementUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createSelectExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createTriggerInvocationExpression()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createVerificationCaseUsage()));
-
-        newChildDescriptors.add(this.createChildParameter(SysmlPackage.eINSTANCE.getOperatorExpression_Operand(),
-                SysmlFactory.eINSTANCE.createViewpointUsage()));
     }
 
 }
diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/resources/plugin.properties b/backend/metamodel/syson-sysml-metamodel-edit/src/main/resources/plugin.properties
index b54ee2b20..a225bc4e9 100644
--- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/resources/plugin.properties
+++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/resources/plugin.properties
@@ -212,9 +212,11 @@ _UI_AnalysisCaseUsage_analysisCaseDefinition_feature = Analysis Case Definition
 _UI_AnalysisCaseUsage_resultExpression_feature = Result Expression
 _UI_AnnotatingElement_annotatedElement_feature = Annotated Element
 _UI_AnnotatingElement_annotation_feature = Annotation
+_UI_AnnotatingElement_ownedAnnotatingRelationship_feature = Owned Annotating Relationship
 _UI_Annotation_annotatedElement_feature = Annotated Element
 _UI_Annotation_annotatingElement_feature = Annotating Element
 _UI_Annotation_owningAnnotatedElement_feature = Owning Annotated Element
+_UI_Annotation_owningAnnotatingElement_feature = Owning Annotating Element
 _UI_AssertConstraintUsage_assertedConstraint_feature = Asserted Constraint
 _UI_AssignmentActionUsage_referent_feature = Referent
 _UI_AssignmentActionUsage_targetArgument_feature = Target Argument
@@ -249,7 +251,6 @@ _UI_Conjugation_originalType_feature = Original Type
 _UI_Conjugation_owningType_feature = Owning Type
 _UI_ConnectionDefinition_connectionEnd_feature = Connection End
 _UI_ConnectionUsage_connectionDefinition_feature = Connection Definition
-_UI_Connector_isDirected_feature = Is Directed
 _UI_Connector_association_feature = Association
 _UI_Connector_connectorEnd_feature = Connector End
 _UI_Connector_relatedFeature_feature = Related Feature
@@ -427,7 +428,6 @@ _UI_OccurrenceUsage_portionKind_feature = Portion Kind
 _UI_OccurrenceUsage_individualDefinition_feature = Individual Definition
 _UI_OccurrenceUsage_occurrenceDefinition_feature = Occurrence Definition
 _UI_OperatorExpression_operator_feature = Operator
-_UI_OperatorExpression_operand_feature = Operand
 _UI_OwningMembership_ownedMemberElementId_feature = Owned Member Element Id
 _UI_OwningMembership_ownedMemberName_feature = Owned Member Name
 _UI_OwningMembership_ownedMemberShortName_feature = Owned Member Short Name
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/AnnotatingElement.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/AnnotatingElement.java
index 61f100efe..565519c8d 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/AnnotatingElement.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/AnnotatingElement.java
@@ -56,4 +56,19 @@ public interface AnnotatingElement extends Element {
      */
     EList<Annotation> getAnnotation();
 
+    /**
+     * Returns the value of the '<em><b>Owned Annotating Relationship</b></em>' reference list. The list contents are of
+     * type {@link org.eclipse.syson.sysml.Annotation}. It is bidirectional and its opposite is
+     * '{@link org.eclipse.syson.sysml.Annotation#getOwningAnnotatingElement <em>Owning Annotating Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Owned Annotating Relationship</em>' reference list.
+     * @see org.eclipse.syson.sysml.SysmlPackage#getAnnotatingElement_OwnedAnnotatingRelationship()
+     * @see org.eclipse.syson.sysml.Annotation#getOwningAnnotatingElement
+     * @model opposite="owningAnnotatingElement" transient="true" changeable="false" volatile="true" derived="true"
+     *        ordered="false" annotation="subsets"
+     * @generated
+     */
+    EList<Annotation> getOwnedAnnotatingRelationship();
+
 } // AnnotatingElement
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Annotation.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Annotation.java
index 9aa8a476f..2563d4091 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Annotation.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Annotation.java
@@ -22,6 +22,7 @@
  * <li>{@link org.eclipse.syson.sysml.Annotation#getAnnotatedElement <em>Annotated Element</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.Annotation#getAnnotatingElement <em>Annotating Element</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.Annotation#getOwningAnnotatedElement <em>Owning Annotated Element</em>}</li>
+ * <li>{@link org.eclipse.syson.sysml.Annotation#getOwningAnnotatingElement <em>Owning Annotating Element</em>}</li>
  * </ul>
  *
  * @see org.eclipse.syson.sysml.SysmlPackage#getAnnotation()
@@ -91,4 +92,18 @@ public interface Annotation extends Relationship {
      */
     Element getOwningAnnotatedElement();
 
+    /**
+     * Returns the value of the '<em><b>Owning Annotating Element</b></em>' reference. It is bidirectional and its
+     * opposite is '{@link org.eclipse.syson.sysml.AnnotatingElement#getOwnedAnnotatingRelationship <em>Owned Annotating
+     * Relationship</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Owning Annotating Element</em>' reference.
+     * @see org.eclipse.syson.sysml.SysmlPackage#getAnnotation_OwningAnnotatingElement()
+     * @see org.eclipse.syson.sysml.AnnotatingElement#getOwnedAnnotatingRelationship
+     * @model opposite="ownedAnnotatingRelationship" transient="true" changeable="false" volatile="true" derived="true"
+     *        ordered="false" annotation="subsets"
+     * @generated
+     */
+    AnnotatingElement getOwningAnnotatingElement();
+
 } // Annotation
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Connector.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Connector.java
index 3c1294039..f64bcfa2e 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Connector.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Connector.java
@@ -21,7 +21,6 @@
  * The following features are supported:
  * </p>
  * <ul>
- * <li>{@link org.eclipse.syson.sysml.Connector#isIsDirected <em>Is Directed</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.Connector#getAssociation <em>Association</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.Connector#getConnectorEnd <em>Connector End</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.Connector#getRelatedFeature <em>Related Feature</em>}</li>
@@ -56,29 +55,6 @@ public interface Connector extends Feature, Relationship {
      */
     EList<Feature> getConnectorEnd();
 
-    /**
-     * Returns the value of the '<em><b>Is Directed</b></em>' attribute. The default value is <code>"false"</code>. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the value of the '<em>Is Directed</em>' attribute.
-     * @see #setIsDirected(boolean)
-     * @see org.eclipse.syson.sysml.SysmlPackage#getConnector_IsDirected()
-     * @model default="false" required="true" ordered="false"
-     * @generated
-     */
-    boolean isIsDirected();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.syson.sysml.Connector#isIsDirected <em>Is Directed</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @param value
-     *            the new value of the '<em>Is Directed</em>' attribute.
-     * @see #isIsDirected()
-     * @generated
-     */
-    void setIsDirected(boolean value);
-
     /**
      * Returns the value of the '<em><b>Related Feature</b></em>' reference list. The list contents are of type
      * {@link org.eclipse.syson.sysml.Feature}. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/OperatorExpression.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/OperatorExpression.java
index 43334feba..d157bdf62 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/OperatorExpression.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/OperatorExpression.java
@@ -12,8 +12,6 @@
 *******************************************************************************/
 package org.eclipse.syson.sysml;
 
-import org.eclipse.emf.common.util.EList;
-
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Operator Expression</b></em>'. <!-- end-user-doc
  * -->
@@ -31,17 +29,6 @@
  * @generated
  */
 public interface OperatorExpression extends InvocationExpression {
-    /**
-     * Returns the value of the '<em><b>Operand</b></em>' containment reference list. The list contents are of type
-     * {@link org.eclipse.syson.sysml.Expression}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the value of the '<em>Operand</em>' containment reference list.
-     * @see org.eclipse.syson.sysml.SysmlPackage#getOperatorExpression_Operand()
-     * @model containment="true" transient="true" changeable="false" volatile="true" derived="true"
-     * @generated
-     */
-    EList<Expression> getOperand();
-
     /**
      * Returns the value of the '<em><b>Operator</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/ParameterMembership.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/ParameterMembership.java
index c265278c5..286970537 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/ParameterMembership.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/ParameterMembership.java
@@ -40,4 +40,12 @@ public interface ParameterMembership extends FeatureMembership {
      */
     Feature getOwnedMemberParameter();
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @model required="true" ordered="false"
+     * @generated
+     */
+    FeatureDirectionKind parameterDirection();
+
 } // ParameterMembership
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/SysmlPackage.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/SysmlPackage.java
index 4562d95eb..ec9fa4b49 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/SysmlPackage.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/SysmlPackage.java
@@ -1184,6 +1184,15 @@ public interface SysmlPackage extends EPackage {
      */
     int TYPE___DIRECTION_OF__FEATURE = NAMESPACE_OPERATION_COUNT + 1;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TYPE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = NAMESPACE_OPERATION_COUNT + 2;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -1191,7 +1200,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TYPE___INHERITED_MEMBERSHIPS__ELIST = NAMESPACE_OPERATION_COUNT + 2;
+    int TYPE___INHERITED_MEMBERSHIPS__ELIST = NAMESPACE_OPERATION_COUNT + 3;
 
     /**
      * The operation id for the '<em>Specializes</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1199,7 +1208,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TYPE___SPECIALIZES__TYPE = NAMESPACE_OPERATION_COUNT + 3;
+    int TYPE___SPECIALIZES__TYPE = NAMESPACE_OPERATION_COUNT + 4;
 
     /**
      * The operation id for the '<em>Specializes From Library</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1208,7 +1217,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TYPE___SPECIALIZES_FROM_LIBRARY__STRING = NAMESPACE_OPERATION_COUNT + 4;
+    int TYPE___SPECIALIZES_FROM_LIBRARY__STRING = NAMESPACE_OPERATION_COUNT + 5;
 
     /**
      * The number of operations of the '<em>Type</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1216,7 +1225,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TYPE_OPERATION_COUNT = NAMESPACE_OPERATION_COUNT + 5;
+    int TYPE_OPERATION_COUNT = NAMESPACE_OPERATION_COUNT + 6;
 
     /**
      * The meta object id for the '{@link org.eclipse.syson.sysml.impl.FeatureImpl <em>Feature</em>}' class. <!--
@@ -1974,6 +1983,15 @@ public interface SysmlPackage extends EPackage {
      */
     int FEATURE___DIRECTION_OF__FEATURE = TYPE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = TYPE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -3131,6 +3149,15 @@ public interface SysmlPackage extends EPackage {
      */
     int USAGE___DIRECTION_OF__FEATURE = FEATURE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -4323,6 +4350,15 @@ public interface SysmlPackage extends EPackage {
      */
     int OCCURRENCE_USAGE___DIRECTION_OF__FEATURE = USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int OCCURRENCE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -5540,6 +5576,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ACTION_USAGE___DIRECTION_OF__FEATURE = OCCURRENCE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -6816,6 +6861,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ACCEPT_ACTION_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ACCEPT_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -7512,6 +7566,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CLASSIFIER___DIRECTION_OF__FEATURE = TYPE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CLASSIFIER___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = TYPE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -8397,6 +8460,15 @@ public interface SysmlPackage extends EPackage {
      */
     int DEFINITION___DIRECTION_OF__FEATURE = CLASSIFIER___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CLASSIFIER___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -9298,6 +9370,15 @@ public interface SysmlPackage extends EPackage {
      */
     int OCCURRENCE_DEFINITION___DIRECTION_OF__FEATURE = DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int OCCURRENCE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -10224,6 +10305,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ACTION_DEFINITION___DIRECTION_OF__FEATURE = OCCURRENCE_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ACTION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -11999,6 +12089,14 @@ public interface SysmlPackage extends EPackage {
      */
     int PARAMETER_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP = FEATURE_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP;
 
+    /**
+     * The operation id for the '<em>Parameter Direction</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int PARAMETER_MEMBERSHIP___PARAMETER_DIRECTION = FEATURE_MEMBERSHIP_OPERATION_COUNT + 0;
+
     /**
      * The number of operations of the '<em>Parameter Membership</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -12006,7 +12104,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int PARAMETER_MEMBERSHIP_OPERATION_COUNT = FEATURE_MEMBERSHIP_OPERATION_COUNT + 0;
+    int PARAMETER_MEMBERSHIP_OPERATION_COUNT = FEATURE_MEMBERSHIP_OPERATION_COUNT + 1;
 
     /**
      * The meta object id for the '{@link org.eclipse.syson.sysml.impl.ActorMembershipImpl <em>Actor Membership</em>}'
@@ -12412,6 +12510,14 @@ public interface SysmlPackage extends EPackage {
      */
     int ACTOR_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP = PARAMETER_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP;
 
+    /**
+     * The operation id for the '<em>Parameter Direction</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ACTOR_MEMBERSHIP___PARAMETER_DIRECTION = PARAMETER_MEMBERSHIP___PARAMETER_DIRECTION;
+
     /**
      * The number of operations of the '<em>Actor Membership</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -13287,6 +13393,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ITEM_DEFINITION___DIRECTION_OF__FEATURE = OCCURRENCE_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ITEM_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -14188,6 +14303,15 @@ public interface SysmlPackage extends EPackage {
      */
     int PART_DEFINITION___DIRECTION_OF__FEATURE = ITEM_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int PART_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ITEM_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -15184,6 +15308,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONNECTION_DEFINITION___DIRECTION_OF__FEATURE = PART_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONNECTION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = PART_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -16189,6 +16322,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ALLOCATION_DEFINITION___DIRECTION_OF__FEATURE = CONNECTION_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ALLOCATION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -17213,14 +17355,6 @@ public interface SysmlPackage extends EPackage {
      */
     int CONNECTOR_AS_USAGE__TARGET = USAGE_FEATURE_COUNT + 5;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int CONNECTOR_AS_USAGE__IS_DIRECTED = USAGE_FEATURE_COUNT + 6;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -17228,7 +17362,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR_AS_USAGE__ASSOCIATION = USAGE_FEATURE_COUNT + 7;
+    int CONNECTOR_AS_USAGE__ASSOCIATION = USAGE_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Connector End</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -17237,7 +17371,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR_AS_USAGE__CONNECTOR_END = USAGE_FEATURE_COUNT + 8;
+    int CONNECTOR_AS_USAGE__CONNECTOR_END = USAGE_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Related Feature</b></em>' reference list. <!-- begin-user-doc --> <!--
@@ -17246,7 +17380,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR_AS_USAGE__RELATED_FEATURE = USAGE_FEATURE_COUNT + 9;
+    int CONNECTOR_AS_USAGE__RELATED_FEATURE = USAGE_FEATURE_COUNT + 8;
 
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -17254,7 +17388,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR_AS_USAGE__SOURCE_FEATURE = USAGE_FEATURE_COUNT + 10;
+    int CONNECTOR_AS_USAGE__SOURCE_FEATURE = USAGE_FEATURE_COUNT + 9;
 
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -17263,7 +17397,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR_AS_USAGE__TARGET_FEATURE = USAGE_FEATURE_COUNT + 11;
+    int CONNECTOR_AS_USAGE__TARGET_FEATURE = USAGE_FEATURE_COUNT + 10;
 
     /**
      * The number of structural features of the '<em>Connector As Usage</em>' class. <!-- begin-user-doc --> <!--
@@ -17272,7 +17406,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR_AS_USAGE_FEATURE_COUNT = USAGE_FEATURE_COUNT + 12;
+    int CONNECTOR_AS_USAGE_FEATURE_COUNT = USAGE_FEATURE_COUNT + 11;
 
     /**
      * The operation id for the '<em>Effective Name</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -17402,6 +17536,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONNECTOR_AS_USAGE___DIRECTION_OF__FEATURE = USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONNECTOR_AS_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -18475,14 +18618,6 @@ public interface SysmlPackage extends EPackage {
      */
     int CONNECTION_USAGE__TARGET = CONNECTOR_AS_USAGE__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int CONNECTION_USAGE__IS_DIRECTED = CONNECTOR_AS_USAGE__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -18725,6 +18860,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONNECTION_USAGE___DIRECTION_OF__FEATURE = CONNECTOR_AS_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONNECTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTOR_AS_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -19797,14 +19941,6 @@ public interface SysmlPackage extends EPackage {
      */
     int ALLOCATION_USAGE__TARGET = CONNECTION_USAGE__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int ALLOCATION_USAGE__IS_DIRECTED = CONNECTION_USAGE__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -20056,6 +20192,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ALLOCATION_USAGE___DIRECTION_OF__FEATURE = CONNECTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ALLOCATION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -21064,6 +21209,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CALCULATION_DEFINITION___DIRECTION_OF__FEATURE = ACTION_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CALCULATION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -22051,6 +22205,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CASE_DEFINITION___DIRECTION_OF__FEATURE = CALCULATION_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CASE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CALCULATION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -23055,6 +23218,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ANALYSIS_CASE_DEFINITION___DIRECTION_OF__FEATURE = CASE_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ANALYSIS_CASE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CASE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -24258,6 +24430,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CALCULATION_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CALCULATION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -25601,6 +25782,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CASE_USAGE___DIRECTION_OF__FEATURE = CALCULATION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CALCULATION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -26971,6 +27161,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ANALYSIS_CASE_USAGE___DIRECTION_OF__FEATURE = CASE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ANALYSIS_CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -27294,6 +27493,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ANNOTATING_ELEMENT__ANNOTATION = ELEMENT_FEATURE_COUNT + 1;
 
+    /**
+     * The feature id for the '<em><b>Owned Annotating Relationship</b></em>' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP = ELEMENT_FEATURE_COUNT + 2;
+
     /**
      * The number of structural features of the '<em>Annotating Element</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -27301,7 +27509,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ANNOTATING_ELEMENT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 2;
+    int ANNOTATING_ELEMENT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 3;
 
     /**
      * The operation id for the '<em>Effective Name</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -27587,6 +27795,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ANNOTATION__OWNING_ANNOTATED_ELEMENT = RELATIONSHIP_FEATURE_COUNT + 2;
 
+    /**
+     * The feature id for the '<em><b>Owning Annotating Element</b></em>' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ANNOTATION__OWNING_ANNOTATING_ELEMENT = RELATIONSHIP_FEATURE_COUNT + 3;
+
     /**
      * The number of structural features of the '<em>Annotation</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -27594,7 +27811,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ANNOTATION_FEATURE_COUNT = RELATIONSHIP_FEATURE_COUNT + 3;
+    int ANNOTATION_FEATURE_COUNT = RELATIONSHIP_FEATURE_COUNT + 4;
 
     /**
      * The operation id for the '<em>Effective Name</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -28803,6 +29020,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONSTRAINT_USAGE___DIRECTION_OF__FEATURE = OCCURRENCE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONSTRAINT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -30095,6 +30321,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ASSERT_CONSTRAINT_USAGE___DIRECTION_OF__FEATURE = CONSTRAINT_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ASSERT_CONSTRAINT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONSTRAINT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -31363,6 +31598,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ASSIGNMENT_ACTION_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ASSIGNMENT_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -32137,6 +32381,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ASSOCIATION___DIRECTION_OF__FEATURE = CLASSIFIER___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ASSOCIATION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CLASSIFIER___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -32829,6 +33082,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ASSOCIATION_STRUCTURE___DIRECTION_OF__FEATURE = ASSOCIATION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ASSOCIATION_STRUCTURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ASSOCIATION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -33715,6 +33977,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ATTRIBUTE_DEFINITION___DIRECTION_OF__FEATURE = DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ATTRIBUTE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -34834,6 +35105,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ATTRIBUTE_USAGE___DIRECTION_OF__FEATURE = USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ATTRIBUTE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -35488,6 +35768,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CLASS___DIRECTION_OF__FEATURE = CLASSIFIER___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CLASS___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CLASSIFIER___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -36109,6 +36398,15 @@ public interface SysmlPackage extends EPackage {
      */
     int BEHAVIOR___DIRECTION_OF__FEATURE = CLASS___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BEHAVIOR___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CLASS___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -36814,14 +37112,6 @@ public interface SysmlPackage extends EPackage {
      */
     int CONNECTOR__TARGET = FEATURE_FEATURE_COUNT + 5;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int CONNECTOR__IS_DIRECTED = FEATURE_FEATURE_COUNT + 6;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -36829,7 +37119,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR__ASSOCIATION = FEATURE_FEATURE_COUNT + 7;
+    int CONNECTOR__ASSOCIATION = FEATURE_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Connector End</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -36838,7 +37128,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR__CONNECTOR_END = FEATURE_FEATURE_COUNT + 8;
+    int CONNECTOR__CONNECTOR_END = FEATURE_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Related Feature</b></em>' reference list. <!-- begin-user-doc --> <!--
@@ -36847,7 +37137,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR__RELATED_FEATURE = FEATURE_FEATURE_COUNT + 9;
+    int CONNECTOR__RELATED_FEATURE = FEATURE_FEATURE_COUNT + 8;
 
     /**
      * The feature id for the '<em><b>Source Feature</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -36855,7 +37145,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR__SOURCE_FEATURE = FEATURE_FEATURE_COUNT + 10;
+    int CONNECTOR__SOURCE_FEATURE = FEATURE_FEATURE_COUNT + 9;
 
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -36864,7 +37154,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR__TARGET_FEATURE = FEATURE_FEATURE_COUNT + 11;
+    int CONNECTOR__TARGET_FEATURE = FEATURE_FEATURE_COUNT + 10;
 
     /**
      * The number of structural features of the '<em>Connector</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -36873,7 +37163,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONNECTOR_FEATURE_COUNT = FEATURE_FEATURE_COUNT + 12;
+    int CONNECTOR_FEATURE_COUNT = FEATURE_FEATURE_COUNT + 11;
 
     /**
      * The operation id for the '<em>Effective Name</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -37003,6 +37293,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONNECTOR___DIRECTION_OF__FEATURE = FEATURE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONNECTOR___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -37757,14 +38056,6 @@ public interface SysmlPackage extends EPackage {
      */
     int BINDING_CONNECTOR__TARGET = CONNECTOR__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int BINDING_CONNECTOR__IS_DIRECTED = CONNECTOR__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -37946,6 +38237,15 @@ public interface SysmlPackage extends EPackage {
      */
     int BINDING_CONNECTOR___DIRECTION_OF__FEATURE = CONNECTOR___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BINDING_CONNECTOR___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTOR___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -39018,14 +39318,6 @@ public interface SysmlPackage extends EPackage {
      */
     int BINDING_CONNECTOR_AS_USAGE__TARGET = CONNECTOR_AS_USAGE__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int BINDING_CONNECTOR_AS_USAGE__IS_DIRECTED = CONNECTOR_AS_USAGE__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -39207,6 +39499,15 @@ public interface SysmlPackage extends EPackage {
      */
     int BINDING_CONNECTOR_AS_USAGE___DIRECTION_OF__FEATURE = CONNECTOR_AS_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BINDING_CONNECTOR_AS_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTOR_AS_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -40063,6 +40364,15 @@ public interface SysmlPackage extends EPackage {
      */
     int STEP___DIRECTION_OF__FEATURE = FEATURE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int STEP___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -40944,6 +41254,15 @@ public interface SysmlPackage extends EPackage {
      */
     int EXPRESSION___DIRECTION_OF__FEATURE = STEP___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = STEP___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -41858,6 +42177,15 @@ public interface SysmlPackage extends EPackage {
      */
     int BOOLEAN_EXPRESSION___DIRECTION_OF__FEATURE = EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BOOLEAN_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -42773,6 +43101,15 @@ public interface SysmlPackage extends EPackage {
      */
     int INVOCATION_EXPRESSION___DIRECTION_OF__FEATURE = EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int INVOCATION_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -43559,15 +43896,6 @@ public interface SysmlPackage extends EPackage {
      */
     int OPERATOR_EXPRESSION__OPERATOR = INVOCATION_EXPRESSION_FEATURE_COUNT + 0;
 
-    /**
-     * The feature id for the '<em><b>Operand</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int OPERATOR_EXPRESSION__OPERAND = INVOCATION_EXPRESSION_FEATURE_COUNT + 1;
-
     /**
      * The number of structural features of the '<em>Operator Expression</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -43575,7 +43903,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int OPERATOR_EXPRESSION_FEATURE_COUNT = INVOCATION_EXPRESSION_FEATURE_COUNT + 2;
+    int OPERATOR_EXPRESSION_FEATURE_COUNT = INVOCATION_EXPRESSION_FEATURE_COUNT + 1;
 
     /**
      * The operation id for the '<em>Effective Name</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -43705,6 +44033,15 @@ public interface SysmlPackage extends EPackage {
      */
     int OPERATOR_EXPRESSION___DIRECTION_OF__FEATURE = INVOCATION_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int OPERATOR_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = INVOCATION_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -44491,15 +44828,6 @@ public interface SysmlPackage extends EPackage {
      */
     int COLLECT_EXPRESSION__OPERATOR = OPERATOR_EXPRESSION__OPERATOR;
 
-    /**
-     * The feature id for the '<em><b>Operand</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int COLLECT_EXPRESSION__OPERAND = OPERATOR_EXPRESSION__OPERAND;
-
     /**
      * The number of structural features of the '<em>Collect Expression</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -44637,6 +44965,15 @@ public interface SysmlPackage extends EPackage {
      */
     int COLLECT_EXPRESSION___DIRECTION_OF__FEATURE = OPERATOR_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int COLLECT_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OPERATOR_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -44928,6 +45265,15 @@ public interface SysmlPackage extends EPackage {
      */
     int COMMENT__ANNOTATION = ANNOTATING_ELEMENT__ANNOTATION;
 
+    /**
+     * The feature id for the '<em><b>Owned Annotating Relationship</b></em>' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int COMMENT__OWNED_ANNOTATING_RELATIONSHIP = ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP;
+
     /**
      * The feature id for the '<em><b>Body</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -45900,6 +46246,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONSTRAINT_DEFINITION___DIRECTION_OF__FEATURE = OCCURRENCE_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONSTRAINT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -46913,6 +47268,15 @@ public interface SysmlPackage extends EPackage {
      */
     int REQUIREMENT_DEFINITION___DIRECTION_OF__FEATURE = CONSTRAINT_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int REQUIREMENT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONSTRAINT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -47926,6 +48290,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONCERN_DEFINITION___DIRECTION_OF__FEATURE = REQUIREMENT_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONCERN_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = REQUIREMENT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -49207,6 +49580,15 @@ public interface SysmlPackage extends EPackage {
      */
     int REQUIREMENT_USAGE___DIRECTION_OF__FEATURE = CONSTRAINT_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int REQUIREMENT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONSTRAINT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -50570,6 +50952,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONCERN_USAGE___DIRECTION_OF__FEATURE = REQUIREMENT_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONCERN_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = REQUIREMENT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -51554,6 +51945,15 @@ public interface SysmlPackage extends EPackage {
      */
     int PORT_DEFINITION___DIRECTION_OF__FEATURE = OCCURRENCE_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int PORT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -52482,6 +52882,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONJUGATED_PORT_DEFINITION___DIRECTION_OF__FEATURE = PORT_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONJUGATED_PORT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = PORT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -54873,6 +55282,15 @@ public interface SysmlPackage extends EPackage {
      */
     int CONTROL_NODE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONTROL_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -55569,6 +55987,15 @@ public interface SysmlPackage extends EPackage {
      */
     int DATA_TYPE___DIRECTION_OF__FEATURE = CLASSIFIER___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DATA_TYPE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CLASSIFIER___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -56737,6 +57164,15 @@ public interface SysmlPackage extends EPackage {
      */
     int DECISION_NODE___DIRECTION_OF__FEATURE = CONTROL_NODE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DECISION_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONTROL_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -57896,6 +58332,15 @@ public interface SysmlPackage extends EPackage {
      */
     int DOCUMENTATION__ANNOTATION = COMMENT__ANNOTATION;
 
+    /**
+     * The feature id for the '<em><b>Owned Annotating Relationship</b></em>' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DOCUMENTATION__OWNED_ANNOTATING_RELATIONSHIP = COMMENT__OWNED_ANNOTATING_RELATIONSHIP;
+
     /**
      * The feature id for the '<em><b>Body</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -59595,6 +60040,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ENUMERATION_DEFINITION___DIRECTION_OF__FEATURE = ATTRIBUTE_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ENUMERATION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ATTRIBUTE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -60723,6 +61177,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ENUMERATION_USAGE___DIRECTION_OF__FEATURE = ATTRIBUTE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ENUMERATION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ATTRIBUTE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -61924,6 +62387,15 @@ public interface SysmlPackage extends EPackage {
      */
     int EVENT_OCCURRENCE_USAGE___DIRECTION_OF__FEATURE = OCCURRENCE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int EVENT_OCCURRENCE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -63183,6 +63655,15 @@ public interface SysmlPackage extends EPackage {
      */
     int STATE_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int STATE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -64507,6 +64988,15 @@ public interface SysmlPackage extends EPackage {
      */
     int EXHIBIT_STATE_USAGE___DIRECTION_OF__FEATURE = STATE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int EXHIBIT_STATE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = STATE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -65936,15 +66426,6 @@ public interface SysmlPackage extends EPackage {
      */
     int FEATURE_CHAIN_EXPRESSION__OPERATOR = OPERATOR_EXPRESSION__OPERATOR;
 
-    /**
-     * The feature id for the '<em><b>Operand</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FEATURE_CHAIN_EXPRESSION__OPERAND = OPERATOR_EXPRESSION__OPERAND;
-
     /**
      * The feature id for the '<em><b>Target Feature</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -66090,6 +66571,15 @@ public interface SysmlPackage extends EPackage {
      */
     int FEATURE_CHAIN_EXPRESSION___DIRECTION_OF__FEATURE = OPERATOR_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FEATURE_CHAIN_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OPERATOR_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -67587,6 +68077,15 @@ public interface SysmlPackage extends EPackage {
      */
     int FEATURE_REFERENCE_EXPRESSION___DIRECTION_OF__FEATURE = EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FEATURE_REFERENCE_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -69357,6 +69856,15 @@ public interface SysmlPackage extends EPackage {
      */
     int FLOW_CONNECTION_DEFINITION___DIRECTION_OF__FEATURE = CONNECTION_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FLOW_CONNECTION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -70381,14 +70889,6 @@ public interface SysmlPackage extends EPackage {
      */
     int FLOW_CONNECTION_USAGE__TARGET = CONNECTION_USAGE__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FLOW_CONNECTION_USAGE__IS_DIRECTED = CONNECTION_USAGE__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -70717,6 +71217,15 @@ public interface SysmlPackage extends EPackage {
      */
     int FLOW_CONNECTION_USAGE___DIRECTION_OF__FEATURE = CONNECTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FLOW_CONNECTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -71967,6 +72476,15 @@ public interface SysmlPackage extends EPackage {
      */
     int FORK_NODE___DIRECTION_OF__FEATURE = CONTROL_NODE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FORK_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONTROL_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -73233,6 +73751,15 @@ public interface SysmlPackage extends EPackage {
      */
     int LOOP_ACTION_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LOOP_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -74506,6 +75033,15 @@ public interface SysmlPackage extends EPackage {
      */
     int FOR_LOOP_ACTION_USAGE___DIRECTION_OF__FEATURE = LOOP_ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FOR_LOOP_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = LOOP_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -76093,6 +76629,15 @@ public interface SysmlPackage extends EPackage {
      */
     int FUNCTION___DIRECTION_OF__FEATURE = BEHAVIOR___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FUNCTION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = BEHAVIOR___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -77285,6 +77830,15 @@ public interface SysmlPackage extends EPackage {
      */
     int IF_ACTION_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int IF_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -78621,6 +79175,15 @@ public interface SysmlPackage extends EPackage {
      */
     int USE_CASE_USAGE___DIRECTION_OF__FEATURE = CASE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int USE_CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -80009,6 +80572,15 @@ public interface SysmlPackage extends EPackage {
      */
     int INCLUDE_USE_CASE_USAGE___DIRECTION_OF__FEATURE = USE_CASE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int INCLUDE_USE_CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = USE_CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -80824,6 +81396,15 @@ public interface SysmlPackage extends EPackage {
      */
     int INTERACTION___DIRECTION_OF__FEATURE = ASSOCIATION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int INTERACTION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ASSOCIATION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -81829,6 +82410,15 @@ public interface SysmlPackage extends EPackage {
      */
     int INTERFACE_DEFINITION___DIRECTION_OF__FEATURE = CONNECTION_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int INTERFACE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -82853,14 +83443,6 @@ public interface SysmlPackage extends EPackage {
      */
     int INTERFACE_USAGE__TARGET = CONNECTION_USAGE__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int INTERFACE_USAGE__IS_DIRECTED = CONNECTION_USAGE__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -83112,6 +83694,15 @@ public interface SysmlPackage extends EPackage {
      */
     int INTERFACE_USAGE___DIRECTION_OF__FEATURE = CONNECTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int INTERFACE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -84292,6 +84883,15 @@ public interface SysmlPackage extends EPackage {
      */
     int INVARIANT___DIRECTION_OF__FEATURE = BOOLEAN_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int INVARIANT___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = BOOLEAN_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -85157,6 +85757,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ITEM_FEATURE___DIRECTION_OF__FEATURE = FEATURE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ITEM_FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -85911,14 +86520,6 @@ public interface SysmlPackage extends EPackage {
      */
     int ITEM_FLOW__TARGET = CONNECTOR__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int ITEM_FLOW__IS_DIRECTED = CONNECTOR__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -86168,6 +86769,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ITEM_FLOW___DIRECTION_OF__FEATURE = CONNECTOR___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ITEM_FLOW___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTOR___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -87008,6 +87618,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ITEM_FLOW_END___DIRECTION_OF__FEATURE = FEATURE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ITEM_FLOW_END___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -88209,6 +88828,15 @@ public interface SysmlPackage extends EPackage {
      */
     int ITEM_USAGE___DIRECTION_OF__FEATURE = OCCURRENCE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ITEM_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -89426,6 +90054,15 @@ public interface SysmlPackage extends EPackage {
      */
     int JOIN_NODE___DIRECTION_OF__FEATURE = CONTROL_NODE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int JOIN_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONTROL_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -90855,6 +91492,15 @@ public interface SysmlPackage extends EPackage {
      */
     int LIFE_CLASS___DIRECTION_OF__FEATURE = CLASS___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LIFE_CLASS___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CLASS___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -91687,6 +92333,15 @@ public interface SysmlPackage extends EPackage {
      */
     int LITERAL_EXPRESSION___DIRECTION_OF__FEATURE = EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LITERAL_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -92602,6 +93257,15 @@ public interface SysmlPackage extends EPackage {
      */
     int LITERAL_BOOLEAN___DIRECTION_OF__FEATURE = LITERAL_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LITERAL_BOOLEAN___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = LITERAL_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -93508,6 +94172,15 @@ public interface SysmlPackage extends EPackage {
      */
     int LITERAL_INFINITY___DIRECTION_OF__FEATURE = LITERAL_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LITERAL_INFINITY___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = LITERAL_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -94422,6 +95095,15 @@ public interface SysmlPackage extends EPackage {
      */
     int LITERAL_INTEGER___DIRECTION_OF__FEATURE = LITERAL_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LITERAL_INTEGER___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = LITERAL_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -95336,6 +96018,15 @@ public interface SysmlPackage extends EPackage {
      */
     int LITERAL_RATIONAL___DIRECTION_OF__FEATURE = LITERAL_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LITERAL_RATIONAL___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = LITERAL_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -96250,6 +96941,15 @@ public interface SysmlPackage extends EPackage {
      */
     int LITERAL_STRING___DIRECTION_OF__FEATURE = LITERAL_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LITERAL_STRING___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = LITERAL_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -98140,6 +98840,15 @@ public interface SysmlPackage extends EPackage {
      */
     int MERGE_NODE___DIRECTION_OF__FEATURE = CONTROL_NODE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int MERGE_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONTROL_NODE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -98836,6 +99545,15 @@ public interface SysmlPackage extends EPackage {
      */
     int STRUCTURE___DIRECTION_OF__FEATURE = CLASS___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int STRUCTURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CLASS___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -99442,6 +100160,15 @@ public interface SysmlPackage extends EPackage {
      */
     int METACLASS___DIRECTION_OF__FEATURE = STRUCTURE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int METACLASS___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = STRUCTURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -100283,6 +101010,15 @@ public interface SysmlPackage extends EPackage {
      */
     int METADATA_ACCESS_EXPRESSION___DIRECTION_OF__FEATURE = EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int METADATA_ACCESS_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -101267,6 +102003,15 @@ public interface SysmlPackage extends EPackage {
      */
     int METADATA_DEFINITION___DIRECTION_OF__FEATURE = ITEM_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int METADATA_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ITEM_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -101939,13 +102684,22 @@ public interface SysmlPackage extends EPackage {
      */
     int METADATA_FEATURE__ANNOTATION = FEATURE_FEATURE_COUNT + 1;
 
+    /**
+     * The feature id for the '<em><b>Owned Annotating Relationship</b></em>' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int METADATA_FEATURE__OWNED_ANNOTATING_RELATIONSHIP = FEATURE_FEATURE_COUNT + 2;
+
     /**
      * The feature id for the '<em><b>Metaclass</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int METADATA_FEATURE__METACLASS = FEATURE_FEATURE_COUNT + 2;
+    int METADATA_FEATURE__METACLASS = FEATURE_FEATURE_COUNT + 3;
 
     /**
      * The number of structural features of the '<em>Metadata Feature</em>' class. <!-- begin-user-doc --> <!--
@@ -101954,7 +102708,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int METADATA_FEATURE_FEATURE_COUNT = FEATURE_FEATURE_COUNT + 3;
+    int METADATA_FEATURE_FEATURE_COUNT = FEATURE_FEATURE_COUNT + 4;
 
     /**
      * The operation id for the '<em>Effective Name</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -102084,6 +102838,15 @@ public interface SysmlPackage extends EPackage {
      */
     int METADATA_FEATURE___DIRECTION_OF__FEATURE = FEATURE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int METADATA_FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -103197,13 +103960,22 @@ public interface SysmlPackage extends EPackage {
      */
     int METADATA_USAGE__ANNOTATION = ITEM_USAGE_FEATURE_COUNT + 1;
 
+    /**
+     * The feature id for the '<em><b>Owned Annotating Relationship</b></em>' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int METADATA_USAGE__OWNED_ANNOTATING_RELATIONSHIP = ITEM_USAGE_FEATURE_COUNT + 2;
+
     /**
      * The feature id for the '<em><b>Metaclass</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int METADATA_USAGE__METACLASS = ITEM_USAGE_FEATURE_COUNT + 2;
+    int METADATA_USAGE__METACLASS = ITEM_USAGE_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Metadata Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
@@ -103212,7 +103984,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int METADATA_USAGE__METADATA_DEFINITION = ITEM_USAGE_FEATURE_COUNT + 3;
+    int METADATA_USAGE__METADATA_DEFINITION = ITEM_USAGE_FEATURE_COUNT + 4;
 
     /**
      * The number of structural features of the '<em>Metadata Usage</em>' class. <!-- begin-user-doc --> <!--
@@ -103221,7 +103993,7 @@ public interface SysmlPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int METADATA_USAGE_FEATURE_COUNT = ITEM_USAGE_FEATURE_COUNT + 4;
+    int METADATA_USAGE_FEATURE_COUNT = ITEM_USAGE_FEATURE_COUNT + 5;
 
     /**
      * The operation id for the '<em>Effective Name</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -103351,6 +104123,15 @@ public interface SysmlPackage extends EPackage {
      */
     int METADATA_USAGE___DIRECTION_OF__FEATURE = ITEM_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int METADATA_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ITEM_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -104223,6 +105004,15 @@ public interface SysmlPackage extends EPackage {
      */
     int MULTIPLICITY___DIRECTION_OF__FEATURE = FEATURE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int MULTIPLICITY___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FEATURE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -105087,6 +105877,15 @@ public interface SysmlPackage extends EPackage {
      */
     int MULTIPLICITY_RANGE___DIRECTION_OF__FEATURE = MULTIPLICITY___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int MULTIPLICITY_RANGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = MULTIPLICITY___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -106633,6 +107432,15 @@ public interface SysmlPackage extends EPackage {
      */
     int NULL_EXPRESSION___DIRECTION_OF__FEATURE = EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int NULL_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -108272,6 +109080,15 @@ public interface SysmlPackage extends EPackage {
      */
     int PART_USAGE___DIRECTION_OF__FEATURE = ITEM_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int PART_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ITEM_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -109507,6 +110324,15 @@ public interface SysmlPackage extends EPackage {
      */
     int PERFORM_ACTION_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int PERFORM_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -111048,6 +111874,15 @@ public interface SysmlPackage extends EPackage {
      */
     int PORT_USAGE___DIRECTION_OF__FEATURE = OCCURRENCE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int PORT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OCCURRENCE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -111744,6 +112579,15 @@ public interface SysmlPackage extends EPackage {
      */
     int PREDICATE___DIRECTION_OF__FEATURE = FUNCTION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int PREDICATE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FUNCTION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -113835,6 +114679,15 @@ public interface SysmlPackage extends EPackage {
      */
     int REFERENCE_USAGE___DIRECTION_OF__FEATURE = USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int REFERENCE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -114793,6 +115646,15 @@ public interface SysmlPackage extends EPackage {
      */
     int RENDERING_DEFINITION___DIRECTION_OF__FEATURE = PART_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RENDERING_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = PART_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -115964,6 +116826,15 @@ public interface SysmlPackage extends EPackage {
      */
     int RENDERING_USAGE___DIRECTION_OF__FEATURE = PART_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RENDERING_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = PART_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -117285,6 +118156,14 @@ public interface SysmlPackage extends EPackage {
      */
     int RETURN_PARAMETER_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP = PARAMETER_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP;
 
+    /**
+     * The operation id for the '<em>Parameter Direction</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RETURN_PARAMETER_MEMBERSHIP___PARAMETER_DIRECTION = PARAMETER_MEMBERSHIP___PARAMETER_DIRECTION;
+
     /**
      * The number of operations of the '<em>Return Parameter Membership</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -118575,6 +119454,15 @@ public interface SysmlPackage extends EPackage {
      */
     int SATISFY_REQUIREMENT_USAGE___DIRECTION_OF__FEATURE = REQUIREMENT_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SATISFY_REQUIREMENT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = REQUIREMENT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -119361,15 +120249,6 @@ public interface SysmlPackage extends EPackage {
      */
     int SELECT_EXPRESSION__OPERATOR = OPERATOR_EXPRESSION__OPERATOR;
 
-    /**
-     * The feature id for the '<em><b>Operand</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int SELECT_EXPRESSION__OPERAND = OPERATOR_EXPRESSION__OPERAND;
-
     /**
      * The number of structural features of the '<em>Select Expression</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -119507,6 +120386,15 @@ public interface SysmlPackage extends EPackage {
      */
     int SELECT_EXPRESSION___DIRECTION_OF__FEATURE = OPERATOR_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = OPERATOR_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -120775,6 +121663,15 @@ public interface SysmlPackage extends EPackage {
      */
     int SEND_ACTION_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SEND_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -121294,6 +122191,14 @@ public interface SysmlPackage extends EPackage {
      */
     int STAKEHOLDER_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP = PARAMETER_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP;
 
+    /**
+     * The operation id for the '<em>Parameter Direction</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int STAKEHOLDER_MEMBERSHIP___PARAMETER_DIRECTION = PARAMETER_MEMBERSHIP___PARAMETER_DIRECTION;
+
     /**
      * The number of operations of the '<em>Stakeholder Membership</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -122234,6 +123139,15 @@ public interface SysmlPackage extends EPackage {
      */
     int STATE_DEFINITION___DIRECTION_OF__FEATURE = ACTION_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int STATE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -123397,6 +124311,14 @@ public interface SysmlPackage extends EPackage {
      */
     int SUBJECT_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP = PARAMETER_MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP;
 
+    /**
+     * The operation id for the '<em>Parameter Direction</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SUBJECT_MEMBERSHIP___PARAMETER_DIRECTION = PARAMETER_MEMBERSHIP___PARAMETER_DIRECTION;
+
     /**
      * The number of operations of the '<em>Subject Membership</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -124077,14 +124999,6 @@ public interface SysmlPackage extends EPackage {
      */
     int SUCCESSION__TARGET = CONNECTOR__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int SUCCESSION__IS_DIRECTED = CONNECTOR__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -124301,6 +125215,15 @@ public interface SysmlPackage extends EPackage {
      */
     int SUCCESSION___DIRECTION_OF__FEATURE = CONNECTOR___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SUCCESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTOR___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -125373,14 +126296,6 @@ public interface SysmlPackage extends EPackage {
      */
     int SUCCESSION_AS_USAGE__TARGET = CONNECTOR_AS_USAGE__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int SUCCESSION_AS_USAGE__IS_DIRECTED = CONNECTOR_AS_USAGE__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -125597,6 +126512,15 @@ public interface SysmlPackage extends EPackage {
      */
     int SUCCESSION_AS_USAGE___DIRECTION_OF__FEATURE = CONNECTOR_AS_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SUCCESSION_AS_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CONNECTOR_AS_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -126670,14 +127594,6 @@ public interface SysmlPackage extends EPackage {
      */
     int SUCCESSION_FLOW_CONNECTION_USAGE__TARGET = FLOW_CONNECTION_USAGE__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int SUCCESSION_FLOW_CONNECTION_USAGE__IS_DIRECTED = FLOW_CONNECTION_USAGE__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -127041,6 +127957,15 @@ public interface SysmlPackage extends EPackage {
      */
     int SUCCESSION_FLOW_CONNECTION_USAGE___DIRECTION_OF__FEATURE = FLOW_CONNECTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SUCCESSION_FLOW_CONNECTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = FLOW_CONNECTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -127828,14 +128753,6 @@ public interface SysmlPackage extends EPackage {
      */
     int SUCCESSION_ITEM_FLOW__TARGET = ITEM_FLOW__TARGET;
 
-    /**
-     * The feature id for the '<em><b>Is Directed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int SUCCESSION_ITEM_FLOW__IS_DIRECTED = ITEM_FLOW__IS_DIRECTED;
-
     /**
      * The feature id for the '<em><b>Association</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -128120,6 +129037,15 @@ public interface SysmlPackage extends EPackage {
      */
     int SUCCESSION_ITEM_FLOW___DIRECTION_OF__FEATURE = ITEM_FLOW___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SUCCESSION_ITEM_FLOW___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ITEM_FLOW___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -128386,6 +129312,15 @@ public interface SysmlPackage extends EPackage {
      */
     int TEXTUAL_REPRESENTATION__ANNOTATION = ANNOTATING_ELEMENT__ANNOTATION;
 
+    /**
+     * The feature id for the '<em><b>Owned Annotating Relationship</b></em>' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXTUAL_REPRESENTATION__OWNED_ANNOTATING_RELATIONSHIP = ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP;
+
     /**
      * The feature id for the '<em><b>Body</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -130058,6 +130993,15 @@ public interface SysmlPackage extends EPackage {
      */
     int TRANSITION_USAGE___DIRECTION_OF__FEATURE = ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TRANSITION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -130996,6 +131940,15 @@ public interface SysmlPackage extends EPackage {
      */
     int TRIGGER_INVOCATION_EXPRESSION___DIRECTION_OF__FEATURE = INVOCATION_EXPRESSION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TRIGGER_INVOCATION_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = INVOCATION_EXPRESSION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -132652,6 +133605,15 @@ public interface SysmlPackage extends EPackage {
      */
     int USE_CASE_DEFINITION___DIRECTION_OF__FEATURE = CASE_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int USE_CASE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CASE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -134019,6 +134981,15 @@ public interface SysmlPackage extends EPackage {
      */
     int VERIFICATION_CASE_DEFINITION___DIRECTION_OF__FEATURE = CASE_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int VERIFICATION_CASE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CASE_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -135275,6 +136246,15 @@ public interface SysmlPackage extends EPackage {
      */
     int VERIFICATION_CASE_USAGE___DIRECTION_OF__FEATURE = CASE_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int VERIFICATION_CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = CASE_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -136317,6 +137297,15 @@ public interface SysmlPackage extends EPackage {
      */
     int VIEW_DEFINITION___DIRECTION_OF__FEATURE = PART_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int VIEW_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = PART_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -137338,6 +138327,15 @@ public interface SysmlPackage extends EPackage {
      */
     int VIEWPOINT_DEFINITION___DIRECTION_OF__FEATURE = REQUIREMENT_DEFINITION___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int VIEWPOINT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = REQUIREMENT_DEFINITION___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -138637,6 +139635,15 @@ public interface SysmlPackage extends EPackage {
      */
     int VIEWPOINT_USAGE___DIRECTION_OF__FEATURE = REQUIREMENT_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int VIEWPOINT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = REQUIREMENT_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -140327,6 +141334,15 @@ public interface SysmlPackage extends EPackage {
      */
     int VIEW_USAGE___DIRECTION_OF__FEATURE = PART_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int VIEW_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = PART_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -141576,6 +142592,15 @@ public interface SysmlPackage extends EPackage {
      */
     int WHILE_LOOP_ACTION_USAGE___DIRECTION_OF__FEATURE = LOOP_ACTION_USAGE___DIRECTION_OF__FEATURE;
 
+    /**
+     * The operation id for the '<em>Direction Of Excluding</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WHILE_LOOP_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST = LOOP_ACTION_USAGE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST;
+
     /**
      * The operation id for the '<em>Inherited Memberships</em>' operation. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -142073,6 +143098,18 @@ public interface SysmlPackage extends EPackage {
      */
     EReference getAnnotatingElement_Annotation();
 
+    /**
+     * Returns the meta object for the reference list
+     * '{@link org.eclipse.syson.sysml.AnnotatingElement#getOwnedAnnotatingRelationship <em>Owned Annotating
+     * Relationship</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the reference list '<em>Owned Annotating Relationship</em>'.
+     * @see org.eclipse.syson.sysml.AnnotatingElement#getOwnedAnnotatingRelationship()
+     * @see #getAnnotatingElement()
+     * @generated
+     */
+    EReference getAnnotatingElement_OwnedAnnotatingRelationship();
+
     /**
      * Returns the meta object for class '{@link org.eclipse.syson.sysml.Annotation <em>Annotation</em>}'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -142116,6 +143153,17 @@ public interface SysmlPackage extends EPackage {
      */
     EReference getAnnotation_OwningAnnotatedElement();
 
+    /**
+     * Returns the meta object for the reference '{@link org.eclipse.syson.sysml.Annotation#getOwningAnnotatingElement
+     * <em>Owning Annotating Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the reference '<em>Owning Annotating Element</em>'.
+     * @see org.eclipse.syson.sysml.Annotation#getOwningAnnotatingElement()
+     * @see #getAnnotation()
+     * @generated
+     */
+    EReference getAnnotation_OwningAnnotatingElement();
+
     /**
      * Returns the meta object for class '{@link org.eclipse.syson.sysml.AssertConstraintUsage <em>Assert Constraint
      * Usage</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -142783,17 +143831,6 @@ public interface SysmlPackage extends EPackage {
      */
     EReference getConnector_ConnectorEnd();
 
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.syson.sysml.Connector#isIsDirected <em>Is
-     * Directed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the meta object for the attribute '<em>Is Directed</em>'.
-     * @see org.eclipse.syson.sysml.Connector#isIsDirected()
-     * @see #getConnector()
-     * @generated
-     */
-    EAttribute getConnector_IsDirected();
-
     /**
      * Returns the meta object for the reference list '{@link org.eclipse.syson.sysml.Connector#getRelatedFeature
      * <em>Related Feature</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -145856,18 +146893,6 @@ public interface SysmlPackage extends EPackage {
      */
     EClass getOperatorExpression();
 
-    /**
-     * Returns the meta object for the containment reference list
-     * '{@link org.eclipse.syson.sysml.OperatorExpression#getOperand <em>Operand</em>}'. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @return the meta object for the containment reference list '<em>Operand</em>'.
-     * @see org.eclipse.syson.sysml.OperatorExpression#getOperand()
-     * @see #getOperatorExpression()
-     * @generated
-     */
-    EReference getOperatorExpression_Operand();
-
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.syson.sysml.OperatorExpression#getOperator
      * <em>Operator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -145989,6 +147014,16 @@ public interface SysmlPackage extends EPackage {
      */
     EReference getParameterMembership_OwnedMemberParameter();
 
+    /**
+     * Returns the meta object for the '{@link org.eclipse.syson.sysml.ParameterMembership#parameterDirection()
+     * <em>Parameter Direction</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the '<em>Parameter Direction</em>' operation.
+     * @see org.eclipse.syson.sysml.ParameterMembership#parameterDirection()
+     * @generated
+     */
+    EOperation getParameterMembership__ParameterDirection();
+
     /**
      * Returns the meta object for class '{@link org.eclipse.syson.sysml.PartDefinition <em>Part Definition</em>}'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -147688,6 +148723,18 @@ public interface SysmlPackage extends EPackage {
      */
     EOperation getType__DirectionOf__Feature();
 
+    /**
+     * Returns the meta object for the
+     * '{@link org.eclipse.syson.sysml.Type#directionOfExcluding(org.eclipse.syson.sysml.Feature, org.eclipse.emf.common.util.EList)
+     * <em>Direction Of Excluding</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the '<em>Direction Of Excluding</em>' operation.
+     * @see org.eclipse.syson.sysml.Type#directionOfExcluding(org.eclipse.syson.sysml.Feature,
+     *      org.eclipse.emf.common.util.EList)
+     * @generated
+     */
+    EOperation getType__DirectionOfExcluding__Feature_EList();
+
     /**
      * Returns the meta object for the
      * '{@link org.eclipse.syson.sysml.Type#inheritedMemberships(org.eclipse.emf.common.util.EList) <em>Inherited
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Type.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Type.java
index 78e8ee7fe..440542335 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Type.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/Type.java
@@ -389,6 +389,14 @@ public interface Type extends Namespace {
      */
     FeatureDirectionKind directionOf(Feature feature);
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @model ordered="false" featureRequired="true" featureOrdered="false" excludedMany="true" excludedOrdered="false"
+     * @generated
+     */
+    FeatureDirectionKind directionOfExcluding(Feature feature, EList<Type> excluded);
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ActorMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ActorMembershipImpl.java
index 65c46a462..758aabad1 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ActorMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ActorMembershipImpl.java
@@ -85,9 +85,8 @@ public PartUsage basicGetOwnedActorParameter() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.ACTOR_MEMBERSHIP__OWNED_ACTOR_PARAMETER:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedActorParameter();
-                }
                 return this.basicGetOwnedActorParameter();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnalysisCaseUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnalysisCaseUsageImpl.java
index ca93a2933..3e02158d6 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnalysisCaseUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnalysisCaseUsageImpl.java
@@ -130,14 +130,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.ANALYSIS_CASE_USAGE__ANALYSIS_ACTION:
                 return this.getAnalysisAction();
             case SysmlPackage.ANALYSIS_CASE_USAGE__ANALYSIS_CASE_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getAnalysisCaseDefinition();
-                }
                 return this.basicGetAnalysisCaseDefinition();
             case SysmlPackage.ANALYSIS_CASE_USAGE__RESULT_EXPRESSION:
-                if (resolve) {
+                if (resolve)
                     return this.getResultExpression();
-                }
                 return this.basicGetResultExpression();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnnotatingElementImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnnotatingElementImpl.java
index f955e4e8f..411674049 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnnotatingElementImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnnotatingElementImpl.java
@@ -12,6 +12,7 @@
 *******************************************************************************/
 package org.eclipse.syson.sysml.impl;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -111,6 +112,17 @@ public EList<Annotation> getAnnotation() {
         return this.annotation;
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated NOT
+     */
+    @Override
+    public EList<Annotation> getOwnedAnnotatingRelationship() {
+        List<Annotation> data = new ArrayList<>();
+        return new EcoreEList.UnmodifiableEList<>(this, SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(), data.size(), data.toArray());
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -152,6 +164,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 return this.getAnnotatedElement();
             case SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION:
                 return this.getAnnotation();
+            case SysmlPackage.ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP:
+                return this.getOwnedAnnotatingRelationship();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -200,6 +214,8 @@ public boolean eIsSet(int featureID) {
                 return !this.getAnnotatedElement().isEmpty();
             case SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION:
                 return this.annotation != null && !this.annotation.isEmpty();
+            case SysmlPackage.ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP:
+                return !this.getOwnedAnnotatingRelationship().isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnnotationImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnnotationImpl.java
index 6b780ade3..bd7d691b7 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnnotationImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AnnotationImpl.java
@@ -37,6 +37,8 @@
  * <li>{@link org.eclipse.syson.sysml.impl.AnnotationImpl#getAnnotatingElement <em>Annotating Element</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.AnnotationImpl#getOwningAnnotatedElement <em>Owning Annotated
  * Element</em>}</li>
+ * <li>{@link org.eclipse.syson.sysml.impl.AnnotationImpl#getOwningAnnotatingElement <em>Owning Annotating
+ * Element</em>}</li>
  * </ul>
  *
  * @generated
@@ -92,9 +94,8 @@ public Element getAnnotatedElement() {
             InternalEObject oldAnnotatedElement = (InternalEObject) this.annotatedElement;
             this.annotatedElement = (Element) this.eResolveProxy(oldAnnotatedElement);
             if (this.annotatedElement != oldAnnotatedElement) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.ANNOTATION__ANNOTATED_ELEMENT, oldAnnotatedElement, this.annotatedElement));
-                }
             }
         }
         return this.annotatedElement;
@@ -118,9 +119,8 @@ public Element basicGetAnnotatedElement() {
     public void setAnnotatedElement(Element newAnnotatedElement) {
         Element oldAnnotatedElement = this.annotatedElement;
         this.annotatedElement = newAnnotatedElement;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ANNOTATION__ANNOTATED_ELEMENT, oldAnnotatedElement, this.annotatedElement));
-        }
     }
 
     /**
@@ -134,9 +134,8 @@ public AnnotatingElement getAnnotatingElement() {
             InternalEObject oldAnnotatingElement = (InternalEObject) this.annotatingElement;
             this.annotatingElement = (AnnotatingElement) this.eResolveProxy(oldAnnotatingElement);
             if (this.annotatingElement != oldAnnotatingElement) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT, oldAnnotatingElement, this.annotatingElement));
-                }
             }
         }
         return this.annotatingElement;
@@ -161,11 +160,10 @@ public NotificationChain basicSetAnnotatingElement(AnnotatingElement newAnnotati
         this.annotatingElement = newAnnotatingElement;
         if (this.eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT, oldAnnotatingElement, newAnnotatingElement);
-            if (msgs == null) {
+            if (msgs == null)
                 msgs = notification;
-            } else {
+            else
                 msgs.add(notification);
-            }
         }
         return msgs;
     }
@@ -179,19 +177,15 @@ public NotificationChain basicSetAnnotatingElement(AnnotatingElement newAnnotati
     public void setAnnotatingElement(AnnotatingElement newAnnotatingElement) {
         if (newAnnotatingElement != this.annotatingElement) {
             NotificationChain msgs = null;
-            if (this.annotatingElement != null) {
+            if (this.annotatingElement != null)
                 msgs = ((InternalEObject) this.annotatingElement).eInverseRemove(this, SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION, AnnotatingElement.class, msgs);
-            }
-            if (newAnnotatingElement != null) {
+            if (newAnnotatingElement != null)
                 msgs = ((InternalEObject) newAnnotatingElement).eInverseAdd(this, SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION, AnnotatingElement.class, msgs);
-            }
             msgs = this.basicSetAnnotatingElement(newAnnotatingElement, msgs);
-            if (msgs != null) {
+            if (msgs != null)
                 msgs.dispatch();
-            }
-        } else if (this.eNotificationRequired()) {
+        } else if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT, newAnnotatingElement, newAnnotatingElement));
-        }
     }
 
     /**
@@ -217,6 +211,29 @@ public Element basicGetOwningAnnotatedElement() {
         return null;
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public AnnotatingElement getOwningAnnotatingElement() {
+        AnnotatingElement owningAnnotatingElement = this.basicGetOwningAnnotatingElement();
+        return owningAnnotatingElement != null && owningAnnotatingElement.eIsProxy() ? (AnnotatingElement) this.eResolveProxy((InternalEObject) owningAnnotatingElement) : owningAnnotatingElement;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public AnnotatingElement basicGetOwningAnnotatingElement() {
+        // TODO: implement this method to return the 'Owning Annotating Element' reference
+        // -> do not perform proxy resolution
+        // Ensure that you remove @generated or mark it @generated NOT
+        return null;
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -226,9 +243,8 @@ public Element basicGetOwningAnnotatedElement() {
     public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
             case SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT:
-                if (this.annotatingElement != null) {
+                if (this.annotatingElement != null)
                     msgs = ((InternalEObject) this.annotatingElement).eInverseRemove(this, SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION, AnnotatingElement.class, msgs);
-                }
                 return this.basicSetAnnotatingElement((AnnotatingElement) otherEnd, msgs);
         }
         return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -257,20 +273,21 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.ANNOTATION__ANNOTATED_ELEMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getAnnotatedElement();
-                }
                 return this.basicGetAnnotatedElement();
             case SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getAnnotatingElement();
-                }
                 return this.basicGetAnnotatingElement();
             case SysmlPackage.ANNOTATION__OWNING_ANNOTATED_ELEMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningAnnotatedElement();
-                }
                 return this.basicGetOwningAnnotatedElement();
+            case SysmlPackage.ANNOTATION__OWNING_ANNOTATING_ELEMENT:
+                if (resolve)
+                    return this.getOwningAnnotatingElement();
+                return this.basicGetOwningAnnotatingElement();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -325,6 +342,8 @@ public boolean eIsSet(int featureID) {
                 return this.annotatingElement != null;
             case SysmlPackage.ANNOTATION__OWNING_ANNOTATED_ELEMENT:
                 return this.basicGetOwningAnnotatedElement() != null;
+            case SysmlPackage.ANNOTATION__OWNING_ANNOTATING_ELEMENT:
+                return this.basicGetOwningAnnotatingElement() != null;
         }
         return super.eIsSet(featureID);
     }
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AssignmentActionUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AssignmentActionUsageImpl.java
index e1369f50d..25c49690c 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AssignmentActionUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AssignmentActionUsageImpl.java
@@ -139,8 +139,7 @@ public Expression getValueExpression() {
      *
      * <code>
      * valueExpression = argument(2)
-     * </code>
-     * <!-- end-user-doc -->
+     * </code> <!-- end-user-doc -->
      *
      * @generated NOT
      */
@@ -157,19 +156,16 @@ public Expression basicGetValueExpression() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.ASSIGNMENT_ACTION_USAGE__REFERENT:
-                if (resolve) {
+                if (resolve)
                     return this.getReferent();
-                }
                 return this.basicGetReferent();
             case SysmlPackage.ASSIGNMENT_ACTION_USAGE__TARGET_ARGUMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getTargetArgument();
-                }
                 return this.basicGetTargetArgument();
             case SysmlPackage.ASSIGNMENT_ACTION_USAGE__VALUE_EXPRESSION:
-                if (resolve) {
+                if (resolve)
                     return this.getValueExpression();
-                }
                 return this.basicGetValueExpression();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AssociationImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AssociationImpl.java
index f0892bd5b..30d6528f3 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AssociationImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AssociationImpl.java
@@ -144,9 +144,8 @@ public boolean isIsImplied() {
     public void setIsImplied(boolean newIsImplied) {
         boolean oldIsImplied = this.isImplied;
         this.isImplied = newIsImplied;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ASSOCIATION__IS_IMPLIED, oldIsImplied, this.isImplied));
-        }
     }
 
     /**
@@ -169,9 +168,8 @@ public EList<Element> getOwnedRelatedElement() {
      */
     @Override
     public Element getOwningRelatedElement() {
-        if (this.eContainerFeatureID() != SysmlPackage.ASSOCIATION__OWNING_RELATED_ELEMENT) {
+        if (this.eContainerFeatureID() != SysmlPackage.ASSOCIATION__OWNING_RELATED_ELEMENT)
             return null;
-        }
         return (Element) this.eInternalContainer();
     }
 
@@ -193,23 +191,18 @@ public NotificationChain basicSetOwningRelatedElement(Element newOwningRelatedEl
     @Override
     public void setOwningRelatedElement(Element newOwningRelatedElement) {
         if (newOwningRelatedElement != this.eInternalContainer() || (this.eContainerFeatureID() != SysmlPackage.ASSOCIATION__OWNING_RELATED_ELEMENT && newOwningRelatedElement != null)) {
-            if (EcoreUtil.isAncestor(this, newOwningRelatedElement)) {
+            if (EcoreUtil.isAncestor(this, newOwningRelatedElement))
                 throw new IllegalArgumentException("Recursive containment not allowed for " + this.toString());
-            }
             NotificationChain msgs = null;
-            if (this.eInternalContainer() != null) {
+            if (this.eInternalContainer() != null)
                 msgs = this.eBasicRemoveFromContainer(msgs);
-            }
-            if (newOwningRelatedElement != null) {
+            if (newOwningRelatedElement != null)
                 msgs = ((InternalEObject) newOwningRelatedElement).eInverseAdd(this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, Element.class, msgs);
-            }
             msgs = this.basicSetOwningRelatedElement(newOwningRelatedElement, msgs);
-            if (msgs != null) {
+            if (msgs != null)
                 msgs.dispatch();
-            }
-        } else if (this.eNotificationRequired()) {
+        } else if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ASSOCIATION__OWNING_RELATED_ELEMENT, newOwningRelatedElement, newOwningRelatedElement));
-        }
     }
 
     /**
@@ -280,9 +273,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
             case SysmlPackage.ASSOCIATION__OWNED_RELATED_ELEMENT:
                 return ((InternalEList<InternalEObject>) (InternalEList<?>) this.getOwnedRelatedElement()).basicAdd(otherEnd, msgs);
             case SysmlPackage.ASSOCIATION__OWNING_RELATED_ELEMENT:
-                if (this.eInternalContainer() != null) {
+                if (this.eInternalContainer() != null)
                     msgs = this.eBasicRemoveFromContainer(msgs);
-                }
                 return this.basicSetOwningRelatedElement((Element) otherEnd, msgs);
         }
         return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -343,9 +335,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.ASSOCIATION__RELATED_TYPE:
                 return this.getRelatedType();
             case SysmlPackage.ASSOCIATION__SOURCE_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getSourceType();
-                }
                 return this.basicGetSourceType();
             case SysmlPackage.ASSOCIATION__TARGET_TYPE:
                 return this.getTargetType();
@@ -506,9 +497,8 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isImplied: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/BooleanExpressionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/BooleanExpressionImpl.java
index db4464c62..2663ca97e 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/BooleanExpressionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/BooleanExpressionImpl.java
@@ -83,9 +83,8 @@ public Predicate basicGetPredicate() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.BOOLEAN_EXPRESSION__PREDICATE:
-                if (resolve) {
+                if (resolve)
                     return this.getPredicate();
-                }
                 return this.basicGetPredicate();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationUsageImpl.java
index 64d711e9c..2837d282b 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationUsageImpl.java
@@ -193,19 +193,16 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.CALCULATION_USAGE__IS_MODEL_LEVEL_EVALUABLE:
                 return this.isIsModelLevelEvaluable();
             case SysmlPackage.CALCULATION_USAGE__FUNCTION:
-                if (resolve) {
+                if (resolve)
                     return this.getFunction();
-                }
                 return this.basicGetFunction();
             case SysmlPackage.CALCULATION_USAGE__RESULT:
-                if (resolve) {
+                if (resolve)
                     return this.getResult();
-                }
                 return this.basicGetResult();
             case SysmlPackage.CALCULATION_USAGE__CALCULATION_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getCalculationDefinition();
-                }
                 return this.basicGetCalculationDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CaseUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CaseUsageImpl.java
index 626c9944f..be3f71981 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CaseUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CaseUsageImpl.java
@@ -158,19 +158,16 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.CASE_USAGE__ACTOR_PARAMETER:
                 return this.getActorParameter();
             case SysmlPackage.CASE_USAGE__CASE_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getCaseDefinition();
-                }
                 return this.basicGetCaseDefinition();
             case SysmlPackage.CASE_USAGE__OBJECTIVE_REQUIREMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getObjectiveRequirement();
-                }
                 return this.basicGetObjectiveRequirement();
             case SysmlPackage.CASE_USAGE__SUBJECT_PARAMETER:
-                if (resolve) {
+                if (resolve)
                     return this.getSubjectParameter();
-                }
                 return this.basicGetSubjectParameter();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConcernUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConcernUsageImpl.java
index e0d1fe9d8..0ff2d2c07 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConcernUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConcernUsageImpl.java
@@ -82,9 +82,8 @@ public ConcernDefinition basicGetConcernDefinition() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.CONCERN_USAGE__CONCERN_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getConcernDefinition();
-                }
                 return this.basicGetConcernDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortDefinitionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortDefinitionImpl.java
index f81b84c7d..1fe52eed2 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortDefinitionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortDefinitionImpl.java
@@ -127,14 +127,12 @@ public String effectiveName() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.CONJUGATED_PORT_DEFINITION__ORIGINAL_PORT_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getOriginalPortDefinition();
-                }
                 return this.basicGetOriginalPortDefinition();
             case SysmlPackage.CONJUGATED_PORT_DEFINITION__OWNED_PORT_CONJUGATOR:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedPortConjugator();
-                }
                 return this.basicGetOwnedPortConjugator();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortTypingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortTypingImpl.java
index ec0343fed..991abc071 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortTypingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortTypingImpl.java
@@ -77,10 +77,9 @@ public ConjugatedPortDefinition getConjugatedPortDefinition() {
             InternalEObject oldConjugatedPortDefinition = (InternalEObject) this.conjugatedPortDefinition;
             this.conjugatedPortDefinition = (ConjugatedPortDefinition) this.eResolveProxy(oldConjugatedPortDefinition);
             if (this.conjugatedPortDefinition != oldConjugatedPortDefinition) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.CONJUGATED_PORT_TYPING__CONJUGATED_PORT_DEFINITION, oldConjugatedPortDefinition,
                             this.conjugatedPortDefinition));
-                }
             }
         }
         return this.conjugatedPortDefinition;
@@ -104,9 +103,8 @@ public ConjugatedPortDefinition basicGetConjugatedPortDefinition() {
     public void setConjugatedPortDefinition(ConjugatedPortDefinition newConjugatedPortDefinition) {
         ConjugatedPortDefinition oldConjugatedPortDefinition = this.conjugatedPortDefinition;
         this.conjugatedPortDefinition = newConjugatedPortDefinition;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONJUGATED_PORT_TYPING__CONJUGATED_PORT_DEFINITION, oldConjugatedPortDefinition, this.conjugatedPortDefinition));
-        }
     }
 
     /**
@@ -141,14 +139,12 @@ public PortDefinition basicGetPortDefinition() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.CONJUGATED_PORT_TYPING__CONJUGATED_PORT_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getConjugatedPortDefinition();
-                }
                 return this.basicGetConjugatedPortDefinition();
             case SysmlPackage.CONJUGATED_PORT_TYPING__PORT_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getPortDefinition();
-                }
                 return this.basicGetPortDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugationImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugationImpl.java
index a4840e206..73d7b3bca 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugationImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugationImpl.java
@@ -90,9 +90,8 @@ public Type getConjugatedType() {
             InternalEObject oldConjugatedType = (InternalEObject) this.conjugatedType;
             this.conjugatedType = (Type) this.eResolveProxy(oldConjugatedType);
             if (this.conjugatedType != oldConjugatedType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.CONJUGATION__CONJUGATED_TYPE, oldConjugatedType, this.conjugatedType));
-                }
             }
         }
         return this.conjugatedType;
@@ -116,9 +115,8 @@ public Type basicGetConjugatedType() {
     public void setConjugatedType(Type newConjugatedType) {
         Type oldConjugatedType = this.conjugatedType;
         this.conjugatedType = newConjugatedType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONJUGATION__CONJUGATED_TYPE, oldConjugatedType, this.conjugatedType));
-        }
     }
 
     /**
@@ -132,9 +130,8 @@ public Type getOriginalType() {
             InternalEObject oldOriginalType = (InternalEObject) this.originalType;
             this.originalType = (Type) this.eResolveProxy(oldOriginalType);
             if (this.originalType != oldOriginalType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.CONJUGATION__ORIGINAL_TYPE, oldOriginalType, this.originalType));
-                }
             }
         }
         return this.originalType;
@@ -158,9 +155,8 @@ public Type basicGetOriginalType() {
     public void setOriginalType(Type newOriginalType) {
         Type oldOriginalType = this.originalType;
         this.originalType = newOriginalType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONJUGATION__ORIGINAL_TYPE, oldOriginalType, this.originalType));
-        }
     }
 
     /**
@@ -195,19 +191,16 @@ public Type basicGetOwningType() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.CONJUGATION__CONJUGATED_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getConjugatedType();
-                }
                 return this.basicGetConjugatedType();
             case SysmlPackage.CONJUGATION__ORIGINAL_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getOriginalType();
-                }
                 return this.basicGetOriginalType();
             case SysmlPackage.CONJUGATION__OWNING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningType();
-                }
                 return this.basicGetOwningType();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionDefinitionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionDefinitionImpl.java
index c14300e6f..67ca145d0 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionDefinitionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionDefinitionImpl.java
@@ -152,9 +152,8 @@ public boolean isIsImplied() {
     public void setIsImplied(boolean newIsImplied) {
         boolean oldIsImplied = this.isImplied;
         this.isImplied = newIsImplied;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTION_DEFINITION__IS_IMPLIED, oldIsImplied, this.isImplied));
-        }
     }
 
     /**
@@ -178,9 +177,8 @@ public EList<Element> getOwnedRelatedElement() {
      */
     @Override
     public Element getOwningRelatedElement() {
-        if (this.eContainerFeatureID() != SysmlPackage.CONNECTION_DEFINITION__OWNING_RELATED_ELEMENT) {
+        if (this.eContainerFeatureID() != SysmlPackage.CONNECTION_DEFINITION__OWNING_RELATED_ELEMENT)
             return null;
-        }
         return (Element) this.eInternalContainer();
     }
 
@@ -202,23 +200,18 @@ public NotificationChain basicSetOwningRelatedElement(Element newOwningRelatedEl
     @Override
     public void setOwningRelatedElement(Element newOwningRelatedElement) {
         if (newOwningRelatedElement != this.eInternalContainer() || (this.eContainerFeatureID() != SysmlPackage.CONNECTION_DEFINITION__OWNING_RELATED_ELEMENT && newOwningRelatedElement != null)) {
-            if (EcoreUtil.isAncestor(this, newOwningRelatedElement)) {
+            if (EcoreUtil.isAncestor(this, newOwningRelatedElement))
                 throw new IllegalArgumentException("Recursive containment not allowed for " + this.toString());
-            }
             NotificationChain msgs = null;
-            if (this.eInternalContainer() != null) {
+            if (this.eInternalContainer() != null)
                 msgs = this.eBasicRemoveFromContainer(msgs);
-            }
-            if (newOwningRelatedElement != null) {
+            if (newOwningRelatedElement != null)
                 msgs = ((InternalEObject) newOwningRelatedElement).eInverseAdd(this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, Element.class, msgs);
-            }
             msgs = this.basicSetOwningRelatedElement(newOwningRelatedElement, msgs);
-            if (msgs != null) {
+            if (msgs != null)
                 msgs.dispatch();
-            }
-        } else if (this.eNotificationRequired()) {
+        } else if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTION_DEFINITION__OWNING_RELATED_ELEMENT, newOwningRelatedElement, newOwningRelatedElement));
-        }
     }
 
     /**
@@ -332,9 +325,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
             case SysmlPackage.CONNECTION_DEFINITION__OWNED_RELATED_ELEMENT:
                 return ((InternalEList<InternalEObject>) (InternalEList<?>) this.getOwnedRelatedElement()).basicAdd(otherEnd, msgs);
             case SysmlPackage.CONNECTION_DEFINITION__OWNING_RELATED_ELEMENT:
-                if (this.eInternalContainer() != null) {
+                if (this.eInternalContainer() != null)
                     msgs = this.eBasicRemoveFromContainer(msgs);
-                }
                 return this.basicSetOwningRelatedElement((Element) otherEnd, msgs);
         }
         return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -395,9 +387,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.CONNECTION_DEFINITION__RELATED_TYPE:
                 return this.getRelatedType();
             case SysmlPackage.CONNECTION_DEFINITION__SOURCE_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getSourceType();
-                }
                 return this.basicGetSourceType();
             case SysmlPackage.CONNECTION_DEFINITION__TARGET_TYPE:
                 return this.getTargetType();
@@ -602,9 +593,8 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isImplied: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionUsageImpl.java
index edec4c503..5ee1758b6 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionUsageImpl.java
@@ -157,9 +157,8 @@ public boolean isIsIndividual() {
     public void setIsIndividual(boolean newIsIndividual) {
         boolean oldIsIndividual = this.isIndividual;
         this.isIndividual = newIsIndividual;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTION_USAGE__IS_INDIVIDUAL, oldIsIndividual, this.isIndividual));
-        }
     }
 
     /**
@@ -192,9 +191,8 @@ public PortionKind getPortionKind() {
     public void setPortionKind(PortionKind newPortionKind) {
         PortionKind oldPortionKind = this.portionKind;
         this.portionKind = newPortionKind == null ? PORTION_KIND_EDEFAULT : newPortionKind;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTION_USAGE__PORTION_KIND, oldPortionKind, this.portionKind));
-        }
     }
 
     /**
@@ -243,9 +241,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.CONNECTION_USAGE__PORTION_KIND:
                 return this.getPortionKind();
             case SysmlPackage.CONNECTION_USAGE__INDIVIDUAL_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getIndividualDefinition();
-                }
                 return this.basicGetIndividualDefinition();
             case SysmlPackage.CONNECTION_USAGE__OCCURRENCE_DEFINITION:
                 return this.getOccurrenceDefinition();
@@ -409,9 +406,8 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isIndividual: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorAsUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorAsUsageImpl.java
index 778419536..4a065617c 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorAsUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorAsUsageImpl.java
@@ -114,26 +114,6 @@ public abstract class ConnectorAsUsageImpl extends UsageImpl implements Connecto
      */
     protected EList<Element> target;
 
-    /**
-     * The default value of the '{@link #isIsDirected() <em>Is Directed</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @see #isIsDirected()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean IS_DIRECTED_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isIsDirected() <em>Is Directed</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @see #isIsDirected()
-     * @generated
-     * @ordered
-     */
-    protected boolean isDirected = IS_DIRECTED_EDEFAULT;
-
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -172,9 +152,8 @@ public boolean isIsImplied() {
     public void setIsImplied(boolean newIsImplied) {
         boolean oldIsImplied = this.isImplied;
         this.isImplied = newIsImplied;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED, oldIsImplied, this.isImplied));
-        }
     }
 
     /**
@@ -198,9 +177,8 @@ public EList<Element> getOwnedRelatedElement() {
      */
     @Override
     public Element getOwningRelatedElement() {
-        if (this.eContainerFeatureID() != SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT) {
+        if (this.eContainerFeatureID() != SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT)
             return null;
-        }
         return (Element) this.eInternalContainer();
     }
 
@@ -222,23 +200,18 @@ public NotificationChain basicSetOwningRelatedElement(Element newOwningRelatedEl
     @Override
     public void setOwningRelatedElement(Element newOwningRelatedElement) {
         if (newOwningRelatedElement != this.eInternalContainer() || (this.eContainerFeatureID() != SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT && newOwningRelatedElement != null)) {
-            if (EcoreUtil.isAncestor(this, newOwningRelatedElement)) {
+            if (EcoreUtil.isAncestor(this, newOwningRelatedElement))
                 throw new IllegalArgumentException("Recursive containment not allowed for " + this.toString());
-            }
             NotificationChain msgs = null;
-            if (this.eInternalContainer() != null) {
+            if (this.eInternalContainer() != null)
                 msgs = this.eBasicRemoveFromContainer(msgs);
-            }
-            if (newOwningRelatedElement != null) {
+            if (newOwningRelatedElement != null)
                 msgs = ((InternalEObject) newOwningRelatedElement).eInverseAdd(this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, Element.class, msgs);
-            }
             msgs = this.basicSetOwningRelatedElement(newOwningRelatedElement, msgs);
-            if (msgs != null) {
+            if (msgs != null)
                 msgs.dispatch();
-            }
-        } else if (this.eNotificationRequired()) {
+        } else if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT, newOwningRelatedElement, newOwningRelatedElement));
-        }
     }
 
     /**
@@ -304,30 +277,6 @@ public EList<Feature> getConnectorEnd() {
         return new EcoreEList.UnmodifiableEList<>(this, SysmlPackage.eINSTANCE.getConnector_ConnectorEnd(), endFeatures.size(), endFeatures.toArray());
     }
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public boolean isIsDirected() {
-        return this.isDirected;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public void setIsDirected(boolean newIsDirected) {
-        boolean oldIsDirected = this.isDirected;
-        this.isDirected = newIsDirected;
-        if (this.eNotificationRequired()) {
-            this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED, oldIsDirected, this.isDirected));
-        }
-    }
-
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -394,9 +343,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
             case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT:
                 return ((InternalEList<InternalEObject>) (InternalEList<?>) this.getOwnedRelatedElement()).basicAdd(otherEnd, msgs);
             case SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT:
-                if (this.eInternalContainer() != null) {
+                if (this.eInternalContainer() != null)
                     msgs = this.eBasicRemoveFromContainer(msgs);
-                }
                 return this.basicSetOwningRelatedElement((Element) otherEnd, msgs);
         }
         return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -452,8 +400,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 return this.getSource();
             case SysmlPackage.CONNECTOR_AS_USAGE__TARGET:
                 return this.getTarget();
-            case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED:
-                return this.isIsDirected();
             case SysmlPackage.CONNECTOR_AS_USAGE__ASSOCIATION:
                 return this.getAssociation();
             case SysmlPackage.CONNECTOR_AS_USAGE__CONNECTOR_END:
@@ -461,9 +407,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.CONNECTOR_AS_USAGE__RELATED_FEATURE:
                 return this.getRelatedFeature();
             case SysmlPackage.CONNECTOR_AS_USAGE__SOURCE_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getSourceFeature();
-                }
                 return this.basicGetSourceFeature();
             case SysmlPackage.CONNECTOR_AS_USAGE__TARGET_FEATURE:
                 return this.getTargetFeature();
@@ -498,9 +443,6 @@ public void eSet(int featureID, Object newValue) {
                 this.getTarget().clear();
                 this.getTarget().addAll((Collection<? extends Element>) newValue);
                 return;
-            case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED:
-                this.setIsDirected((Boolean) newValue);
-                return;
         }
         super.eSet(featureID, newValue);
     }
@@ -528,9 +470,6 @@ public void eUnset(int featureID) {
             case SysmlPackage.CONNECTOR_AS_USAGE__TARGET:
                 this.getTarget().clear();
                 return;
-            case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED:
-                this.setIsDirected(IS_DIRECTED_EDEFAULT);
-                return;
         }
         super.eUnset(featureID);
     }
@@ -555,8 +494,6 @@ public boolean eIsSet(int featureID) {
                 return this.source != null && !this.source.isEmpty();
             case SysmlPackage.CONNECTOR_AS_USAGE__TARGET:
                 return this.target != null && !this.target.isEmpty();
-            case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED:
-                return this.isDirected != IS_DIRECTED_EDEFAULT;
             case SysmlPackage.CONNECTOR_AS_USAGE__ASSOCIATION:
                 return !this.getAssociation().isEmpty();
             case SysmlPackage.CONNECTOR_AS_USAGE__CONNECTOR_END:
@@ -598,8 +535,6 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
         }
         if (baseClass == Connector.class) {
             switch (derivedFeatureID) {
-                case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED:
-                    return SysmlPackage.CONNECTOR__IS_DIRECTED;
                 case SysmlPackage.CONNECTOR_AS_USAGE__ASSOCIATION:
                     return SysmlPackage.CONNECTOR__ASSOCIATION;
                 case SysmlPackage.CONNECTOR_AS_USAGE__CONNECTOR_END:
@@ -644,8 +579,6 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
         }
         if (baseClass == Connector.class) {
             switch (baseFeatureID) {
-                case SysmlPackage.CONNECTOR__IS_DIRECTED:
-                    return SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED;
                 case SysmlPackage.CONNECTOR__ASSOCIATION:
                     return SysmlPackage.CONNECTOR_AS_USAGE__ASSOCIATION;
                 case SysmlPackage.CONNECTOR__CONNECTOR_END:
@@ -670,15 +603,12 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isImplied: ");
         result.append(this.isImplied);
-        result.append(", isDirected: ");
-        result.append(this.isDirected);
         result.append(')');
         return result.toString();
     }
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorImpl.java
index a8f67657f..fc7d4eb01 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorImpl.java
@@ -51,7 +51,6 @@
  * <li>{@link org.eclipse.syson.sysml.impl.ConnectorImpl#getRelatedElement <em>Related Element</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.ConnectorImpl#getSource <em>Source</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.ConnectorImpl#getTarget <em>Target</em>}</li>
- * <li>{@link org.eclipse.syson.sysml.impl.ConnectorImpl#isIsDirected <em>Is Directed</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.ConnectorImpl#getAssociation <em>Association</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.ConnectorImpl#getConnectorEnd <em>Connector End</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.ConnectorImpl#getRelatedFeature <em>Related Feature</em>}</li>
@@ -112,26 +111,6 @@ public class ConnectorImpl extends FeatureImpl implements Connector {
      */
     protected EList<Element> target;
 
-    /**
-     * The default value of the '{@link #isIsDirected() <em>Is Directed</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @see #isIsDirected()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean IS_DIRECTED_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isIsDirected() <em>Is Directed</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @see #isIsDirected()
-     * @generated
-     * @ordered
-     */
-    protected boolean isDirected = IS_DIRECTED_EDEFAULT;
-
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -170,9 +149,8 @@ public boolean isIsImplied() {
     public void setIsImplied(boolean newIsImplied) {
         boolean oldIsImplied = this.isImplied;
         this.isImplied = newIsImplied;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR__IS_IMPLIED, oldIsImplied, this.isImplied));
-        }
     }
 
     /**
@@ -195,9 +173,8 @@ public EList<Element> getOwnedRelatedElement() {
      */
     @Override
     public Element getOwningRelatedElement() {
-        if (this.eContainerFeatureID() != SysmlPackage.CONNECTOR__OWNING_RELATED_ELEMENT) {
+        if (this.eContainerFeatureID() != SysmlPackage.CONNECTOR__OWNING_RELATED_ELEMENT)
             return null;
-        }
         return (Element) this.eInternalContainer();
     }
 
@@ -219,23 +196,18 @@ public NotificationChain basicSetOwningRelatedElement(Element newOwningRelatedEl
     @Override
     public void setOwningRelatedElement(Element newOwningRelatedElement) {
         if (newOwningRelatedElement != this.eInternalContainer() || (this.eContainerFeatureID() != SysmlPackage.CONNECTOR__OWNING_RELATED_ELEMENT && newOwningRelatedElement != null)) {
-            if (EcoreUtil.isAncestor(this, newOwningRelatedElement)) {
+            if (EcoreUtil.isAncestor(this, newOwningRelatedElement))
                 throw new IllegalArgumentException("Recursive containment not allowed for " + this.toString());
-            }
             NotificationChain msgs = null;
-            if (this.eInternalContainer() != null) {
+            if (this.eInternalContainer() != null)
                 msgs = this.eBasicRemoveFromContainer(msgs);
-            }
-            if (newOwningRelatedElement != null) {
+            if (newOwningRelatedElement != null)
                 msgs = ((InternalEObject) newOwningRelatedElement).eInverseAdd(this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, Element.class, msgs);
-            }
             msgs = this.basicSetOwningRelatedElement(newOwningRelatedElement, msgs);
-            if (msgs != null) {
+            if (msgs != null)
                 msgs.dispatch();
-            }
-        } else if (this.eNotificationRequired()) {
+        } else if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR__OWNING_RELATED_ELEMENT, newOwningRelatedElement, newOwningRelatedElement));
-        }
     }
 
     /**
@@ -266,30 +238,6 @@ public EList<Feature> getConnectorEnd() {
         return new EcoreEList.UnmodifiableEList<>(this, SysmlPackage.eINSTANCE.getConnector_ConnectorEnd(), endFeatures.size(), endFeatures.toArray());
     }
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public boolean isIsDirected() {
-        return this.isDirected;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public void setIsDirected(boolean newIsDirected) {
-        boolean oldIsDirected = this.isDirected;
-        this.isDirected = newIsDirected;
-        if (this.eNotificationRequired()) {
-            this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR__IS_DIRECTED, oldIsDirected, this.isDirected));
-        }
-    }
-
     /**
      * <!-- begin-user-doc --> The Features that are related by this Connector considered as a Relationship and that
      * restrict the links it identifies, given by the referenced Features of the connectorEnds of the Connector.
@@ -371,9 +319,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
             case SysmlPackage.CONNECTOR__OWNED_RELATED_ELEMENT:
                 return ((InternalEList<InternalEObject>) (InternalEList<?>) this.getOwnedRelatedElement()).basicAdd(otherEnd, msgs);
             case SysmlPackage.CONNECTOR__OWNING_RELATED_ELEMENT:
-                if (this.eInternalContainer() != null) {
+                if (this.eInternalContainer() != null)
                     msgs = this.eBasicRemoveFromContainer(msgs);
-                }
                 return this.basicSetOwningRelatedElement((Element) otherEnd, msgs);
         }
         return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -429,8 +376,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 return this.getSource();
             case SysmlPackage.CONNECTOR__TARGET:
                 return this.getTarget();
-            case SysmlPackage.CONNECTOR__IS_DIRECTED:
-                return this.isIsDirected();
             case SysmlPackage.CONNECTOR__ASSOCIATION:
                 return this.getAssociation();
             case SysmlPackage.CONNECTOR__CONNECTOR_END:
@@ -438,9 +383,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.CONNECTOR__RELATED_FEATURE:
                 return this.getRelatedFeature();
             case SysmlPackage.CONNECTOR__SOURCE_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getSourceFeature();
-                }
                 return this.basicGetSourceFeature();
             case SysmlPackage.CONNECTOR__TARGET_FEATURE:
                 return this.getTargetFeature();
@@ -475,9 +419,6 @@ public void eSet(int featureID, Object newValue) {
                 this.getTarget().clear();
                 this.getTarget().addAll((Collection<? extends Element>) newValue);
                 return;
-            case SysmlPackage.CONNECTOR__IS_DIRECTED:
-                this.setIsDirected((Boolean) newValue);
-                return;
         }
         super.eSet(featureID, newValue);
     }
@@ -505,9 +446,6 @@ public void eUnset(int featureID) {
             case SysmlPackage.CONNECTOR__TARGET:
                 this.getTarget().clear();
                 return;
-            case SysmlPackage.CONNECTOR__IS_DIRECTED:
-                this.setIsDirected(IS_DIRECTED_EDEFAULT);
-                return;
         }
         super.eUnset(featureID);
     }
@@ -532,8 +470,6 @@ public boolean eIsSet(int featureID) {
                 return this.source != null && !this.source.isEmpty();
             case SysmlPackage.CONNECTOR__TARGET:
                 return this.target != null && !this.target.isEmpty();
-            case SysmlPackage.CONNECTOR__IS_DIRECTED:
-                return this.isDirected != IS_DIRECTED_EDEFAULT;
             case SysmlPackage.CONNECTOR__ASSOCIATION:
                 return !this.getAssociation().isEmpty();
             case SysmlPackage.CONNECTOR__CONNECTOR_END:
@@ -611,15 +547,12 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isImplied: ");
         result.append(this.isImplied);
-        result.append(", isDirected: ");
-        result.append(this.isDirected);
         result.append(')');
         return result.toString();
     }
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintUsageImpl.java
index 9f959c84f..70187fa91 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintUsageImpl.java
@@ -252,24 +252,20 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.CONSTRAINT_USAGE__IS_MODEL_LEVEL_EVALUABLE:
                 return this.isIsModelLevelEvaluable();
             case SysmlPackage.CONSTRAINT_USAGE__FUNCTION:
-                if (resolve) {
+                if (resolve)
                     return this.getFunction();
-                }
                 return this.basicGetFunction();
             case SysmlPackage.CONSTRAINT_USAGE__RESULT:
-                if (resolve) {
+                if (resolve)
                     return this.getResult();
-                }
                 return this.basicGetResult();
             case SysmlPackage.CONSTRAINT_USAGE__PREDICATE:
-                if (resolve) {
+                if (resolve)
                     return this.getPredicate();
-                }
                 return this.basicGetPredicate();
             case SysmlPackage.CONSTRAINT_USAGE__CONSTRAINT_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getConstraintDefinition();
-                }
                 return this.basicGetConstraintDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DefinitionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DefinitionImpl.java
index ae6ac4f85..c6bb901ed 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DefinitionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DefinitionImpl.java
@@ -697,7 +697,7 @@ public EList<VariantMembership> getVariantMembership() {
      */
     @Override
     public EList<Membership> getInheritedMembership() {
-        EList<Membership> inheritedMemberships = inheritedMemberships(new BasicEList<>());
+        EList<Membership> inheritedMemberships = this.inheritedMemberships(new BasicEList<>());
         return new EcoreEList.UnmodifiableEList<>(this, SysmlPackage.eINSTANCE.getType_InheritedMembership(), inheritedMemberships.size(), inheritedMemberships.toArray());
     }
 
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DifferencingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DifferencingImpl.java
index a2cc53e23..8d88eaa3b 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DifferencingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DifferencingImpl.java
@@ -79,9 +79,8 @@ public Type getDifferencingType() {
             InternalEObject oldDifferencingType = (InternalEObject) this.differencingType;
             this.differencingType = (Type) this.eResolveProxy(oldDifferencingType);
             if (this.differencingType != oldDifferencingType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.DIFFERENCING__DIFFERENCING_TYPE, oldDifferencingType, this.differencingType));
-                }
             }
         }
         return this.differencingType;
@@ -105,9 +104,8 @@ public Type basicGetDifferencingType() {
     public void setDifferencingType(Type newDifferencingType) {
         Type oldDifferencingType = this.differencingType;
         this.differencingType = newDifferencingType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.DIFFERENCING__DIFFERENCING_TYPE, oldDifferencingType, this.differencingType));
-        }
     }
 
     /**
@@ -142,14 +140,12 @@ public Type basicGetTypeDifferenced() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.DIFFERENCING__DIFFERENCING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getDifferencingType();
-                }
                 return this.basicGetDifferencingType();
             case SysmlPackage.DIFFERENCING__TYPE_DIFFERENCED:
-                if (resolve) {
+                if (resolve)
                     return this.getTypeDifferenced();
-                }
                 return this.basicGetTypeDifferenced();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DisjoiningImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DisjoiningImpl.java
index 5c860b6d6..7715eae81 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DisjoiningImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DisjoiningImpl.java
@@ -90,9 +90,8 @@ public Type getDisjoiningType() {
             InternalEObject oldDisjoiningType = (InternalEObject) this.disjoiningType;
             this.disjoiningType = (Type) this.eResolveProxy(oldDisjoiningType);
             if (this.disjoiningType != oldDisjoiningType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.DISJOINING__DISJOINING_TYPE, oldDisjoiningType, this.disjoiningType));
-                }
             }
         }
         return this.disjoiningType;
@@ -116,9 +115,8 @@ public Type basicGetDisjoiningType() {
     public void setDisjoiningType(Type newDisjoiningType) {
         Type oldDisjoiningType = this.disjoiningType;
         this.disjoiningType = newDisjoiningType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.DISJOINING__DISJOINING_TYPE, oldDisjoiningType, this.disjoiningType));
-        }
     }
 
     /**
@@ -155,9 +153,8 @@ public Type getTypeDisjoined() {
             InternalEObject oldTypeDisjoined = (InternalEObject) this.typeDisjoined;
             this.typeDisjoined = (Type) this.eResolveProxy(oldTypeDisjoined);
             if (this.typeDisjoined != oldTypeDisjoined) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.DISJOINING__TYPE_DISJOINED, oldTypeDisjoined, this.typeDisjoined));
-                }
             }
         }
         return this.typeDisjoined;
@@ -181,9 +178,8 @@ public Type basicGetTypeDisjoined() {
     public void setTypeDisjoined(Type newTypeDisjoined) {
         Type oldTypeDisjoined = this.typeDisjoined;
         this.typeDisjoined = newTypeDisjoined;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.DISJOINING__TYPE_DISJOINED, oldTypeDisjoined, this.typeDisjoined));
-        }
     }
 
     /**
@@ -195,19 +191,16 @@ public void setTypeDisjoined(Type newTypeDisjoined) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.DISJOINING__DISJOINING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getDisjoiningType();
-                }
                 return this.basicGetDisjoiningType();
             case SysmlPackage.DISJOINING__OWNING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningType();
-                }
                 return this.basicGetOwningType();
             case SysmlPackage.DISJOINING__TYPE_DISJOINED:
-                if (resolve) {
+                if (resolve)
                     return this.getTypeDisjoined();
-                }
                 return this.basicGetTypeDisjoined();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DocumentationImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DocumentationImpl.java
index 60bb212c2..5372a8b2c 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DocumentationImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/DocumentationImpl.java
@@ -81,9 +81,8 @@ public Element basicGetDocumentedElement() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.DOCUMENTATION__DOCUMENTED_ELEMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getDocumentedElement();
-                }
                 return this.basicGetDocumentedElement();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementFilterMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementFilterMembershipImpl.java
index 3c8c68f18..10d7dd335 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementFilterMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementFilterMembershipImpl.java
@@ -83,9 +83,8 @@ public Expression basicGetCondition() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.ELEMENT_FILTER_MEMBERSHIP__CONDITION:
-                if (resolve) {
+                if (resolve)
                     return this.getCondition();
-                }
                 return this.basicGetCondition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementImpl.java
index 2106e776e..865eb1eb5 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementImpl.java
@@ -261,9 +261,8 @@ public String getDeclaredName() {
     public void setDeclaredName(String newDeclaredName) {
         String oldDeclaredName = this.declaredName;
         this.declaredName = newDeclaredName;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__DECLARED_NAME, oldDeclaredName, this.declaredName));
-        }
     }
 
     /**
@@ -285,9 +284,8 @@ public String getDeclaredShortName() {
     public void setDeclaredShortName(String newDeclaredShortName) {
         String oldDeclaredShortName = this.declaredShortName;
         this.declaredShortName = newDeclaredShortName;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__DECLARED_SHORT_NAME, oldDeclaredShortName, this.declaredShortName));
-        }
     }
 
     /**
@@ -324,9 +322,8 @@ public String getElementId() {
     public void setElementId(String newElementId) {
         String oldElementId = this.elementId;
         this.elementId = newElementId;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__ELEMENT_ID, oldElementId, this.elementId));
-        }
     }
 
     /**
@@ -348,9 +345,8 @@ public boolean isIsImpliedIncluded() {
     public void setIsImpliedIncluded(boolean newIsImpliedIncluded) {
         boolean oldIsImpliedIncluded = this.isImpliedIncluded;
         this.isImpliedIncluded = newIsImpliedIncluded;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__IS_IMPLIED_INCLUDED, oldIsImpliedIncluded, this.isImpliedIncluded));
-        }
     }
 
     /**
@@ -500,9 +496,8 @@ public Namespace basicGetOwningNamespace() {
      */
     @Override
     public Relationship getOwningRelationship() {
-        if (this.eContainerFeatureID() != SysmlPackage.ELEMENT__OWNING_RELATIONSHIP) {
+        if (this.eContainerFeatureID() != SysmlPackage.ELEMENT__OWNING_RELATIONSHIP)
             return null;
-        }
         return (Relationship) this.eInternalContainer();
     }
 
@@ -524,23 +519,18 @@ public NotificationChain basicSetOwningRelationship(Relationship newOwningRelati
     @Override
     public void setOwningRelationship(Relationship newOwningRelationship) {
         if (newOwningRelationship != this.eInternalContainer() || (this.eContainerFeatureID() != SysmlPackage.ELEMENT__OWNING_RELATIONSHIP && newOwningRelationship != null)) {
-            if (EcoreUtil.isAncestor(this, newOwningRelationship)) {
+            if (EcoreUtil.isAncestor(this, newOwningRelationship))
                 throw new IllegalArgumentException("Recursive containment not allowed for " + this.toString());
-            }
             NotificationChain msgs = null;
-            if (this.eInternalContainer() != null) {
+            if (this.eInternalContainer() != null)
                 msgs = this.eBasicRemoveFromContainer(msgs);
-            }
-            if (newOwningRelationship != null) {
+            if (newOwningRelationship != null)
                 msgs = ((InternalEObject) newOwningRelationship).eInverseAdd(this, SysmlPackage.RELATIONSHIP__OWNED_RELATED_ELEMENT, Relationship.class, msgs);
-            }
             msgs = this.basicSetOwningRelationship(newOwningRelationship, msgs);
-            if (msgs != null) {
+            if (msgs != null)
                 msgs.dispatch();
-            }
-        } else if (this.eNotificationRequired()) {
+        } else if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__OWNING_RELATIONSHIP, newOwningRelationship, newOwningRelationship));
-        }
     }
 
     /**
@@ -670,9 +660,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
             case SysmlPackage.ELEMENT__OWNED_RELATIONSHIP:
                 return ((InternalEList<InternalEObject>) (InternalEList<?>) this.getOwnedRelationship()).basicAdd(otherEnd, msgs);
             case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP:
-                if (this.eInternalContainer() != null) {
+                if (this.eInternalContainer() != null)
                     msgs = this.eBasicRemoveFromContainer(msgs);
-                }
                 return this.basicSetOwningRelationship((Relationship) otherEnd, msgs);
         }
         return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -743,19 +732,16 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.ELEMENT__OWNED_RELATIONSHIP:
                 return this.getOwnedRelationship();
             case SysmlPackage.ELEMENT__OWNER:
-                if (resolve) {
+                if (resolve)
                     return this.getOwner();
-                }
                 return this.basicGetOwner();
             case SysmlPackage.ELEMENT__OWNING_MEMBERSHIP:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningMembership();
-                }
                 return this.basicGetOwningMembership();
             case SysmlPackage.ELEMENT__OWNING_NAMESPACE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningNamespace();
-                }
                 return this.basicGetOwningNamespace();
             case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP:
                 return this.getOwningRelationship();
@@ -909,9 +895,8 @@ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTarg
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (aliasIds: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EnumerationUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EnumerationUsageImpl.java
index ba85abce5..ab1d2c232 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EnumerationUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EnumerationUsageImpl.java
@@ -109,9 +109,8 @@ public EnumerationDefinition basicGetEnumerationDefinition() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.ENUMERATION_USAGE__ENUMERATION_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getEnumerationDefinition();
-                }
                 return this.basicGetEnumerationDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EventOccurrenceUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EventOccurrenceUsageImpl.java
index 330b8df51..4c01edc61 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EventOccurrenceUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EventOccurrenceUsageImpl.java
@@ -94,9 +94,8 @@ public boolean isIsReference() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.EVENT_OCCURRENCE_USAGE__EVENT_OCCURRENCE:
-                if (resolve) {
+                if (resolve)
                     return this.getEventOccurrence();
-                }
                 return this.basicGetEventOccurrence();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExhibitStateUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExhibitStateUsageImpl.java
index 60afe3470..7266946f3 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExhibitStateUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExhibitStateUsageImpl.java
@@ -142,19 +142,16 @@ public StateUsage basicGetExhibitedState() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.EXHIBIT_STATE_USAGE__EVENT_OCCURRENCE:
-                if (resolve) {
+                if (resolve)
                     return this.getEventOccurrence();
-                }
                 return this.basicGetEventOccurrence();
             case SysmlPackage.EXHIBIT_STATE_USAGE__PERFORMED_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getPerformedAction();
-                }
                 return this.basicGetPerformedAction();
             case SysmlPackage.EXHIBIT_STATE_USAGE__EXHIBITED_STATE:
-                if (resolve) {
+                if (resolve)
                     return this.getExhibitedState();
-                }
                 return this.basicGetExhibitedState();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExpressionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExpressionImpl.java
index 9f4e43b8b..6dff9686d 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExpressionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExpressionImpl.java
@@ -175,14 +175,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.EXPRESSION__IS_MODEL_LEVEL_EVALUABLE:
                 return this.isIsModelLevelEvaluable();
             case SysmlPackage.EXPRESSION__FUNCTION:
-                if (resolve) {
+                if (resolve)
                     return this.getFunction();
-                }
                 return this.basicGetFunction();
             case SysmlPackage.EXPRESSION__RESULT:
-                if (resolve) {
+                if (resolve)
                     return this.getResult();
-                }
                 return this.basicGetResult();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureChainingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureChainingImpl.java
index 7bbe21be7..a68bdfea0 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureChainingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureChainingImpl.java
@@ -80,9 +80,8 @@ public Feature getChainingFeature() {
             InternalEObject oldChainingFeature = (InternalEObject) this.chainingFeature;
             this.chainingFeature = (Feature) this.eResolveProxy(oldChainingFeature);
             if (this.chainingFeature != oldChainingFeature) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.FEATURE_CHAINING__CHAINING_FEATURE, oldChainingFeature, this.chainingFeature));
-                }
             }
         }
         return this.chainingFeature;
@@ -106,9 +105,8 @@ public Feature basicGetChainingFeature() {
     public void setChainingFeature(Feature newChainingFeature) {
         Feature oldChainingFeature = this.chainingFeature;
         this.chainingFeature = newChainingFeature;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_CHAINING__CHAINING_FEATURE, oldChainingFeature, this.chainingFeature));
-        }
     }
 
     /**
@@ -143,14 +141,12 @@ public Feature basicGetFeatureChained() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.FEATURE_CHAINING__CHAINING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getChainingFeature();
-                }
                 return this.basicGetChainingFeature();
             case SysmlPackage.FEATURE_CHAINING__FEATURE_CHAINED:
-                if (resolve) {
+                if (resolve)
                     return this.getFeatureChained();
-                }
                 return this.basicGetFeatureChained();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureImpl.java
index 2e24b0491..0d706cd98 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureImpl.java
@@ -304,9 +304,8 @@ public void setDirection(FeatureDirectionKind newDirection) {
         this.direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;
         boolean oldDirectionESet = this.directionESet;
         this.directionESet = true;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__DIRECTION, oldDirection, this.direction, !oldDirectionESet));
-        }
     }
 
     /**
@@ -320,9 +319,8 @@ public void unsetDirection() {
         boolean oldDirectionESet = this.directionESet;
         this.direction = DIRECTION_EDEFAULT;
         this.directionESet = false;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.UNSET, SysmlPackage.FEATURE__DIRECTION, oldDirection, DIRECTION_EDEFAULT, oldDirectionESet));
-        }
     }
 
     /**
@@ -388,9 +386,8 @@ public boolean isIsComposite() {
     public void setIsComposite(boolean newIsComposite) {
         boolean oldIsComposite = this.isComposite;
         this.isComposite = newIsComposite;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_COMPOSITE, oldIsComposite, this.isComposite));
-        }
     }
 
     /**
@@ -412,9 +409,8 @@ public boolean isIsDerived() {
     public void setIsDerived(boolean newIsDerived) {
         boolean oldIsDerived = this.isDerived;
         this.isDerived = newIsDerived;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_DERIVED, oldIsDerived, this.isDerived));
-        }
     }
 
     /**
@@ -436,9 +432,8 @@ public boolean isIsEnd() {
     public void setIsEnd(boolean newIsEnd) {
         boolean oldIsEnd = this.isEnd;
         this.isEnd = newIsEnd;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_END, oldIsEnd, this.isEnd));
-        }
     }
 
     /**
@@ -470,9 +465,8 @@ public boolean isIsOrdered() {
     public void setIsOrdered(boolean newIsOrdered) {
         boolean oldIsOrdered = this.isOrdered;
         this.isOrdered = newIsOrdered;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_ORDERED, oldIsOrdered, this.isOrdered));
-        }
     }
 
     /**
@@ -494,9 +488,8 @@ public boolean isIsPortion() {
     public void setIsPortion(boolean newIsPortion) {
         boolean oldIsPortion = this.isPortion;
         this.isPortion = newIsPortion;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_PORTION, oldIsPortion, this.isPortion));
-        }
     }
 
     /**
@@ -518,9 +511,8 @@ public boolean isIsReadOnly() {
     public void setIsReadOnly(boolean newIsReadOnly) {
         boolean oldIsReadOnly = this.isReadOnly;
         this.isReadOnly = newIsReadOnly;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_READ_ONLY, oldIsReadOnly, this.isReadOnly));
-        }
     }
 
     /**
@@ -542,9 +534,8 @@ public boolean isIsUnique() {
     public void setIsUnique(boolean newIsUnique) {
         boolean oldIsUnique = this.isUnique;
         this.isUnique = newIsUnique;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_UNIQUE, oldIsUnique, this.isUnique));
-        }
     }
 
     /**
@@ -840,9 +831,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.FEATURE__CHAINING_FEATURE:
                 return this.getChainingFeature();
             case SysmlPackage.FEATURE__END_OWNING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getEndOwningType();
-                }
                 return this.basicGetEndOwningType();
             case SysmlPackage.FEATURE__FEATURING_TYPE:
                 return this.getFeaturingType();
@@ -853,9 +843,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.FEATURE__OWNED_REDEFINITION:
                 return this.getOwnedRedefinition();
             case SysmlPackage.FEATURE__OWNED_REFERENCE_SUBSETTING:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedReferenceSubsetting();
-                }
                 return this.basicGetOwnedReferenceSubsetting();
             case SysmlPackage.FEATURE__OWNED_SUBSETTING:
                 return this.getOwnedSubsetting();
@@ -864,21 +853,18 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.FEATURE__OWNED_TYPING:
                 return this.getOwnedTyping();
             case SysmlPackage.FEATURE__OWNING_FEATURE_MEMBERSHIP:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningFeatureMembership();
-                }
                 return this.basicGetOwningFeatureMembership();
             case SysmlPackage.FEATURE__OWNING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningType();
-                }
                 return this.basicGetOwningType();
             case SysmlPackage.FEATURE__TYPE:
                 return this.getType();
             case SysmlPackage.FEATURE__VALUATION:
-                if (resolve) {
+                if (resolve)
                     return this.getValuation();
-                }
                 return this.basicGetValuation();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -1088,17 +1074,15 @@ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTarg
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (direction: ");
-        if (this.directionESet) {
+        if (this.directionESet)
             result.append(this.direction);
-        } else {
+        else
             result.append("<unset>");
-        }
         result.append(", isComposite: ");
         result.append(this.isComposite);
         result.append(", isDerived: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureInvertingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureInvertingImpl.java
index ab968c2af..b70d3dc41 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureInvertingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureInvertingImpl.java
@@ -91,9 +91,8 @@ public Feature getFeatureInverted() {
             InternalEObject oldFeatureInverted = (InternalEObject) this.featureInverted;
             this.featureInverted = (Feature) this.eResolveProxy(oldFeatureInverted);
             if (this.featureInverted != oldFeatureInverted) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.FEATURE_INVERTING__FEATURE_INVERTED, oldFeatureInverted, this.featureInverted));
-                }
             }
         }
         return this.featureInverted;
@@ -117,9 +116,8 @@ public Feature basicGetFeatureInverted() {
     public void setFeatureInverted(Feature newFeatureInverted) {
         Feature oldFeatureInverted = this.featureInverted;
         this.featureInverted = newFeatureInverted;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_INVERTING__FEATURE_INVERTED, oldFeatureInverted, this.featureInverted));
-        }
     }
 
     /**
@@ -133,9 +131,8 @@ public Feature getInvertingFeature() {
             InternalEObject oldInvertingFeature = (InternalEObject) this.invertingFeature;
             this.invertingFeature = (Feature) this.eResolveProxy(oldInvertingFeature);
             if (this.invertingFeature != oldInvertingFeature) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.FEATURE_INVERTING__INVERTING_FEATURE, oldInvertingFeature, this.invertingFeature));
-                }
             }
         }
         return this.invertingFeature;
@@ -159,9 +156,8 @@ public Feature basicGetInvertingFeature() {
     public void setInvertingFeature(Feature newInvertingFeature) {
         Feature oldInvertingFeature = this.invertingFeature;
         this.invertingFeature = newInvertingFeature;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_INVERTING__INVERTING_FEATURE, oldInvertingFeature, this.invertingFeature));
-        }
     }
 
     /**
@@ -196,19 +192,16 @@ public Feature basicGetOwningFeature() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.FEATURE_INVERTING__FEATURE_INVERTED:
-                if (resolve) {
+                if (resolve)
                     return this.getFeatureInverted();
-                }
                 return this.basicGetFeatureInverted();
             case SysmlPackage.FEATURE_INVERTING__INVERTING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getInvertingFeature();
-                }
                 return this.basicGetInvertingFeature();
             case SysmlPackage.FEATURE_INVERTING__OWNING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningFeature();
-                }
                 return this.basicGetOwningFeature();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureMembershipImpl.java
index a848e115e..da1077171 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureMembershipImpl.java
@@ -110,9 +110,8 @@ public Type getType() {
             InternalEObject oldType = (InternalEObject) this.type;
             this.type = (Type) this.eResolveProxy(oldType);
             if (this.type != oldType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.FEATURE_MEMBERSHIP__TYPE, oldType, this.type));
-                }
             }
         }
         return this.type;
@@ -124,10 +123,6 @@ public Type getType() {
      * @generated
      */
     public Type basicGetType() {
-        Type owningType = this.getOwningType();
-        if (owningType != null) {
-            return owningType;
-        }
         return this.type;
     }
 
@@ -140,9 +135,8 @@ public Type basicGetType() {
     public void setType(Type newType) {
         Type oldType = this.type;
         this.type = newType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_MEMBERSHIP__TYPE, oldType, this.type));
-        }
     }
 
     /**
@@ -224,24 +218,20 @@ public String getMemberShortName() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.FEATURE_MEMBERSHIP__FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getFeature();
-                }
                 return this.basicGetFeature();
             case SysmlPackage.FEATURE_MEMBERSHIP__TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getType();
-                }
                 return this.basicGetType();
             case SysmlPackage.FEATURE_MEMBERSHIP__OWNED_MEMBER_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedMemberFeature();
-                }
                 return this.basicGetOwnedMemberFeature();
             case SysmlPackage.FEATURE_MEMBERSHIP__OWNING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningType();
-                }
                 return this.basicGetOwningType();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -363,14 +353,14 @@ public Namespace getMembershipOwningNamespace() {
         return this.getOwningType();
     }
 
-     /**
+    /**
      * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
      *
      * @generated NOT
      */
-     @Override
-     public Feature getFeature() {
-         return this.getOwnedMemberFeature();
-     }
+    @Override
+    public Feature getFeature() {
+        return this.getOwnedMemberFeature();
+    }
 
 } // FeatureMembershipImpl
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureTypingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureTypingImpl.java
index 9c28401a6..cf29dbf73 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureTypingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureTypingImpl.java
@@ -110,9 +110,8 @@ public Type getType() {
             InternalEObject oldType = (InternalEObject) this.type;
             this.type = (Type) this.eResolveProxy(oldType);
             if (this.type != oldType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.FEATURE_TYPING__TYPE, oldType, this.type));
-                }
             }
         }
         return this.type;
@@ -136,9 +135,8 @@ public Type basicGetType() {
     public void setType(Type newType) {
         Type oldType = this.type;
         this.type = newType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_TYPING__TYPE, oldType, this.type));
-        }
     }
 
     /**
@@ -152,9 +150,8 @@ public Feature getTypedFeature() {
             InternalEObject oldTypedFeature = (InternalEObject) this.typedFeature;
             this.typedFeature = (Feature) this.eResolveProxy(oldTypedFeature);
             if (this.typedFeature != oldTypedFeature) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.FEATURE_TYPING__TYPED_FEATURE, oldTypedFeature, this.typedFeature));
-                }
             }
         }
         return this.typedFeature;
@@ -178,9 +175,8 @@ public Feature basicGetTypedFeature() {
     public void setTypedFeature(Feature newTypedFeature) {
         Feature oldTypedFeature = this.typedFeature;
         this.typedFeature = newTypedFeature;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_TYPING__TYPED_FEATURE, oldTypedFeature, this.typedFeature));
-        }
     }
 
     /**
@@ -192,19 +188,16 @@ public void setTypedFeature(Feature newTypedFeature) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.FEATURE_TYPING__OWNING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningFeature();
-                }
                 return this.basicGetOwningFeature();
             case SysmlPackage.FEATURE_TYPING__TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getType();
-                }
                 return this.basicGetType();
             case SysmlPackage.FEATURE_TYPING__TYPED_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getTypedFeature();
-                }
                 return this.basicGetTypedFeature();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureValueImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureValueImpl.java
index 856c44723..5efc0c229 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureValueImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureValueImpl.java
@@ -138,9 +138,8 @@ public boolean isIsDefault() {
     public void setIsDefault(boolean newIsDefault) {
         boolean oldIsDefault = this.isDefault;
         this.isDefault = newIsDefault;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_VALUE__IS_DEFAULT, oldIsDefault, this.isDefault));
-        }
     }
 
     /**
@@ -162,9 +161,8 @@ public boolean isIsInitial() {
     public void setIsInitial(boolean newIsInitial) {
         boolean oldIsInitial = this.isInitial;
         this.isInitial = newIsInitial;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_VALUE__IS_INITIAL, oldIsInitial, this.isInitial));
-        }
     }
 
     /**
@@ -204,14 +202,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.FEATURE_VALUE__IS_INITIAL:
                 return this.isIsInitial();
             case SysmlPackage.FEATURE_VALUE__FEATURE_WITH_VALUE:
-                if (resolve) {
+                if (resolve)
                     return this.getFeatureWithValue();
-                }
                 return this.basicGetFeatureWithValue();
             case SysmlPackage.FEATURE_VALUE__VALUE:
-                if (resolve) {
+                if (resolve)
                     return this.getValue();
-                }
                 return this.basicGetValue();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -280,9 +276,8 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isDefault: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FlowConnectionUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FlowConnectionUsageImpl.java
index 92c596355..c7833882a 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FlowConnectionUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FlowConnectionUsageImpl.java
@@ -267,23 +267,20 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.FLOW_CONNECTION_USAGE__INTERACTION:
                 return this.getInteraction();
             case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getItemFeature();
-                }
                 return this.basicGetItemFeature();
             case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_FLOW_END:
                 return this.getItemFlowEnd();
             case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_TYPE:
                 return this.getItemType();
             case SysmlPackage.FLOW_CONNECTION_USAGE__SOURCE_OUTPUT_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getSourceOutputFeature();
-                }
                 return this.basicGetSourceOutputFeature();
             case SysmlPackage.FLOW_CONNECTION_USAGE__TARGET_INPUT_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getTargetInputFeature();
-                }
                 return this.basicGetTargetInputFeature();
             case SysmlPackage.FLOW_CONNECTION_USAGE__FLOW_CONNECTION_DEFINITION:
                 return this.getFlowConnectionDefinition();
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FramedConcernMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FramedConcernMembershipImpl.java
index 056e7925d..a028387bc 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FramedConcernMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FramedConcernMembershipImpl.java
@@ -108,14 +108,12 @@ public ConcernUsage basicGetReferencedConcern() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.FRAMED_CONCERN_MEMBERSHIP__OWNED_CONCERN:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedConcern();
-                }
                 return this.basicGetOwnedConcern();
             case SysmlPackage.FRAMED_CONCERN_MEMBERSHIP__REFERENCED_CONCERN:
-                if (resolve) {
+                if (resolve)
                     return this.getReferencedConcern();
-                }
                 return this.basicGetReferencedConcern();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ImportImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ImportImpl.java
index feeab3e19..357ef368b 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ImportImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ImportImpl.java
@@ -189,9 +189,8 @@ public boolean isIsImportAll() {
     public void setIsImportAll(boolean newIsImportAll) {
         boolean oldIsImportAll = this.isImportAll;
         this.isImportAll = newIsImportAll;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.IMPORT__IS_IMPORT_ALL, oldIsImportAll, this.isImportAll));
-        }
     }
 
     /**
@@ -213,9 +212,8 @@ public boolean isIsRecursive() {
     public void setIsRecursive(boolean newIsRecursive) {
         boolean oldIsRecursive = this.isRecursive;
         this.isRecursive = newIsRecursive;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.IMPORT__IS_RECURSIVE, oldIsRecursive, this.isRecursive));
-        }
     }
 
     /**
@@ -237,9 +235,8 @@ public VisibilityKind getVisibility() {
     public void setVisibility(VisibilityKind newVisibility) {
         VisibilityKind oldVisibility = this.visibility;
         this.visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.IMPORT__VISIBILITY, oldVisibility, this.visibility));
-        }
     }
 
     /**
@@ -269,14 +266,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.IMPORT__VISIBILITY:
                 return this.getVisibility();
             case SysmlPackage.IMPORT__IMPORTED_ELEMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getImportedElement();
-                }
                 return this.basicGetImportedElement();
             case SysmlPackage.IMPORT__IMPORT_OWNING_NAMESPACE:
-                if (resolve) {
+                if (resolve)
                     return this.getImportOwningNamespace();
-                }
                 return this.basicGetImportOwningNamespace();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -368,9 +363,8 @@ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTarg
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isImportAll: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IncludeUseCaseUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IncludeUseCaseUsageImpl.java
index d0ff49374..6604ac976 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IncludeUseCaseUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IncludeUseCaseUsageImpl.java
@@ -130,19 +130,16 @@ public UseCaseUsage basicGetUseCaseIncluded() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.INCLUDE_USE_CASE_USAGE__EVENT_OCCURRENCE:
-                if (resolve) {
+                if (resolve)
                     return this.getEventOccurrence();
-                }
                 return this.basicGetEventOccurrence();
             case SysmlPackage.INCLUDE_USE_CASE_USAGE__PERFORMED_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getPerformedAction();
-                }
                 return this.basicGetPerformedAction();
             case SysmlPackage.INCLUDE_USE_CASE_USAGE__USE_CASE_INCLUDED:
-                if (resolve) {
+                if (resolve)
                     return this.getUseCaseIncluded();
-                }
                 return this.basicGetUseCaseIncluded();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IntersectingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IntersectingImpl.java
index 961566182..0a5065737 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IntersectingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IntersectingImpl.java
@@ -79,9 +79,8 @@ public Type getIntersectingType() {
             InternalEObject oldIntersectingType = (InternalEObject) this.intersectingType;
             this.intersectingType = (Type) this.eResolveProxy(oldIntersectingType);
             if (this.intersectingType != oldIntersectingType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.INTERSECTING__INTERSECTING_TYPE, oldIntersectingType, this.intersectingType));
-                }
             }
         }
         return this.intersectingType;
@@ -105,9 +104,8 @@ public Type basicGetIntersectingType() {
     public void setIntersectingType(Type newIntersectingType) {
         Type oldIntersectingType = this.intersectingType;
         this.intersectingType = newIntersectingType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.INTERSECTING__INTERSECTING_TYPE, oldIntersectingType, this.intersectingType));
-        }
     }
 
     /**
@@ -142,14 +140,12 @@ public Type basicGetTypeIntersected() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.INTERSECTING__INTERSECTING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getIntersectingType();
-                }
                 return this.basicGetIntersectingType();
             case SysmlPackage.INTERSECTING__TYPE_INTERSECTED:
-                if (resolve) {
+                if (resolve)
                     return this.getTypeIntersected();
-                }
                 return this.basicGetTypeIntersected();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/InvocationExpressionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/InvocationExpressionImpl.java
index 77f954b8a..e223a51ae 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/InvocationExpressionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/InvocationExpressionImpl.java
@@ -21,7 +21,6 @@
 import org.eclipse.syson.sysml.Expression;
 import org.eclipse.syson.sysml.Feature;
 import org.eclipse.syson.sysml.FeatureDirectionKind;
-import org.eclipse.syson.sysml.FeatureValue;
 import org.eclipse.syson.sysml.InvocationExpression;
 import org.eclipse.syson.sysml.SysmlPackage;
 
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ItemFlowImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ItemFlowImpl.java
index 2cdb96781..6e7dc0095 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ItemFlowImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ItemFlowImpl.java
@@ -198,23 +198,20 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.ITEM_FLOW__INTERACTION:
                 return this.getInteraction();
             case SysmlPackage.ITEM_FLOW__ITEM_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getItemFeature();
-                }
                 return this.basicGetItemFeature();
             case SysmlPackage.ITEM_FLOW__ITEM_FLOW_END:
                 return this.getItemFlowEnd();
             case SysmlPackage.ITEM_FLOW__ITEM_TYPE:
                 return this.getItemType();
             case SysmlPackage.ITEM_FLOW__SOURCE_OUTPUT_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getSourceOutputFeature();
-                }
                 return this.basicGetSourceOutputFeature();
             case SysmlPackage.ITEM_FLOW__TARGET_INPUT_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getTargetInputFeature();
-                }
                 return this.basicGetTargetInputFeature();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -291,7 +288,7 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
     /**
      * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public EList<Association> getAssociation() {
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImpl.java
index 8c8d6f6aa..2033897ff 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImpl.java
@@ -158,9 +158,8 @@ public Element getMemberElement() {
             InternalEObject oldMemberElement = (InternalEObject) this.memberElement;
             this.memberElement = (Element) this.eResolveProxy(oldMemberElement);
             if (this.memberElement != oldMemberElement) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT, oldMemberElement, this.memberElement));
-                }
             }
         }
         return this.memberElement;
@@ -184,9 +183,8 @@ public Element basicGetMemberElement() {
     public void setMemberElement(Element newMemberElement) {
         Element oldMemberElement = this.memberElement;
         this.memberElement = newMemberElement;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT, oldMemberElement, this.memberElement));
-        }
     }
 
     /**
@@ -222,9 +220,8 @@ public String getMemberName() {
     public void setMemberName(String newMemberName) {
         String oldMemberName = this.memberName;
         this.memberName = newMemberName;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_NAME, oldMemberName, this.memberName));
-        }
     }
 
     /**
@@ -270,9 +267,8 @@ public String getMemberShortName() {
     public void setMemberShortName(String newMemberShortName) {
         String oldMemberShortName = this.memberShortName;
         this.memberShortName = newMemberShortName;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_SHORT_NAME, oldMemberShortName, this.memberShortName));
-        }
     }
 
     /**
@@ -294,9 +290,8 @@ public VisibilityKind getVisibility() {
     public void setVisibility(VisibilityKind newVisibility) {
         VisibilityKind oldVisibility = this.visibility;
         this.visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__VISIBILITY, oldVisibility, this.visibility));
-        }
     }
 
     /**
@@ -326,14 +321,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.MEMBERSHIP__VISIBILITY:
                 return this.getVisibility();
             case SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getMemberElement();
-                }
                 return this.basicGetMemberElement();
             case SysmlPackage.MEMBERSHIP__MEMBERSHIP_OWNING_NAMESPACE:
-                if (resolve) {
+                if (resolve)
                     return this.getMembershipOwningNamespace();
-                }
                 return this.basicGetMembershipOwningNamespace();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -432,9 +425,8 @@ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTarg
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (memberName: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImportImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImportImpl.java
index 637b4a99c..6653a4596 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImportImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImportImpl.java
@@ -81,9 +81,8 @@ public Membership getImportedMembership() {
             InternalEObject oldImportedMembership = (InternalEObject) this.importedMembership;
             this.importedMembership = (Membership) this.eResolveProxy(oldImportedMembership);
             if (this.importedMembership != oldImportedMembership) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.MEMBERSHIP_IMPORT__IMPORTED_MEMBERSHIP, oldImportedMembership, this.importedMembership));
-                }
             }
         }
         return this.importedMembership;
@@ -107,9 +106,8 @@ public Membership basicGetImportedMembership() {
     public void setImportedMembership(Membership newImportedMembership) {
         Membership oldImportedMembership = this.importedMembership;
         this.importedMembership = newImportedMembership;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP_IMPORT__IMPORTED_MEMBERSHIP, oldImportedMembership, this.importedMembership));
-        }
     }
 
     /**
@@ -121,9 +119,8 @@ public void setImportedMembership(Membership newImportedMembership) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.MEMBERSHIP_IMPORT__IMPORTED_MEMBERSHIP:
-                if (resolve) {
+                if (resolve)
                     return this.getImportedMembership();
-                }
                 return this.basicGetImportedMembership();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataFeatureImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataFeatureImpl.java
index 403d2f6cd..d1f669da7 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataFeatureImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataFeatureImpl.java
@@ -101,6 +101,17 @@ public EList<Annotation> getAnnotation() {
         return this.annotation;
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated NOT
+     */
+    @Override
+    public EList<Annotation> getOwnedAnnotatingRelationship() {
+        List<Usage> data = new ArrayList<>();
+        return new EcoreEList.UnmodifiableEList<>(this, SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(), data.size(), data.toArray());
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -209,6 +220,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 return this.getAnnotatedElement();
             case SysmlPackage.METADATA_FEATURE__ANNOTATION:
                 return this.getAnnotation();
+            case SysmlPackage.METADATA_FEATURE__OWNED_ANNOTATING_RELATIONSHIP:
+                return this.getOwnedAnnotatingRelationship();
             case SysmlPackage.METADATA_FEATURE__METACLASS:
                 if (resolve)
                     return this.getMetaclass();
@@ -261,6 +274,8 @@ public boolean eIsSet(int featureID) {
                 return !this.getAnnotatedElement().isEmpty();
             case SysmlPackage.METADATA_FEATURE__ANNOTATION:
                 return this.annotation != null && !this.annotation.isEmpty();
+            case SysmlPackage.METADATA_FEATURE__OWNED_ANNOTATING_RELATIONSHIP:
+                return !this.getOwnedAnnotatingRelationship().isEmpty();
             case SysmlPackage.METADATA_FEATURE__METACLASS:
                 return this.basicGetMetaclass() != null;
         }
@@ -280,6 +295,8 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
                     return SysmlPackage.ANNOTATING_ELEMENT__ANNOTATED_ELEMENT;
                 case SysmlPackage.METADATA_FEATURE__ANNOTATION:
                     return SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION;
+                case SysmlPackage.METADATA_FEATURE__OWNED_ANNOTATING_RELATIONSHIP:
+                    return SysmlPackage.ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP;
                 default:
                     return -1;
             }
@@ -300,6 +317,8 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
                     return SysmlPackage.METADATA_FEATURE__ANNOTATED_ELEMENT;
                 case SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION:
                     return SysmlPackage.METADATA_FEATURE__ANNOTATION;
+                case SysmlPackage.ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP:
+                    return SysmlPackage.METADATA_FEATURE__OWNED_ANNOTATING_RELATIONSHIP;
                 default:
                     return -1;
             }
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java
index dadc1f2ff..67c9441d0 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java
@@ -45,6 +45,8 @@
  * <ul>
  * <li>{@link org.eclipse.syson.sysml.impl.MetadataUsageImpl#getAnnotatedElement <em>Annotated Element</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.MetadataUsageImpl#getAnnotation <em>Annotation</em>}</li>
+ * <li>{@link org.eclipse.syson.sysml.impl.MetadataUsageImpl#getOwnedAnnotatingRelationship <em>Owned Annotating
+ * Relationship</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.MetadataUsageImpl#getMetaclass <em>Metaclass</em>}</li>
  * <li>{@link org.eclipse.syson.sysml.impl.MetadataUsageImpl#getMetadataDefinition <em>Metadata Definition</em>}</li>
  * </ul>
@@ -105,6 +107,17 @@ public EList<Annotation> getAnnotation() {
         return this.annotation;
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated NOT
+     */
+    @Override
+    public EList<Annotation> getOwnedAnnotatingRelationship() {
+        List<Usage> data = new ArrayList<>();
+        return new EcoreEList.UnmodifiableEList<>(this, SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(), data.size(), data.toArray());
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -239,15 +252,15 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 return this.getAnnotatedElement();
             case SysmlPackage.METADATA_USAGE__ANNOTATION:
                 return this.getAnnotation();
+            case SysmlPackage.METADATA_USAGE__OWNED_ANNOTATING_RELATIONSHIP:
+                return this.getOwnedAnnotatingRelationship();
             case SysmlPackage.METADATA_USAGE__METACLASS:
-                if (resolve) {
+                if (resolve)
                     return this.getMetaclass();
-                }
                 return this.basicGetMetaclass();
             case SysmlPackage.METADATA_USAGE__METADATA_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getMetadataDefinition();
-                }
                 return this.basicGetMetadataDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -297,6 +310,8 @@ public boolean eIsSet(int featureID) {
                 return !this.getAnnotatedElement().isEmpty();
             case SysmlPackage.METADATA_USAGE__ANNOTATION:
                 return this.annotation != null && !this.annotation.isEmpty();
+            case SysmlPackage.METADATA_USAGE__OWNED_ANNOTATING_RELATIONSHIP:
+                return !this.getOwnedAnnotatingRelationship().isEmpty();
             case SysmlPackage.METADATA_USAGE__METACLASS:
                 return this.basicGetMetaclass() != null;
             case SysmlPackage.METADATA_USAGE__METADATA_DEFINITION:
@@ -318,6 +333,8 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
                     return SysmlPackage.ANNOTATING_ELEMENT__ANNOTATED_ELEMENT;
                 case SysmlPackage.METADATA_USAGE__ANNOTATION:
                     return SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION;
+                case SysmlPackage.METADATA_USAGE__OWNED_ANNOTATING_RELATIONSHIP:
+                    return SysmlPackage.ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP;
                 default:
                     return -1;
             }
@@ -346,6 +363,8 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
                     return SysmlPackage.METADATA_USAGE__ANNOTATED_ELEMENT;
                 case SysmlPackage.ANNOTATING_ELEMENT__ANNOTATION:
                     return SysmlPackage.METADATA_USAGE__ANNOTATION;
+                case SysmlPackage.ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP:
+                    return SysmlPackage.METADATA_USAGE__OWNED_ANNOTATING_RELATIONSHIP;
                 default:
                     return -1;
             }
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MultiplicityRangeImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MultiplicityRangeImpl.java
index a12fc0a06..fed9f3728 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MultiplicityRangeImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MultiplicityRangeImpl.java
@@ -175,14 +175,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.MULTIPLICITY_RANGE__BOUND:
                 return this.getBound();
             case SysmlPackage.MULTIPLICITY_RANGE__LOWER_BOUND:
-                if (resolve) {
+                if (resolve)
                     return this.getLowerBound();
-                }
                 return this.basicGetLowerBound();
             case SysmlPackage.MULTIPLICITY_RANGE__UPPER_BOUND:
-                if (resolve) {
+                if (resolve)
                     return this.getUpperBound();
-                }
                 return this.basicGetUpperBound();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImpl.java
index 442e8ae16..4ab59f1a5 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImpl.java
@@ -187,10 +187,10 @@ public EList<Membership> importedMemberships(EList<Namespace> excluded) {
         excludedAndSelf.addAll(excluded);
         excludedAndSelf.add(this);
         this.getOwnedImport().stream()
-            .map(imprt -> imprt.importedMemberships(excludedAndSelf))
-            .flatMap(Collection::stream)
-            .filter(nameConflictingFilter)
-            .forEach(importedMemberships::add);
+                .map(imprt -> imprt.importedMemberships(excludedAndSelf))
+                .flatMap(Collection::stream)
+                .filter(nameConflictingFilter)
+                .forEach(importedMemberships::add);
         return new EcoreEList.UnmodifiableEList<>(this, SysmlPackage.eINSTANCE.getNamespace_ImportedMembership(), importedMemberships.size(), importedMemberships.toArray());
     }
 
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImportImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImportImpl.java
index f37ddb558..07dffcc55 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImportImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImportImpl.java
@@ -81,9 +81,8 @@ public Namespace getImportedNamespace() {
             InternalEObject oldImportedNamespace = (InternalEObject) this.importedNamespace;
             this.importedNamespace = (Namespace) this.eResolveProxy(oldImportedNamespace);
             if (this.importedNamespace != oldImportedNamespace) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.NAMESPACE_IMPORT__IMPORTED_NAMESPACE, oldImportedNamespace, this.importedNamespace));
-                }
             }
         }
         return this.importedNamespace;
@@ -107,9 +106,8 @@ public Namespace basicGetImportedNamespace() {
     public void setImportedNamespace(Namespace newImportedNamespace) {
         Namespace oldImportedNamespace = this.importedNamespace;
         this.importedNamespace = newImportedNamespace;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.NAMESPACE_IMPORT__IMPORTED_NAMESPACE, oldImportedNamespace, this.importedNamespace));
-        }
     }
 
     /**
@@ -121,9 +119,8 @@ public void setImportedNamespace(Namespace newImportedNamespace) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.NAMESPACE_IMPORT__IMPORTED_NAMESPACE:
-                if (resolve) {
+                if (resolve)
                     return this.getImportedNamespace();
-                }
                 return this.basicGetImportedNamespace();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ObjectiveMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ObjectiveMembershipImpl.java
index 49202b578..5bf5919c0 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ObjectiveMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ObjectiveMembershipImpl.java
@@ -87,9 +87,8 @@ public RequirementUsage basicGetOwnedObjectiveRequirement() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.OBJECTIVE_MEMBERSHIP__OWNED_OBJECTIVE_REQUIREMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedObjectiveRequirement();
-                }
                 return this.basicGetOwnedObjectiveRequirement();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OccurrenceUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OccurrenceUsageImpl.java
index 9c42b46bb..0d00fc62f 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OccurrenceUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OccurrenceUsageImpl.java
@@ -147,9 +147,8 @@ public boolean isIsIndividual() {
     public void setIsIndividual(boolean newIsIndividual) {
         boolean oldIsIndividual = this.isIndividual;
         this.isIndividual = newIsIndividual;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.OCCURRENCE_USAGE__IS_INDIVIDUAL, oldIsIndividual, this.isIndividual));
-        }
     }
 
     /**
@@ -182,9 +181,8 @@ public PortionKind getPortionKind() {
     public void setPortionKind(PortionKind newPortionKind) {
         PortionKind oldPortionKind = this.portionKind;
         this.portionKind = newPortionKind == null ? PORTION_KIND_EDEFAULT : newPortionKind;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.OCCURRENCE_USAGE__PORTION_KIND, oldPortionKind, this.portionKind));
-        }
     }
 
     /**
@@ -200,9 +198,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.OCCURRENCE_USAGE__PORTION_KIND:
                 return this.getPortionKind();
             case SysmlPackage.OCCURRENCE_USAGE__INDIVIDUAL_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getIndividualDefinition();
-                }
                 return this.basicGetIndividualDefinition();
             case SysmlPackage.OCCURRENCE_USAGE__OCCURRENCE_DEFINITION:
                 return this.getOccurrenceDefinition();
@@ -274,9 +271,8 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isIndividual: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OperatorExpressionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OperatorExpressionImpl.java
index b6f160e42..b7ad6dfcc 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OperatorExpressionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OperatorExpressionImpl.java
@@ -12,21 +12,11 @@
 *******************************************************************************/
 package org.eclipse.syson.sysml.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.syson.sysml.Expression;
 import org.eclipse.syson.sysml.OperatorExpression;
 import org.eclipse.syson.sysml.SysmlPackage;
-import org.eclipse.syson.sysml.Usage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Operator Expression</b></em>'. <!--
@@ -36,7 +26,6 @@
  * </p>
  * <ul>
  * <li>{@link org.eclipse.syson.sysml.impl.OperatorExpressionImpl#getOperator <em>Operator</em>}</li>
- * <li>{@link org.eclipse.syson.sysml.impl.OperatorExpressionImpl#getOperand <em>Operand</em>}</li>
  * </ul>
  *
  * @generated
@@ -81,17 +70,6 @@ protected EClass eStaticClass() {
         return SysmlPackage.eINSTANCE.getOperatorExpression();
     }
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated NOT
-     */
-    @Override
-    public EList<Expression> getOperand() {
-        List<Usage> data = new ArrayList<>();
-        return new EcoreEList.UnmodifiableEList<>(this, SysmlPackage.eINSTANCE.getOperatorExpression_Operand(), data.size(), data.toArray());
-    }
-
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -111,22 +89,9 @@ public String getOperator() {
     public void setOperator(String newOperator) {
         String oldOperator = this.operator;
         this.operator = newOperator;
-        if (this.eNotificationRequired())
+        if (this.eNotificationRequired()) {
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.OPERATOR_EXPRESSION__OPERATOR, oldOperator, this.operator));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SysmlPackage.OPERATOR_EXPRESSION__OPERAND:
-                return ((InternalEList<?>) this.getOperand()).basicRemove(otherEnd, msgs);
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
@@ -139,8 +104,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.OPERATOR_EXPRESSION__OPERATOR:
                 return this.getOperator();
-            case SysmlPackage.OPERATOR_EXPRESSION__OPERAND:
-                return this.getOperand();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -186,8 +149,6 @@ public boolean eIsSet(int featureID) {
         switch (featureID) {
             case SysmlPackage.OPERATOR_EXPRESSION__OPERATOR:
                 return OPERATOR_EDEFAULT == null ? this.operator != null : !OPERATOR_EDEFAULT.equals(this.operator);
-            case SysmlPackage.OPERATOR_EXPRESSION__OPERAND:
-                return !this.getOperand().isEmpty();
         }
         return super.eIsSet(featureID);
     }
@@ -199,8 +160,9 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy())
+        if (this.eIsProxy()) {
             return super.toString();
+        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (operator: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OwningMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OwningMembershipImpl.java
index dcccea09d..f4b59a413 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OwningMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/OwningMembershipImpl.java
@@ -188,9 +188,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.OWNING_MEMBERSHIP__OWNED_MEMBER_SHORT_NAME:
                 return this.getOwnedMemberShortName();
             case SysmlPackage.OWNING_MEMBERSHIP__OWNED_MEMBER_ELEMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedMemberElement();
-                }
                 return this.basicGetOwnedMemberElement();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ParameterMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ParameterMembershipImpl.java
index b2b0f9fb8..41a8764bb 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ParameterMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ParameterMembershipImpl.java
@@ -12,9 +12,13 @@
 *******************************************************************************/
 package org.eclipse.syson.sysml.impl;
 
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.syson.sysml.Feature;
+import org.eclipse.syson.sysml.FeatureDirectionKind;
 import org.eclipse.syson.sysml.ParameterMembership;
 import org.eclipse.syson.sysml.SysmlPackage;
 
@@ -75,6 +79,18 @@ public Feature basicGetOwnedMemberParameter() {
                 .orElse(null);
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public FeatureDirectionKind parameterDirection() {
+        // TODO: implement this method
+        // Ensure that you remove @generated or mark it @generated NOT
+        return null;
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -84,9 +100,8 @@ public Feature basicGetOwnedMemberParameter() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.PARAMETER_MEMBERSHIP__OWNED_MEMBER_PARAMETER:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedMemberParameter();
-                }
                 return this.basicGetOwnedMemberParameter();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -106,6 +121,20 @@ public boolean eIsSet(int featureID) {
         return super.eIsSet(featureID);
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+        switch (operationID) {
+            case SysmlPackage.PARAMETER_MEMBERSHIP___PARAMETER_DIRECTION:
+                return this.parameterDirection();
+        }
+        return super.eInvoke(operationID, arguments);
+    }
+
     /**
      * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
      *
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PerformActionUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PerformActionUsageImpl.java
index f5b99fcf4..457ea639b 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PerformActionUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PerformActionUsageImpl.java
@@ -115,14 +115,12 @@ public ActionUsage basicGetPerformedAction() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.PERFORM_ACTION_USAGE__EVENT_OCCURRENCE:
-                if (resolve) {
+                if (resolve)
                     return this.getEventOccurrence();
-                }
                 return this.basicGetEventOccurrence();
             case SysmlPackage.PERFORM_ACTION_USAGE__PERFORMED_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getPerformedAction();
-                }
                 return this.basicGetPerformedAction();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PortConjugationImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PortConjugationImpl.java
index 38e7e6eb9..1ea1cf74b 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PortConjugationImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PortConjugationImpl.java
@@ -102,9 +102,8 @@ public PortDefinition getOriginalPortDefinition() {
             InternalEObject oldOriginalPortDefinition = (InternalEObject) this.originalPortDefinition;
             this.originalPortDefinition = (PortDefinition) this.eResolveProxy(oldOriginalPortDefinition);
             if (this.originalPortDefinition != oldOriginalPortDefinition) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.PORT_CONJUGATION__ORIGINAL_PORT_DEFINITION, oldOriginalPortDefinition, this.originalPortDefinition));
-                }
             }
         }
         return this.originalPortDefinition;
@@ -128,9 +127,8 @@ public PortDefinition basicGetOriginalPortDefinition() {
     public void setOriginalPortDefinition(PortDefinition newOriginalPortDefinition) {
         PortDefinition oldOriginalPortDefinition = this.originalPortDefinition;
         this.originalPortDefinition = newOriginalPortDefinition;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.PORT_CONJUGATION__ORIGINAL_PORT_DEFINITION, oldOriginalPortDefinition, this.originalPortDefinition));
-        }
     }
 
     /**
@@ -142,14 +140,12 @@ public void setOriginalPortDefinition(PortDefinition newOriginalPortDefinition)
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.PORT_CONJUGATION__CONJUGATED_PORT_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getConjugatedPortDefinition();
-                }
                 return this.basicGetConjugatedPortDefinition();
             case SysmlPackage.PORT_CONJUGATION__ORIGINAL_PORT_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getOriginalPortDefinition();
-                }
                 return this.basicGetOriginalPortDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RedefinitionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RedefinitionImpl.java
index ee06df8cb..bd64e9020 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RedefinitionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RedefinitionImpl.java
@@ -83,9 +83,8 @@ public Feature getRedefinedFeature() {
             InternalEObject oldRedefinedFeature = (InternalEObject) this.redefinedFeature;
             this.redefinedFeature = (Feature) this.eResolveProxy(oldRedefinedFeature);
             if (this.redefinedFeature != oldRedefinedFeature) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.REDEFINITION__REDEFINED_FEATURE, oldRedefinedFeature, this.redefinedFeature));
-                }
             }
         }
         return this.redefinedFeature;
@@ -109,9 +108,8 @@ public Feature basicGetRedefinedFeature() {
     public void setRedefinedFeature(Feature newRedefinedFeature) {
         Feature oldRedefinedFeature = this.redefinedFeature;
         this.redefinedFeature = newRedefinedFeature;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.REDEFINITION__REDEFINED_FEATURE, oldRedefinedFeature, this.redefinedFeature));
-        }
     }
 
     /**
@@ -125,9 +123,8 @@ public Feature getRedefiningFeature() {
             InternalEObject oldRedefiningFeature = (InternalEObject) this.redefiningFeature;
             this.redefiningFeature = (Feature) this.eResolveProxy(oldRedefiningFeature);
             if (this.redefiningFeature != oldRedefiningFeature) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.REDEFINITION__REDEFINING_FEATURE, oldRedefiningFeature, this.redefiningFeature));
-                }
             }
         }
         return this.redefiningFeature;
@@ -151,9 +148,8 @@ public Feature basicGetRedefiningFeature() {
     public void setRedefiningFeature(Feature newRedefiningFeature) {
         Feature oldRedefiningFeature = this.redefiningFeature;
         this.redefiningFeature = newRedefiningFeature;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.REDEFINITION__REDEFINING_FEATURE, oldRedefiningFeature, this.redefiningFeature));
-        }
     }
 
     /**
@@ -165,14 +161,12 @@ public void setRedefiningFeature(Feature newRedefiningFeature) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.REDEFINITION__REDEFINED_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getRedefinedFeature();
-                }
                 return this.basicGetRedefinedFeature();
             case SysmlPackage.REDEFINITION__REDEFINING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getRedefiningFeature();
-                }
                 return this.basicGetRedefiningFeature();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ReferenceSubsettingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ReferenceSubsettingImpl.java
index 337765ce8..b2692a064 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ReferenceSubsettingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ReferenceSubsettingImpl.java
@@ -77,9 +77,8 @@ public Feature getReferencedFeature() {
             InternalEObject oldReferencedFeature = (InternalEObject) this.referencedFeature;
             this.referencedFeature = (Feature) this.eResolveProxy(oldReferencedFeature);
             if (this.referencedFeature != oldReferencedFeature) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.REFERENCE_SUBSETTING__REFERENCED_FEATURE, oldReferencedFeature, this.referencedFeature));
-                }
             }
         }
         return this.referencedFeature;
@@ -103,9 +102,8 @@ public Feature basicGetReferencedFeature() {
     public void setReferencedFeature(Feature newReferencedFeature) {
         Feature oldReferencedFeature = this.referencedFeature;
         this.referencedFeature = newReferencedFeature;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.REFERENCE_SUBSETTING__REFERENCED_FEATURE, oldReferencedFeature, this.referencedFeature));
-        }
     }
 
     /**
@@ -137,14 +135,12 @@ public Feature basicGetReferencingFeature() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.REFERENCE_SUBSETTING__REFERENCED_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getReferencedFeature();
-                }
                 return this.basicGetReferencedFeature();
             case SysmlPackage.REFERENCE_SUBSETTING__REFERENCING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getReferencingFeature();
-                }
                 return this.basicGetReferencingFeature();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RenderingUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RenderingUsageImpl.java
index f5ca8a5ee..790c37216 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RenderingUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RenderingUsageImpl.java
@@ -86,9 +86,8 @@ public RenderingDefinition basicGetRenderingDefinition() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.RENDERING_USAGE__RENDERING_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getRenderingDefinition();
-                }
                 return this.basicGetRenderingDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementConstraintMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementConstraintMembershipImpl.java
index 5c00ce9f7..6ee1757be 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementConstraintMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementConstraintMembershipImpl.java
@@ -97,9 +97,8 @@ public RequirementConstraintKind getKind() {
     public void setKind(RequirementConstraintKind newKind) {
         RequirementConstraintKind oldKind = this.kind;
         this.kind = newKind == null ? KIND_EDEFAULT : newKind;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.REQUIREMENT_CONSTRAINT_MEMBERSHIP__KIND, oldKind, this.kind));
-        }
     }
 
     /**
@@ -160,14 +159,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.REQUIREMENT_CONSTRAINT_MEMBERSHIP__KIND:
                 return this.getKind();
             case SysmlPackage.REQUIREMENT_CONSTRAINT_MEMBERSHIP__OWNED_CONSTRAINT:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedConstraint();
-                }
                 return this.basicGetOwnedConstraint();
             case SysmlPackage.REQUIREMENT_CONSTRAINT_MEMBERSHIP__REFERENCED_CONSTRAINT:
-                if (resolve) {
+                if (resolve)
                     return this.getReferencedConstraint();
-                }
                 return this.basicGetReferencedConstraint();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -228,9 +225,8 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (kind: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementUsageImpl.java
index 28ad98750..8ba2a213a 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementUsageImpl.java
@@ -157,9 +157,8 @@ public String getReqId() {
     public void setReqId(String newReqId) {
         String oldReqId = this.reqId;
         this.reqId = newReqId;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.REQUIREMENT_USAGE__REQ_ID, oldReqId, this.reqId));
-        }
     }
 
     /**
@@ -280,16 +279,14 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.REQUIREMENT_USAGE__REQUIRED_CONSTRAINT:
                 return this.getRequiredConstraint();
             case SysmlPackage.REQUIREMENT_USAGE__REQUIREMENT_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getRequirementDefinition();
-                }
                 return this.basicGetRequirementDefinition();
             case SysmlPackage.REQUIREMENT_USAGE__STAKEHOLDER_PARAMETER:
                 return this.getStakeholderParameter();
             case SysmlPackage.REQUIREMENT_USAGE__SUBJECT_PARAMETER:
-                if (resolve) {
+                if (resolve)
                     return this.getSubjectParameter();
-                }
                 return this.basicGetSubjectParameter();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -363,9 +360,8 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (reqId: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementVerificationMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementVerificationMembershipImpl.java
index 81bd2c3a3..5a4f06e72 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementVerificationMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/RequirementVerificationMembershipImpl.java
@@ -109,14 +109,12 @@ public RequirementUsage basicGetVerifiedRequirement() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.REQUIREMENT_VERIFICATION_MEMBERSHIP__OWNED_REQUIREMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedRequirement();
-                }
                 return this.basicGetOwnedRequirement();
             case SysmlPackage.REQUIREMENT_VERIFICATION_MEMBERSHIP__VERIFIED_REQUIREMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getVerifiedRequirement();
-                }
                 return this.basicGetVerifiedRequirement();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ResultExpressionMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ResultExpressionMembershipImpl.java
index 48726c039..b9946d618 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ResultExpressionMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ResultExpressionMembershipImpl.java
@@ -84,9 +84,8 @@ public Expression basicGetOwnedResultExpression() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.RESULT_EXPRESSION_MEMBERSHIP__OWNED_RESULT_EXPRESSION:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedResultExpression();
-                }
                 return this.basicGetOwnedResultExpression();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SatisfyRequirementUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SatisfyRequirementUsageImpl.java
index 9a800a7de..30c29dec0 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SatisfyRequirementUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SatisfyRequirementUsageImpl.java
@@ -101,9 +101,8 @@ public boolean isIsNegated() {
     public void setIsNegated(boolean newIsNegated) {
         boolean oldIsNegated = this.isNegated;
         this.isNegated = newIsNegated;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.SATISFY_REQUIREMENT_USAGE__IS_NEGATED, oldIsNegated, this.isNegated));
-        }
     }
 
     /**
@@ -120,10 +119,12 @@ public ConstraintUsage getAssertedConstraint() {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
+     * 
      */
     public ConstraintUsage basicGetAssertedConstraint() {
         return this.getSatisfiedRequirement();
+
     }
 
     /**
@@ -183,19 +184,16 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.SATISFY_REQUIREMENT_USAGE__IS_NEGATED:
                 return this.isIsNegated();
             case SysmlPackage.SATISFY_REQUIREMENT_USAGE__ASSERTED_CONSTRAINT:
-                if (resolve) {
+                if (resolve)
                     return this.getAssertedConstraint();
-                }
                 return this.basicGetAssertedConstraint();
             case SysmlPackage.SATISFY_REQUIREMENT_USAGE__SATISFIED_REQUIREMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getSatisfiedRequirement();
-                }
                 return this.basicGetSatisfiedRequirement();
             case SysmlPackage.SATISFY_REQUIREMENT_USAGE__SATISFYING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getSatisfyingFeature();
-                }
                 return this.basicGetSatisfyingFeature();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -310,9 +308,8 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isNegated: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SpecializationImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SpecializationImpl.java
index f6f6f20dc..a109dd4fe 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SpecializationImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SpecializationImpl.java
@@ -90,9 +90,8 @@ public Type getGeneral() {
             InternalEObject oldGeneral = (InternalEObject) this.general;
             this.general = (Type) this.eResolveProxy(oldGeneral);
             if (this.general != oldGeneral) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.SPECIALIZATION__GENERAL, oldGeneral, this.general));
-                }
             }
         }
         return this.general;
@@ -116,9 +115,8 @@ public Type basicGetGeneral() {
     public void setGeneral(Type newGeneral) {
         Type oldGeneral = this.general;
         this.general = newGeneral;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.SPECIALIZATION__GENERAL, oldGeneral, this.general));
-        }
     }
 
     /**
@@ -155,9 +153,8 @@ public Type getSpecific() {
             InternalEObject oldSpecific = (InternalEObject) this.specific;
             this.specific = (Type) this.eResolveProxy(oldSpecific);
             if (this.specific != oldSpecific) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.SPECIALIZATION__SPECIFIC, oldSpecific, this.specific));
-                }
             }
         }
         return this.specific;
@@ -181,9 +178,8 @@ public Type basicGetSpecific() {
     public void setSpecific(Type newSpecific) {
         Type oldSpecific = this.specific;
         this.specific = newSpecific;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.SPECIALIZATION__SPECIFIC, oldSpecific, this.specific));
-        }
     }
 
     /**
@@ -195,19 +191,16 @@ public void setSpecific(Type newSpecific) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.SPECIALIZATION__GENERAL:
-                if (resolve) {
+                if (resolve)
                     return this.getGeneral();
-                }
                 return this.basicGetGeneral();
             case SysmlPackage.SPECIALIZATION__OWNING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningType();
-                }
                 return this.basicGetOwningType();
             case SysmlPackage.SPECIALIZATION__SPECIFIC:
-                if (resolve) {
+                if (resolve)
                     return this.getSpecific();
-                }
                 return this.basicGetSpecific();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StakeholderMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StakeholderMembershipImpl.java
index 15c78c8dd..7eb5437e6 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StakeholderMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StakeholderMembershipImpl.java
@@ -84,9 +84,8 @@ public PartUsage basicGetOwnedStakeholderParameter() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.STAKEHOLDER_MEMBERSHIP__OWNED_STAKEHOLDER_PARAMETER:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedStakeholderParameter();
-                }
                 return this.basicGetOwnedStakeholderParameter();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateDefinitionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateDefinitionImpl.java
index 194695163..073d57d36 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateDefinitionImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateDefinitionImpl.java
@@ -188,9 +188,8 @@ public boolean isIsParallel() {
     public void setIsParallel(boolean newIsParallel) {
         boolean oldIsParallel = this.isParallel;
         this.isParallel = newIsParallel;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.STATE_DEFINITION__IS_PARALLEL, oldIsParallel, this.isParallel));
-        }
     }
 
     /**
@@ -215,19 +214,16 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.STATE_DEFINITION__IS_PARALLEL:
                 return this.isIsParallel();
             case SysmlPackage.STATE_DEFINITION__DO_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getDoAction();
-                }
                 return this.basicGetDoAction();
             case SysmlPackage.STATE_DEFINITION__ENTRY_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getEntryAction();
-                }
                 return this.basicGetEntryAction();
             case SysmlPackage.STATE_DEFINITION__EXIT_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getExitAction();
-                }
                 return this.basicGetExitAction();
             case SysmlPackage.STATE_DEFINITION__STATE:
                 return this.getState();
@@ -295,9 +291,8 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isParallel: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateSubactionMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateSubactionMembershipImpl.java
index eac71e0af..e4d6ddf22 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateSubactionMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateSubactionMembershipImpl.java
@@ -126,9 +126,8 @@ public StateSubactionKind getKind() {
     public void setKind(StateSubactionKind newKind) {
         StateSubactionKind oldKind = this.kind;
         this.kind = newKind == null ? KIND_EDEFAULT : newKind;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.STATE_SUBACTION_MEMBERSHIP__KIND, oldKind, this.kind));
-        }
     }
 
     /**
@@ -142,9 +141,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.STATE_SUBACTION_MEMBERSHIP__KIND:
                 return this.getKind();
             case SysmlPackage.STATE_SUBACTION_MEMBERSHIP__ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getAction();
-                }
                 return this.basicGetAction();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -203,9 +201,8 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (kind: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateUsageImpl.java
index 30dc01440..7fd9044bf 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateUsageImpl.java
@@ -191,9 +191,8 @@ public boolean isIsParallel() {
     public void setIsParallel(boolean newIsParallel) {
         boolean oldIsParallel = this.isParallel;
         this.isParallel = newIsParallel;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.STATE_USAGE__IS_PARALLEL, oldIsParallel, this.isParallel));
-        }
     }
 
     /**
@@ -258,19 +257,16 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.STATE_USAGE__IS_PARALLEL:
                 return this.isIsParallel();
             case SysmlPackage.STATE_USAGE__DO_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getDoAction();
-                }
                 return this.basicGetDoAction();
             case SysmlPackage.STATE_USAGE__ENTRY_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getEntryAction();
-                }
                 return this.basicGetEntryAction();
             case SysmlPackage.STATE_USAGE__EXIT_ACTION:
-                if (resolve) {
+                if (resolve)
                     return this.getExitAction();
-                }
                 return this.basicGetExitAction();
             case SysmlPackage.STATE_USAGE__STATE_DEFINITION:
                 return this.getStateDefinition();
@@ -352,9 +348,8 @@ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTarg
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isParallel: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubclassificationImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubclassificationImpl.java
index 7ffd0cbab..242e5e880 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubclassificationImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubclassificationImpl.java
@@ -106,9 +106,8 @@ public Classifier getSubclassifier() {
             InternalEObject oldSubclassifier = (InternalEObject) this.subclassifier;
             this.subclassifier = (Classifier) this.eResolveProxy(oldSubclassifier);
             if (this.subclassifier != oldSubclassifier) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.SUBCLASSIFICATION__SUBCLASSIFIER, oldSubclassifier, this.subclassifier));
-                }
             }
         }
         return this.subclassifier;
@@ -132,9 +131,8 @@ public Classifier basicGetSubclassifier() {
     public void setSubclassifier(Classifier newSubclassifier) {
         Classifier oldSubclassifier = this.subclassifier;
         this.subclassifier = newSubclassifier;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.SUBCLASSIFICATION__SUBCLASSIFIER, oldSubclassifier, this.subclassifier));
-        }
     }
 
     /**
@@ -148,9 +146,8 @@ public Classifier getSuperclassifier() {
             InternalEObject oldSuperclassifier = (InternalEObject) this.superclassifier;
             this.superclassifier = (Classifier) this.eResolveProxy(oldSuperclassifier);
             if (this.superclassifier != oldSuperclassifier) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.SUBCLASSIFICATION__SUPERCLASSIFIER, oldSuperclassifier, this.superclassifier));
-                }
             }
         }
         return this.superclassifier;
@@ -174,9 +171,8 @@ public Classifier basicGetSuperclassifier() {
     public void setSuperclassifier(Classifier newSuperclassifier) {
         Classifier oldSuperclassifier = this.superclassifier;
         this.superclassifier = newSuperclassifier;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.SUBCLASSIFICATION__SUPERCLASSIFIER, oldSuperclassifier, this.superclassifier));
-        }
     }
 
     /**
@@ -188,19 +184,16 @@ public void setSuperclassifier(Classifier newSuperclassifier) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.SUBCLASSIFICATION__OWNING_CLASSIFIER:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningClassifier();
-                }
                 return this.basicGetOwningClassifier();
             case SysmlPackage.SUBCLASSIFICATION__SUBCLASSIFIER:
-                if (resolve) {
+                if (resolve)
                     return this.getSubclassifier();
-                }
                 return this.basicGetSubclassifier();
             case SysmlPackage.SUBCLASSIFICATION__SUPERCLASSIFIER:
-                if (resolve) {
+                if (resolve)
                     return this.getSuperclassifier();
-                }
                 return this.basicGetSuperclassifier();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubjectMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubjectMembershipImpl.java
index a718c7fef..c120ce249 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubjectMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubjectMembershipImpl.java
@@ -86,9 +86,8 @@ public Usage basicGetOwnedSubjectParameter() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.SUBJECT_MEMBERSHIP__OWNED_SUBJECT_PARAMETER:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedSubjectParameter();
-                }
                 return this.basicGetOwnedSubjectParameter();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubsettingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubsettingImpl.java
index 2df2801d8..6d90e8220 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubsettingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SubsettingImpl.java
@@ -110,9 +110,8 @@ public Feature getSubsettedFeature() {
             InternalEObject oldSubsettedFeature = (InternalEObject) this.subsettedFeature;
             this.subsettedFeature = (Feature) this.eResolveProxy(oldSubsettedFeature);
             if (this.subsettedFeature != oldSubsettedFeature) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.SUBSETTING__SUBSETTED_FEATURE, oldSubsettedFeature, this.subsettedFeature));
-                }
             }
         }
         return this.subsettedFeature;
@@ -136,9 +135,8 @@ public Feature basicGetSubsettedFeature() {
     public void setSubsettedFeature(Feature newSubsettedFeature) {
         Feature oldSubsettedFeature = this.subsettedFeature;
         this.subsettedFeature = newSubsettedFeature;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.SUBSETTING__SUBSETTED_FEATURE, oldSubsettedFeature, this.subsettedFeature));
-        }
     }
 
     /**
@@ -152,9 +150,8 @@ public Feature getSubsettingFeature() {
             InternalEObject oldSubsettingFeature = (InternalEObject) this.subsettingFeature;
             this.subsettingFeature = (Feature) this.eResolveProxy(oldSubsettingFeature);
             if (this.subsettingFeature != oldSubsettingFeature) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.SUBSETTING__SUBSETTING_FEATURE, oldSubsettingFeature, this.subsettingFeature));
-                }
             }
         }
         return this.subsettingFeature;
@@ -178,9 +175,8 @@ public Feature basicGetSubsettingFeature() {
     public void setSubsettingFeature(Feature newSubsettingFeature) {
         Feature oldSubsettingFeature = this.subsettingFeature;
         this.subsettingFeature = newSubsettingFeature;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.SUBSETTING__SUBSETTING_FEATURE, oldSubsettingFeature, this.subsettingFeature));
-        }
     }
 
     /**
@@ -192,19 +188,16 @@ public void setSubsettingFeature(Feature newSubsettingFeature) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.SUBSETTING__OWNING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningFeature();
-                }
                 return this.basicGetOwningFeature();
             case SysmlPackage.SUBSETTING__SUBSETTED_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getSubsettedFeature();
-                }
                 return this.basicGetSubsettedFeature();
             case SysmlPackage.SUBSETTING__SUBSETTING_FEATURE:
-                if (resolve) {
+                if (resolve)
                     return this.getSubsettingFeature();
-                }
                 return this.basicGetSubsettingFeature();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SysmlPackageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SysmlPackageImpl.java
index f9cf3834d..5c1ef787b 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SysmlPackageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/SysmlPackageImpl.java
@@ -1634,6 +1634,16 @@ public EReference getAnnotatingElement_Annotation() {
         return (EReference) this.annotatingElementEClass.getEStructuralFeatures().get(1);
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getAnnotatingElement_OwnedAnnotatingRelationship() {
+        return (EReference) this.annotatingElementEClass.getEStructuralFeatures().get(2);
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -1674,6 +1684,16 @@ public EReference getAnnotation_OwningAnnotatedElement() {
         return (EReference) this.annotationEClass.getEStructuralFeatures().get(2);
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getAnnotation_OwningAnnotatingElement() {
+        return (EReference) this.annotationEClass.getEStructuralFeatures().get(3);
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -2281,7 +2301,7 @@ public EClass getConnector() {
      */
     @Override
     public EReference getConnector_Association() {
-        return (EReference) this.connectorEClass.getEStructuralFeatures().get(1);
+        return (EReference) this.connectorEClass.getEStructuralFeatures().get(0);
     }
 
     /**
@@ -2291,17 +2311,7 @@ public EReference getConnector_Association() {
      */
     @Override
     public EReference getConnector_ConnectorEnd() {
-        return (EReference) this.connectorEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EAttribute getConnector_IsDirected() {
-        return (EAttribute) this.connectorEClass.getEStructuralFeatures().get(0);
+        return (EReference) this.connectorEClass.getEStructuralFeatures().get(1);
     }
 
     /**
@@ -2311,7 +2321,7 @@ public EAttribute getConnector_IsDirected() {
      */
     @Override
     public EReference getConnector_RelatedFeature() {
-        return (EReference) this.connectorEClass.getEStructuralFeatures().get(3);
+        return (EReference) this.connectorEClass.getEStructuralFeatures().get(2);
     }
 
     /**
@@ -2321,7 +2331,7 @@ public EReference getConnector_RelatedFeature() {
      */
     @Override
     public EReference getConnector_SourceFeature() {
-        return (EReference) this.connectorEClass.getEStructuralFeatures().get(4);
+        return (EReference) this.connectorEClass.getEStructuralFeatures().get(3);
     }
 
     /**
@@ -2331,7 +2341,7 @@ public EReference getConnector_SourceFeature() {
      */
     @Override
     public EReference getConnector_TargetFeature() {
-        return (EReference) this.connectorEClass.getEStructuralFeatures().get(5);
+        return (EReference) this.connectorEClass.getEStructuralFeatures().get(4);
     }
 
     /**
@@ -5164,16 +5174,6 @@ public EClass getOperatorExpression() {
         return this.operatorExpressionEClass;
     }
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EReference getOperatorExpression_Operand() {
-        return (EReference) this.operatorExpressionEClass.getEStructuralFeatures().get(1);
-    }
-
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -5284,6 +5284,16 @@ public EReference getParameterMembership_OwnedMemberParameter() {
         return (EReference) this.parameterMembershipEClass.getEStructuralFeatures().get(0);
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EOperation getParameterMembership__ParameterDirection() {
+        return this.parameterMembershipEClass.getEOperations().get(0);
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -6850,7 +6860,7 @@ public EOperation getType__DirectionOf__Feature() {
      * @generated
      */
     @Override
-    public EOperation getType__InheritedMemberships__EList() {
+    public EOperation getType__DirectionOfExcluding__Feature_EList() {
         return this.typeEClass.getEOperations().get(2);
     }
 
@@ -6860,7 +6870,7 @@ public EOperation getType__InheritedMemberships__EList() {
      * @generated
      */
     @Override
-    public EOperation getType__Specializes__Type() {
+    public EOperation getType__InheritedMemberships__EList() {
         return this.typeEClass.getEOperations().get(3);
     }
 
@@ -6870,10 +6880,20 @@ public EOperation getType__Specializes__Type() {
      * @generated
      */
     @Override
-    public EOperation getType__SpecializesFromLibrary__String() {
+    public EOperation getType__Specializes__Type() {
         return this.typeEClass.getEOperations().get(4);
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EOperation getType__SpecializesFromLibrary__String() {
+        return this.typeEClass.getEOperations().get(5);
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -7800,11 +7820,13 @@ public void createPackageContents() {
         this.annotatingElementEClass = this.createEClass(ANNOTATING_ELEMENT);
         this.createEReference(this.annotatingElementEClass, ANNOTATING_ELEMENT__ANNOTATED_ELEMENT);
         this.createEReference(this.annotatingElementEClass, ANNOTATING_ELEMENT__ANNOTATION);
+        this.createEReference(this.annotatingElementEClass, ANNOTATING_ELEMENT__OWNED_ANNOTATING_RELATIONSHIP);
 
         this.annotationEClass = this.createEClass(ANNOTATION);
         this.createEReference(this.annotationEClass, ANNOTATION__ANNOTATED_ELEMENT);
         this.createEReference(this.annotationEClass, ANNOTATION__ANNOTATING_ELEMENT);
         this.createEReference(this.annotationEClass, ANNOTATION__OWNING_ANNOTATED_ELEMENT);
+        this.createEReference(this.annotationEClass, ANNOTATION__OWNING_ANNOTATING_ELEMENT);
 
         this.assertConstraintUsageEClass = this.createEClass(ASSERT_CONSTRAINT_USAGE);
         this.createEReference(this.assertConstraintUsageEClass, ASSERT_CONSTRAINT_USAGE__ASSERTED_CONSTRAINT);
@@ -7891,7 +7913,6 @@ public void createPackageContents() {
         this.createEReference(this.connectionUsageEClass, CONNECTION_USAGE__CONNECTION_DEFINITION);
 
         this.connectorEClass = this.createEClass(CONNECTOR);
-        this.createEAttribute(this.connectorEClass, CONNECTOR__IS_DIRECTED);
         this.createEReference(this.connectorEClass, CONNECTOR__ASSOCIATION);
         this.createEReference(this.connectorEClass, CONNECTOR__CONNECTOR_END);
         this.createEReference(this.connectorEClass, CONNECTOR__RELATED_FEATURE);
@@ -8259,7 +8280,6 @@ public void createPackageContents() {
 
         this.operatorExpressionEClass = this.createEClass(OPERATOR_EXPRESSION);
         this.createEAttribute(this.operatorExpressionEClass, OPERATOR_EXPRESSION__OPERATOR);
-        this.createEReference(this.operatorExpressionEClass, OPERATOR_EXPRESSION__OPERAND);
 
         this.owningMembershipEClass = this.createEClass(OWNING_MEMBERSHIP);
         this.createEAttribute(this.owningMembershipEClass, OWNING_MEMBERSHIP__OWNED_MEMBER_ELEMENT_ID);
@@ -8273,6 +8293,7 @@ public void createPackageContents() {
 
         this.parameterMembershipEClass = this.createEClass(PARAMETER_MEMBERSHIP);
         this.createEReference(this.parameterMembershipEClass, PARAMETER_MEMBERSHIP__OWNED_MEMBER_PARAMETER);
+        this.createEOperation(this.parameterMembershipEClass, PARAMETER_MEMBERSHIP___PARAMETER_DIRECTION);
 
         this.partDefinitionEClass = this.createEClass(PART_DEFINITION);
 
@@ -8470,6 +8491,7 @@ public void createPackageContents() {
         this.createEReference(this.typeEClass, TYPE__UNIONING_TYPE);
         this.createEOperation(this.typeEClass, TYPE___ALL_SUPERTYPES);
         this.createEOperation(this.typeEClass, TYPE___DIRECTION_OF__FEATURE);
+        this.createEOperation(this.typeEClass, TYPE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST);
         this.createEOperation(this.typeEClass, TYPE___INHERITED_MEMBERSHIPS__ELIST);
         this.createEOperation(this.typeEClass, TYPE___SPECIALIZES__TYPE);
         this.createEOperation(this.typeEClass, TYPE___SPECIALIZES_FROM_LIBRARY__STRING);
@@ -8883,6 +8905,8 @@ public void initializePackageContents() {
         this.initEReference(this.getAnnotatingElement_Annotation(), this.getAnnotation(), this.getAnnotation_AnnotatingElement(), "annotation", null, 0, -1, AnnotatingElement.class, !IS_TRANSIENT,
                 !IS_VOLATILE,
                 IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        this.initEReference(this.getAnnotatingElement_OwnedAnnotatingRelationship(), this.getAnnotation(), this.getAnnotation_OwningAnnotatingElement(), "ownedAnnotatingRelationship", null, 0, -1,
+                AnnotatingElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 
         this.initEClass(this.annotationEClass, Annotation.class, "Annotation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         this.initEReference(this.getAnnotation_AnnotatedElement(), this.getElement(), null, "annotatedElement", null, 1, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
@@ -8893,6 +8917,8 @@ public void initializePackageContents() {
         this.initEReference(this.getAnnotation_OwningAnnotatedElement(), this.getElement(), this.getElement_OwnedAnnotation(), "owningAnnotatedElement", null, 0, 1, Annotation.class, IS_TRANSIENT,
                 IS_VOLATILE,
                 !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+        this.initEReference(this.getAnnotation_OwningAnnotatingElement(), this.getAnnotatingElement(), this.getAnnotatingElement_OwnedAnnotatingRelationship(), "owningAnnotatingElement", null, 0, 1,
+                Annotation.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 
         this.initEClass(this.assertConstraintUsageEClass, AssertConstraintUsage.class, "AssertConstraintUsage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         this.initEReference(this.getAssertConstraintUsage_AssertedConstraint(), this.getConstraintUsage(), null, "assertedConstraint", null, 1, 1, AssertConstraintUsage.class, IS_TRANSIENT,
@@ -9034,9 +9060,6 @@ public void initializePackageContents() {
                 !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
         this.initEClass(this.connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        this.initEAttribute(this.getConnector_IsDirected(), this.ecorePackage.getEBoolean(), "isDirected", "false", 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID,
-                IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
         this.initEReference(this.getConnector_Association(), this.getAssociation(), null, "association", null, 0, -1, Connector.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE,
                 IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
         this.initEReference(this.getConnector_ConnectorEnd(), this.getFeature(), null, "connectorEnd", null, 0, -1, Connector.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE,
@@ -9766,8 +9789,6 @@ public void initializePackageContents() {
         this.initEAttribute(this.getOperatorExpression_Operator(), this.ecorePackage.getEString(), "operator", null, 1, 1, OperatorExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 !IS_UNSETTABLE,
                 !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-        this.initEReference(this.getOperatorExpression_Operand(), this.getExpression(), null, "operand", null, 0, -1, OperatorExpression.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, IS_COMPOSITE,
-                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
         this.initEClass(this.owningMembershipEClass, OwningMembership.class, "OwningMembership", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         this.initEAttribute(this.getOwningMembership_OwnedMemberElementId(), this.ecorePackage.getEString(), "ownedMemberElementId", null, 1, 1, OwningMembership.class, IS_TRANSIENT, IS_VOLATILE,
@@ -9796,6 +9817,8 @@ public void initializePackageContents() {
                 !IS_CHANGEABLE,
                 !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 
+        this.initEOperation(this.getParameterMembership__ParameterDirection(), this.getFeatureDirectionKind(), "parameterDirection", 1, 1, IS_UNIQUE, !IS_ORDERED);
+
         this.initEClass(this.partDefinitionEClass, PartDefinition.class, "PartDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
         this.initEClass(this.partUsageEClass, PartUsage.class, "PartUsage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -10186,6 +10209,10 @@ public void initializePackageContents() {
         op = this.initEOperation(this.getType__DirectionOf__Feature(), this.getFeatureDirectionKind(), "directionOf", 0, 1, IS_UNIQUE, !IS_ORDERED);
         this.addEParameter(op, this.getFeature(), "feature", 1, 1, IS_UNIQUE, !IS_ORDERED);
 
+        op = this.initEOperation(this.getType__DirectionOfExcluding__Feature_EList(), this.getFeatureDirectionKind(), "directionOfExcluding", 0, 1, IS_UNIQUE, !IS_ORDERED);
+        this.addEParameter(op, this.getFeature(), "feature", 1, 1, IS_UNIQUE, !IS_ORDERED);
+        this.addEParameter(op, this.getType(), "excluded", 0, -1, IS_UNIQUE, !IS_ORDERED);
+
         op = this.initEOperation(this.getType__InheritedMemberships__EList(), this.getMembership(), "inheritedMemberships", 0, -1, IS_UNIQUE, IS_ORDERED);
         this.addEParameter(op, this.getType(), "excluded", 0, -1, IS_UNIQUE, !IS_ORDERED);
 
@@ -10493,6 +10520,14 @@ protected void createSubsetsAnnotations() {
                 new URI[] {
                         URI.createURI(eNS_URI).appendFragment("//Type/ownedFeature")
                 });
+        this.addAnnotation(this.getAnnotatingElement_OwnedAnnotatingRelationship(),
+                source,
+                new String[] {
+                },
+                new URI[] {
+                        URI.createURI(eNS_URI).appendFragment("//AnnotatingElement/annotation"),
+                        URI.createURI(eNS_URI).appendFragment("//Element/ownedRelationship")
+                });
         this.addAnnotation(this.getAnnotation_OwningAnnotatedElement(),
                 source,
                 new String[] {
@@ -10501,6 +10536,14 @@ protected void createSubsetsAnnotations() {
                         URI.createURI(eNS_URI).appendFragment("//Annotation/annotatedElement"),
                         URI.createURI(eNS_URI).appendFragment("//Relationship/owningRelatedElement")
                 });
+        this.addAnnotation(this.getAnnotation_OwningAnnotatingElement(),
+                source,
+                new String[] {
+                },
+                new URI[] {
+                        URI.createURI(eNS_URI).appendFragment("//Annotation/annotatingElement"),
+                        URI.createURI(eNS_URI).appendFragment("//Relationship/owningRelatedElement")
+                });
         this.addAnnotation(this.getAssignmentActionUsage_Referent(),
                 source,
                 new String[] {
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TextualRepresentationImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TextualRepresentationImpl.java
index bb8d5a944..565af8bc6 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TextualRepresentationImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TextualRepresentationImpl.java
@@ -117,9 +117,8 @@ public String getBody() {
     public void setBody(String newBody) {
         String oldBody = this.body;
         this.body = newBody;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TEXTUAL_REPRESENTATION__BODY, oldBody, this.body));
-        }
     }
 
     /**
@@ -141,9 +140,8 @@ public String getLanguage() {
     public void setLanguage(String newLanguage) {
         String oldLanguage = this.language;
         this.language = newLanguage;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TEXTUAL_REPRESENTATION__LANGUAGE, oldLanguage, this.language));
-        }
     }
 
     /**
@@ -182,9 +180,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.TEXTUAL_REPRESENTATION__LANGUAGE:
                 return this.getLanguage();
             case SysmlPackage.TEXTUAL_REPRESENTATION__REPRESENTED_ELEMENT:
-                if (resolve) {
+                if (resolve)
                     return this.getRepresentedElement();
-                }
                 return this.basicGetRepresentedElement();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -251,9 +248,8 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (body: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TransitionFeatureMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TransitionFeatureMembershipImpl.java
index 4797d3ee8..0f5ff1aa1 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TransitionFeatureMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TransitionFeatureMembershipImpl.java
@@ -118,7 +118,7 @@ public Step getTransitionFeature() {
      * @generated NOT
      */
     public Step basicGetTransitionFeature() {
-        return getOwnedRelatedElement().stream()
+        return this.getOwnedRelatedElement().stream()
                 .filter(Step.class::isInstance)
                 .map(Step.class::cast)
                 .findFirst()
@@ -209,7 +209,7 @@ public String toString() {
     /**
      * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public Feature getOwnedMemberFeature() {
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeFeaturingImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeFeaturingImpl.java
index 22f9d14aa..cc7566231 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeFeaturingImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeFeaturingImpl.java
@@ -92,9 +92,8 @@ public Feature getFeatureOfType() {
             InternalEObject oldFeatureOfType = (InternalEObject) this.featureOfType;
             this.featureOfType = (Feature) this.eResolveProxy(oldFeatureOfType);
             if (this.featureOfType != oldFeatureOfType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.TYPE_FEATURING__FEATURE_OF_TYPE, oldFeatureOfType, this.featureOfType));
-                }
             }
         }
         return this.featureOfType;
@@ -118,9 +117,8 @@ public Feature basicGetFeatureOfType() {
     public void setFeatureOfType(Feature newFeatureOfType) {
         Feature oldFeatureOfType = this.featureOfType;
         this.featureOfType = newFeatureOfType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TYPE_FEATURING__FEATURE_OF_TYPE, oldFeatureOfType, this.featureOfType));
-        }
     }
 
     /**
@@ -134,9 +132,8 @@ public Type getFeaturingType() {
             InternalEObject oldFeaturingType = (InternalEObject) this.featuringType;
             this.featuringType = (Type) this.eResolveProxy(oldFeaturingType);
             if (this.featuringType != oldFeaturingType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.TYPE_FEATURING__FEATURING_TYPE, oldFeaturingType, this.featuringType));
-                }
             }
         }
         return this.featuringType;
@@ -160,9 +157,8 @@ public Type basicGetFeaturingType() {
     public void setFeaturingType(Type newFeaturingType) {
         Type oldFeaturingType = this.featuringType;
         this.featuringType = newFeaturingType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TYPE_FEATURING__FEATURING_TYPE, oldFeaturingType, this.featuringType));
-        }
     }
 
     /**
@@ -197,19 +193,16 @@ public Feature basicGetOwningFeatureOfType() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.TYPE_FEATURING__FEATURE_OF_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getFeatureOfType();
-                }
                 return this.basicGetFeatureOfType();
             case SysmlPackage.TYPE_FEATURING__FEATURING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getFeaturingType();
-                }
                 return this.basicGetFeaturingType();
             case SysmlPackage.TYPE_FEATURING__OWNING_FEATURE_OF_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningFeatureOfType();
-                }
                 return this.basicGetOwningFeatureOfType();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeImpl.java
index f8fd457ff..0fe4c6471 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeImpl.java
@@ -286,9 +286,8 @@ public boolean isIsAbstract() {
     public void setIsAbstract(boolean newIsAbstract) {
         boolean oldIsAbstract = this.isAbstract;
         this.isAbstract = newIsAbstract;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TYPE__IS_ABSTRACT, oldIsAbstract, this.isAbstract));
-        }
     }
 
     /**
@@ -320,9 +319,8 @@ public boolean isIsSufficient() {
     public void setIsSufficient(boolean newIsSufficient) {
         boolean oldIsSufficient = this.isSufficient;
         this.isSufficient = newIsSufficient;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TYPE__IS_SUFFICIENT, oldIsSufficient, this.isSufficient));
-        }
     }
 
     /**
@@ -507,7 +505,9 @@ public EList<Type> getUnioningType() {
      */
     @Override
     public EList<Type> allSupertypes() {
-        return this.allSupertypes(this, new ArrayList<>());
+        // TODO: implement this method
+        // Ensure that you remove @generated or mark it @generated NOT
+        return null;
     }
 
     /**
@@ -550,6 +550,7 @@ private EList<Type> allSupertypes(Type currentType, List<Type> visited) {
         }
         return superTypes;
     }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -562,6 +563,18 @@ public FeatureDirectionKind directionOf(Feature feature) {
         return null;
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public FeatureDirectionKind directionOfExcluding(Feature feature, EList<Type> excluded) {
+        // TODO: implement this method
+        // Ensure that you remove @generated or mark it @generated NOT
+        return null;
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -575,7 +588,7 @@ public EList<Membership> inheritedMemberships(EList<Type> excluded) {
     /**
      * @generated NOT
      */
-    private EList<Namespace> toNamespaceExclusion(EList<Type> excluded){
+    private EList<Namespace> toNamespaceExclusion(EList<Type> excluded) {
         return excluded.stream().filter(Namespace.class::isInstance)
                 .map(Namespace.class::cast)
                 .collect(toCollection(BasicEList<Namespace>::new));
@@ -589,15 +602,15 @@ protected EList<Membership> getMembership(EList<Namespace> excluded) {
         List<Element> memberships = new ArrayList<>();
         NameConflictingFilter filter = new NameConflictingFilter();
         this.getOwnedMembership().stream()
-            .filter(filter)
-            .forEach(memberships::add);
+                .filter(filter)
+                .forEach(memberships::add);
         this.importedMemberships(excluded).stream()
-            .filter(filter)
-            .forEach(memberships::add);
+                .filter(filter)
+                .forEach(memberships::add);
         this.inheritedMemberships(excluded.stream()
-                    .filter(Type.class::isInstance)
-                    .map(Type.class::cast)
-                    .collect(toCollection(UniqueEList::new)))
+                .filter(Type.class::isInstance)
+                .map(Type.class::cast)
+                .collect(toCollection(UniqueEList::new)))
                 .stream()
                 .filter(filter)
                 .forEach(memberships::add);
@@ -669,16 +682,14 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.TYPE__INTERSECTING_TYPE:
                 return this.getIntersectingType();
             case SysmlPackage.TYPE__MULTIPLICITY:
-                if (resolve) {
+                if (resolve)
                     return this.getMultiplicity();
-                }
                 return this.basicGetMultiplicity();
             case SysmlPackage.TYPE__OUTPUT:
                 return this.getOutput();
             case SysmlPackage.TYPE__OWNED_CONJUGATOR:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedConjugator();
-                }
                 return this.basicGetOwnedConjugator();
             case SysmlPackage.TYPE__OWNED_DIFFERENCING:
                 return this.getOwnedDifferencing();
@@ -812,6 +823,8 @@ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTarg
                 return this.allSupertypes();
             case SysmlPackage.TYPE___DIRECTION_OF__FEATURE:
                 return this.directionOf((Feature) arguments.get(0));
+            case SysmlPackage.TYPE___DIRECTION_OF_EXCLUDING__FEATURE_ELIST:
+                return this.directionOfExcluding((Feature) arguments.get(0), (EList<Type>) arguments.get(1));
             case SysmlPackage.TYPE___INHERITED_MEMBERSHIPS__ELIST:
                 return this.inheritedMemberships((EList<Type>) arguments.get(0));
             case SysmlPackage.TYPE___SPECIALIZES__TYPE:
@@ -829,9 +842,8 @@ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTarg
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isAbstract: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UnioningImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UnioningImpl.java
index 9645aa862..aea32c642 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UnioningImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UnioningImpl.java
@@ -102,9 +102,8 @@ public Type getUnioningType() {
             InternalEObject oldUnioningType = (InternalEObject) this.unioningType;
             this.unioningType = (Type) this.eResolveProxy(oldUnioningType);
             if (this.unioningType != oldUnioningType) {
-                if (this.eNotificationRequired()) {
+                if (this.eNotificationRequired())
                     this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.UNIONING__UNIONING_TYPE, oldUnioningType, this.unioningType));
-                }
             }
         }
         return this.unioningType;
@@ -128,9 +127,8 @@ public Type basicGetUnioningType() {
     public void setUnioningType(Type newUnioningType) {
         Type oldUnioningType = this.unioningType;
         this.unioningType = newUnioningType;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.UNIONING__UNIONING_TYPE, oldUnioningType, this.unioningType));
-        }
     }
 
     /**
@@ -142,14 +140,12 @@ public void setUnioningType(Type newUnioningType) {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.UNIONING__TYPE_UNIONED:
-                if (resolve) {
+                if (resolve)
                     return this.getTypeUnioned();
-                }
                 return this.basicGetTypeUnioned();
             case SysmlPackage.UNIONING__UNIONING_TYPE:
-                if (resolve) {
+                if (resolve)
                     return this.getUnioningType();
-                }
                 return this.basicGetUnioningType();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java
index 9e64d2d84..b36a06faa 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java
@@ -231,9 +231,8 @@ public boolean isIsVariation() {
     public void setIsVariation(boolean newIsVariation) {
         boolean oldIsVariation = this.isVariation;
         this.isVariation = newIsVariation;
-        if (this.eNotificationRequired()) {
+        if (this.eNotificationRequired())
             this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.USAGE__IS_VARIATION, oldIsVariation, this.isVariation));
-        }
     }
 
     /**
@@ -894,14 +893,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.USAGE__NESTED_VIEWPOINT:
                 return this.getNestedViewpoint();
             case SysmlPackage.USAGE__OWNING_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningDefinition();
-                }
                 return this.basicGetOwningDefinition();
             case SysmlPackage.USAGE__OWNING_USAGE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwningUsage();
-                }
                 return this.basicGetOwningUsage();
             case SysmlPackage.USAGE__USAGE:
                 return this.getUsage();
@@ -1035,9 +1032,8 @@ public boolean eIsSet(int featureID) {
      */
     @Override
     public String toString() {
-        if (this.eIsProxy()) {
+        if (this.eIsProxy())
             return super.toString();
-        }
 
         StringBuilder result = new StringBuilder(super.toString());
         result.append(" (isVariation: ");
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UseCaseUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UseCaseUsageImpl.java
index 52773ce09..0bca43a32 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UseCaseUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UseCaseUsageImpl.java
@@ -102,9 +102,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.USE_CASE_USAGE__INCLUDED_USE_CASE:
                 return this.getIncludedUseCase();
             case SysmlPackage.USE_CASE_USAGE__USE_CASE_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getUseCaseDefinition();
-                }
                 return this.basicGetUseCaseDefinition();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/VariantMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/VariantMembershipImpl.java
index 71290432a..9d1b2de58 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/VariantMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/VariantMembershipImpl.java
@@ -89,9 +89,8 @@ public Usage basicGetOwnedVariantUsage() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.VARIANT_MEMBERSHIP__OWNED_VARIANT_USAGE:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedVariantUsage();
-                }
                 return this.basicGetOwnedVariantUsage();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewRenderingMembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewRenderingMembershipImpl.java
index e7bfb2b2e..09a8760b4 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewRenderingMembershipImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewRenderingMembershipImpl.java
@@ -108,14 +108,12 @@ public RenderingUsage basicGetReferencedRendering() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.VIEW_RENDERING_MEMBERSHIP__OWNED_RENDERING:
-                if (resolve) {
+                if (resolve)
                     return this.getOwnedRendering();
-                }
                 return this.basicGetOwnedRendering();
             case SysmlPackage.VIEW_RENDERING_MEMBERSHIP__REFERENCED_RENDERING:
-                if (resolve) {
+                if (resolve)
                     return this.getReferencedRendering();
-                }
                 return this.basicGetReferencedRendering();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewUsageImpl.java
index 0a5dfa3d8..409fca421 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewUsageImpl.java
@@ -170,14 +170,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
             case SysmlPackage.VIEW_USAGE__VIEW_CONDITION:
                 return this.getViewCondition();
             case SysmlPackage.VIEW_USAGE__VIEW_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getViewDefinition();
-                }
                 return this.basicGetViewDefinition();
             case SysmlPackage.VIEW_USAGE__VIEW_RENDERING:
-                if (resolve) {
+                if (resolve)
                     return this.getViewRendering();
-                }
                 return this.basicGetViewRendering();
         }
         return super.eGet(featureID, resolve, coreType);
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewpointUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewpointUsageImpl.java
index 70cf06819..b1b265206 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewpointUsageImpl.java
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewpointUsageImpl.java
@@ -103,9 +103,8 @@ public EList<PartUsage> getViewpointStakeholder() {
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
             case SysmlPackage.VIEWPOINT_USAGE__VIEWPOINT_DEFINITION:
-                if (resolve) {
+                if (resolve)
                     return this.getViewpointDefinition();
-                }
                 return this.basicGetViewpointDefinition();
             case SysmlPackage.VIEWPOINT_USAGE__VIEWPOINT_STAKEHOLDER:
                 return this.getViewpointStakeholder();
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/resources/model/sysml.ecore b/backend/metamodel/syson-sysml-metamodel/src/main/resources/model/sysml.ecore
index 5d52ca625..b7af83794 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/resources/model/sysml.ecore
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/resources/model/sysml.ecore
@@ -92,6 +92,11 @@
         derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="annotation" upperBound="-1"
         eType="#//Annotation" eOpposite="#//Annotation/annotatingElement"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAnnotatingRelationship"
+        ordered="false" upperBound="-1" eType="#//Annotation" changeable="false" volatile="true"
+        transient="true" derived="true" eOpposite="#//Annotation/owningAnnotatingElement">
+      <eAnnotations source="subsets" references="#//AnnotatingElement/annotation #//Element/ownedRelationship"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Annotation" eSuperTypes="#//Relationship">
     <eStructuralFeatures xsi:type="ecore:EReference" name="annotatedElement" ordered="false"
@@ -107,6 +112,11 @@
         derived="true" eOpposite="#//Element/ownedAnnotation">
       <eAnnotations source="subsets" references="#//Annotation/annotatedElement #//Relationship/owningRelatedElement"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="owningAnnotatingElement"
+        ordered="false" eType="#//AnnotatingElement" changeable="false" volatile="true"
+        transient="true" derived="true" eOpposite="#//AnnotatingElement/ownedAnnotatingRelationship">
+      <eAnnotations source="subsets" references="#//Annotation/annotatingElement #//Relationship/owningRelatedElement"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AssertConstraintUsage" eSuperTypes="#//ConstraintUsage #//Invariant">
     <eStructuralFeatures xsi:type="ecore:EReference" name="assertedConstraint" ordered="false"
@@ -297,9 +307,6 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Connector" eSuperTypes="#//Feature #//Relationship">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDirected" ordered="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="association" upperBound="-1"
         eType="#//Association" changeable="false" volatile="true" transient="true"
         derived="true">
@@ -1237,9 +1244,6 @@
   <eClassifiers xsi:type="ecore:EClass" name="OperatorExpression" eSuperTypes="#//InvocationExpression">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false"
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="operand" upperBound="-1"
-        eType="#//Expression" changeable="false" volatile="true" transient="true"
-        derived="true" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="OwningMembership" eSuperTypes="#//Membership">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ownedMemberElementId" ordered="false"
@@ -1275,6 +1279,7 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ParameterMembership" eSuperTypes="#//FeatureMembership">
+    <eOperations name="parameterDirection" ordered="false" lowerBound="1" eType="#//FeatureDirectionKind"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ownedMemberParameter" ordered="false"
         lowerBound="1" eType="#//Feature" changeable="false" volatile="true" transient="true"
         derived="true">
@@ -1733,6 +1738,10 @@
     <eOperations name="directionOf" ordered="false" eType="#//FeatureDirectionKind">
       <eParameters name="feature" ordered="false" lowerBound="1" eType="#//Feature"/>
     </eOperations>
+    <eOperations name="directionOfExcluding" ordered="false" eType="#//FeatureDirectionKind">
+      <eParameters name="feature" ordered="false" lowerBound="1" eType="#//Feature"/>
+      <eParameters name="excluded" ordered="false" upperBound="-1" eType="#//Type"/>
+    </eOperations>
     <eOperations name="inheritedMemberships" upperBound="-1" eType="#//Membership">
       <eParameters name="excluded" ordered="false" upperBound="-1" eType="#//Type"/>
     </eOperations>
diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/resources/model/sysml.genmodel b/backend/metamodel/syson-sysml-metamodel/src/main/resources/model/sysml.genmodel
index 950751e9b..6227bc18c 100644
--- a/backend/metamodel/syson-sysml-metamodel/src/main/resources/model/sysml.genmodel
+++ b/backend/metamodel/syson-sysml-metamodel/src/main/resources/model/sysml.genmodel
@@ -87,11 +87,13 @@
     <genClasses ecoreClass="sysml.ecore#//AnnotatingElement">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//AnnotatingElement/annotatedElement"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//AnnotatingElement/annotation"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//AnnotatingElement/ownedAnnotatingRelationship"/>
     </genClasses>
     <genClasses ecoreClass="sysml.ecore#//Annotation">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//Annotation/annotatedElement"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//Annotation/annotatingElement"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//Annotation/owningAnnotatedElement"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//Annotation/owningAnnotatingElement"/>
     </genClasses>
     <genClasses ecoreClass="sysml.ecore#//AssertConstraintUsage">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//AssertConstraintUsage/assertedConstraint"/>
@@ -171,7 +173,6 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//ConnectionUsage/connectionDefinition"/>
     </genClasses>
     <genClasses ecoreClass="sysml.ecore#//Connector">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//Connector/isDirected"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//Connector/association"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//Connector/connectorEnd"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//Connector/relatedFeature"/>
@@ -570,7 +571,6 @@
     </genClasses>
     <genClasses ecoreClass="sysml.ecore#//OperatorExpression">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//OperatorExpression/operator"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference sysml.ecore#//OperatorExpression/operand"/>
     </genClasses>
     <genClasses ecoreClass="sysml.ecore#//OwningMembership">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//OwningMembership/ownedMemberElementId"/>
@@ -586,6 +586,7 @@
     </genClasses>
     <genClasses ecoreClass="sysml.ecore#//ParameterMembership">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//ParameterMembership/ownedMemberParameter"/>
+      <genOperations ecoreOperation="sysml.ecore#//ParameterMembership/parameterDirection"/>
     </genClasses>
     <genClasses ecoreClass="sysml.ecore#//PartDefinition"/>
     <genClasses ecoreClass="sysml.ecore#//PartUsage">
@@ -778,6 +779,10 @@
       <genOperations ecoreOperation="sysml.ecore#//Type/directionOf">
         <genParameters ecoreParameter="sysml.ecore#//Type/directionOf/feature"/>
       </genOperations>
+      <genOperations ecoreOperation="sysml.ecore#//Type/directionOfExcluding">
+        <genParameters ecoreParameter="sysml.ecore#//Type/directionOfExcluding/feature"/>
+        <genParameters ecoreParameter="sysml.ecore#//Type/directionOfExcluding/excluded"/>
+      </genOperations>
       <genOperations ecoreOperation="sysml.ecore#//Type/inheritedMemberships">
         <genParameters ecoreParameter="sysml.ecore#//Type/inheritedMemberships/excluded"/>
       </genOperations>