[500369] Regenerate AS

29 files changed, 561 insertions, 1088 deletions

diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BottomPattern.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BottomPattern.java
index 7fd2e6c76..b09fd7342 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BottomPattern.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BottomPattern.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.common.util.EList;
  * <ul>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.BottomPattern#getArea <em>Area</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.BottomPattern#getAssignment <em>Assignment</em>}</li>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.BottomPattern#getRealizedVariable <em>Realized Variable</em>}</li>
  * </ul>
  *
  * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getBottomPattern()
@@ -79,19 +78,4 @@ public interface BottomPattern extends ImperativePattern {
 	 */
 	EList<Assignment> getAssignment();
 
-	/**
-	 * Returns the value of the '<em><b>Realized Variable</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Realized Variable</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Realized Variable</em>' containment reference list.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getBottomPattern_RealizedVariable()
-	 * @generated
-	 */
-	EList<RealizedVariable> getRealizedVariable();
-
 } // BottomPattern
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/NewStatement.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/NewStatement.java
new file mode 100644
index 000000000..8285e82f7
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/NewStatement.java
@@ -0,0 +1,61 @@
+/**
+ * <copyright>
+ * 
+ * Copyright (c) 2013, 2017 Willink Transformations and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   E.D.Willink - Initial API and implementation
+ * 
+ * </copyright>
+ */
+package org.eclipse.qvtd.pivot.qvtimperative;
+
+import org.eclipse.ocl.pivot.Variable;
+import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>New Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.NewStatement#getReferredTypedModel <em>Referred Typed Model</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getNewStatement()
+ * @generated
+ */
+public interface NewStatement extends Variable, BottomStatement {
+
+	/**
+	 * Returns the value of the '<em><b>Referred Typed Model</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Referred Typed Model</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Referred Typed Model</em>' reference.
+	 * @see #setReferredTypedModel(TypedModel)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getNewStatement_ReferredTypedModel()
+	 * @generated
+	 */
+	TypedModel getReferredTypedModel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.NewStatement#getReferredTypedModel <em>Referred Typed Model</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Referred Typed Model</em>' reference.
+	 * @see #getReferredTypedModel()
+	 * @generated
+	 */
+	void setReferredTypedModel(TypedModel value);
+} // NewStatement
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java
index d18a79452..4373a26f0 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java
@@ -37,7 +37,7 @@ public interface QVTimperativeFactory extends EFactory {
 	 * @return a new object of class '<em>Add Statement</em>'.
 	 * @generated
 	 */
-	@NonNull AddStatement createAddStatement();
+	AddStatement createAddStatement();
 
 	/**
 	 * Returns a new object of class '<em>Bottom Pattern</em>'.
@@ -130,13 +130,13 @@ public interface QVTimperativeFactory extends EFactory {
 	@NonNull MappingLoop createMappingLoop();
 
 	/**
-	 * Returns a new object of class '<em>Realized Variable</em>'.
+	 * Returns a new object of class '<em>New Statement</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Realized Variable</em>'.
+	 * @return a new object of class '<em>New Statement</em>'.
 	 * @generated
 	 */
-	@NonNull RealizedVariable createRealizedVariable();
+	@NonNull NewStatement createNewStatement();
 
 	/**
 	 * Returns a new object of class '<em>Set Statement</em>'.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
index 3e65ad631..2830b68c9 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
@@ -219,16 +219,6 @@ public interface QVTimperativePackage extends EPackage {
 	int MAPPING_LOOP = 13;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.RealizedVariableImpl <em>Realized Variable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.RealizedVariableImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getRealizedVariable()
-	 * @generated
-	 */
-	int REALIZED_VARIABLE = 15;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.StatementImpl <em>Statement</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -754,22 +744,13 @@ public interface QVTimperativePackage extends EPackage {
 	int BOTTOM_PATTERN__ASSIGNMENT = IMPERATIVE_PATTERN_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Realized Variable</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BOTTOM_PATTERN__REALIZED_VARIABLE = IMPERATIVE_PATTERN_FEATURE_COUNT + 2;
-
-	/**
 	 * The number of structural features of the '<em>Bottom Pattern</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN_FEATURE_COUNT = IMPERATIVE_PATTERN_FEATURE_COUNT + 3;
+	int BOTTOM_PATTERN_FEATURE_COUNT = IMPERATIVE_PATTERN_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1645,13 +1626,23 @@ public interface QVTimperativePackage extends EPackage {
 	int MAPPING_LOOP_FEATURE_COUNT = MAPPING_STATEMENT_FEATURE_COUNT + 3;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.NewStatementImpl <em>New Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.NewStatementImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getNewStatement()
+	 * @generated
+	 */
+	int NEW_STATEMENT = 15;
+
+	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__ANNOTATING_COMMENTS = PivotPackage.VARIABLE__ANNOTATING_COMMENTS;
+	int NEW_STATEMENT__ANNOTATING_COMMENTS = PivotPackage.VARIABLE__ANNOTATING_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
@@ -1660,7 +1651,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__OWNED_ANNOTATIONS = PivotPackage.VARIABLE__OWNED_ANNOTATIONS;
+	int NEW_STATEMENT__OWNED_ANNOTATIONS = PivotPackage.VARIABLE__OWNED_ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
@@ -1669,7 +1660,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__OWNED_COMMENTS = PivotPackage.VARIABLE__OWNED_COMMENTS;
+	int NEW_STATEMENT__OWNED_COMMENTS = PivotPackage.VARIABLE__OWNED_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
@@ -1678,7 +1669,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__OWNED_EXTENSIONS = PivotPackage.VARIABLE__OWNED_EXTENSIONS;
+	int NEW_STATEMENT__OWNED_EXTENSIONS = PivotPackage.VARIABLE__OWNED_EXTENSIONS;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1687,7 +1678,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__NAME = PivotPackage.VARIABLE__NAME;
+	int NEW_STATEMENT__NAME = PivotPackage.VARIABLE__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Is Many</b></em>' attribute.
@@ -1696,7 +1687,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__IS_MANY = PivotPackage.VARIABLE__IS_MANY;
+	int NEW_STATEMENT__IS_MANY = PivotPackage.VARIABLE__IS_MANY;
 
 	/**
 	 * The feature id for the '<em><b>Is Required</b></em>' attribute.
@@ -1705,7 +1696,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__IS_REQUIRED = PivotPackage.VARIABLE__IS_REQUIRED;
+	int NEW_STATEMENT__IS_REQUIRED = PivotPackage.VARIABLE__IS_REQUIRED;
 
 	/**
 	 * The feature id for the '<em><b>Type</b></em>' reference.
@@ -1714,7 +1705,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__TYPE = PivotPackage.VARIABLE__TYPE;
+	int NEW_STATEMENT__TYPE = PivotPackage.VARIABLE__TYPE;
 
 	/**
 	 * The feature id for the '<em><b>Type Value</b></em>' reference.
@@ -1723,7 +1714,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__TYPE_VALUE = PivotPackage.VARIABLE__TYPE_VALUE;
+	int NEW_STATEMENT__TYPE_VALUE = PivotPackage.VARIABLE__TYPE_VALUE;
 
 	/**
 	 * The feature id for the '<em><b>Is Implicit</b></em>' attribute.
@@ -1732,7 +1723,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__IS_IMPLICIT = PivotPackage.VARIABLE__IS_IMPLICIT;
+	int NEW_STATEMENT__IS_IMPLICIT = PivotPackage.VARIABLE__IS_IMPLICIT;
 
 	/**
 	 * The feature id for the '<em><b>Owned Init</b></em>' containment reference.
@@ -1741,7 +1732,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__OWNED_INIT = PivotPackage.VARIABLE__OWNED_INIT;
+	int NEW_STATEMENT__OWNED_INIT = PivotPackage.VARIABLE__OWNED_INIT;
 
 	/**
 	 * The feature id for the '<em><b>Represented Parameter</b></em>' reference.
@@ -1750,16 +1741,25 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE__REPRESENTED_PARAMETER = PivotPackage.VARIABLE__REPRESENTED_PARAMETER;
+	int NEW_STATEMENT__REPRESENTED_PARAMETER = PivotPackage.VARIABLE__REPRESENTED_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Referred Typed Model</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NEW_STATEMENT__REFERRED_TYPED_MODEL = PivotPackage.VARIABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Realized Variable</em>' class.
+	 * The number of structural features of the '<em>New Statement</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REALIZED_VARIABLE_FEATURE_COUNT = PivotPackage.VARIABLE_FEATURE_COUNT + 0;
+	int NEW_STATEMENT_FEATURE_COUNT = PivotPackage.VARIABLE_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SetStatementImpl <em>Set Statement</em>}' class.
@@ -2207,17 +2207,6 @@ public interface QVTimperativePackage extends EPackage {
 	EReference getBottomPattern_Assignment();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.qvtd.pivot.qvtimperative.BottomPattern#getRealizedVariable <em>Realized Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Realized Variable</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.BottomPattern#getRealizedVariable()
-	 * @see #getBottomPattern()
-	 * @generated
-	 */
-	EReference getBottomPattern_RealizedVariable();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.BottomStatement <em>Bottom Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2493,14 +2482,25 @@ public interface QVTimperativePackage extends EPackage {
 	EClass getMappingStatement();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable <em>Realized Variable</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.NewStatement <em>New Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>New Statement</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.NewStatement
+	 * @generated
+	 */
+	EClass getNewStatement();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtimperative.NewStatement#getReferredTypedModel <em>Referred Typed Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Realized Variable</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable
+	 * @return the meta object for the reference '<em>Referred Typed Model</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.NewStatement#getReferredTypedModel()
+	 * @see #getNewStatement()
 	 * @generated
 	 */
-	EClass getRealizedVariable();
+	EReference getNewStatement_ReferredTypedModel();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.SetStatement <em>Set Statement</em>}'.
@@ -2767,14 +2767,6 @@ public interface QVTimperativePackage extends EPackage {
 		EReference BOTTOM_PATTERN__ASSIGNMENT = eINSTANCE.getBottomPattern_Assignment();
 
 		/**
-		 * The meta object literal for the '<em><b>Realized Variable</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BOTTOM_PATTERN__REALIZED_VARIABLE = eINSTANCE.getBottomPattern_RealizedVariable();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BottomStatementImpl <em>Bottom Statement</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -3005,14 +2997,22 @@ public interface QVTimperativePackage extends EPackage {
 		EClass MAPPING_STATEMENT = eINSTANCE.getMappingStatement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.RealizedVariableImpl <em>Realized Variable</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.NewStatementImpl <em>New Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.NewStatementImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getNewStatement()
+		 * @generated
+		 */
+		EClass NEW_STATEMENT = eINSTANCE.getNewStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Referred Typed Model</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.RealizedVariableImpl
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getRealizedVariable()
 		 * @generated
 		 */
-		EClass REALIZED_VARIABLE = eINSTANCE.getRealizedVariable();
+		EReference NEW_STATEMENT__REFERRED_TYPED_MODEL = eINSTANCE.getNewStatement_ReferredTypedModel();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SetStatementImpl <em>Set Statement</em>}' class.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/RealizedVariable.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/RealizedVariable.java
deleted file mode 100644
index 70c7aca36..000000000
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/RealizedVariable.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * <copyright>
- * 
- * Copyright (c) 2013, 2017 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   E.D.Willink - Initial API and implementation
- * 
- * </copyright>
- */
-package org.eclipse.qvtd.pivot.qvtimperative;
-
-import org.eclipse.ocl.pivot.Variable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Realized Variable</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getRealizedVariable()
- * @generated
- */
-public interface RealizedVariable extends Variable {
-} // RealizedVariable
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/AddStatementImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/AddStatementImpl.java
index 1f0b167f2..cfbb9aa14 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/AddStatementImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/AddStatementImpl.java
@@ -16,22 +16,15 @@ package org.eclipse.qvtd.pivot.qvtimperative.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.jdt.annotation.NonNull;
-
 import org.eclipse.ocl.pivot.OCLExpression;
-
 import org.eclipse.ocl.pivot.util.Visitor;
-
 import org.eclipse.qvtd.pivot.qvtimperative.AddStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
-
 import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
 
 /**
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BottomPatternImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BottomPatternImpl.java
index f4bdccb0e..44ee90c98 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BottomPatternImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BottomPatternImpl.java
@@ -22,7 +22,6 @@ 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.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
@@ -32,7 +31,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.Area;
 import org.eclipse.qvtd.pivot.qvtimperative.Assignment;
 import org.eclipse.qvtd.pivot.qvtimperative.BottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
-import org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
 
 /**
@@ -45,7 +43,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
  * <ul>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BottomPatternImpl#getArea <em>Area</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BottomPatternImpl#getAssignment <em>Assignment</em>}</li>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BottomPatternImpl#getRealizedVariable <em>Realized Variable</em>}</li>
  * </ul>
  *
  * @generated
@@ -62,16 +59,6 @@ public class BottomPatternImpl extends ImperativePatternImpl implements BottomPa
 	protected EList<Assignment> assignment;
 
 	/**
-	 * The cached value of the '{@link #getRealizedVariable() <em>Realized Variable</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRealizedVariable()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<RealizedVariable> realizedVariable;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -151,19 +138,6 @@ public class BottomPatternImpl extends ImperativePatternImpl implements BottomPa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public EList<RealizedVariable> getRealizedVariable() {
-		if (realizedVariable == null) {
-			realizedVariable = new EObjectContainmentEList<RealizedVariable>(RealizedVariable.class, this, QVTimperativePackage.BOTTOM_PATTERN__REALIZED_VARIABLE);
-		}
-		return realizedVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -190,8 +164,6 @@ public class BottomPatternImpl extends ImperativePatternImpl implements BottomPa
 				return basicSetArea(null, msgs);
 			case QVTimperativePackage.BOTTOM_PATTERN__ASSIGNMENT:
 				return ((InternalEList<?>)getAssignment()).basicRemove(otherEnd, msgs);
-			case QVTimperativePackage.BOTTOM_PATTERN__REALIZED_VARIABLE:
-				return ((InternalEList<?>)getRealizedVariable()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -222,8 +194,6 @@ public class BottomPatternImpl extends ImperativePatternImpl implements BottomPa
 				return getArea();
 			case QVTimperativePackage.BOTTOM_PATTERN__ASSIGNMENT:
 				return getAssignment();
-			case QVTimperativePackage.BOTTOM_PATTERN__REALIZED_VARIABLE:
-				return getRealizedVariable();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -244,10 +214,6 @@ public class BottomPatternImpl extends ImperativePatternImpl implements BottomPa
 				getAssignment().clear();
 				getAssignment().addAll((Collection<? extends Assignment>)newValue);
 				return;
-			case QVTimperativePackage.BOTTOM_PATTERN__REALIZED_VARIABLE:
-				getRealizedVariable().clear();
-				getRealizedVariable().addAll((Collection<? extends RealizedVariable>)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -266,9 +232,6 @@ public class BottomPatternImpl extends ImperativePatternImpl implements BottomPa
 			case QVTimperativePackage.BOTTOM_PATTERN__ASSIGNMENT:
 				getAssignment().clear();
 				return;
-			case QVTimperativePackage.BOTTOM_PATTERN__REALIZED_VARIABLE:
-				getRealizedVariable().clear();
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -285,8 +248,6 @@ public class BottomPatternImpl extends ImperativePatternImpl implements BottomPa
 				return getArea() != null;
 			case QVTimperativePackage.BOTTOM_PATTERN__ASSIGNMENT:
 				return assignment != null && !assignment.isEmpty();
-			case QVTimperativePackage.BOTTOM_PATTERN__REALIZED_VARIABLE:
-				return realizedVariable != null && !realizedVariable.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/NewStatementImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/NewStatementImpl.java
new file mode 100644
index 000000000..61a0f6b74
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/NewStatementImpl.java
@@ -0,0 +1,181 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2013, 2017 Willink Transformations and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   E.D.Willink - Initial API and implementation
+ *
+ * </copyright>
+ */
+package org.eclipse.qvtd.pivot.qvtimperative.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.internal.VariableImpl;
+import org.eclipse.ocl.pivot.util.Visitor;
+import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
+import org.eclipse.qvtd.pivot.qvtimperative.NewStatement;
+import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
+import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>New Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.NewStatementImpl#getReferredTypedModel <em>Referred Typed Model</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NewStatementImpl extends VariableImpl implements NewStatement {
+	/**
+	 * The cached value of the '{@link #getReferredTypedModel() <em>Referred Typed Model</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getReferredTypedModel()
+	 * @generated
+	 * @ordered
+	 */
+	protected TypedModel referredTypedModel;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NewStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return QVTimperativePackage.Literals.NEW_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TypedModel getReferredTypedModel() {
+		if (referredTypedModel != null && referredTypedModel.eIsProxy()) {
+			InternalEObject oldReferredTypedModel = (InternalEObject)referredTypedModel;
+			referredTypedModel = (TypedModel)eResolveProxy(oldReferredTypedModel);
+			if (referredTypedModel != oldReferredTypedModel) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTimperativePackage.NEW_STATEMENT__REFERRED_TYPED_MODEL, oldReferredTypedModel, referredTypedModel));
+			}
+		}
+		return referredTypedModel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TypedModel basicGetReferredTypedModel() {
+		return referredTypedModel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setReferredTypedModel(TypedModel newReferredTypedModel) {
+		TypedModel oldReferredTypedModel = referredTypedModel;
+		referredTypedModel = newReferredTypedModel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.NEW_STATEMENT__REFERRED_TYPED_MODEL, oldReferredTypedModel, referredTypedModel));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case QVTimperativePackage.NEW_STATEMENT__REFERRED_TYPED_MODEL:
+				if (resolve) return getReferredTypedModel();
+				return basicGetReferredTypedModel();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case QVTimperativePackage.NEW_STATEMENT__REFERRED_TYPED_MODEL:
+				setReferredTypedModel((TypedModel)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.NEW_STATEMENT__REFERRED_TYPED_MODEL:
+				setReferredTypedModel((TypedModel)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.NEW_STATEMENT__REFERRED_TYPED_MODEL:
+				return referredTypedModel != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public <R> R accept(@NonNull Visitor<R> visitor) {
+		return (R) ((QVTimperativeVisitor<?>)visitor).visitNewStatement(this);
+	}
+
+} //NewStatementImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java
index 1ff6819e3..a11767862 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java
@@ -27,9 +27,9 @@ import org.eclipse.qvtd.pivot.qvtimperative.Mapping;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop;
+import org.eclipse.qvtd.pivot.qvtimperative.NewStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeFactory;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
-import org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.SetStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.VariableAssignment;
 import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate;
@@ -89,7 +89,7 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 			case QVTimperativePackage.MAPPING_CALL: return createMappingCall();
 			case QVTimperativePackage.MAPPING_CALL_BINDING: return createMappingCallBinding();
 			case QVTimperativePackage.MAPPING_LOOP: return createMappingLoop();
-			case QVTimperativePackage.REALIZED_VARIABLE: return createRealizedVariable();
+			case QVTimperativePackage.NEW_STATEMENT: return createNewStatement();
 			case QVTimperativePackage.SET_STATEMENT: return createSetStatement();
 			case QVTimperativePackage.VARIABLE_ASSIGNMENT: return createVariableAssignment();
 			case QVTimperativePackage.VARIABLE_PREDICATE: return createVariablePredicate();
@@ -104,7 +104,7 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull AddStatement createAddStatement() {
+	public AddStatement createAddStatement() {
 		AddStatementImpl addStatement = new AddStatementImpl();
 		return addStatement;
 	}
@@ -225,9 +225,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull RealizedVariable createRealizedVariable() {
-		RealizedVariableImpl realizedVariable = new RealizedVariableImpl();
-		return realizedVariable;
+	public @NonNull NewStatement createNewStatement() {
+		NewStatementImpl newStatement = new NewStatementImpl();
+		return newStatement;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
index 4db78869d..9be8206a5 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
@@ -32,9 +32,9 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement;
+import org.eclipse.qvtd.pivot.qvtimperative.NewStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeFactory;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
-import org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.SetStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.Statement;
 import org.eclipse.qvtd.pivot.qvtimperative.VariableAssignment;
@@ -157,7 +157,7 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass realizedVariableEClass = null;
+	private EClass newStatementEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link QVTimperativePackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -246,7 +246,7 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		// Mark meta-data to indicate it can't be changed
 		theQVTimperativePackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(QVTimperativePackage.eNS_URI, theQVTimperativePackage);
 		return theQVTimperativePackage;
@@ -418,16 +418,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getBottomPattern_RealizedVariable() {
-		return (EReference)bottomPatternEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
 	public EClass getBottomStatement() {
 		return bottomStatementEClass;
 	}
@@ -688,8 +678,18 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getRealizedVariable() {
-		return realizedVariableEClass;
+	public EClass getNewStatement() {
+		return newStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getNewStatement_ReferredTypedModel() {
+		return (EReference)newStatementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -840,7 +840,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		bottomPatternEClass = createEClass(BOTTOM_PATTERN);
 		createEReference(bottomPatternEClass, BOTTOM_PATTERN__AREA);
 		createEReference(bottomPatternEClass, BOTTOM_PATTERN__ASSIGNMENT);
-		createEReference(bottomPatternEClass, BOTTOM_PATTERN__REALIZED_VARIABLE);
 
 		bottomStatementEClass = createEClass(BOTTOM_STATEMENT);
 
@@ -879,7 +878,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		mappingStatementEClass = createEClass(MAPPING_STATEMENT);
 
-		realizedVariableEClass = createEClass(REALIZED_VARIABLE);
+		newStatementEClass = createEClass(NEW_STATEMENT);
+		createEReference(newStatementEClass, NEW_STATEMENT__REFERRED_TYPED_MODEL);
 
 		setStatementEClass = createEClass(SET_STATEMENT);
 		createEReference(setStatementEClass, SET_STATEMENT__SLOT_EXPRESSION);
@@ -946,7 +946,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		mappingCallBindingEClass.getESuperTypes().add(thePivotPackage.getElement());
 		mappingLoopEClass.getESuperTypes().add(this.getMappingStatement());
 		mappingStatementEClass.getESuperTypes().add(this.getStatement());
-		realizedVariableEClass.getESuperTypes().add(thePivotPackage.getVariable());
+		newStatementEClass.getESuperTypes().add(thePivotPackage.getVariable());
+		newStatementEClass.getESuperTypes().add(this.getBottomStatement());
 		setStatementEClass.getESuperTypes().add(this.getBottomStatement());
 		statementEClass.getESuperTypes().add(thePivotPackage.getNamedElement());
 		variableAssignmentEClass.getESuperTypes().add(this.getAssignment());
@@ -972,7 +973,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		initEClass(bottomPatternEClass, BottomPattern.class, "BottomPattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getBottomPattern_Area(), this.getArea(), this.getArea_BottomPattern(), "area", null, 1, 1, BottomPattern.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getBottomPattern_Assignment(), this.getAssignment(), this.getAssignment_BottomPattern(), "assignment", null, 0, -1, BottomPattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBottomPattern_RealizedVariable(), this.getRealizedVariable(), null, "realizedVariable", null, 0, -1, BottomPattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(bottomStatementEClass, BottomStatement.class, "BottomStatement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
@@ -1013,7 +1013,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		initEClass(mappingStatementEClass, MappingStatement.class, "MappingStatement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(realizedVariableEClass, RealizedVariable.class, "RealizedVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(newStatementEClass, NewStatement.class, "NewStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getNewStatement_ReferredTypedModel(), theQVTbasePackage.getTypedModel(), null, "referredTypedModel", null, 1, 1, NewStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(setStatementEClass, SetStatement.class, "SetStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getSetStatement_SlotExpression(), thePivotPackage.getVariableExp(), null, "slotExpression", null, 1, 1, SetStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1046,13 +1047,13 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	protected void createImportAnnotations() {
-		String source = "http://www.eclipse.org/OCL/Import";	
+		String source = "http://www.eclipse.org/OCL/Import";
 		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "qvtb", "../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#/"
-		   });
+		(this,
+			source,
+			new String[] {
+				"qvtb", "../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#/"
+		});
 	}
 
 	/**
@@ -1062,55 +1063,55 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	protected void createEmofAnnotations() {
-		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";	
+		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
 		addAnnotation
-		  (getAddStatement_TargetVariable(), 
-		   source, 
-		   new String[] {
-			 "body", "assignment"
-		   });	
+		(getAddStatement_TargetVariable(),
+			source,
+			new String[] {
+				"body", "assignment"
+		});
 		addAnnotation
-		  (getAddStatement_Value(), 
-		   source, 
-		   new String[] {
-			 "body", "valueAssignment"
-		   });	
+		(getAddStatement_Value(),
+			source,
+			new String[] {
+				"body", "valueAssignment"
+		});
 		addAnnotation
-		  (getAssignment_Value(), 
-		   source, 
-		   new String[] {
-			 "body", "valueAssignment"
-		   });	
+		(getAssignment_Value(),
+			source,
+			new String[] {
+				"body", "valueAssignment"
+		});
 		addAnnotation
-		  (getSetStatement_SlotExpression(), 
-		   source, 
-		   new String[] {
-			 "body", "slotAssignment"
-		   });	
+		(getSetStatement_SlotExpression(),
+			source,
+			new String[] {
+				"body", "slotAssignment"
+		});
 		addAnnotation
-		  (getSetStatement_TargetProperty(), 
-		   source, 
-		   new String[] {
-			 "body", "assignment"
-		   });	
+		(getSetStatement_TargetProperty(),
+			source,
+			new String[] {
+				"body", "assignment"
+		});
 		addAnnotation
-		  (getSetStatement_Value(), 
-		   source, 
-		   new String[] {
-			 "body", "valueAssignment"
-		   });	
+		(getSetStatement_Value(),
+			source,
+			new String[] {
+				"body", "valueAssignment"
+		});
 		addAnnotation
-		  (getVariableAssignment_TargetVariable(), 
-		   source, 
-		   new String[] {
-			 "body", "assignment"
-		   });	
+		(getVariableAssignment_TargetVariable(),
+			source,
+			new String[] {
+				"body", "assignment"
+		});
 		addAnnotation
-		  (getVariablePredicate_TargetVariable(), 
-		   source, 
-		   new String[] {
-			 "body", "predicate"
-		   });
+		(getVariablePredicate_TargetVariable(),
+			source,
+			new String[] {
+				"body", "predicate"
+		});
 	}
 
 } //QVTimperativePackageImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/RealizedVariableImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/RealizedVariableImpl.java
deleted file mode 100644
index 07ae21880..000000000
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/RealizedVariableImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * <copyright>
- * 
- * Copyright (c) 2013, 2017 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   E.D.Willink - Initial API and implementation
- * 
- * </copyright>
- */
-package org.eclipse.qvtd.pivot.qvtimperative.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jdt.annotation.NonNull;
-
-import org.eclipse.ocl.pivot.internal.VariableImpl;
-
-import org.eclipse.ocl.pivot.util.Visitor;
-
-import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
-import org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable;
-
-import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Realized Variable</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class RealizedVariableImpl extends VariableImpl implements RealizedVariable {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RealizedVariableImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return QVTimperativePackage.Literals.REALIZED_VARIABLE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public <R> R accept(@NonNull Visitor<R> visitor) {
-		return (R) ((QVTimperativeVisitor<?>)visitor).visitRealizedVariable(this);
-	}
-
-} //RealizedVariableImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java
index 82ff824a9..c2f4415b8 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java
@@ -106,8 +106,8 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
-	public R visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
-		return delegate.visitRealizedVariable(object);
+	public R visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
+		return delegate.visitNewStatement(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java
index de45ee4e6..dab45230d 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java
@@ -110,7 +110,7 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
-	public R visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public R visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return visitVariable(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractMergedQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractMergedQVTimperativeVisitor.java
index 0fc2276ec..e77ffb6ca 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractMergedQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractMergedQVTimperativeVisitor.java
@@ -104,7 +104,7 @@ public abstract class AbstractMergedQVTimperativeVisitor<R, C>
 	}
 
 	@Override
-	public R visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public R visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return visiting(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java
index e8a3e2fa1..b68aed80b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java
@@ -110,7 +110,7 @@ public abstract class AbstractNullQVTimperativeVisitor<@Nullable R, C>
 	}
 
 	@Override
-	public R visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public R visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return null;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java
index 37091363a..934469d11 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java
@@ -114,7 +114,7 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
-	public @Nullable Object visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public @Nullable Object visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return visitVariable(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
index 597f56994..a2192e608 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
@@ -114,7 +114,7 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
-	public @Nullable Boolean visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public @Nullable Boolean visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return visitVariable(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java
index b2431bea3..26a79a4e0 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java
@@ -114,7 +114,7 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
-	public @Nullable Object visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public @Nullable Object visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return visitVariable(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java
index 505f58489..8d88ad0f8 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java
@@ -116,7 +116,7 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
-	public @Nullable Object visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public @Nullable Object visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return visitVariable(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java
index fff79ba08..086c47c6c 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java
@@ -114,7 +114,7 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
-	public @Nullable Object visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public @Nullable Object visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return visitVariable(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeTemplateParameterSubstitutionVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeTemplateParameterSubstitutionVisitor.java
index 4eba23f65..a290a18e2 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeTemplateParameterSubstitutionVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeTemplateParameterSubstitutionVisitor.java
@@ -117,7 +117,7 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
-	public @Nullable Object visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public @Nullable Object visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		return visitVariable(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java
index 164053d22..76e5b1355 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java
@@ -200,10 +200,10 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object) {
+	public R visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitRealizedVariable(object);
+			R result = delegate.visitNewStatement(object);
 			return postVisit(object, prologue, result);
 		}
 		catch (Throwable e) {
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java
index 3cb4d7273..ba998e1ea 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java
@@ -45,8 +45,8 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement;
+import org.eclipse.qvtd.pivot.qvtimperative.NewStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
-import org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.SetStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.Statement;
 import org.eclipse.qvtd.pivot.qvtimperative.VariableAssignment;
@@ -108,151 +108,151 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	 */
 	protected QVTimperativeSwitch<@Nullable Adapter> modelSwitch =
 			new QVTimperativeSwitch<@Nullable Adapter>() {
-			@Override
-			public Adapter caseAddStatement(AddStatement object) {
-				return createAddStatementAdapter();
-			}
-			@Override
-			public Adapter caseArea(Area object) {
-				return createAreaAdapter();
-			}
-			@Override
-			public Adapter caseAssignment(Assignment object) {
-				return createAssignmentAdapter();
-			}
-			@Override
-			public Adapter caseBottomPattern(BottomPattern object) {
-				return createBottomPatternAdapter();
-			}
-			@Override
-			public Adapter caseBottomStatement(BottomStatement object) {
-				return createBottomStatementAdapter();
-			}
-			@Override
-			public Adapter caseConnectionVariable(ConnectionVariable object) {
-				return createConnectionVariableAdapter();
-			}
-			@Override
-			public Adapter caseGuardPattern(GuardPattern object) {
-				return createGuardPatternAdapter();
-			}
-			@Override
-			public Adapter caseImperativeDomain(ImperativeDomain object) {
-				return createImperativeDomainAdapter();
-			}
-			@Override
-			public Adapter caseImperativeModel(ImperativeModel object) {
-				return createImperativeModelAdapter();
-			}
-			@Override
-			public Adapter caseImperativePattern(ImperativePattern object) {
-				return createImperativePatternAdapter();
-			}
-			@Override
-			public Adapter caseMapping(Mapping object) {
-				return createMappingAdapter();
-			}
-			@Override
-			public Adapter caseMappingCall(MappingCall object) {
-				return createMappingCallAdapter();
-			}
-			@Override
-			public Adapter caseMappingCallBinding(MappingCallBinding object) {
-				return createMappingCallBindingAdapter();
-			}
-			@Override
-			public Adapter caseMappingLoop(MappingLoop object) {
-				return createMappingLoopAdapter();
-			}
-			@Override
-			public Adapter caseMappingStatement(MappingStatement object) {
-				return createMappingStatementAdapter();
-			}
-			@Override
-			public Adapter caseRealizedVariable(RealizedVariable object) {
-				return createRealizedVariableAdapter();
-			}
-			@Override
-			public Adapter caseSetStatement(SetStatement object) {
-				return createSetStatementAdapter();
-			}
-			@Override
-			public Adapter caseStatement(Statement object) {
-				return createStatementAdapter();
-			}
-			@Override
-			public Adapter caseVariableAssignment(VariableAssignment object) {
-				return createVariableAssignmentAdapter();
-			}
-			@Override
-			public Adapter caseVariablePredicate(VariablePredicate object) {
-				return createVariablePredicateAdapter();
-			}
-			@Override
-			public Adapter caseVisitable(Visitable object) {
-				return createVisitableAdapter();
-			}
-			@Override
-			public Adapter caseElement(Element object) {
-				return createElementAdapter();
-			}
-			@Override
-			public Adapter caseNameable(Nameable object) {
-				return createNameableAdapter();
-			}
-			@Override
-			public Adapter caseNamedElement(NamedElement object) {
-				return createNamedElementAdapter();
-			}
-			@Override
-			public Adapter casePattern(Pattern object) {
-				return createPatternAdapter();
-			}
-			@Override
-			public Adapter caseTypedElement(TypedElement object) {
-				return createTypedElementAdapter();
-			}
-			@Override
-			public Adapter caseVariableDeclaration(VariableDeclaration object) {
-				return createVariableDeclarationAdapter();
-			}
-			@Override
-			public Adapter caseVariable(Variable object) {
-				return createVariableAdapter();
-			}
-			@Override
-			public Adapter caseReferringElement(ReferringElement object) {
-				return createReferringElementAdapter();
-			}
-			@Override
-			public Adapter caseDomain(Domain object) {
-				return createDomainAdapter();
-			}
-			@Override
-			public Adapter caseNamespace(Namespace object) {
-				return createNamespaceAdapter();
-			}
-			@Override
-			public Adapter caseModel(Model object) {
-				return createModelAdapter();
-			}
-			@Override
-			public Adapter caseBaseModel(BaseModel object) {
-				return createBaseModelAdapter();
-			}
-			@Override
-			public Adapter caseRule(Rule object) {
-				return createRuleAdapter();
-			}
-			@Override
-			public Adapter casePredicate(Predicate object) {
-				return createPredicateAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+		@Override
+		public Adapter caseAddStatement(AddStatement object) {
+			return createAddStatementAdapter();
+		}
+		@Override
+		public Adapter caseArea(Area object) {
+			return createAreaAdapter();
+		}
+		@Override
+		public Adapter caseAssignment(Assignment object) {
+			return createAssignmentAdapter();
+		}
+		@Override
+		public Adapter caseBottomPattern(BottomPattern object) {
+			return createBottomPatternAdapter();
+		}
+		@Override
+		public Adapter caseBottomStatement(BottomStatement object) {
+			return createBottomStatementAdapter();
+		}
+		@Override
+		public Adapter caseConnectionVariable(ConnectionVariable object) {
+			return createConnectionVariableAdapter();
+		}
+		@Override
+		public Adapter caseGuardPattern(GuardPattern object) {
+			return createGuardPatternAdapter();
+		}
+		@Override
+		public Adapter caseImperativeDomain(ImperativeDomain object) {
+			return createImperativeDomainAdapter();
+		}
+		@Override
+		public Adapter caseImperativeModel(ImperativeModel object) {
+			return createImperativeModelAdapter();
+		}
+		@Override
+		public Adapter caseImperativePattern(ImperativePattern object) {
+			return createImperativePatternAdapter();
+		}
+		@Override
+		public Adapter caseMapping(Mapping object) {
+			return createMappingAdapter();
+		}
+		@Override
+		public Adapter caseMappingCall(MappingCall object) {
+			return createMappingCallAdapter();
+		}
+		@Override
+		public Adapter caseMappingCallBinding(MappingCallBinding object) {
+			return createMappingCallBindingAdapter();
+		}
+		@Override
+		public Adapter caseMappingLoop(MappingLoop object) {
+			return createMappingLoopAdapter();
+		}
+		@Override
+		public Adapter caseMappingStatement(MappingStatement object) {
+			return createMappingStatementAdapter();
+		}
+		@Override
+		public Adapter caseNewStatement(NewStatement object) {
+			return createNewStatementAdapter();
+		}
+		@Override
+		public Adapter caseSetStatement(SetStatement object) {
+			return createSetStatementAdapter();
+		}
+		@Override
+		public Adapter caseStatement(Statement object) {
+			return createStatementAdapter();
+		}
+		@Override
+		public Adapter caseVariableAssignment(VariableAssignment object) {
+			return createVariableAssignmentAdapter();
+		}
+		@Override
+		public Adapter caseVariablePredicate(VariablePredicate object) {
+			return createVariablePredicateAdapter();
+		}
+		@Override
+		public Adapter caseVisitable(Visitable object) {
+			return createVisitableAdapter();
+		}
+		@Override
+		public Adapter caseElement(Element object) {
+			return createElementAdapter();
+		}
+		@Override
+		public Adapter caseNameable(Nameable object) {
+			return createNameableAdapter();
+		}
+		@Override
+		public Adapter caseNamedElement(NamedElement object) {
+			return createNamedElementAdapter();
+		}
+		@Override
+		public Adapter casePattern(Pattern object) {
+			return createPatternAdapter();
+		}
+		@Override
+		public Adapter caseTypedElement(TypedElement object) {
+			return createTypedElementAdapter();
+		}
+		@Override
+		public Adapter caseVariableDeclaration(VariableDeclaration object) {
+			return createVariableDeclarationAdapter();
+		}
+		@Override
+		public Adapter caseVariable(Variable object) {
+			return createVariableAdapter();
+		}
+		@Override
+		public Adapter caseReferringElement(ReferringElement object) {
+			return createReferringElementAdapter();
+		}
+		@Override
+		public Adapter caseDomain(Domain object) {
+			return createDomainAdapter();
+		}
+		@Override
+		public Adapter caseNamespace(Namespace object) {
+			return createNamespaceAdapter();
+		}
+		@Override
+		public Adapter caseModel(Model object) {
+			return createModelAdapter();
+		}
+		@Override
+		public Adapter caseBaseModel(BaseModel object) {
+			return createBaseModelAdapter();
+		}
+		@Override
+		public Adapter caseRule(Rule object) {
+			return createRuleAdapter();
+		}
+		@Override
+		public Adapter casePredicate(Predicate object) {
+			return createPredicateAdapter();
+		}
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
@@ -409,16 +409,16 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable <em>Realized Variable</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.NewStatement <em>New Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.NewStatement
 	 * @generated
 	 */
-	public Adapter createRealizedVariableAdapter() {
+	public Adapter createNewStatementAdapter() {
 		return null;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java
index 6f1259f2a..14337b202 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java
@@ -44,8 +44,8 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement;
+import org.eclipse.qvtd.pivot.qvtimperative.NewStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
-import org.eclipse.qvtd.pivot.qvtimperative.RealizedVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.SetStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.Statement;
 import org.eclipse.qvtd.pivot.qvtimperative.VariableAssignment;
@@ -271,16 +271,18 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case QVTimperativePackage.REALIZED_VARIABLE: {
-				RealizedVariable realizedVariable = (RealizedVariable)theEObject;
-				T result = caseRealizedVariable(realizedVariable);
-				if (result == null) result = caseVariable(realizedVariable);
-				if (result == null) result = caseVariableDeclaration(realizedVariable);
-				if (result == null) result = caseTypedElement(realizedVariable);
-				if (result == null) result = caseNamedElement(realizedVariable);
-				if (result == null) result = caseElement(realizedVariable);
-				if (result == null) result = caseNameable(realizedVariable);
-				if (result == null) result = caseVisitable(realizedVariable);
+			case QVTimperativePackage.NEW_STATEMENT: {
+				NewStatement newStatement = (NewStatement)theEObject;
+				T result = caseNewStatement(newStatement);
+				if (result == null) result = caseVariable(newStatement);
+				if (result == null) result = caseBottomStatement(newStatement);
+				if (result == null) result = caseVariableDeclaration(newStatement);
+				if (result == null) result = caseStatement(newStatement);
+				if (result == null) result = caseTypedElement(newStatement);
+				if (result == null) result = caseNamedElement(newStatement);
+				if (result == null) result = caseElement(newStatement);
+				if (result == null) result = caseNameable(newStatement);
+				if (result == null) result = caseVisitable(newStatement);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -554,17 +556,17 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Realized Variable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>New Statement</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Realized Variable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>New Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseRealizedVariable(RealizedVariable object) {
+	public T caseNewStatement(NewStatement object) {
 		return null;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java
index 4a762f95a..e17adeb75 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java
@@ -37,7 +37,7 @@ public interface QVTimperativeVisitor<R> extends org.eclipse.qvtd.pivot.qvtbase.
 	R visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object);
 	R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object);
 	R visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object);
-	R visitRealizedVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull RealizedVariable object);
+	R visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object);
 	R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object);
 	R visitStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Statement object);
 	R visitVariableAssignment(org.eclipse.qvtd.pivot.qvtimperative.@NonNull VariableAssignment object);
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/ConnectionStatementCS.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/ConnectionStatementCS.java
deleted file mode 100644
index b66808983..000000000
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/ConnectionStatementCS.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * 
- * Copyright (c) 2013, 2016 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   E.D.Willink - Initial API and implementation
- * 
- * </copyright>
- */
-package org.eclipse.qvtd.xtext.qvtimperativecs;
-
-import org.eclipse.ocl.pivot.Variable;
-import org.eclipse.ocl.xtext.essentialoclcs.ExpCS;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connection Statement CS</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.qvtd.xtext.qvtimperativecs.ConnectionStatementCS#getOwnedExpression <em>Owned Expression</em>}</li>
- *   <li>{@link org.eclipse.qvtd.xtext.qvtimperativecs.ConnectionStatementCS#getTargetVariable <em>Target Variable</em>}</li>
- * </ul>
- *
- * @see org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage#getConnectionStatementCS()
- * @model
- * @generated
- */
-public interface ConnectionStatementCS extends MappingStatementCS {
-	/**
-	 * Returns the value of the '<em><b>Owned Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Owned Expression</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owned Expression</em>' containment reference.
-	 * @see #setOwnedExpression(ExpCS)
-	 * @see org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage#getConnectionStatementCS_OwnedExpression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ExpCS getOwnedExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.qvtd.xtext.qvtimperativecs.ConnectionStatementCS#getOwnedExpression <em>Owned Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owned Expression</em>' containment reference.
-	 * @see #getOwnedExpression()
-	 * @generated
-	 */
-	void setOwnedExpression(ExpCS value);
-
-	/**
-	 * Returns the value of the '<em><b>Target Variable</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Variable</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Variable</em>' reference.
-	 * @see #setTargetVariable(Variable)
-	 * @see org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage#getConnectionStatementCS_TargetVariable()
-	 * @model required="true"
-	 * @generated
-	 */
-	Variable getTargetVariable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.qvtd.xtext.qvtimperativecs.ConnectionStatementCS#getTargetVariable <em>Target Variable</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Variable</em>' reference.
-	 * @see #getTargetVariable()
-	 * @generated
-	 */
-	void setTargetVariable(Variable value);
-
-} // ConnectionStatementCS
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/RealizedVariableCS.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/RealizedVariableCS.java
deleted file mode 100644
index 16eb96d39..000000000
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/RealizedVariableCS.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * <copyright>
- * 
- * Copyright (c) 2013, 2017 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   E.D.Willink - Initial API and implementation
- * 
- * </copyright>
- */
-package org.eclipse.qvtd.xtext.qvtimperativecs;
-
-import org.eclipse.ocl.xtext.essentialoclcs.ExpCS;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Realized Variable CS</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.qvtd.xtext.qvtimperativecs.RealizedVariableCS#getOwnedInitExpression <em>Owned Init Expression</em>}</li>
- * </ul>
- *
- * @see org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage#getRealizedVariableCS()
- * @model
- * @generated
- */
-public interface RealizedVariableCS extends RealizeableVariableCS {
-
-	/**
-	 * Returns the value of the '<em><b>Owned Init Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Owned Init Expression</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owned Init Expression</em>' containment reference.
-	 * @see #setOwnedInitExpression(ExpCS)
-	 * @see org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage#getRealizedVariableCS_OwnedInitExpression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ExpCS getOwnedInitExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.qvtd.xtext.qvtimperativecs.RealizedVariableCS#getOwnedInitExpression <em>Owned Init Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owned Init Expression</em>' containment reference.
-	 * @see #getOwnedInitExpression()
-	 * @generated
-	 */
-	void setOwnedInitExpression(ExpCS value);
-} // RealizedVariableCS
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/impl/ConnectionStatementCSImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/impl/ConnectionStatementCSImpl.java
deleted file mode 100644
index b90bc829f..000000000
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/impl/ConnectionStatementCSImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * <copyright>
- * 
- * Copyright (c) 2013, 2016 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   E.D.Willink - Initial API and implementation
- * 
- * </copyright>
- */
-package org.eclipse.qvtd.xtext.qvtimperativecs.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.ocl.pivot.Variable;
-import org.eclipse.ocl.xtext.basecs.util.BaseCSVisitor;
-import org.eclipse.ocl.xtext.essentialoclcs.ExpCS;
-import org.eclipse.qvtd.xtext.qvtimperativecs.ConnectionStatementCS;
-import org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage;
-import org.eclipse.qvtd.xtext.qvtimperativecs.util.QVTimperativeCSVisitor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Connection Statement CS</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.qvtd.xtext.qvtimperativecs.impl.ConnectionStatementCSImpl#getOwnedExpression <em>Owned Expression</em>}</li>
- *   <li>{@link org.eclipse.qvtd.xtext.qvtimperativecs.impl.ConnectionStatementCSImpl#getTargetVariable <em>Target Variable</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ConnectionStatementCSImpl extends MappingStatementCSImpl implements ConnectionStatementCS {
-	/**
-	 * The cached value of the '{@link #getOwnedExpression() <em>Owned Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOwnedExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExpCS ownedExpression;
-
-	/**
-	 * The cached value of the '{@link #getTargetVariable() <em>Target Variable</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetVariable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Variable targetVariable;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConnectionStatementCSImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return QVTimperativeCSPackage.Literals.CONNECTION_STATEMENT_CS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ExpCS getOwnedExpression() {
-		return ownedExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOwnedExpression(ExpCS newOwnedExpression, NotificationChain msgs) {
-		ExpCS oldOwnedExpression = ownedExpression;
-		ownedExpression = newOwnedExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION, oldOwnedExpression, newOwnedExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setOwnedExpression(ExpCS newOwnedExpression) {
-		if (newOwnedExpression != ownedExpression) {
-			NotificationChain msgs = null;
-			if (ownedExpression != null)
-				msgs = ((InternalEObject)ownedExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION, null, msgs);
-			if (newOwnedExpression != null)
-				msgs = ((InternalEObject)newOwnedExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION, null, msgs);
-			msgs = basicSetOwnedExpression(newOwnedExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION, newOwnedExpression, newOwnedExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Variable getTargetVariable() {
-		if (targetVariable != null && targetVariable.eIsProxy()) {
-			InternalEObject oldTargetVariable = (InternalEObject)targetVariable;
-			targetVariable = (Variable)eResolveProxy(oldTargetVariable);
-			if (targetVariable != oldTargetVariable) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__TARGET_VARIABLE, oldTargetVariable, targetVariable));
-			}
-		}
-		return targetVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Variable basicGetTargetVariable() {
-		return targetVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setTargetVariable(Variable newTargetVariable) {
-		Variable oldTargetVariable = targetVariable;
-		targetVariable = newTargetVariable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__TARGET_VARIABLE, oldTargetVariable, targetVariable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION:
-				return basicSetOwnedExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION:
-				return getOwnedExpression();
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__TARGET_VARIABLE:
-				if (resolve) return getTargetVariable();
-				return basicGetTargetVariable();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION:
-				setOwnedExpression((ExpCS)newValue);
-				return;
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__TARGET_VARIABLE:
-				setTargetVariable((Variable)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION:
-				setOwnedExpression((ExpCS)null);
-				return;
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__TARGET_VARIABLE:
-				setTargetVariable((Variable)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__OWNED_EXPRESSION:
-				return ownedExpression != null;
-			case QVTimperativeCSPackage.CONNECTION_STATEMENT_CS__TARGET_VARIABLE:
-				return targetVariable != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public <R> R accept(@NonNull BaseCSVisitor<R> visitor) {
-		return (R) ((QVTimperativeCSVisitor<?>)visitor).visitConnectionStatementCS(this);
-	}
-
-} //ConnectionStatementCSImpl
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/impl/RealizedVariableCSImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/impl/RealizedVariableCSImpl.java
deleted file mode 100644
index 443b25c36..000000000
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperativecs/impl/RealizedVariableCSImpl.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2013, 2017 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   E.D.Willink - Initial API and implementation
- *
- * </copyright>
- */
-package org.eclipse.qvtd.xtext.qvtimperativecs.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.ocl.xtext.basecs.util.BaseCSVisitor;
-import org.eclipse.ocl.xtext.essentialoclcs.ExpCS;
-import org.eclipse.qvtd.xtext.qvtimperativecs.QVTimperativeCSPackage;
-import org.eclipse.qvtd.xtext.qvtimperativecs.RealizedVariableCS;
-import org.eclipse.qvtd.xtext.qvtimperativecs.util.QVTimperativeCSVisitor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Realized Variable CS</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.qvtd.xtext.qvtimperativecs.impl.RealizedVariableCSImpl#getOwnedInitExpression <em>Owned Init Expression</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class RealizedVariableCSImpl extends RealizeableVariableCSImpl implements RealizedVariableCS {
-	/**
-	 * The cached value of the '{@link #getOwnedInitExpression() <em>Owned Init Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOwnedInitExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExpCS ownedInitExpression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RealizedVariableCSImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return QVTimperativeCSPackage.Literals.REALIZED_VARIABLE_CS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ExpCS getOwnedInitExpression() {
-		return ownedInitExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOwnedInitExpression(ExpCS newOwnedInitExpression, NotificationChain msgs) {
-		ExpCS oldOwnedInitExpression = ownedInitExpression;
-		ownedInitExpression = newOwnedInitExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION, oldOwnedInitExpression, newOwnedInitExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setOwnedInitExpression(ExpCS newOwnedInitExpression) {
-		if (newOwnedInitExpression != ownedInitExpression) {
-			NotificationChain msgs = null;
-			if (ownedInitExpression != null)
-				msgs = ((InternalEObject)ownedInitExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION, null, msgs);
-			if (newOwnedInitExpression != null)
-				msgs = ((InternalEObject)newOwnedInitExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION, null, msgs);
-			msgs = basicSetOwnedInitExpression(newOwnedInitExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION, newOwnedInitExpression, newOwnedInitExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION:
-				return basicSetOwnedInitExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION:
-				return getOwnedInitExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION:
-				setOwnedInitExpression((ExpCS)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION:
-				setOwnedInitExpression((ExpCS)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case QVTimperativeCSPackage.REALIZED_VARIABLE_CS__OWNED_INIT_EXPRESSION:
-				return ownedInitExpression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public <R> R accept(@NonNull BaseCSVisitor<R> visitor) {
-		return (R) ((QVTimperativeCSVisitor<?>)visitor).visitRealizedVariableCS(this);
-	}
-
-} //RealizedVariableCSImpl